rdstation-ruby-client 2.8.0 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9c55a165bdad7cd10471e913f2f531d429e4200c7180b291d55695e5370c585
-  data.tar.gz: f88b126bc80b46bb3b7ffd5f5d424190251f8d93f3c787aeefb291c6ccdec544
+  metadata.gz: 365408ab365bf2acacec98dfa4765b19b642a90a1d6fce3edccd09db8e10e0e3
+  data.tar.gz: 9296202984e88f88c38114be6fca87e68f4d87a3693fc7d4f2765c5f63b4821c
 SHA512:
-  metadata.gz: bc9a5c11adcc7d45451b2b069b3634c08bb3a47a9af4b473f7d2a39222969764cf80cd746d4d74cf723a6ff46b03f3983a1257f72f5a6a6f88085d2bc7929785
-  data.tar.gz: 17df3fc0b5abaa008377680764ef12a9fadb99a1d44a1fdbc3d76ea656776f07a51da3a348c00fc2982691b517f89d596d0d6e1fd1ca553bb5fd8e007c80ccac
+  metadata.gz: 324fc169085b6b89ef45d509807f4286b8358f8f72e35a944659fef19623bb3280a316d1f3d50178275f2a8c0e39b6d15621ac7e7b01b9fc90ff0bac10601944
+  data.tar.gz: 7ea2fc324339bcd68c22a0d9b0560e00fdd2289e7feda605819c22e516c566b6a2d80af0f14ef57b02de044a1f451a159ee727cc17457dd9197e44f255aaa2fc

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.8.2
+
+- Fix TooManyRequest handler
+
+## 2.8.1
+
+- Makes the retryable_request method also retry when a `RDStation::Error::Unauthorized` error happen
+
 ## 2.8.0
 
 ### Additions

data/README.md

@@ -55,7 +55,7 @@ RDStation.configure do |config|
 end
 ```
 
-For details on what `client_id` and `client_secret` are, check the [developers portal](https://developers.rdstation.com/en/authentication).
+For details on what `client_id` and `client_secret` are, check the [developers portal](https://developers.rdstation.com/reference/autenticacao).
 
 ### Authentication
 
@@ -123,7 +123,7 @@ client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'ref
 client.contacts.by_uuid('uuid')
 ```
 
-More info: https://developers.rdstation.com/pt-BR/reference/contacts#methodGetDetailsuuid
+More info: https://developers.rdstation.com/reference/get_platform-contacts-identifier-value
 
 #### Getting a Contact by Email
 
@@ -134,7 +134,7 @@ client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'ref
 client.contacts.by_email('email')
 ```
 
-More info: https://developers.rdstation.com/pt-BR/reference/contacts#methodGetDetailsemail
+More info:  https://developers.rdstation.com/pt-BR/reference/contacts#methodGetDetailsuuid
 
 #### Update a Contact by UUID
 
@@ -160,7 +160,7 @@ Contact Default Parameters
  - website
  - tags
 
-More info: https://developers.rdstation.com/pt-BR/reference/contacts#methodPatchDetails
+More info: https://developers.rdstation.com/reference/patch_platform-contacts-identifier-value
 
 
 #### Upsert a Contact by identifier and value
@@ -179,7 +179,7 @@ client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'ref
 client.contacts.upsert(identifier, identifier_value, contact_info)
 ```
 
-More info: https://developers.rdstation.com/pt-BR/reference/contacts#methodPatchUpsertDetails
+More info: https://developers.rdstation.com/reference/patch_platform-contacts-identifier-value
 
 ### Events
 
@@ -189,7 +189,7 @@ The events endpoint are responsible for receiving different event types in which
 
 It is possible to send default events to RD Station such as conversion events, lifecycle events and won and lost events. Also, RD Station supports the possibility of receiving different event types, for instance, chat events, ecommerce ones and others.
 
