Adding Client#last_push

Author: otobrglez

databox test/test_push.py

@@ -3,14 +3,16 @@
 from pprint import pprint as pp
 
 
-def mock_push_json(data={}):
-    return True
+def mock_push_json(data=None, path='/'):
+    return {'status': 'ok'}
 
 
 class TestPush(unittest.TestCase):
     def setUp(self):
         self.databox_push_token = "adxg1kq5a4g04k0wk0s4wkssow8osw84"
         self.client = Client(self.databox_push_token)
+
+        self.original_push_json = self.client._push_json
         self.client._push_json = mock_push_json
 
     def test_push(self):
@@ -39,9 +41,29 @@ def test_insert_all(self):
             ])
         )
 
+    def test_last_push(self):
+        self.client._push_json = lambda data=None, path='/': {
+            'err': [],
+            'no_err': 0
+        }
+
+        assert self.client.last_push()['err'] == []
+
     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': [],
+            'no_err': 0
+        }
+
+        assert last_push(token=self.databox_push_token)['err'] == []

databox/__init__.py

@@ -41,30 +41,40 @@ def process_kpi(self, **args):
 
         return item
 
-    def _push_json(self, data={}):
+    def _push_json(self, data=None, path="/"):
+        if data is not None:
+            data = json_dumps(data)
+
         response = requests.post(
-            self.push_host,
+            self.push_host + path,
             auth=HTTPBasicAuth(self.push_token, ''),
             headers={'Content-Type': 'application/json'},
-            data=json_dumps(data)
+            data=data
         )
 
-        return response.json()['status'] == 'ok'
+        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 insert_all(self, rows):
         return self._push_json({
             'data': [self.process_kpi(**row) for row in rows]
-        })
+        })['status'] == 'ok'
+
+    def last_push(self):
+        return self._push_json(path='/lastpushes/1')
 
 
 def push(key, value, date=None, token=None):
     return Client(token).push(key, value, date)
 
 
 def insert_all(rows=[], token=None):
-    return Client(token).insert_all(rows)
+    return Client(token).insert_all(rows)
+
+
+def last_push(token=None):
+    return Client(token).last_push()

example.py

@@ -1,8 +1,20 @@
 #!/usr/bin/env python
+from datetime import date, timedelta
+from random import randint
+from databox import insert_all
 
-from databox import Client, push
+"""
+This example generates fake temperature KPIs for last 14 days and inserts them.
+"""
 
-Client("adxg1kq5a4g04k0wk0s4wkssow8osw84")\
-    .push("templj", 92.2)
+TOKEN = "adxg1kq5a4g04k0wk0s4wkssow8osw84"
 
-push("templj", 102.3, 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."