faraday-throttler-rx 0.0.6 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b4d9bed4de87645679ba476eced15a525516375df5bd3b71431e9342b56997e
-  data.tar.gz: 7e0a2f1a0a01621b56737e40f08a5da6642eb53a2ef2dd2b70a86c834e076834
+  metadata.gz: e8d9b78ffc27c6b8d6d6f47b678be32539d571e272087898b89624821bca1ed7
+  data.tar.gz: c31a2b9aa214f9d4319d6b2458a5d7dcac4ff4ef94093deba0ae4ad81151e4f6
 SHA512:
-  metadata.gz: fcefae47311b805e92d57b767d5e7e1bcb867da116dc1209fa83293ba384e44acba1eb455d478f7a0b2e38499cb59f540973692f25ad0bbb38485d80d74ea1ae
-  data.tar.gz: 5a3a84912f922df0d58bb1fcf51ffd3bd832106274afe899560c9cf9db7c4734527212cee41954e56c3c8bb3321d5689140d1a036b9b30d28ef50cc4e8042c9b
+  metadata.gz: 888c02795d3f47399f721dc70f9ef5b12036c61eeaca61a35579f4ea4d9d359187747696322e8886dc47e1de88d9d3c499e30da6e629829d7040e8733da1de6a
+  data.tar.gz: e534db868dd5abc3f081189a7218528e14c3deb652de7dd17545ff54e39637a7d01499c8c163b2e891dad36ed196a8b4b5e63348ce3f742ffc3520952a8fd09a

data/examples/client.rb

@@ -6,7 +6,7 @@ require 'faraday_throttler/redis_cache'
 
 
 redis = Redis.new
-cache = FaradayThrottler::RedisCache.new(redis: redis, ttl: 60)
+cache = FaradayThrottler::RedisCache.new(redis: redis, default_ttl: 60)
 
 conn = Faraday.new(:url => 'http://localhost:9800') do |faraday|
   # faraday.response :logger                  # log requests to STDOUT

data/lib/faraday_throttler/middleware.rb

@@ -11,6 +11,9 @@ module FaradayThrottler
         # The base Faraday adapter.
         app,
 
+        # enable the throller
+        enabled: true,
+
         # Sticks cache.
         cache: Cache.new,
 
@@ -63,7 +66,7 @@ module FaradayThrottler
     end
 
     def call(request_env)
-      return app.call(request_env) if request_env[:method] != :get
+      return app.call(request_env) if skip?(request_env)
 
       start = Time.now
 
@@ -81,7 +84,7 @@ module FaradayThrottler
 
     private
     attr_reader :app, :cache, :cache_key_resolver, :rate, :wait, :timeout,
-                :rate_limit_response_checker, :logger
+                :rate_limit_response_checker, :logger, enabled
 
     def handle_request(request_env, cache_key, start)
       logger.debug logline(cache_key, "B.1.1. handle sync. Timeout: #{timeout}")
@@ -105,10 +108,11 @@ module FaradayThrottler
           release_request_stick(cache_key)
         end
       end
-    rescue Faraday::ClientError => e
-      if rate_limit_response_checker.call(e.response)
+    rescue Faraday::Error => e
+      if e.is_a?(Faraday::ClientError) && rate_limit_response_checker.call(e.response)
         wait_and_replay_call(request_env, cache_key, start)
       else
+        release_request_stick(cache_key)
         raise e
       end
     end
@@ -159,6 +163,10 @@ module FaradayThrottler
     def logline(cache_key, line)
       "[Throttler:#{cache_key}] #{line}"
     end
+
+    def skip?(request_env)
+      !enabled || request_env[:method] != :get
+    end
   end
 
   Faraday::Middleware.register_middleware throttler: ->{ Middleware }

data/lib/faraday_throttler/version.rb

@@ -1,3 +1,3 @@
 module FaradayThrottler
-  VERSION = "0.0.6"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-throttler-rx
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.9
 platform: ruby
 authors:
 - Boris Koumondji
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday