modulr-api 0.0.44 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 985e67e8a7284607d6d6ab83c5961c56d7ab92a8ef4fe24713908730afe063b6
-  data.tar.gz: 57c5b585f5039a0c69942f0311017d1f13e0505fb2f8c9900d501948a3d448a9
+  metadata.gz: 45f16a01e7450ae71621e53a850720a9679124c4bc22db243da24916eee09229
+  data.tar.gz: 1b67cded77fa55969e1024dfc676f06b5cd77cfd35153a801b9492c980f4e334
 SHA512:
-  metadata.gz: 198a8ece89370a7f720622874bf1d0f6dce08862eede48664f3405b8db19a0aa2c63cdc162f2d8e04ff846809baf64d8bb3e85a60368de9e663b10505b52c491
-  data.tar.gz: 7b97f877c66a30566c2fa484664ee0433fb84650b31bd4109312ece4cbee41f77d02c052f68bb5b74979011c157a4ede681354b2697699636c9ea1055dd6eb05
+  metadata.gz: a859137b06dd2fce7562b8e1f044991e9a53c0f529cb1390e182e5dab67eb30b68d3adec9f55b38d371458438287f64ed81c1b9b7522ee2412981b3e8c35d571
+  data.tar.gz: 3b4fe0303298bebe102ea330c4b183f937304bac3ed548e0b0743c704fd92dbf495747c8463dec193d4ae7adb64cf4d7739fb2d62c491962412d4855e1bc23f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modulr-api (0.0.44)
+    modulr-api (0.0.46)
       faraday (~> 1.0)
       faraday_middleware (~> 1.0)
 

data/lib/modulr/api/service.rb

@@ -9,12 +9,6 @@ module Modulr
         @client = client
       end
 
-      def idempotency_headers(options)
-        headers = {}
-        headers[:idempotency_key] = options[:idempotency_key] if options[:idempotency_key]
-        headers
-      end
-
       def format_datetime(datetime)
         datetime.strftime("%Y-%m-%dT%H:%M:%S%z")
       end

data/lib/modulr/client.rb

@@ -80,28 +80,30 @@ module Modulr
 
     def request_options(method, _path, data, options)
       default_options.tap do |defaults|
+        add_idempotency_headers!(defaults[:headers], method, options)
         add_auth_options!(defaults)
-        add_idempotency_headers!(defaults[:headers], method, options) if options
+
         defaults[:body] = JSON.dump(data) if data
       end
     end
 
     def add_auth_options!(options)
-      return sandbox_auth_options(options) if @base_url.eql?(SANDBOX_URL)
+      return sandbox_auth_options(options[:headers]) if @base_url.eql?(SANDBOX_URL)
 
-      auth_options(options)
+      auth_options(options[:headers])
     end
 
     def sandbox_auth_options(options)
-      options[:headers][:authorization] = @apikey
+      options[:authorization] = @apikey
     end
 
     def auth_options(options)
-      signature = Auth::Signature.calculate(apikey: @apikey, apisecret: @apisecret)
+      nonce = options["x-mod-nonce"]
+      signature = Auth::Signature.calculate(apikey: @apikey, apisecret: @apisecret, nonce: nonce)
 
-      options[:headers][:authorization] = signature.authorization
-      options[:headers][:date] = signature.timestamp
-      options[:headers][:"x-mod-nonce"] ||= signature.nonce
+      options[:authorization] = signature.authorization
+      options[:date] = signature.timestamp
+      options["x-mod-nonce"] = signature.nonce
     end
 
     private def add_idempotency_headers!(headers, method, options)
@@ -111,8 +113,8 @@ module Modulr
       return unless idempotency_key
 
       nonce = self.class.idempotency_nonce(idempotency_key)
-      headers[:"x-mod-nonce"] = nonce
-      headers[:"x-mod-retry"] = "true" if nonce && !nonce.empty?
+      headers["x-mod-nonce"] = nonce
+      headers["x-mod-retry"] = "true"
     end
 
     private def merge_query_params(request, method, options)
@@ -126,6 +128,8 @@ module Modulr
       case error
       when Faraday::ClientError
         raise ClientError, error
+      when Faraday::TimeoutError
+        raise TimeoutError, error
       when Faraday::ServerError
         raise ServerError, error
       else

data/lib/modulr/error.rb

@@ -35,4 +35,7 @@ module Modulr
 
   class ServerError < Error
   end
+
+  class TimeoutError < Error
+  end
 end

data/lib/modulr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modulr
-  VERSION = "0.0.44"
+  VERSION = "0.0.46"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modulr-api
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.46
 platform: ruby
 authors:
 - Aitor García Rey