active_record_api-request 0.3.15 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07723fe8a0e7ef8a09d646992c72e93f334473b2f90a86e74af704beb1e8b054
-  data.tar.gz: a6a7af0c05535d34ee363e455b3f3162d27a9f8c9990e8e4349cded201e7335b
+  metadata.gz: d6af4134939034714b4b254d0ad382ac6dd421ce005d710dc6304d5972c4dba9
+  data.tar.gz: 1ff9df91defe7292c1f7fe6c8d3ab46bf2a154808bd8b99754b85a99827aee87
 SHA512:
-  metadata.gz: 35c489d8cb6613b5b933b7a1cfdd258085a490d8cc76ad9efb908db450d27409566af8c05d5b83eabb0ddc07a57fd1c99ec9102c7b1a880979b50f6979b198b6
-  data.tar.gz: 4b4ad95507d5af98fc3a0061e3f97807d84f873c3de8e4d4bd6f35708fedbb5295e6a5f4295eda01e220d50c6df6957fcba86e628b747c23b41be81980b7c69d
+  metadata.gz: f846a71d5626dc282e221d6dc0cf38300376980f5d2849269485d31e4af5833522fba7a5a2b91dac8ffe67418e887623d7c7480e3c18a30699292cea3bc9c6be
+  data.tar.gz: 947ed413c5e927c4ac6889a5d34500c8dfe09b7ebeab347bb67fb3a665a58c2d20690070e9f0cc57f51cd93254f5842a2dd84ae7180e83ed367fd159aaa9d0d5

data/lib/active_record_api/request/connection.rb

@@ -5,7 +5,7 @@ require 'faraday-http-cache'
 module ActiveRecordApi
   module Request
     class Connection < Credentials
-      attr_accessor :debug, :path, :cache_store
+      attr_accessor :debug, :path, :cache_store, :timeout
       attr_writer :full_url
 
       def authenticated_connection
@@ -16,7 +16,7 @@ module ActiveRecordApi
       def connection
         @connection ||= Faraday.new do |builder|
           builder.options[:open_timeout] = 2
-          builder.options[:timeout] = 5
+          builder.options[:timeout] = timeout || 5
           builder.request :json
           builder.request :url_encoded
           builder.request :retry, max: 5, interval: 0.05, interval_randomness: 0.5, backoff_factor: 2, exceptions: [ActiveRecordApi::Request::AuthError]
@@ -24,7 +24,7 @@ module ActiveRecordApi
           builder.use :http_cache, http_cache_options
           builder.use FaradayFollowNextLinks, 5
           builder.use FaradayMiddleware::FollowRedirects, standards_compliant: true
-          builder.use FaradayAuthTokenRetry, credentials: credentials, host: host, token_path: token_path, debug: debug
+          builder.use FaradayAuthTokenRetry, credentials: credentials, host: host, token_path: token_path, debug: debug, timeout: timeout
           builder.response :json, content_type: /\bjson$/
           builder.response :raise_error
           builder.response :logger if debug

data/lib/active_record_api/request/faraday_auth_token_retry.rb

@@ -6,14 +6,15 @@ module ActiveRecordApi
     class FaradayAuthTokenRetry < Faraday::Middleware
       AUTH_KEY = 'Authorization'.freeze
 
-      attr_reader :credentials, :host, :token_path, :debug
+      attr_reader :credentials, :host, :token_path, :debug, :timeout
 
-      def initialize(app, credentials: nil, host: nil, token_path: nil, debug: false)
+      def initialize(app, credentials: nil, host: nil, token_path: nil, debug: false, timeout: nil)
         super(app)
         @credentials = credentials
         @host = host
         @token_path = token_path
         @debug = debug
+        @timeout = timeout
       end
 
       def call(env)
@@ -42,7 +43,7 @@ module ActiveRecordApi
       end
 
       def retrieve_token
-        token_cache.fetch_token Proc.new { TokenRetriever.new(credentials: credentials, host: host, token_path: token_path, debug: debug).fetch_token }
+        token_cache.fetch_token Proc.new { TokenRetriever.new(credentials: credentials, host: host, token_path: token_path, debug: debug, timeout: timeout).fetch_token }
       end
 
       def token_cache

data/lib/active_record_api/request/token_cache.rb

@@ -3,7 +3,7 @@ module ActiveRecordApi
   module Request
     class TokenCache
       include ActiveAttr::Model
-      attr_accessor  :debug
+      attr_accessor :debug
 
       def flush
         return unless defined? AUTH_REDIS_POOL
@@ -33,14 +33,14 @@ module ActiveRecordApi
           @token = nil
           @retry = 0
           while @token.nil? && @retry < 5
-            @retry += 1
             @token = @redis_client.get('auth_token')
             debug_log "retry ##{@retry}"
             debug_log "found token: #{@token}"
+            @retry += 1
             if @token.nil? || session_missing_for?(@token)
               if acquire_lock
                 begin
-                  debug_log "acquired lock and fetching token for cache"
+                  debug_log 'acquired lock and fetching token for cache'
                   @token = token_proc.call
                   raise "no token returned! #{@token}" if @token.nil?
                   @redis_client.set 'auth_token', @token
@@ -70,7 +70,7 @@ module ActiveRecordApi
           return nil
         end
 
-        @redis_session ||= Redis.new({url: "redis://#{ENV['REDIS_SESSION_HOST']}", db: ENV['REDIS_SESSION']})
+        @redis_session ||= Redis.new({ url: "redis://#{ENV['REDIS_SESSION_HOST']}", db: ENV['REDIS_SESSION'] })
       end
 
       def session_missing_for?(token)
@@ -86,7 +86,7 @@ module ActiveRecordApi
       end
 
       def acquire_lock
-        @redis_client.set 'auth_token_lock', unique_key, nx: true, ex: 60
+        @redis_client.set 'auth_token_lock', unique_key, nx: true, ex: 8
         current_lock_value = @redis_client.get 'auth_token_lock'
         debug_log "#{current_lock_value} == #{unique_key}"
         current_lock_value == unique_key
@@ -102,4 +102,5 @@ module ActiveRecordApi
     end
   end
 end
+
 #:nocov:#

data/lib/active_record_api/request/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecordApi
   module Request
-    VERSION = '0.3.15'.freeze
+    VERSION = '0.3.19'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_api-request
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.19
 platform: ruby
 authors:
 - Full Measure Education
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr