Merge pull request #9 from nkl-kst/dev

nkl-kst · web-flow · commit 38febc828b77 · 2018-10-31T20:32:43.000+01:00
Version 1.1.1
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -9,7 +9,8 @@
         "IconMapper": true,
         "Module": true,
         "moment": true,
-        "Log": true
+        "Log": true,
+        "version": true
     },
     "rules": {
         "indent": ["error", 4],
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
+## [1.1.1] - 2018-10-31
+
+### Added
+- Icon mapping for thunder and additional rain types
+
+### Updated
+- eslint-plugin-node@^8.0.0
+- jsdom@^13.0.0
+- Use Font Awesome 5 icons if MagicMirror version is higher than 2.5.0
+
+
 ## [1.1.0] - 2018-10-26
 
 - New minor version with new features (e.g. animated icons), bugfixes etc.
diff --git a/IconMapper.js b/IconMapper.js
@@ -33,6 +33,8 @@ IconMapper = {
         '122000': 'rainy-3',
         '122200': 'snowy-3',
         '123000': 'rainy-1',
+        '123001': 'thunder',
+        '123002': 'rainy-1',
         '123300': 'snowy-2',
         '200000': 'night',
         '210000': 'cloudy-night-1',
@@ -51,6 +53,8 @@ IconMapper = {
         '222000': 'rainy-6',
         '222200': 'rainy-7',
         '223000': 'rainy-5',
+        '223001': 'thunder',
+        '223002': 'rainy-5',
         '223300': 'snowy-4',
         '320000': 'cloudy',
         '320100': 'snowy-4',
@@ -61,6 +65,8 @@ IconMapper = {
         '322000': 'rainy-6',
         '322200': 'rainy-7',
         '323000': 'rainy-5',
+        '323001': 'thunder',
+        '323002': 'rainy-5',
         '323300': 'snowy-4',
         '330000': 'cloudy',
         '330100': 'snowy-4',
diff --git a/MMM-RBB-Weather.js b/MMM-RBB-Weather.js
@@ -201,8 +201,14 @@ Module.register('MMM-RBB-Weather', {
         if (temp >= 24) return 'fa-thermometer-three-quarters';
         if (temp >= 16) return 'fa-thermometer-half';
         if (temp >= 8) return 'fa-thermometer-quarter';
-        if (temp >= 0) return 'fa-thermometer-empty'; // TODO: Use "fa-snowflake" when Font Awesome 5 is available
-        return 'fa-asterisk';
+        if (temp >= 0) return 'fa-thermometer-empty';
+
+        // Font Awesome 5 (with fa-snowflake) is not available in MagicMirror <= 2.5.0
+        if (version.localeCompare('2.5.0', 'en', { numeric: true }) <= 0) {
+            return 'fa-asterisk';
+        }
+
+        return 'fa-snowflake';
     },
 
     /**
@@ -216,8 +222,13 @@ Module.register('MMM-RBB-Weather', {
     getRainProbabilityIcon: function(prob) {
 
         if (prob <= 15) {
-            // TODO: Use "fa-tint-slash" when Font Awesome 5 is available
-            return 'fa-tint dimmed';
+
+            // Font Awesome 5 (with fa-tint-slash) is not available in MagicMirror <= 2.5.0
+            if (version.localeCompare('2.5.0', 'en', { numeric: true }) <= 0) {
+                return 'fa-tint dimmed';
+            }
+
+            return 'fa-tint-slash';
         }
 
         if (prob >= 70) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MMM-RBB-Weather",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "MagicMirror module to display RBB weather data.",
   "author": "Nikolai Keist",
   "license": "MIT",
@@ -24,10 +24,10 @@
     "eslint": "^5.7.0",
     "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-node": "^7.0.1",
+    "eslint-plugin-node": "^8.0.0",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
-    "jsdom": "^12.2.0",
+    "jsdom": "^13.0.0",
     "libxmljs": "^0.19.5",
     "mocha": "^5.2.0",
     "moment": "^2.22.2",
diff --git a/test/unit/MMM-RBB-Weather-Test.js b/test/unit/MMM-RBB-Weather-Test.js
@@ -44,6 +44,9 @@ describe('MMM-RBB-Weather', () => {
 
         // Fake DOM
         document = new JSDOM(`<!DOCTYPE html>`).window.document;
+
+        // Fake MagicMirror Version
+        version = '2.6.0';
     });
 
     afterEach(() => {
@@ -76,7 +79,7 @@ describe('MMM-RBB-Weather', () => {
 
     describe('getTranslations', () => {
 
-        it('should return an array', () => {
+        it('should return an object', () => {
 
             // Act
             let translations = module.getTranslations();
@@ -339,7 +342,19 @@ describe('MMM-RBB-Weather', () => {
             assert.deepStrictEqual(icon, 'fa-thermometer-empty');
         });
 
-        it('should return "fa-asterisk" icon if temperature is lower than 0', () => {
+        it('should return "fa-snowflake" icon if temperature is lower than 0', () => {
+
+            // Act
+            let icon = module.getTempIcon(-1);
+
+            // Assert
+            assert.deepStrictEqual(icon, 'fa-snowflake');
+        });
+
+        it('should return "fa-asterisk" icon if temperature is lower than 0 and version is lower or equal 2.5.0', () => {
+
+            // Arrange
+            version = '2.5.0';
 
             // Act
             let icon = module.getTempIcon(-1);
@@ -360,7 +375,19 @@ describe('MMM-RBB-Weather', () => {
             assert.deepStrictEqual(icon, 'fa-tint');
         });
 
-        it('should return "fa-tint dimmed" icon if probability is under or equal low', () => {
+        it('should return "fa-tint-slash" icon if probability is under or equal low', () => {
+
+            // Act
+            let icon = module.getRainProbabilityIcon(15);
+
+            // Assert
+            assert.deepStrictEqual(icon, 'fa-tint-slash');
+        });
+
+        it('should return "fa-tint dimmed" icon if probability is under or equal low and version is lower or equal 2.5.0', () => {
+
+            // Arrange
+            version = '2.5.0';
 
             // Act
             let icon = module.getRainProbabilityIcon(15);
