active_record_api-request 0.3.14 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3ae3c4b01a5fcdf15167f2155ce8eb91b6ddeb09be9fbdd1c5b3c6e8ff3c32e
-  data.tar.gz: 0675d8d722aec937f73b6cd197fe8242a2f1c2e458a415831722bce48691aa1c
+  metadata.gz: 4bf85446f65a2cdec067be322385b94966bdf4f6cb457fe7914a118e563b2a9e
+  data.tar.gz: 10b170ac1aeed7d5b95cb87fef0bba7e3975715413395cb2578d8222941f70aa
 SHA512:
-  metadata.gz: 04a53111d32529814b3f3ac60cff067cd670672e77fd86f380161cf012c36ef1f2994a1208de4f94f6d8f3cb0436c0470d7591b844369236650dc80dc135a735
-  data.tar.gz: 65bf626a5fe19420fd6924ecc44caaa2da90e027e3fb327fccc44d935412f3904f2865702ebb7173cbe3e96c6f80cca9e665f84d5f6994c92a10529ef982ad85
+  metadata.gz: 7b83ec91607f9c2e6d0df1319f0cb0aeb9e0d1e0d740655c8660e9ac57c77f29e62f887bb4e5ca4066600fae71191f904260d83812889ca12dd09492d7e408b1
+  data.tar.gz: 3ef8d895de630379c8e35afbc3a0d8bdeefd3318854ab97ff1cc524bef7270dec0661029829f375813be43393462daacfd34c7c91d24d6a5ebe0d438c5b54cc9

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 = nil
       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.14'.freeze
+    VERSION = '0.3.18'.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.14
+  version: 0.3.18
 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