Merge pull request #32 from fhasanaj/RCB-317

Binding now handles X-RosetteAPI-Key instead of user_key

Author: cp2boston

docker/run_python.sh

@@ -50,15 +50,15 @@ if [ ! -z "${ALT_URL}" ]; then
 fi
 
 #Checks for valid url
-match=$(curl "${ping_url}/ping" -H "user_key: ${API_KEY}" |  grep -o "Rosette API")
+match=$(curl "${ping_url}/ping" -H "X-RosetteAPI-Key: ${API_KEY}" |  grep -o "Rosette API")
 if [ "${match}" = "" ]; then
     echo -e "\n${ping_url} server not responding\n"
     exit 1
 fi  
 
 #Checks if Rosette API key is valid
 function checkAPI {
-    match=$(curl "${ping_url}/ping" -H "user_key: ${API_KEY}" |  grep -o "forbidden")
+    match=$(curl "${ping_url}/ping" -H "X-RosetteAPI-Key: ${API_KEY}" |  grep -o "forbidden")
     if [ ! -z $match ]; then
         echo -e "\nInvalid Rosette API Key"
         exit 1

examples/docker/run_python.sh

@@ -40,15 +40,15 @@ if [ ! -z "${ALT_URL}" ]; then
 fi
 
 #Checks for valid url
-match=$(curl "${ping_url}/ping" -H "user_key: ${API_KEY}" |  grep -o "Rosette API")
+match=$(curl "${ping_url}/ping" -H "X-RosetteAPI-Key: ${API_KEY}" |  grep -o "Rosette API")
 if [ "${match}" = "" ]; then
     echo -e "\n${ping_url} server not responding\n"
     exit 1
 fi  
 
 #Checks if Rosette API key is valid
 function checkAPI {
-    match=$(curl "${ping_url}/ping" -H "user_key: ${API_KEY}" |  grep -o "forbidden")
+    match=$(curl "${ping_url}/ping" -H "X-RosetteAPI-Key: ${API_KEY}" |  grep -o "forbidden")
     if [ ! -z $match ]; then
         echo -e "\nInvalid Rosette API Key"
         exit 1

rosette/api.py

@@ -115,8 +115,6 @@ def _retrying_request(op, url, data, headers):
             response = HTTP_CONNECTION.getresponse()
             status = response.status
             rdata = response.read()
-            request_id = response.getheader("x-rosetteapi-request-id")
-            processed_language = response.getheader("x-rosetteapi-processed-language")
             response_headers["responseHeaders"] = (dict(response.getheaders()))
             if status < 500:
                 if not REUSE_CONNECTION:
@@ -513,7 +511,7 @@ def info(self):
         self.logger.info('info: ' + url)
         headers = {'Accept': 'application/json'}
         if self.user_key is not None:
-            headers["user_key"] = self.user_key
+            headers["X-RosetteAPI-Key"] = self.user_key
         r = _get_http(url, headers=headers)
         return self.__finish_result(r, "info")
 
@@ -526,7 +524,7 @@ def checkVersion(self):
         self.logger.info('info: ' + url)
         headers = {'Accept': 'application/json'}
         if self.user_key is not None:
-            headers["user_key"] = self.user_key
+            headers["X-RosetteAPI-Key"] = self.user_key
         r = _post_http(url, None, headers=headers)
         return self.__finish_result(r, "info")
 
@@ -542,7 +540,7 @@ def ping(self):
         self.logger.info('Ping: ' + url)
         headers = {'Accept': 'application/json'}
         if self.user_key is not None:
-            headers["user_key"] = self.user_key
+            headers["X-RosetteAPI-Key"] = self.user_key
         r = _get_http(url, headers=headers)
         return self.__finish_result(r, "ping")
 
@@ -587,7 +585,7 @@ def call(self, parameters):
         params_to_serialize = parameters.serialize()
         headers = {'Accept': "application/json", 'Accept-Encoding': "gzip"}
         if self.user_key is not None:
-            headers["user_key"] = self.user_key
+            headers["X-RosetteAPI-Key"] = self.user_key
         headers['Content-Type'] = "application/json"
         r = _post_http(url, params_to_serialize, headers)
         # pprint.pprint(headers)