Merge pull request #58 from rosette-api/AdvancedMode

RCB-492 Advanced mode

Author: cp2boston

README.md

@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.org/rosette-api/python.svg?branch=master)](https://travis-ci.org/rosette-api/python)
 
 # This is the Python client binding for Rosette API.
+See the wiki for more information.
 
 Installation
 ------------

rosette/api.py

@@ -525,6 +525,7 @@ def __init__(
         self.connection_refresh_duration = refresh_duration
         self.options = {}
         self.customHeaders = {}
+        self.urlParameters = {}
         self.maxPoolSize = 1
         self.session = requests.Session()
 
@@ -549,7 +550,11 @@ def _make_request(self, op, url, data, headers):
         rdata = None
         response_headers = {}
 
-        request = requests.Request(op, url, data=data, headers=headers)
+        payload = None
+        if (self.urlParameters):
+            payload = self.urlParameters
+
+        request = requests.Request(op, url, data=data, headers=headers, params=payload)
         session = requests.Session()
         prepared_request = session.prepare_request(request)
 
@@ -659,6 +664,37 @@ def clearOptions(self):
         """
         self.options.clear()
 
+    def setUrlParameter(self, name, value):
+        """
+        Sets a URL parameter
+
+        @param name: name of parameter
+        @param value: value of parameter
+        """
+        if value is None:
+            self.urlParameters.pop(name, None)
+        else:
+            self.urlParameters[name] = value
+
+    def getUrlParameter(self, name):
+        """
+        Gets a URL parameter
+
+        @param name: name of parameter
+
+        @return: value of parameter
+        """
+        if name in self.urlParameters.keys():
+            return self.urlParameters[name]
+        else:
+            return None
+
+    def clearUrlParameters(self):
+        """
+        Clears all options
+        """
+        self.urlParameters.clear()
+
     def setCustomHeaders(self, name, value):
         """
         Sets custom headers

tests/test_rosette_api.py

@@ -82,6 +82,24 @@ def test_option_clear_single_option(api):
     api.setOption('test', None)
     assert api.getOption('test') is None
 
+# Test the URL parameter set/get/clear
+
+
+def test_UrlParameter_get_set_clear(api):
+    api.setUrlParameter('test', 'foo')
+    assert 'foo' == api.getUrlParameter('test')
+
+    api.clearUrlParameters()
+    assert api.getUrlParameter('test') is None
+
+
+def test_UrlParameter_clear_single_option(api):
+    api.setUrlParameter('test', 'foo')
+    assert 'foo' == api.getUrlParameter('test')
+
+    api.setUrlParameter('test', None)
+    assert api.getUrlParameter('test') is None
+
 # Test the custom header set/get/clear