smartystreets_ruby_sdk 5.14.13 → 5.14.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42a215aa8d810dbd85f5739ae7a73dbd0ead4a253627d8bfeb36d017e36ca716
-  data.tar.gz: 3be273085fc4466f96c0376e9d101d5dc2464210aa3a092c00e0f4ddade0fb12
+  metadata.gz: f3b53c497e2b878f2e38640936f0506d2e5261a667ce32d01858c09f630a9d9f
+  data.tar.gz: 1b14bbb12896b4c35477039085b3fb4979956a019dcbf88d1fd51a130be625c4
 SHA512:
-  metadata.gz: 318e5a6802ffa480c4a83887637a0e64c41e3481d5cfd28799de3d455f68369f2733c9fad6afa9b1e95974524da273daf688d54f124062d8ea9e634b80ad0bda
-  data.tar.gz: f719f070faf89dfe73c4e248f19cdb71c769ecdd88e2e5bd2ddf0ec9cfcd4f35f66630fe763b05e6903b7a76af5932302ed41ff29dcbceac46d43dc0f513d00a
+  metadata.gz: d7b37c5ca35a41d18cbb57bb66f6afd6c08c1ab2da90fb13ce26d4c749856c5120081ede5421ede7a7a83dd5d5b999ae246b345a9595d2d23ba32bc84b4118e9
+  data.tar.gz: ddcb7bd954004e635befcbe9fe42577a22383edd74cfea57669c4d3eca7d398f55c664650739b2bf277da4a14e5dd2eb0548191f9e261c65abcdcd7b0ef746d6

data/.github/workflows/gem-publish.yml

@@ -13,47 +13,15 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 0 # need all the commits
+          fetch-depth: 0
       
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'
           bundler-cache: false
-      
-      - uses: actions/setup-node@v2
-      
-      - name: Clean
-        run: |
-          rm -f *.gem
-          git checkout lib/smartystreets_ruby_sdk/version.rb
-      
-      - name: Dependencies
-        run: |
-          gem install minitest
-      
-      - name: Test
-        run: |
-          rake test
-      
-      - name: Set Environment Variable
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Grab Version
-        run: |
-          echo "Module SmartyStreets
-          VERSION = '${{ env.RELEASE_VERSION }}' 
-          end" >> version.rb \
-          && cat version.rb \
-          && gem build *.gemspec \
-          && git checkout lib/smartystreets_ruby_sdk/version.rb
 
-      - name: Push to rubygems.org
+      - name: Publish
         run: |
