active_record_api-request 0.3.13 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 263d60c6f20dedeb4ddf11c57f477db856bbbef2d6d4dc3b059c52d7bcae5234
-  data.tar.gz: aaabc4345b53434748f68dd39e3e1049d1425e2157abbd06c385cacb07e107e9
+  metadata.gz: 1d6e188005d1705103e43caaaeb1b64ffe616927b61a2565a97d6409db6c90f9
+  data.tar.gz: e95f2b46e96a2ebb02d2c4d107d6f1606c77904a4fba4a71ffcb20bd3e26a0c4
 SHA512:
-  metadata.gz: 7da94f911d65e00e5df2efa8c242812c6279ee92aa853060adbb944d47a37ac09012a6520aff91ea1640876863927b046abad59b3b98c29ecb855bd54defc629
-  data.tar.gz: ab2306aec21f5841c0e88e78e9787ca4a243cb2710f9d3eb8163738024153b93c57026e8736e9a019b406d26d3ad1bf48cae5d7f57e536f1a70067ec04494384
+  metadata.gz: 06a9ce7ac4ab27d5d20f28efccc37d832849ee0d9cf7299ee377fa47e364d7ecd8563b03e3ce45e9693a5dc26f4913d663e17c0f32d2bd021d725fb39fbe807b
+  data.tar.gz: 0d5e6c6ed78ffbf16d740baa2f770175115057e98bf9e9e7eeb46e3df161aeba6f0e9a1eb4b237494ce7c7c1ccaf18d5b016e30c73167cc0a3ef78ededb22be3

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]

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
@@ -25,7 +25,7 @@ module ActiveRecordApi
         unless defined? AUTH_REDIS_POOL
           debug_log 'no auth redis pool. getting new token'
           token = token_proc.call
-          raise "no token returned! #{token}" if @token.nil?
+          raise "no token returned! #{token}" if token.nil?
           return token
         end
         AUTH_REDIS_POOL.with do |client|
@@ -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.13'.freeze
+    VERSION = '0.3.17'.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.13
+  version: 0.3.17
 platform: ruby
 authors:
 - Full Measure Education
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr