hubspot-api-client 14.4.0 → 14.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3229748b2d14e474894aecf5f28d60ae7ace8f5dda38d98daa34a2bbda93e033
-  data.tar.gz: 2867ef54025f5caa340e9ad28e7fafa940cb88bc8b11142b6f75d45df8e6829a
+  metadata.gz: 1d8b685b37efbc5b2140970f793514d482f2c1b3cc1e7da8bb0f22d6814a4e72
+  data.tar.gz: 5db20fc0ccb46c3e201751171f08fc1f052b48053ae64e1ff8a09ab9b6cc1705
 SHA512:
-  metadata.gz: 13932717d618997bff59721afe32a3480b30f579d299837d55f925cd1b47f300a70143245d954fadc14b8ca408587051abe355900310d34543e243ea866129a6
-  data.tar.gz: 59711b28a7e2b9fe86fe610434d4bcbb1065ece4812c5448e5856ba53fa77ba275eb6df9bfd24299fae494e98858ddfc94dbd5a4f29c51412be942a86d931d8f
+  metadata.gz: 63275e727159844f6841460d15c9a672f103295693bb010a7c0dd8a178bce450e5a1f0995f0f98b93fb6698d920d6d31d385a3b54330f74498dfc59a37dc930d
+  data.tar.gz: e94d656b76d0782d533e7378416652378a36a2194386ac67496fc142a6713293a8ac858ff1e3fb88f7a1017c34080513938a17b2d7fbb61cde3e730f3006792d

data/CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [14.5.1] - 2022-09-30
+### Changed
+
+- with_http methods were added to the discovery classes
+
+## [14.5.0] - 2022-09-30
+### Changed
+
+- handling ApiError with retries
+
 ## [14.4.0] - 2022-09-27
 ### Changed
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hubspot-api-client (14.4.0)
+    hubspot-api-client (14.5.1)
       json (~> 2.1, >= 2.1.0)
       require_all (~> 3.0.0)
       typhoeus (~> 1.4.0)

data/README.md

@@ -196,6 +196,28 @@ api_client = ::Hubspot::Crm::Companies::ApiClient.new(config)
 basic_api = ::Hubspot::Crm::Companies::BasicApi.new(api_client)
 ```
 
+for new discovery classes since version 14.5
+
+Available params:
+  - max_retries (maximum number of retries)
+  - seconds_delay (pause in seconds between retries)
+  - passing a block (block that handles errors occured)
+
+
+```ruby
+require 'hubspot-api-client'
+
+# Set handlers of statuses you want to handle
+retry_config = {
+  500..530 => { max_retries: 2, seconds_delay: 2 },
+  400 => { max_retries: 3, seconds_delay: 3 }
+}
+
+client = Hubspot::Client.new(access_token: 'your_access_token')
+
+contacts = client.crm.contacts.basic_api.get_page(retry: retry_config) { |error| error.code }
+```
+
 ### Sample apps
 
 Please, take a look at our [Sample apps](https://github.com/HubSpot/sample-apps-list)

data/lib/hubspot/discovery/base_api_client.rb

@@ -11,7 +11,10 @@ module Hubspot
       end
 
       def api_methods
-        api.methods.grep(/with_http_info/).map {|elem| elem.to_s.gsub('_with_http_info', '').to_sym }
+        api.methods.grep(/with_http_info/).inject([]) do |methods, method|
+          methods << method
+          methods << method.to_s.gsub('_with_http_info', '').to_sym
+        end
       end
 
       def config
@@ -59,6 +62,32 @@ module Hubspot
         yield(e)
       end
 
+      def call_api_with_retry(api_method, params_to_pass, retry_config, &block)
+        call_api_with_rescue(api_method, params_to_pass) do |error|
+          opts = retry_config.detect{ |k,v| k === error.code }&.last
+          retries = opts&.dig(:max_retries) || 5
+
+          block.call(error) unless block.nil?
+
+          response = error
+
+          while retries > 0 && opts
+            sleep opts[:seconds_delay] if opts[:seconds_delay]
+            response = call_api_with_rescue(api_method, params_to_pass) do |e|
+              block.call(e) unless block.nil?
+              e
+            end
+
+            return response unless response.respond_to?(:code)
+
+            opts = retry_config.detect{ |k,v| k === response.code }&.last
+            retries -= 1
+          end
+
+          response
+        end
+      end
+
       def define_methods
         define_api_methods
       end
@@ -82,7 +111,7 @@ module Hubspot
 
             signature_param_names = signature_params.map { |_, param| param }
             params_with_defaults.each do |param_name, param_value|
-              params_with_defaults[:opts][param_name] = param_value if !signature_param_names.include?(param_name) && param_name != :body
+              params_with_defaults[:opts][param_name] = param_value if !signature_param_names.include?(param_name) && param_name != :body && param_name != :retry
             end
 
             params_to_pass = signature_params.map do |req, param|
@@ -94,6 +123,7 @@ module Hubspot
               params_with_defaults[param]
             end
 
+            return call_api_with_retry(api_method, params_to_pass, params[:retry], &block) unless params[:retry].nil?
             return call_api_with_rescue(api_method, params_to_pass, &block) unless block.nil?
             call_api(api_method, params_to_pass)
           end

data/lib/hubspot/version.rb

@@ -1,3 +1,3 @@
  module Hubspot
-  VERSION = '14.4.0'
+  VERSION = '14.5.1'
  end

data/spec/discovery/base_api_client_spec.rb

@@ -29,6 +29,16 @@ describe 'Hubspot::Discovery::BaseApiClient' do
 
     def raise_error_with_http_info
     end
+
+    def raise_error_on_third_call
+      @calls_count ||= 0
+      @calls_count += 1
+      raise Hubspot::ApiError if @calls_count < 3
+      'ok'
+    end
+
+    def raise_error_on_third_call_with_http_info
+    end
   end
 
   class Hubspot::ApiClient
@@ -40,6 +50,10 @@ describe 'Hubspot::Discovery::BaseApiClient' do
     def message
       'test error'
     end
+
+    def code
+      429
+    end
   end
 
   class Hubspot::SimplePublicObjectInput
@@ -61,8 +75,8 @@ describe 'Hubspot::Discovery::BaseApiClient' do
   
   it { is_expected.to respond_to(:get) }
   it { is_expected.to respond_to(:update) }
-  it { is_expected.not_to respond_to(:get_with_http_info) }
-  it { is_expected.not_to respond_to(:update_with_http_info) }
+  it { is_expected.to respond_to(:get_with_http_info) }
+  it { is_expected.to respond_to(:update_with_http_info) }
 
   describe '#get' do
     subject(:get) { client.get(params) }
@@ -127,4 +141,26 @@ describe 'Hubspot::Discovery::BaseApiClient' do
 
     it { is_expected.to eq('test error') }
   end
+
+  describe '#raise_error_on_third_call' do
+    subject(:raise_error_on_third_call) { client.raise_error_on_third_call(retry: retry_config) }
+
+    context 'with 2 retries' do
+      let(:retry_config) { {429 => { max_retries: 2 }} }
+
+      it { is_expected.to eq('ok') }
+
+      context 'with range config' do
+        let(:retry_config) { {429..442 => { max_retries: 2 }} }
+
+        it { is_expected.to eq('ok') }
+      end
+    end
+
+    context 'with 1 retry' do
+      let(:retry_config) { {429 => { max_retries: 1 }} }
+
+      it { is_expected.to have_attributes(code: 429, message: 'test error') }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubspot-api-client
 version: !ruby/object:Gem::Version
-  version: 14.4.0
+  version: 14.5.1
 platform: ruby
 authors:
 - HubSpot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus