Replacing POST with GET on API

Author: otobrglez

.travis.yml

@@ -1,8 +1,12 @@
 language: python
+sudo: false
+
 python:
   - "2.7"
+
 install:
-  - "pip install ."
   - "pip install -r requirements.txt"
+  - "pip install ."
+
 script:
-  - python -m unittest discover -v
+  - python -m unittest discover -v

databox test/test_push.py

@@ -1,6 +1,7 @@
 import unittest
 from databox import *
 from pprint import pprint as pp
+from os import getenv
 
 
 def mock_push_json(data=None, path='/'):
@@ -9,7 +10,7 @@ def mock_push_json(data=None, path='/'):
 
 class TestPush(unittest.TestCase):
     def setUp(self):
-        self.databox_push_token = "adxg1kq5a4g04k0wk0s4wkssow8osw84"
+        self.databox_push_token = getenv("DATABOX_PUSH_TOKEN") or "adxg1kq5a4g04k0wk0s4wkssow8osw84"
         self.client = Client(self.databox_push_token)
 
         self.original_push_json = self.client._push_json
@@ -57,7 +58,7 @@ def test_insert_all(self):
 
 
     def test_last_push(self):
-        self.client._push_json = lambda data=None, path='/': {
+        self.client._get_json = lambda path='/': {
             'err': [],
             'no_err': 0
         }
@@ -66,7 +67,7 @@ def test_last_push(self):
 
 
     def test_last_push_with_number(self):
-        self.client._push_json = lambda data=None, path='/': path
+        self.client._get_json = lambda data=None, path='/': path
         assert self.client.last_push(3) == '/lastpushes/3'
 
 
@@ -82,7 +83,7 @@ def test_short(self):
                               },
                           ], token=self.databox_push_token) is True
 
-        Client._push_json = lambda data=None, path='/': {
+        Client._get_json = lambda number=None, path='/': {
             'err': [],
             'no_err': 0
         }

databox/__init__.py

@@ -64,6 +64,18 @@ def _push_json(self, data=None, path="/"):
 
         return response.json()
 
+    def _get_json(self, path):
+        response = requests.get(
+                self.push_host + path,
+                auth=HTTPBasicAuth(self.push_token, ''),
+                headers={
+                    'Content-Type': 'application/json',
+                    'User-Agent': "Databox/" + __version__ + " (Python)"
+                }
+        )
+
+        return response.json()
+
     def push(self, key, value, date=None, attributes=None):
         self.last_push_content = self._push_json({
             'data': [self.process_kpi(
@@ -84,7 +96,7 @@ def insert_all(self, rows):
         return self.last_push_content['status'] == 'ok'
 
     def last_push(self, number=1):
-        return self._push_json(path='/lastpushes/{n}'.format(**{'n': number}))
+        return self._get_json(path='/lastpushes/{n}'.format(**{'n': number}))
 
 
 def push(key, value, date=None, token=None):

example.py

@@ -2,12 +2,13 @@
 from datetime import date, timedelta
 from random import randint
 from databox import insert_all
+from os import getenv
 
 """
 This example generates fake temperature KPIs for last 14 days and inserts them.
 """
 
-TOKEN = "adxg1kq5a4g04k0wk0s4wkssow8osw84"
+TOKEN = getenv("DATABOX_PUSH_TOKEN") or "adxg1kq5a4g04k0wk0s4wkssow8osw84"
 
 from databox import Client
 
@@ -27,7 +28,6 @@
 #
 #
 
-
 print client.insert_all([
     {'key': 'temp.boston', 'value': 51},
     {'key': 'temp.boston', 'value': 49, 'date': '2015-01-01 17:00:00'},
@@ -37,5 +37,7 @@
     }},
 ])
 
+print "--------"
+
 print client.last_push(3)