Tweaks to rss reader and announce app

imbrianj · Oct 29, 2017 · 8eccdbb · 8eccdbb
1 parent e2c3b92
commit 8eccdbb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/apps/announceRss.js b/apps/announceRss.js
@@ -28,10 +28,10 @@
 module.exports = (function () {
   'use strict';
 
-  var RssArticles = '';
+  var RssArticles = {};
 
   return {
-    version : 20161101,
+    version : 20171029,
 
     translate : function (token, lang) {
       var translate = require(__dirname + '/../lib/translate');
@@ -48,8 +48,8 @@ module.exports = (function () {
       if ((values) && (values.value) && (values.value[0]) && (values.value[0].title)) {
         articleTitle = values.value[0].title;
 
-        if (RssArticles !== articleTitle) {
-          if ((articleTitle) && (RssArticles)) {
+        if (RssArticles[deviceId] !== articleTitle) {
+          if ((articleTitle) && (RssArticles[deviceId])) {
             notify     = require(__dirname + '/../lib/notify');
 
             message = this.translate('NEW_ARTICLE', lang);
@@ -59,7 +59,7 @@ module.exports = (function () {
             notify.notify(message, controllers, deviceId);
           }
 
-          RssArticles = articleTitle;
+          RssArticles[deviceId] = articleTitle;
         }
       }
     }

diff --git a/cache/version.txt b/cache/version.txt
@@ -1 +1 @@
-1509119296393
+1509238737150
diff --git a/devices/rss/controller.js b/devices/rss/controller.js
@@ -107,7 +107,7 @@ module.exports = (function () {
 
           rssData[j] = { 'title'       : util.sanitize(article.title[0]._),
                          'url'         : util.sanitize(article.link[0].$.href),
-                         'description' : article.summary ? util.sanitize(article.summary[0]) : null,
+                         'description' : article.summary ? util.sanitize(article.summary[0]._) : null,
                          'text'        : util.sanitize(article.content[0]._) };
 
           j += 1;

diff --git a/js/combo.min.js b/js/combo.min.js
diff --git a/tests/unit/devices/rss/controller.js b/tests/unit/devices/rss/controller.js
@@ -41,11 +41,11 @@ exports.rssControllerTest = {
     'use strict';
 
     var rssController = require(__dirname + '/../../../../devices/rss/controller'),
-        configGet     = { host   : 'example.com',
-                         port    : '80',
-                         path    : '/test/',
-                         method  : 'GET',
-                         badData : 'FAILURE' },
+        configGet     = { host    : 'example.com',
+                          port    : '80',
+                          path    : '/test/',
+                          method  : 'GET',
+                          badData : 'FAILURE' },
         testGet       = rssController.postPrepare(configGet);
 
     test.deepEqual(testGet, { host : 'example.com', port : '80', path : '/test/', method : 'GET' }, 'Additional params are filtered out.');
@@ -59,35 +59,35 @@ exports.rssControllerTest = {
     var rssController = require(__dirname + '/../../../../devices/rss/controller'),
         rssData       = { rss : { channel : [{ item : [
           { 'title'           : ['Test 1'],
-            'link'             : ['http://example.com/test1'],
+            'link'            : ['http://example.com/test1'],
             'description'     : ['<span>This is a test</span>'],
             'content:encoded' : ['This is a piece of encoded content']
           },
           { 'title'           : ['Test 2'],
-            'link'             : ['http://example.com/test2'],
+            'link'            : ['http://example.com/test2'],
             'description'     : ['This is another test'],
             'content:encoded' : ['This is another piece of encoded content']
           }
         ]}]}},
         atomData      = { feed : { entry : [
           { title   : [{ '_' : 'Test 1'}],
             link    : [{'$'   : { 'href' : 'http://example.com/test1' }}],
-            summary : ['This is a test'],
+            summary : [{ '_' : 'This is a test'}],
             content : [{ '_' : 'This is a piece of encoded content'}]
           },
           { title   : [{ '_' : 'Test 2'}],
             link    : [{'$'   : { 'href' : 'http://example.com/test2' }}],
-            summary : ['This is another test'],
+            summary : [{ '_' : 'This is another test'}],
             content : [{ '_' : 'This is another piece of encoded content'}]
           },
           { title   : [{ '_' : 'Test 3'}],
             link    : [{'$'   : { 'href' : 'http://example.com/test3' }}],
-            summary : ['This is a third test'],
+            summary : [{ '_' : 'This is a third test'}],
             content : [{ '_' : 'This is a 3rd piece of encoded content'}]
           },
           { title   : [{ '_' : 'Test 4'}],
-            link    : [{'$'   : { 'href' : 'http://example.com/test4' }}],
-            summary : ['This is a fourth test'],
+            link    : [{'$'  : { 'href' : 'http://example.com/test4' }}],
+            summary : [{ '_' : 'This is a fourth test'}],
             content : [{ '_' : 'This is a fourth piece of encoded content'}]
           },
         ]}},