Merge branch 'master' of https://github.com/databox/databox-python

Author: otobrglez

README.md

@@ -34,6 +34,10 @@ from databox import Client
 client = Client('<access token>')
 client.push('sales.total', 1447.0)
 client.push('orders.total', 32, date='2015-01-01 09:00:00')
+client.push('orders.total', 34, attributes={
+  'something': 1447,
+})
+
 ```
 
 Inserting multiple matrices with one `insert_all`:

databox test/test_push.py

@@ -19,12 +19,26 @@ def test_push(self):
         assert self.client.push("templj", 10.0) is True
         assert self.client.push("templj", 12.0, date="2015-01-01 09:00:00") is True
 
+    def test_push_with_attributes(self):
+        self.client._push_json = lambda data=None, path='/': dict({
+                                                                      'status': 'ok',
+                                                                  }.items() + data.items())
+
+        push = self.client.push("meta", 100, attributes={
+            'n': 100
+        })
+
+        assert self.client.last_push_content['data'][0]['$meta'] == 100
+        assert self.client.last_push_content['data'][0]['n'] == 100
+
+
     def test_push_validation(self):
         self.assertRaises(
             Client.KPIValidationException,
             lambda: self.client.push(None, None)
         )
 
+
     def test_insert_all(self):
         assert self.client.insert_all([
             {'key': 'templj', 'value': 83.3},
@@ -41,6 +55,7 @@ def test_insert_all(self):
             ])
         )
 
+
     def test_last_push(self):
         self.client._push_json = lambda data=None, path='/': {
             'err': [],
@@ -49,17 +64,23 @@ def test_last_push(self):
 
         assert self.client.last_push()['err'] == []
 
+
+    def test_last_push_with_number(self):
+        self.client._push_json = lambda data=None, path='/': path
+        assert self.client.last_push(3) == '/lastpushes/3'
+
+
     def test_short(self):
         Client._push_json = mock_push_json
 
         assert push("templj", 22, token=self.databox_push_token) is True
 
         assert insert_all([
-            {
-                'key': 'templj',
-                'value': 83.3
-            },
-        ], token=self.databox_push_token) is True
+                              {
+                                  'key': 'templj',
+                                  'value': 83.3
+                              },
+                          ], token=self.databox_push_token) is True
 
         Client._push_json = lambda data=None, path='/': {
             'err': [],

databox/__init__.py

@@ -7,6 +7,7 @@
 class Client(object):
     push_token = None
     push_host = 'https://push2new.databox.com'
+    last_push_content = None
 
     class MissingToken(Exception):
         pass
@@ -39,6 +40,10 @@ def process_kpi(self, **args):
         if date is not None:
             item['date'] = date
 
+        attributes = args.get('attributes', None)
+        if attributes is not None:
+            item = dict(item.items() + attributes.items())
+
         return item
 
     def _push_json(self, data=None, path="/"):
@@ -54,18 +59,31 @@ def _push_json(self, data=None, path="/"):
 
         return response.json()
 
-    def push(self, key, value, date=None):
-        return self._push_json({
-            'data': [self.process_kpi(key=key, value=value, date=date)]
-        })['status'] == 'ok'
+
+    def push(self, key, value, date=None, attributes=None):
+        self.last_push_content = self._push_json({
+            'data': [self.process_kpi(
+                key=key,
+                value=value,
+                date=date,
+                attributes=attributes
+            )]
+        })
+
+        return self.last_push_content['status'] == 'ok'
+
+
 
     def insert_all(self, rows):
-        return self._push_json({
+        self.last_push_content = self._push_json({
             'data': [self.process_kpi(**row) for row in rows]
-        })['status'] == 'ok'
+        })
+
+        return self.last_push_content['status'] == 'ok'
+
 
-    def last_push(self):
-        return self._push_json(path='/lastpushes/1')
+    def last_push(self, number=1):
+        return self._push_json(path='/lastpushes/{n}'.format(**{'n': number}))
 
 
 def push(key, value, date=None, token=None):

example.py

@@ -9,33 +9,33 @@
 
 TOKEN = "adxg1kq5a4g04k0wk0s4wkssow8osw84"
 
-key = 'temp.ljx'
-rows = []
-
-for i, day in enumerate([date.today()-timedelta(days=d) for d in range(0, 14)]):
-    n = 20 + randint(0, 15)
-    rows.append({'key': key, 'value': n, 'date': day.strftime("%Y-%m-%d")})
-
-if insert_all(rows, token=TOKEN):
-    print "Inserted", len(rows), "rows."
-
-
 from databox import Client
 
-client = Client('<access token>')
-client.push('sales.total', 1447.0)
-client.push('orders.total', 32, date='2015-01-01 09:00:00')
+client = Client(TOKEN)
+# client.push('sales.total', 1447.0)
+#client.push('orders.total', 32, date='2015-01-01 09:00:00')
+
+# key = 'temp.ljx'
+# rows = []
+#
+# for i, day in enumerate([date.today()-timedelta(days=d) for d in range(0, 14)]):
+#     n = 20 + randint(0, 15)
+#     rows.append({'key': key, 'value': n, 'date': day.strftime("%Y-%m-%d")})
+#
+# if insert_all(rows, token=TOKEN):
+#     print "Inserted", len(rows), "rows."
+#
+#
 
-print client.last_push()
 
-client.insert_all([
+print client.insert_all([
     {'key': 'temp.boston', 'value': 51},
     {'key': 'temp.boston', 'value': 49, 'date': '2015-01-01 17:00:00'},
-    {'key': 'sales.total', 'value': 3000},
+    {'key': 'sales.total', 'value': 3000, 'attributes': {
+        'name': "Oto",
+        'price': 199
+    }},
 ])
 
+print client.last_push(3)
 
-
-from databox import push, insert_all, last_push
-push('sales.total', 1448.9, token=TOKEN)
-print last_push(TOKEN)