connect python api to ioriodb backend

Author: javierdallamore

examples/sendjson.py

@@ -32,7 +32,7 @@ def parse_args():
             help='Path to the JSON file you want to send')
     parser.add_argument('--url', '-U', metavar='URL',
             help='URL for Event Fabric API',
-            default="https://event-fabric.com/ef/api/")
+            default="https://event-fabric.com/")
 
     return parser.parse_args()
 

src/eventfabric.py

@@ -14,21 +14,23 @@
 class Client(object):
     """API Client"""
     def __init__(self, username, password,
-            root_url="https://event-fabric.com/api/"):
+            root_url="https://event-fabric.com/"):
         self.root_url = root_url if root_url.endswith("/") else root_url + "/"
         self.username = username
+        self.token = None
+        self.session_header_name = "x-session"
         self.password = password
-        self.cookies = None
 
     def login(self, requester=requests.post):
         """login to the service with the specified credentials, return a tuple
         with a boolean specifying if the login was successful and the response
         object"""
         headers = {'content-type': 'application/json'}
-        response = requester(self.endpoint("session"),
+        response = requester(self.endpoint("sessions"),
+                verify = False,
                 data=json.dumps(self.credentials), headers=headers)
 
-        self.cookies = response.cookies
+        self.token = response.json().get("token")
 
         status_ok = response.status_code in (200, 201)
         return status_ok, response
@@ -50,8 +52,12 @@ def send_event(self, event, requester=requests.post):
         the login was successful and the response object"""
 
         headers = {'content-type': 'application/json'}
-        response = requester(self.endpoint("event"),
-                data=json.dumps(event.json), cookies=self.cookies,
+        if self.token:
+            headers[self.session_header_name] = self.token
+        url = self.endpoint("streams") + "/" + self.username + "/" + event.channel + "/"
+        response = requester(url,
+                verify = False,
+                data=json.dumps(event.value),
                 headers=headers)
 
         status_ok = response.status_code in (200, 201)

tests/eventfabric_tests.py

@@ -7,6 +7,8 @@
 TEST_DIR = os.path.dirname(__file__)
 BASE_DIR = os.path.join(TEST_DIR, '..', 'src')
 sys.path.append(BASE_DIR)
+USERNAME = "admin"
+PASSWORD = "secret"
 
 import eventfabric as ef
 
@@ -31,25 +33,25 @@ class TestEventFabric(unittest.TestCase):
 
     def test_client_creation(self):
         "test that the client is created and parameters are set correctly"
-        client = ef.Client("username", "password",
-                "http://localhost:8080/ef/api")
-        self.assertEqual(client.username, "username")
-        self.assertEqual(client.password, "password")
-        self.assertEqual(client.root_url, "http://localhost:8080/ef/api/")
+        client = ef.Client(USERNAME, PASSWORD,
+                "http://localhost:8080/")
+        self.assertEqual(client.username, USERNAME)
+        self.assertEqual(client.password, PASSWORD)
+        self.assertEqual(client.root_url, "http://localhost:8080/")
         self.assertEqual(client.cookies, None)
-        self.assertEqual(client.credentials["username"], "username")
-        self.assertEqual(client.credentials["password"], "password")
+        self.assertEqual(client.credentials["username"], USERNAME)
+        self.assertEqual(client.credentials["password"], PASSWORD)
 
     def test_endpoint(self):
         "tests that endpoints are created correctly"
-        client = ef.Client("username", "password",
-                "http://localhost:8080/ef/api")
-        self.assertEqual(client.endpoint("session"),
-                "http://localhost:8080/ef/api/session")
+        client = ef.Client(USERNAME, PASSWORD,
+                "http://localhost:8080/")
+        self.assertEqual(client.endpoint("sessions"),
+                "http://localhost:8080/sessions")
 
     def test_login(self):
-        client = ef.Client("username", "password",
-                "http://localhost:8080/ef/api")
+        client = ef.Client(USERNAME, PASSWORD,
+                "http://localhost:8080/")
         storage = []
         requester = fake_post(storage, FakeResponse(200, "cookies!"))
         status, response = client.login(requester)
@@ -58,17 +60,17 @@ def test_login(self):
         data_arg = kwargs["data"]
         headers = kwargs["headers"]
 
-        self.assertTrue(status) 
+        self.assertTrue(status)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.cookies, "cookies!")
         self.assertEqual(response.cookies, client.cookies)
         self.assertEqual(data_arg, json.dumps(client.credentials))
         self.assertEqual(headers["content-type"], "application/json")
-        self.assertEqual(endpoint, "http://localhost:8080/ef/api/session")
+        self.assertEqual(endpoint, "http://localhost:8080/sessions")
 
     def test_send_event(self):
-        client = ef.Client("username", "password",
-                "http://localhost:8080/ef/api")
+        client = ef.Client(USERNAME, PASSWORD,
+                "http://localhost:8080/")
         storage = []
         requester = fake_post(storage, FakeResponse(201))
         data = {"name": "bob", "count": 10}
@@ -84,7 +86,7 @@ def test_send_event(self):
         self.assertEqual(response.status_code, 201)
         self.assertEqual(data_arg, json.dumps(event.json))
         self.assertEqual(headers["content-type"], "application/json")
-        self.assertEqual(endpoint, "http://localhost:8080/ef/api/event")
+        self.assertEqual(endpoint, "http://localhost:8080/streams/" + USERNAME + "/" + channel + "/")
 
 if __name__ == '__main__':
     unittest.main()