-Check the [developers portal](https://developers.rdstation.com/en/reference/events) to learn about the required payload structure and which events are available.
+Check the [developers portal](https://developers.rdstation.com/reference/eventos) to learn about the required payload structure and which events are available.
 
 This creates a new event on RDSM:
 
@@ -201,7 +201,7 @@ client.events.create(payload)
 
 ### Fields
 
-Endpoints to [manage Contact Fields](https://developers.rdstation.com/en/reference/fields) information in your RD Station account.
+Endpoints to [manage Contact Fields](https://developers.rdstation.com/reference/get_platform-contacts-fields) information in your RD Station account.
 
 #### List all fields
 
@@ -287,7 +287,7 @@ client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'ref
 client.webhooks.create(payload)
 ```
 
-The required strucutre of the payload is [described here](https://developers.rdstation.com/en/reference/webhooks#methodPostDetails).
+The required strucutre of the payload is [described here](https://developers.rdstation.com/reference/post_integrations-webhooks).
 
 #### Updating a webhook
 
@@ -297,7 +297,7 @@ client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'ref
 client.webhooks.create('WEBHOOK_UUID', payload)
 ```
 
-The required strucutre of the payload is [described here](https://developers.rdstation.com/en/reference/webhooks#methodPutDetails).
+The required strucutre of the payload is [described here](https://developers.rdstation.com/reference/put_integrations-webhooks-uuid)
 
 #### Deleting a webhook
 
@@ -434,8 +434,7 @@ So, here is a step-by-step guide on how to upgrade your app:
 
 ## Maintainers
 
-- [Filipe Nascimento](mailto:filipe.nascimento@resultadosdigitais.com.br)
-- [João Hornburg](mailto:joao@rdstation.com)
+- [EcoSystem API Team](mailto:ecosystem@rdstation.com)
 
 ## Reference
 

data/lib/rdstation/error/format.rb

@@ -29,7 +29,7 @@ module RDStation
       def single_hash?
         return unless @errors.is_a?(Hash)
 
-        @errors.key?('error')
+        @errors.key?('error') || @errors.key?('message')
       end
 
       def flat_hash?

data/lib/rdstation/error/formatter.rb

@@ -5,8 +5,9 @@ require_relative './format'
 module RDStation
   class Error
     class Formatter
-      def initialize(error_response)
+      def initialize(error_response, headers = {})
         @error_response = error_response
+        @headers = headers
       end
 
       def to_array
@@ -30,13 +31,13 @@ module RDStation
 
       def from_single_hash
         error_hash = @error_response.dup
-        error_message = error_hash.delete('error')
+        error_message = error_hash.delete('error') || error_hash.delete('message')
 
         [
           {
             'error_type' => 'TOO_MANY_REQUESTS',
             'error_message' => error_message,
-            'details' => error_hash
+            'details' => error_hash.key?('max') ? error_hash : error_details
           }
         ]
       end
@@ -102,6 +103,14 @@ module RDStation
           array_of_errors.push(*errors)
         end
       end
+
+      def error_details
+        {
+          max: @headers.fetch('ratelimit-limit-quotas', 0),
+          usage: @headers.fetch('ratelimit-limit-quotas', 0),
+          remaining_time: @headers.fetch('retry-after-quotas', 0)
+        }
+      end
     end
   end
 end

data/lib/rdstation/error_handler.rb

@@ -54,7 +54,7 @@ module RDStation
     end
 
     def error_formatter
-      @error_formatter = RDStation::Error::Formatter.new(response_errors)
+      @error_formatter = RDStation::Error::Formatter.new(response_errors, response.headers)
     end
 
     def additional_error_attributes

data/lib/rdstation/retryable_request.rb

@@ -7,7 +7,7 @@ module RDStation
       retries = 0
       begin
         yield authorization
-      rescue ::RDStation::Error::ExpiredAccessToken => e
+      rescue ::RDStation::Error::ExpiredAccessToken, ::RDStation::Error::Unauthorized => e
         raise if !retry_possible?(authorization) || retries >= MAX_RETRIES
 
         retries += 1

data/lib/rdstation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RDStation
-  VERSION = '2.8.0'
+  VERSION = '2.8.2'
 end

data/rdstation-ruby-client.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["paulo.casaretto@resultadosdigitais.com.br"]
   spec.description   = "Ruby API wrapper for RD Station"
   spec.summary       = "Ruby API wrapper for RD Station"
-  spec.homepage      = "http://resultadosdigitais.com.br"
+  spec.homepage      = "https://github.com/ResultadosDigitais/rdstation-ruby-client"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/spec/lib/rdstation/error/formatter_spec.rb

@@ -218,31 +218,60 @@ RSpec.describe RDStation::Error::Formatter do
 
     context 'when receives a single hash of errors' do
       let(:error_format) { instance_double(RDStation::Error::Format, format: RDStation::Error::Format::SINGLE_HASH) }
-
-      let(:error_response) do
-        {
-          'error' => "'lead_limiter' rate limit exceeded for 86400 second(s) period for key",
-          'max' => 24,
-          'usage' => 55,
-          'remaining_time' => 20745
-        }
-      end
-
       let(:error_formatter) { described_class.new(error_response) }
 
-      let(:expected_result) do
-        [
+      context 'when response comes from RDSM' do
+        let(:error_response) do
           {
-            'error_type' => 'TOO_MANY_REQUESTS',
-            'error_message' => "'lead_limiter' rate limit exceeded for 86400 second(s) period for key",
-            'details' => { 'max' => 24, 'usage' => 55, 'remaining_time' => 20745 }
+            'error' => "'lead_limiter' rate limit exceeded for 86400 second(s) period for key",
+            'max' => 24,
+            'usage' => 55,
+            'remaining_time' => 20745
           }
-        ]
+        end
+
+        let(:expected_result) do
+          [
+            {
+              'error_type' => 'TOO_MANY_REQUESTS',
+              'error_message' => "'lead_limiter' rate limit exceeded for 86400 second(s) period for key",
+              'details' => { 'max' => 24, 'usage' => 55, 'remaining_time' => 20745 }
+            }
+          ]
+        end
+
+        it 'returns an array of errors' do
+          result = error_formatter.to_array
+          expect(result).to eq(expected_result)
+        end
       end
 
-      it 'returns an array of errors' do
-        result = error_formatter.to_array
-        expect(result).to eq(expected_result)
+      context 'when response comes from API Gateway' do
+        let(:error_formatter) { described_class.new(error_response, response_headers) }
+        let(:error_response) do
+          { 'message' => 'API rate limit exceeded' }
+        end
+        let(:response_headers) do
+          {
+            'ratelimit-limit-quotas' => 120,
+            'retry-after-quotas' => 20745
+          }
+        end
+
+        let(:expected_result) do
+          [
+            {
+              'error_type' => 'TOO_MANY_REQUESTS',
+              'error_message' => 'API rate limit exceeded',
+              'details' => { max: 120, usage: 120, remaining_time: 20745 }
+            }
+          ]
+        end
+
+        it 'returns an array of errors' do
+          result = error_formatter.to_array
+          expect(result).to eq(expected_result)
+        end
       end
     end
   end

data/spec/lib/rdstation/retryable_request_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe RDStation::RetryableRequest do
                                             and_return(new_credentials)
         end
 
-        it 'refreshes the access_token and retries the request' do
+        it 'refreshes the access_token and retries the request when an ExpiredAccessToken error happen' do
           dummy_request = double("dummy_request")
           expect(dummy_request).to receive(:call).twice do |auth|
             expired_token = ::RDStation::Error::ExpiredAccessToken.new({'error_message' => 'x'})
@@ -74,6 +74,24 @@ RSpec.describe RDStation::RetryableRequest do
           end.not_to raise_error
         end
 
+        it 'refreshes the access_token and retries the request an Unauthorized error happen' do
+          dummy_request = double("dummy_request")
+          expect(dummy_request).to receive(:call).twice do |auth|
+            expired_token = ::RDStation::Error::Unauthorized.new({'error_message' => 'x'})
+            raise expired_token unless auth.access_token == new_access_token
+          end
+        
+          expect(RDStation.configuration.access_token_refresh_callback)
+            .to receive(:call)
+            .once do |authorization|
+              expect(authorization.access_token).to eq new_access_token
+            end
+
+          expect do
+            subject.retryable_request(auth) { |yielded_auth| dummy_request.call(yielded_auth) }
+          end.not_to raise_error
+        end
+
         context 'and keeps raising retryable exception event after token refreshed' do
           it 'retries only once' do
             dummy_request = double("dummy_request")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdstation-ruby-client
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.2
 platform: ruby
 authors:
 - Paulo L F Casaretto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,7 +197,7 @@ files:
 - spec/lib/rdstation/webhooks_spec.rb
 - spec/lib/rdstation_spec.rb
 - spec/spec_helper.rb
-homepage: http://resultadosdigitais.com.br
+homepage: https://github.com/ResultadosDigitais/rdstation-ruby-client
 licenses:
 - MIT
 metadata: {}