update naming conventions

Author: mredolatti

identify/microclients/__init__.py

@@ -62,7 +62,7 @@ def _setup_args(self):
         '''
         le2e_test_file = path.join(
             path.dirname(path.realpath(__file__)),
-            'identify',
+            'splitapiclient',
             'tests',
             'e2e',
             'e2etests.py'
@@ -88,8 +88,9 @@ def run(self):
 
 # Standard unit test requirements
 tests_requires = [
-    'pytest-mock',
-    'pytest',
+    'mock==2.0.0',
+    'pytest-mock==1.6.0',
+    'pytest==3.1.3',
 ]
 
 
@@ -101,11 +102,11 @@ def run(self):
 
 # Get version number
 with open(path.join(path.abspath(path.dirname(__file__)),
-                    'identify', 'version.py')) as f:
+                    'splitapiclient', 'version.py')) as f:
     exec(f.read())
 # Run setup!
 setup(
-    name='identify_client',
+    name='splitapiclient',
     version=__version__,  # noqa
     description='Split.io Identify Python Client',
     author='Patricio Echague, Sebastian Arrubia, Martin Redolatti',

identify/resources/__init__.py

@@ -3,19 +3,20 @@
 import abc
 import re
 import six
-from identify.util.exceptions import MissingParametersException
+from splitapiclient.util.exceptions import MissingParametersException
+
 
 class BaseHttpClient(six.with_metaclass(abc.ABCMeta)):
     '''
     Abstrac class providing an interface and generic methods of the HTTP client
-    responsible for interacting with the Identify APIs
+    responsible for interacting with the Split APIs
     '''
 
     def __init__(self, baseurl, auth_token):
         '''
         Class constructor. Sotores basic connection information.
 
-        :param baseurl: string. Identify host and base url.
+        :param baseurl: string. Split host and base url.
         :param auth_token: string. Authentication token needed to make API
             calls.
         '''

setup.py

@@ -3,11 +3,11 @@
 import json
 from functools import partial
 import requests
-from identify.http_clients import base_client
-from identify.util.logger import LOGGER
-from identify.util.exceptions import HTTPResponseError, HTTPNotFoundError, \
-    HTTPIncorrectParametersError, HTTPUnauthorizedError, \
-    IdentifyBackendUnreachableError
+from splitapiclient.http_clients import base_client
+from splitapiclient.util.logger import LOGGER
+from splitapiclient.util.exceptions import HTTPResponseError, \
+    HTTPNotFoundError, HTTPIncorrectParametersError, HTTPUnauthorizedError, \
+    SplitBackendUnreachableError
 
 
 class SyncHttpClient(base_client.BaseHttpClient):
@@ -54,18 +54,18 @@ def _handle_invalid_response(self, response):
         if exc:
             raise exc()
         else:
-            raise HTTPResponseError
+            raise HTTPResponseError()
 
     def _handle_connection_error(self, e):
         '''
-        Handle error when attempting to connect to identify backend.
+        Handle error when attempting to connect to split backend.
         Logs exception thrown by requests module, and raises an
-        IdentifyBackendUnreachableError error, so that it can be caught
-        by using the top level IdentifyException
+        SplitBackendUnreachableError error, so that it can be caught
+        by using the top level SplitException
         '''
         LOGGER.debug(e)
-        raise IdentifyBackendUnreachableError(
-            'Unable to reach Identify backend'
+        raise SplitBackendUnreachableError(
+            'Unable to reach Split backend'
         )
 
     def make_request(self, endpoint, body=None, **kwargs):
@@ -97,10 +97,9 @@ def make_request(self, endpoint, body=None, **kwargs):
         # Make the actual HTTP call!
         try:
             response = method(url, headers=headers)
+            LOGGER.debug('RESPONSE: ' + response.text)
         except Exception as e:
             return self._handle_connection_error(e)
-        finally:
-            LOGGER.debug('RESPONSE: ' + response.text)
 
         if not response.status_code == 200:
             LOGGER.warning('RESPONSE CODE: %s' % response.status_code)

identify/__init__.py splitapiclient/__init__.pyidentify/__init__.py renamed to splitapiclient/__init__.py

@@ -1,12 +1,12 @@
-from identify.main.identify_sync_client import SyncIdentifyClient
+from splitapiclient.main.sync_apiclient import SyncApiClient
 
 
 def get_client(config):
     '''
-    Entry point for the Identify API client
+    Entry point for the Split API client
     '''
     _async = config.get('async', False)
     if _async:
         raise Exception('Async client not yet implemented')
 
-    return SyncIdentifyClient(config)
+    return SyncApiClient(config)

identify/http_clients/__init__.py splitapiclient/http_clients/__init__.pyidentify/http_clients/__init__.py renamed to splitapiclient/http_clients/__init__.py

@@ -3,7 +3,7 @@
 import abc
 
 
-class BaseIdentifyClient:
+class BaseApiClient:
     '''
     '''
     __metaclass__ = abc.ABCMeta
@@ -13,17 +13,17 @@ def __init__(self, config):
         pass
 
     @abc.abstractproperty
-    def traffic_type(self):
+    def traffic_types(self):
         pass
 
     @abc.abstractproperty
-    def environment(self):
+    def environments(sself):
         pass
 
     @abc.abstractproperty
-    def attribute(self):
+    def attributes(self):
         pass
 
     @abc.abstractproperty
-    def identity(self):
+    def identities(self):
         pass

identify/http_clients/base_client.py …litapiclient/http_clients/base_client.pyidentify/http_clients/base_client.py renamed to splitapiclient/http_clients/base_client.py identify/http_clients/base_client.py renamed to splitapiclient/http_clients/base_client.py

@@ -1,17 +1,17 @@
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
-from identify.main.identify_client import BaseIdentifyClient
-from identify.http_clients.sync_client import SyncHttpClient
-from identify.util.exceptions import InsufficientConfigArgumentsException
-from identify.microclients import TrafficTypeMicroClient
-from identify.microclients import EnvironmentMicroClient
-from identify.microclients import IdentityMicroClient
-from identify.microclients import AttributeMicroClient
+from splitapiclient.main.apiclient import BaseApiClient
+from splitapiclient.http_clients.sync_client import SyncHttpClient
+from splitapiclient.util.exceptions import InsufficientConfigArgumentsException
+from splitapiclient.microclients import TrafficTypeMicroClient
+from splitapiclient.microclients import EnvironmentMicroClient
+from splitapiclient.microclients import IdentityMicroClient
+from splitapiclient.microclients import AttributeMicroClient
 
 
-class SyncIdentifyClient(BaseIdentifyClient):
+class SyncApiClient(BaseApiClient):
     '''
-    Synchronous Identify API client
+    Synchronous Split API client
     '''
 
     def __init__(self, config):
@@ -41,17 +41,17 @@ def __init__(self, config):
         self._identity_client = IdentityMicroClient(http_client)
 
     @property
-    def traffic_type(self):
+    def traffic_types(self):
         return self._traffic_type_client
 
     @property
-    def environment(self):
+    def environments(self):
         return self._environment_client
 
     @property
-    def attribute(self):
+    def attributes(self):
         return self._attribute_client
 
     @property
-    def identity(self):
+    def identities(self):
         return self._identity_client