Merge pull request #47 from smartystreets/xan/fix-url-prefix-bug

Fix url prefix bug from retries

smartystreets_python_sdk/international_autocomplete/client.py

@@ -35,7 +35,7 @@ def build_request(self, lookup):
         request = Request()
 
         if lookup.address_id is not None:
-            request.url_prefix = "/" + lookup.address_id
+            request.url_components = "/" + lookup.address_id
 
         self.add_parameter(request, 'country', lookup.country)
         self.add_parameter(request, 'search', lookup.search)

smartystreets_python_sdk/request.py

@@ -6,5 +6,6 @@ def __init__(self):
         self.parameters = OrderedDict()
         self.payload = None
         self.url_prefix = None
+        self.url_components = None
         self.referer = None
         self.content_type = 'application/json'

smartystreets_python_sdk/url_prefix_sender.py

@@ -4,9 +4,8 @@ def __init__(self, url_prefix, inner):
         self.inner = inner
 
     def send(self, request):
-        if request.url_prefix is not None:
-            request.url_prefix = self.url_prefix + request.url_prefix
+        if request.url_components:
+            request.url_prefix = self.url_prefix + request.url_components
         else:
             request.url_prefix = self.url_prefix
-
         return self.inner.send(request)

smartystreets_python_sdk/us_enrichment/client.py

@@ -47,6 +47,6 @@ def send_lookup(client: Client, lookup):
 
 def build_request(lookup):
     request = Request()
-    request.url_prefix = lookup.smartykey + "/" + lookup.dataset + "/" + lookup.dataSubset
+    request.url_components = lookup.smartykey + "/" + lookup.dataset + "/" + lookup.dataSubset
 
     return request

test/international_autocomplete/client_test.py

@@ -34,7 +34,7 @@ def test_sending_fully_populated_lookup(self):
         self.assertEqual(7, sender.request.parameters['max_results'])
         self.assertEqual('3', sender.request.parameters['include_only_locality'])
         self.assertEqual('4', sender.request.parameters['include_only_postal_code'])
-        self.assertEqual('/5', sender.request.url_prefix)
+        self.assertEqual('/5', sender.request.url_components)
 
     def test_deserialize_called_with_response_body(self):
         response = Response('Hello, World!', 0)

test/url_prefix_sender_test.py

@@ -8,7 +8,7 @@ def test_request_url_present(self):
         fakeSender = FakeSender()
         prefix_sender = URLPrefixSender('https://mysite.com', fakeSender)
         request = Request()
-        request.url_prefix = '/jimbo'
+        request.url_components = '/jimbo'
 
         new_request = prefix_sender.send(request)
         self.assertEqual('https://mysite.com/jimbo', new_request.url_prefix)
@@ -21,6 +21,16 @@ def test_request_url_not_present(self):
         new_request = prefix_sender.send(request)
         self.assertEqual('https://mysite.com', new_request.url_prefix)
 
+    def test_multiple_sends(self):
+        fakeSender = FakeSender()
+        prefix_sender = URLPrefixSender('https://mysite.com', fakeSender)
+        request = Request()
+        request.url_components = '/jimbo'
+
+        new_request = prefix_sender.send(request)
+        new_request = prefix_sender.send(request)
+        self.assertEqual('https://mysite.com/jimbo', new_request.url_prefix)
+
 class FakeSender:
     def send(self, request):
         return request