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

Fix url prefix bug from retries

lib/smartystreets_ruby_sdk/international_autocomplete/client.rb

@@ -33,7 +33,7 @@ def build_request(lookup)
         request = Request.new
 
         unless lookup.address_id.nil?
-          request.url_prefix = '/' + lookup.address_id
+          request.url_components = '/' + lookup.address_id
         end
 
         add_parameter(request, 'search', lookup.search)

lib/smartystreets_ruby_sdk/request.rb

@@ -1,11 +1,12 @@
 module SmartyStreets
   class Request
-    attr_accessor :parameters, :payload, :url_prefix, :referer, :header, :content_type
+    attr_accessor :parameters, :payload, :url_components, :url_prefix, :referer, :header, :content_type
 
     def initialize
       @parameters = {}
       @payload = nil
       @url_prefix = nil
+      @url_components = nil
       @referer = nil
       @header = {}
       @content_type = 'application/json'

lib/smartystreets_ruby_sdk/url_prefix_sender.rb

@@ -6,10 +6,10 @@ def initialize(url_prefix, inner)
     end
 
     def send(request)
-      if request.url_prefix.nil?
+      if request.url_components.nil?
         request.url_prefix = @url_prefix
       else
-        request.url_prefix = @url_prefix + request.url_prefix
+        request.url_prefix = @url_prefix + request.url_components
       end
 
       @inner.send(request)

lib/smartystreets_ruby_sdk/us_enrichment/client.rb

@@ -25,7 +25,7 @@ def __send(lookup)
 
                 return if lookup.nil?
 
-                smarty_request.url_prefix = '/' + lookup.smarty_key + '/' + lookup.data_set + '/' + lookup.data_sub_set
+                smarty_request.url_components = '/' + lookup.smarty_key + '/' + lookup.data_set + '/' + lookup.data_sub_set
 
                 response = @sender.send(smarty_request)
                 results = @serializer.deserialize(response.payload)

test/smartystreets_ruby_sdk/international_autocomplete/test_international_autocomplete_client.rb

@@ -36,7 +36,7 @@ def test_sending_fully_populated_lookup
     assert_equal('7', sender.request.parameters['max_results'])
     assert_equal('3', sender.request.parameters['include_only_locality'])
     assert_equal('4', sender.request.parameters['include_only_postal_code'])
-    assert_equal('/5', sender.request.url_prefix)
+    assert_equal('/5', sender.request.url_components)
 
   end
 

test/smartystreets_ruby_sdk/test_url_prefix_sender.rb

@@ -7,7 +7,7 @@ class TestURLPrefixSender < Minitest::Test
   def test_request_url_present
     inner = MockSender.new(SmartyStreets::Response.new(nil, 123))
     request = SmartyStreets::Request.new
-    request.url_prefix = '/jimbo' 
+    request.url_components = '/jimbo' 
     sender = SmartyStreets::URLPrefixSender.new('http://mysite.com/lookup', inner)
 
     sender.send(request)
@@ -23,4 +23,15 @@ def test_request_url_not_present
 
     assert_equal('http://mysite.com/lookup', request.url_prefix)
   end
+  def test_multiple_sends
+    inner = MockSender.new(SmartyStreets::Response.new(nil, 123))
+    request = SmartyStreets::Request.new
+    request.url_components = '/jimbo' 
+    sender = SmartyStreets::URLPrefixSender.new('http://mysite.com/lookup', inner)
+
+    sender.send(request)
+    sender.send(request)
+
+    assert_equal('http://mysite.com/lookup/jimbo', request.url_prefix)
+  end
 end

test/smartystreets_ruby_sdk/us_enrichment/test_client.rb

@@ -14,9 +14,9 @@ def test_url_formatted_correctly
     client = SmartyStreets::USEnrichment::Client.new(sender, FakeDeserializer.new(nil))
 
     client.send_property_financial_lookup("xxx")
-    assert_equal("/xxx/property/financial", sender.request.url_prefix)
+    assert_equal("/xxx/property/financial", sender.request.url_components)
 
     client.send_property_principal_lookup("123")
-    assert_equal("/123/property/principal", sender.request.url_prefix)
+    assert_equal("/123/property/principal", sender.request.url_components)
   end
 end