-          mkdir -p $HOME/.gem
-          touch $HOME/.gem/credentials
-          chmod 0600 $HOME/.gem/credentials
-          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-          gem push *.gem
-#          chmod 0600 /root/.gem/credentials
+          VERSION=${GITHUB_REF#refs/*/} API_KEY=${{ secrets.GEM_HOST_API_KEY }} make publish
         env:
-          GEM_HOST_API_KEY: "${{secrets.GEM_HOST_API_KEY}}"
+          API_KEY: "${{ secrets.GEM_HOST_API_KEY }}"

data/Makefile

@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-VERSION       := $(shell tagit -p --dry-run)
 VERSION_FILE  := lib/smartystreets_ruby_sdk/version.rb
 
 clean:
@@ -14,20 +13,16 @@ dependencies:
 	gem install minitest
 
 package: clean dependencies test
-	sed -i "s/0\.0\.0/$(VERSION)/g" "$(VERSION_FILE)" \
-		&& gem build *.gemspec \
-		&& git checkout "$(VERSION_FILE)"
+	sed -i "s/0\.0\.0/${VERSION}/g" "$(VERSION_FILE)" \
+	&& gem build *.gemspec \
+	&& git checkout "$(VERSION_FILE)"
 
 publish: package
-	chmod 0600 /root/.gem/credentials
+	mkdir -p ~/.gem
+	touch ~/.gem/credentials
+	chmod 0600 ~/.gem/credentials
+	printf -- "---\n:rubygems_api_key: ${API_KEY}\n" > ~/.gem/credentials
+	cat ~/.gem/credentials
 	gem push *.gem
 
-#####################################################################
-
-workspace:
-	docker-compose run sdk /bin/sh
-
-release:
-	docker-compose run sdk make publish && tagit -p && git push origin --tags
-
-.PHONY: clean test dependencies package publish workspace release
+.PHONY: clean test dependencies package publish

data/examples/us_street_single_address_example.rb

@@ -1,6 +1,7 @@
 require 'smartystreets_ruby_sdk/static_credentials'
 require 'smartystreets_ruby_sdk/client_builder'
 require 'smartystreets_ruby_sdk/us_street/lookup'
+require 'smartystreets_ruby_sdk/us_street/match_type'
 
 class USStreetSingleAddressExample
   def run
@@ -16,9 +17,11 @@ class USStreetSingleAddressExample
     # The appropriate license values to be used for your subscriptions
     # can be found on the Subscriptions page of the account dashboard.
     # https://www.smartystreets.com/docs/cloud/licensing
-    client = SmartyStreets::ClientBuilder.new(credentials).with_licenses(['us-core-cloud'])
-        # with_proxy('localhost', 8080, 'proxyUser', 'proxyPassword'). # Uncomment this line to try it with a proxy
-        build_us_street_api_client
+    #
+    # To try with a proxy, add this method call after with_licences
+    #   with_proxy('localhost', 8080, 'proxyUser', 'proxyPassword')
+    client = SmartyStreets::ClientBuilder.new(credentials).with_licenses(['us-core-cloud']).
+             build_us_street_api_client
 
     # Documentation for input fields can be found at:
     # https://smartystreets.com/docs/cloud/us-street-api
@@ -34,7 +37,8 @@ class USStreetSingleAddressExample
     lookup.state = 'CA'
     lookup.zipcode = '21229'
     lookup.candidates = 3
-    lookup.match = Lookup.INVALID # "invalid" is the most permissive match,
+    lookup.match = SmartyStreets::USStreet::MatchType::INVALID
+                                    # "invalid" is the most permissive match,
                                     # this will always return at least one result even if the address is invalid.
                                     # Refer to the documentation for additional Match Strategy options.
 
@@ -64,4 +68,4 @@ class USStreetSingleAddressExample
 end
 
 example = USStreetSingleAddressExample.new
-example.run
+example.run

data/lib/smartystreets_ruby_sdk/client_builder.rb

@@ -39,7 +39,7 @@ module SmartyStreets
       @max_timeout = 10
       @url_prefix = nil
       @proxy = nil
-      @headers = nil
+      @header = nil
       @licenses = %w()
       @debug = nil
     end
@@ -98,8 +98,8 @@ module SmartyStreets
     # headers is a Hash object.
     #
     # Returns self to accommodate method chaining.
-    def with_custom_headers(headers)
-      @headers = headers
+    def with_custom_headers(header)
+      @header = header
       self
     end
 
@@ -170,7 +170,7 @@ module SmartyStreets
 
       sender = StatusCodeSender.new(sender)
 
-      sender = CustomHeaderSender.new(sender, @headers) unless @headers.nil?
+      sender = CustomHeaderSender.new(sender, @header) unless @header.nil?
 
       sender = SigningSender.new(@signer, sender) unless @signer.nil?
 

data/lib/smartystreets_ruby_sdk/custom_header_sender.rb

@@ -1,12 +1,12 @@
 module SmartyStreets
   class CustomHeaderSender
-    def initialize(inner, headers)
+    def initialize(inner, header)
       @inner = inner
-      @headers = headers
+      @header = header
     end
 
     def send(request)
-      request.headers = @headers
+      request.header = @header
       @inner.send(request)
     end
   end

data/lib/smartystreets_ruby_sdk/errors.rb

@@ -15,8 +15,7 @@ module SmartyStreets
 
   UNPROCESSABLE_ENTITY = 'GET request lacked required fields.'.freeze
 
-  TOO_MANY_REQUESTS = 'When using public "website key" authentication,
-we restrict the number of requests coming from a given source over too short of a time.'.freeze
+  TOO_MANY_REQUESTS = 'The rate limit has been exceeded.'.freeze
 
   INTERNAL_SERVER_ERROR = 'Internal Server Error.'.freeze
 

data/lib/smartystreets_ruby_sdk/international_street/components.rb

@@ -5,17 +5,21 @@ module SmartyStreets
       attr_reader :premise, :thoroughfare_trailing_type, :sub_building, :locality, :post_box_number,
                   :thoroughfare_name, :thoroughfare_postdirection, :dependent_thoroughfare, :premise_prefix_number,
                   :thoroughfare, :dependent_thoroughfare_name, :postal_code_short, :dependent_thoroughfare_trailing_type,
-                  :administrative_area, :post_box, :building_leading_type, :dependent_locality_name, :thoroughfare_type,
+                  :administrative_area, :administrative_area_short, :administrative_area_long, :post_box,
+                  :building_leading_type, :dependent_locality_name, :thoroughfare_type,
                   :dependent_thoroughfare_postdirection, :double_dependent_locality, :premise_number,
                   :dependent_thoroughfare_type, :post_box_type, :building, :sub_administrative_area, :postal_code_extra,
                   :sub_building_name, :postal_code, :dependent_locality, :premise_type, :sub_building_number,
                   :super_administrative_area, :premise_extra, :dependent_thoroughfare_predirection,
-                  :building_trailing_type, :thoroughfare_predirection, :building_name, :country_iso_3, :sub_building_type
+                  :building_trailing_type, :thoroughfare_predirection, :building_name, :level_type, :level_number,
+                  :country_iso_3, :sub_building_type
 
       def initialize(obj)
         @country_iso_3 = obj.fetch('country_iso_3', nil)
         @super_administrative_area = obj.fetch('super_administrative_area', nil)
         @administrative_area = obj.fetch('administrative_area', nil)
+        @administrative_area_short = obj.fetch('administrative_area_short', nil)
+        @administrative_area_long = obj.fetch('administrative_area_long', nil)
         @sub_administrative_area = obj.fetch('sub_administrative_area', nil)
         @dependent_locality= obj.fetch('dependent_locality', nil)
         @dependent_locality_name = obj.fetch('dependent_locality_name', nil)
@@ -49,6 +53,8 @@ module SmartyStreets
         @sub_building_number = obj.fetch('sub_building_number', nil)
         @sub_building_name = obj.fetch('sub_building_name', nil)
         @sub_building = obj.fetch('sub_building', nil)
+        @level_type = obj.fetch('level_type', nil)
+        @level_number = obj.fetch('level_number', nil)
         @post_box = obj.fetch('post_box', nil)
         @post_box_type = obj.fetch('post_box_type', nil)
         @post_box_number = obj.fetch('post_box_number', nil)

data/lib/smartystreets_ruby_sdk/native_sender.rb

@@ -24,7 +24,11 @@ module SmartyStreets
 
         http.finish if http.started?
       rescue StandardError => err
-        return Response.new(nil, nil, err)
+        if response.nil?
+          return Response.new(nil, nil, nil, err)
+        else
+          return Response.new(nil, nil, response.header, err)
+        end
       end
 
       build_smarty_response(response)
@@ -43,12 +47,16 @@ module SmartyStreets
       request.body = smarty_request.payload
       request['User-Agent'] = "smartystreets (sdk:ruby@#{SmartyStreets::VERSION})"
       request['Referer'] = smarty_request.referer unless smarty_request.referer.nil?
-      set_custom_headers(smarty_request.headers, request)
+      set_custom_headers(smarty_request.header, request)
       request
     end
 
     def build_smarty_response(native_response)
-      Response.new(native_response.body, native_response.code)
+      if native_response.header.nil?
+        Response.new(native_response.body, native_response.code)
+      else
+        Response.new(native_response.body, native_response.code, native_response.header)
+      end
     end
 
     def build_http(request)
@@ -70,8 +78,8 @@ module SmartyStreets
       URI.encode_www_form(smarty_request.parameters)
     end
 
-    def self.set_custom_headers(smarty_headers, request)
-      smarty_headers.each do |key, values|
+    def self.set_custom_headers(smarty_header, request)
+      smarty_header.each do |key, values|
         if values.respond_to? :each
           values.each do |value|
             request.add_field(key, value)

data/lib/smartystreets_ruby_sdk/request.rb

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

data/lib/smartystreets_ruby_sdk/response.rb

@@ -1,10 +1,11 @@
 module SmartyStreets
   class Response
-    attr_accessor :payload, :status_code, :error
+    attr_accessor :payload, :status_code, :header, :error
 
-    def initialize(payload, status_code, error = nil)
+    def initialize(payload, status_code, header = nil, error = nil)
       @payload = payload
       @status_code = status_code
+      @header = header
       @error = error
     end
   end

data/lib/smartystreets_ruby_sdk/retry_sender.rb

@@ -1,8 +1,8 @@
 module SmartyStreets
   class RetrySender
     MAX_BACKOFF_DURATION = 10
-    STATUS_INTERNAL_SERVER_ERROR = 500
     STATUS_TOO_MANY_REQUESTS = 429
+    STATUS_TO_RETRY = [408, 429, 500, 502, 503, 504]
 
     def initialize(max_retries, inner, sleeper, logger)
       @max_retries = max_retries
@@ -15,14 +15,20 @@ module SmartyStreets
       response = @inner.send(request)
 
       (0..@max_retries-1).each do |i|
-        if response.status_code.to_i == STATUS_TOO_MANY_REQUESTS
-          backoff(5)
-        end
-        
-        break if response.status_code.to_i < STATUS_INTERNAL_SERVER_ERROR
 
-        backoff(i)
+        break if STATUS_TO_RETRY.include?(response.status_code.to_i) == false
 
+        if response.status_code.to_i == STATUS_TOO_MANY_REQUESTS
+          seconds_to_backoff = 10
+          if response.header.nil? == false
+            if Integer(response.header["Retry-After"], exception: false)
+              seconds_to_backoff = response.header["Retry-After"].to_i
+            end
+          end
+          rate_limit_backoff(seconds_to_backoff)
+        else
+          backoff(i)
+        end
         response = @inner.send(request)
       end
 
@@ -35,5 +41,10 @@ module SmartyStreets
       @logger.log("There was an error processing the request. Retrying in #{backoff_duration} seconds...")
       @sleeper.sleep(backoff_duration)
     end
+
+    def rate_limit_backoff(backoff_duration)
+      @logger.log("Rate limit reached. Retrying in #{backoff_duration} seconds...")
+      @sleeper.sleep(backoff_duration)
+    end
   end
 end

data/lib/smartystreets_ruby_sdk/status_code_sender.rb

@@ -10,11 +10,29 @@ module SmartyStreets
     def send(request)
       response = @inner.send(request)
 
+      if response.status_code == '429'
+        response.error = parse_rate_limit_response(response)
+      end
       assign_exception(response) if response.error == nil
 
       response
     end
 
+    def parse_rate_limit_response(response)
+      error_message = ""
+      if !response.payload.nil?
+        response_json = JSON.parse(response.payload)
+        response_json["errors"].each do |error|
+          error_message += (" " + error["message"])
+        end
+        error_message.strip!
+      end
+      if error_message == ""
+        error_message = TOO_MANY_REQUESTS
+      end
+      TooManyRequestsError.new(error_message)
+    end
+
     def assign_exception(response)
       response.error = case response.status_code
                          when '401'

data/lib/smartystreets_ruby_sdk/version.rb

@@ -1,3 +1,3 @@
 module SmartyStreets
-  VERSION = '5.14.13' # DO NOT EDIT (this is updated by a build job when a new release is published)
+  VERSION = '5.14.17' # DO NOT EDIT (this is updated by a build job when a new release is published)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartystreets_ruby_sdk
 version: !ruby/object:Gem::Version
-  version: 5.14.13
+  version: 5.14.17
 platform: ruby
 authors:
 - SmartyStreets SDK Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler