Adding test suite and rewrite of client

Author: otobrglez

databox test/test_push.py

@@ -1,11 +1,47 @@
 import unittest
 from databox import *
+from pprint import pprint as pp
+
+
+def mock_push_json(data={}):
+    return True
+
 
 class TestPush(unittest.TestCase):
     def setUp(self):
         self.databox_push_token = "adxg1kq5a4g04k0wk0s4wkssow8osw84"
         self.client = Client(self.databox_push_token)
+        self.client._push_json = mock_push_json
+
+    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_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},
+            {'key': 'templj', 'value': 83.3, 'date': "2015-01-01 09:00:00"},
+            {'key': 'templj', 'value': 12.3},
+        ]) is True
+
+        self.assertRaises(
+            Client.KPIValidationException,
+            lambda: self.client.insert_all([
+                {'value': 83.3},
+                {'key': 'templj', 'value': 83.3, 'date': "2015-01-01 09:00:00"},
+                {'key': 'templj', 'value': 12.3},
+            ])
+        )
+
+    def test_short(self):
+        assert push("templj", 22, token=self.databox_push_token) is True
 
-    def test_setup(self):
-        self.client.push("oto", 10.0)
-        push("aaa", 22)
+        assert insert_all([
+            {'key': 'templj', 'value': 83.3},
+        ], token=self.databox_push_token) is True

databox/__init__.py

@@ -1,53 +1,70 @@
 import requests
+from requests.auth import HTTPBasicAuth
 from os import getenv
+from json import dumps as json_dumps
 
 
-class SingleClient(object):
-    _token = None
+class Client(object):
+    push_token = None
+    push_host = 'https://push2new.databox.com'
 
     class MissingToken(Exception):
         pass
 
-    @property
-    def token(self):
-        if self._token is None:
-            self._token = getenv("DATABOX_PUSH_TOKEN", None)
+    class KPIValidationException(Exception):
+        pass
 
-        if self._token is None:
-            raise SingleClient.MissingToken("Missing Databox push token")
+    def __init__(self, token=None):
+        self.push_token = token
+        if self.push_token is None:
+            self.push_token = getenv('DATABOX_PUSH_TOKEN', None)
 
-        return self._token
+        if self.push_token is None:
+            raise self.MissingToken('Push token is missing!')
 
-    def __init__(self, token=None):
-        if self._token is None and token is not None:
-            self._token = token
+        self.push_host = getenv('DATABOX_PUSH_HOST', self.push_host)
 
-    def push(self, key, value, date=None):
-        print "--- push --- ", self.token
-        pass
+    def process_kpi(self, **args):
+        key = args.get('key', None)
+        if key is None:
+            raise self.KPIValidationException('Missing "key"')
 
+        value = args.get('value', None)
+        if value is None:
+            raise self.KPIValidationException('Missing "value"')
 
+        item = {("$%s" % args['key']): args['value']}
 
-class Client(object):
-    _instance = None
-    client_instance = None
+        date = args.get('date', None)
+        if date is not None:
+            item['date'] = date
 
-    def __init__(self, token=None):
-        self.client_instance = SingleClient(token)
+        return item
 
-    def __new__(cls, *args, **kwargs):
-        if not cls._instance:
-            cls._instance = super(Client, cls). \
-                __new__(cls, *args, **kwargs)
-        return cls._instance
+    def _push_json(self, data={}):
+        response = requests.post(
+            self.push_host,
+            auth=HTTPBasicAuth(self.push_token, ''),
+            headers={'Content-Type': 'application/json'},
+            data=json_dumps(data)
+        )
 
-    @property
-    def client(self):
-        return self.client_instance
+        return response.json()['status'] == 'ok'
 
     def push(self, key, value, date=None):
-        return self.client.push(key, value, date)
+        return self._push_json({
+            'data': [self.process_kpi(key=key, value=value, date=date)]
+        })
+
+    def insert_all(self, rows):
+        return self._push_json({
+            'data': [self.process_kpi(**row) for row in rows]
+        })
 
 
 def push(key, value, date=None, token=None):
-    return Client().push(key, value, date)
+    return Client(token).push(key, value, date)
+
+
+def insert_all(rows=[], token=None):
+    return Client(token).insert_all(rows)

example.py

@@ -2,6 +2,7 @@
 
 from databox import Client, push
 
-Client("adxg1kq5a4g04k0wk0s4wkssow8osw84")
+Client("adxg1kq5a4g04k0wk0s4wkssow8osw84")\
+    .push("templj", 92.2)
 
-push("sales", 10)
+push("templj", 102.3, token="adxg1kq5a4g04k0wk0s4wkssow8osw84")

requirements.txt

@@ -1 +1 @@
-requests >= 2.7
+requests[security] >= 2.7

setup.py

@@ -10,7 +10,7 @@
     url="https://github.com/databox/databox-python",
     license='MIT',
 
-    packages=find_packages(exclude=('tests',)),
+    packages=find_packages(exclude=('databox test',)),
     install_requires=[
         'requests >= 2.7'
     ]