Merge pull request #1 from databox/attributes

Adding additional attributes

README.md

@@ -33,7 +33,18 @@ client.insertAll([
     {
         key: 'js.prices.gas',
         value: 100,
+
+        // With date
         date: '2015-06-23 09:00:00'
+    },
+    {
+        key: 'js.prices.gas',
+        value: 200,
+
+        // With additional attributes
+        attributes: {
+            'station': 'ny-main'
+        }
     }
 ], function(result){
     console.log(result);
@@ -68,6 +79,11 @@ client.lastPushes(10, function (pushes) {
 
     git clone ...
     npm test
+
+## Debugging
+
+    # Add "debugger" keyword anywhere and run
+    mocha debug test
 
 ## Author & Licence
 - [Oto Brglez](https://github.com/otobrglez)

lib/databox.js

@@ -72,6 +72,11 @@ Databox.prototype._processKPI = function (kpi) {
         //TODO: If it's some kind of Date/Time instance do "casting".
     }
 
+    if (kpi.hasOwnProperty('attributes') || typeof(kpi.attributes) != "undefined") {
+        for(var k in kpi.attributes)
+            out[k] = kpi.attributes[k];
+    }
+
     return out;
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "databox",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Node.js bindings bindings for Databox",
   "author": {
     "name": "Oto Brglez",

test/databox.test.js

@@ -68,6 +68,27 @@ describe('Databox', function () {
             });
         });
 
+        it('Should push KPI w/ #push and additional attributes', function (done) {
+            var key = 'test';
+            var value = 300;
+
+            Databox.prototype._pushJSONRequest = function (options, data, cb) {
+                var i_value = data[0][util.format('$%s', key)];
+                assert.equal(i_value, value);
+                assert.equal(data[0].me, 'Oto');
+                done();
+            };
+
+            databox.push({
+                key: key,
+                value: value,
+                attributes: {
+                    'me': 'Oto'
+                }
+            });
+
+        });
+
         it('Should push KPI w/ #push & callback', function (done) {
             var key = 'me.key';
             var value = 299;