Merge pull request #53 from nightscout/dev

Dev

index.js

@@ -66,6 +66,45 @@ var DIRECTIONS = {
 , 'NOT COMPUTABLE': 8
 , 'RATE OUT OF RANGE': 9
 };
+function stringLowerCaseNoSpaces(str) {
+  str = str.toLowerCase()
+  while(str.indexOf(' ')>-1)
+    str = str.replace(' ','');
+  return str;
+}
+
+
+function copyObjectWithLowercaseKeys(obj) {
+  // return a copy of obj but with each key transformed to lowercase
+  // and spaces removed
+  return Object.keys(obj).reduce(function (result, key)  {
+    var newKey = stringLowerCaseNoSpaces(key);
+    result[newKey] = obj[key];
+    return result
+  }, {});
+}
+
+var LCDIRECTIONS = copyObjectWithLowercaseKeys(DIRECTIONS);
+
+
+function matchTrend(trend) {
+  // attempt to match the trend based on
+  // a) it is a number
+  // b) it matches a key in DIRECTIONS
+  // c) it matches a key in LCDIRECTIONS if converted to lowercase and all spaces removed
+
+  if (typeof(trend) !== "string")
+    return trend;
+
+  if (trend in DIRECTIONS)
+    return DIRECTIONS[trend];
+
+  var lctrend = stringLowerCaseNoSpaces(trend);
+
+  if (lctrend in LCDIRECTIONS) return LCDIRECTIONS[lctrend];
+  return trend;
+}
+
 var Trends = (function ( ) {
   var keys = Object.keys(DIRECTIONS);
   var trends = keys.sort(function (a, b) {
@@ -202,12 +241,14 @@ function dex_to_entry (d) {
   var regex = /\((.*)\)/;
   var wall = parseInt(d.WT.match(regex)[1]);
   var date = new Date(wall);
+  var trend = matchTrend(d.Trend);
+
   var entry = {
     sgv: d.Value
   , date: wall
   , dateString: date.toISOString( )
-  , trend: d.Trend
-  , direction: trendToDirection(d.Trend)
+  , trend: trend
+  , direction: trendToDirection(trend)
   , device: 'share2'
   , type: 'sgv'
   };
@@ -270,6 +311,7 @@ function engine (opts) {
 
   function refresh_token ( ) {
     console.log('Fetching new token');
+    opts.login.accountId = null;
     authorize(opts.login, function (err, res, body) {
       if (!err && body && res && res.statusCode == 200) {
         my.sessionID = body;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "share2nightscout-bridge",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Fetches data from Dexcom's webservice and puts it in Nightscout.",
   "main": "index.js",
   "scripts": {

tests/authorize_fetch.test.js

@@ -26,7 +26,12 @@ describe("authorize_fetch", () => {
 					.be.an.instanceOf(Object);
 				glucose[0].DT.should.be.a.String().and.containEql("Date");
 				glucose[0].ST.should.be.a.String().and.containEql("Date");
-				glucose[0].Trend.should.be.a.Number();
+				glucose[0].Trend.should.exist();
+				if (typeof glucose[0].Trend === "string") {
+					glucose[0].Trend.should.be.a.String();
+				} else {				
+					glucose[0].Trend.should.be.a.Number();
+				}
 				glucose[0].Value.should.be.a.Number();
 				glucose[0].WT.should.be.a.String().and.containEql("Date");