change persistence strategy to use KeenApi object, change client to use new persistence strategy initializer

Author: dkador

keen/client.py

@@ -1,5 +1,6 @@
 import json
 from keen import persistence_strategies, exceptions
+from keen.api import KeenApi
 from keen.persistence_strategies import BasePersistenceStrategy
 
 __author__ = 'dkador'
@@ -40,8 +41,9 @@ def __init__(self, project_id, auth_token, persistence_strategy=None):
             if not isinstance(persistence_strategy, BasePersistenceStrategy):
                 raise exceptions.InvalidPersistenceStrategyError()
         if not persistence_strategy:
+            keen_api = KeenApi(project_id, auth_token)
             persistence_strategy = persistence_strategies\
-            .DirectPersistenceStrategy(project_id, auth_token)
+            .DirectPersistenceStrategy(keen_api)
 
         self.project_id = project_id
         self.auth_token = auth_token

keen/persistence_strategies.py

@@ -1,6 +1,3 @@
-import requests
-from keen import exceptions
-
 __author__ = 'dkador'
 
 class BasePersistenceStrategy(object):
@@ -23,43 +20,32 @@ class DirectPersistenceStrategy(BasePersistenceStrategy):
     cache.
     """
 
-    base_url = "https://api.keen.io"
-    api_version = "2.0"
-
-    def __init__(self, project_id, auth_token, base_url=None,
-                 api_version=None):
+    def __init__(self, api):
         """ Initializer for DirectPersistenceStrategy.
 
-        :param project_id: the Keen project id
-        :param auth_token: the Keen authorization token
-        :param base_url: the base_url of the Keen API
-        :param api_version: the version of the Keen API to use
-
+        :param api: the Keen Api object used to communicate with the Keen API
         """
         super(DirectPersistenceStrategy, self).__init__()
-        self.project_id = project_id
-        self.auth_token = auth_token
-        if base_url:
-            self.base_url = base_url
-        if api_version:
-            self.api_version = api_version
+        self.api = api
 
     def persist(self, event):
-        url = "{}/{}/projects/{}/{}".format(self.base_url, self.api_version,
-                                            self.project_id,
-                                            event.collection_name)
-        headers = {"Authorization": self.auth_token,
-                   "Content-Type": "application/json"}
-        payload = event.to_json()
-        response = requests.post(url, data=payload, headers=headers)
-        if response.status_code != 201:
-            error = response.json
-            raise exceptions.KeenApiError(error)
+        self.api.post_event(event)
 
 
 class RedisPersistenceStrategy(BasePersistenceStrategy):
+    """
+    A persistence strategy that persists events to Redis for later processing.
+
+    Not yet implemented.
+    """
     pass
 
 
 class FilePersistenceStrategy(BasePersistenceStrategy):
+    """
+    A persistence strategy that persists events to the local file system for
+    later processing.
+
+    Not yet implemented.
+    """
     pass