Merge pull request #44 from SamHausmann/RCB-396

removed check version module and updated http headers to including bi…

Author: lauren12292

rosette/api.py

@@ -346,7 +346,6 @@ def __init__(self, api, suburl):
         self.user_key = api.user_key
         self.logger = api.logger
         self.useMultipart = False
-        self.checker = lambda: api.check_version()
         self.suburl = suburl
         self.debug = api.debug
         self.api = api
@@ -374,7 +373,7 @@ def info(self):
         @return: A dictionary telling server version and other
         identifying data."""
         url = self.service_url + "info"
-        headers = {'Accept': 'application/json'}
+        headers = {'Accept': 'application/json', 'X-RosetteAPI-Binding': 'python', 'X-RosetteAPI-Binding-Version': _BINDING_VERSION}
         if self.debug:
             headers['X-RosetteAPI-Devel'] = 'true'
         self.logger.info('info: ' + url)
@@ -383,27 +382,14 @@ def info(self):
         r = self.api._get_http(url, headers=headers)
         return self.__finish_result(r, "info")
 
-    def checkVersion(self):
-        """Issues a special "info" request to the L{EndpointCaller}'s specific endpoint.
-        @return: A dictionary containing server version as well as version check"""
-        url = self.service_url + "info?clientVersion=" + _BINDING_VERSION
-        headers = {'Accept': 'application/json'}
-        if self.debug:
-            headers["X-RosetteAPI-Devel"] = 'true'
-        self.logger.info('info: ' + url)
-        if self.user_key is not None:
-            headers["X-RosetteAPI-Key"] = self.user_key
-        r = self.api._post_http(url, None, headers)
-        return self.__finish_result(r, "info")
-
     def ping(self):
         """Issues a "ping" request to the L{EndpointCaller}'s (server-wide) endpoint.
         @return: A dictionary if OK.  If the server cannot be reached,
         or is not the right server or some other error occurs, it will be
         signalled."""
 
         url = self.service_url + 'ping'
-        headers = {'Accept': 'application/json'}
+        headers = {'Accept': 'application/json', 'X-RosetteAPI-Binding': 'python', 'X-RosetteAPI-Binding-Version': _BINDING_VERSION}
         if self.debug:
             headers['X-RosetteAPI-Devel'] = 'true'
         self.logger.info('Ping: ' + url)
@@ -443,14 +429,14 @@ def call(self, parameters):
                     "Text-only input only works for DocumentParameter endpoints",
                     self.suburl)
 
-        self.checker()
-
         self.useMultipart = parameters.useMultipart
         url = self.service_url + self.suburl
         params_to_serialize = parameters.serialize()
         headers = {}
         if self.user_key is not None:
             headers["X-RosetteAPI-Key"] = self.user_key
+            headers["X-RosetteAPI-Binding"] = "python"
+            headers["X-RosetteAPI-Binding-Version"] = _BINDING_VERSION
         if self.useMultipart:
             params = dict(
                 (key,
@@ -513,7 +499,6 @@ def __init__(
         self.logger = logging.getLogger('rosette.api')
         self.logger.info('Initialized on ' + self.service_url)
         self.debug = debug
-        self.version_checked = False
 
         if (retries < 1):
             retries = 1
@@ -629,23 +614,6 @@ def _post_http(self, url, data, headers):
 
         return _ReturnObject(_my_loads(rdata, response_headers), status)
 
-    def check_version(self):
-        """
-        Info call to check binding version against the current Rosette API
-        """
-        if self.version_checked:
-            return True
-        op = EndpointCaller(self, None)
-        result = op.checkVersion()
-        if 'versionChecked' not in result or result['versionChecked'] is False:
-            raise RosetteException(
-                "incompatibleVersion",
-                "The server version is not compatible with binding version " +
-                _BINDING_VERSION,
-                '')
-        self.version_checked = True
-        return True
-
     def ping(self):
         """
         Create a ping L{EndpointCaller} for the server and ping it.

tests/mock-data/response/info.json

@@ -2,6 +2,5 @@
   "buildNumber": "6bafb29d", 
   "buildTime": "2015.05.08_12:31:26", 
   "name": "Rosette API", 
-  "version": "0.5.0",
-  "versionChecked": true
+  "version": "0.5.0"
 }

tests/test_rosette_api.py

@@ -88,38 +88,6 @@ def test_info(api, json_response):
 
     result = api.info()
     assert result["name"] == "Rosette API"
-    assert result["versionChecked"] is True
-    httpretty.disable()
-    httpretty.reset()
-
-# Test check version - fail
-
-
-def test_check_version_fails(api, doc_params):
-    httpretty.enable()
-    body = json.dumps({'name': 'Rosette API'})
-    httpretty.register_uri(httpretty.POST, "https://api.rosette.com/rest/v1/info",
-                           body=body, status=200, content_type="application/json")
-    with pytest.raises(RosetteException) as e_rosette:
-        result = api.categories(doc_params)
-
-    assert e_rosette.value.status == "incompatibleVersion"
-    httpretty.disable()
-    httpretty.reset()
-
-# Test check version - pass
-
-
-def test_check_version_pass(api, json_response, doc_params):
-    httpretty.enable()
-    httpretty.register_uri(httpretty.POST, "https://api.rosette.com/rest/v1/info",
-                           body=json_response, status=200, content_type="application/json")
-    httpretty.register_uri(httpretty.POST, "https://api.rosette.com/rest/v1/categories",
-                           body=json_response, status=200, content_type="application/json")
-
-    result = api.categories(doc_params)
-
-    assert result["versionChecked"] is True
     httpretty.disable()
     httpretty.reset()