faraday-throttler-rx 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 738f110db26c21d7dc990c80ba45bc3fc0e14c29969acc29966fefaa43c6fce9
-  data.tar.gz: 70038994c2d843986096408fdad77d7d97890abe5a8c4dd33f3c3fddd2d309d8
+  metadata.gz: c6d581e747431ec354d2cb30e38fb89af04116942c4144fab4875537f91979bf
+  data.tar.gz: 26e6ff264ae784e8587e19806ecdd2b22fc77f9cc197df02313402289c36094f
 SHA512:
-  metadata.gz: 660ed0f9ccd96314b02e452a6978dcf9f5315fb028df9f10b9282e510b37452526884a1375d78066631827c7beebf507c5eb622f6c74df32e8d2156623d276c2
-  data.tar.gz: 9b27963794c77477b65f35d511cee4784f6f0e80cb4e314d4432fe8fa7fee210a25926199c04d6863426eb244d2c4884315739b16a6af79576408858abdc608b
+  metadata.gz: 7b1392f8e2107e14e491ea24a5d3dc6e2279e08cb59032a10d3f2c1fc4896b69295b53882fb2c831f4cf26a6ba88e58014f0b329e35aac063b76224b0fb78d4e
+  data.tar.gz: 7b8ded781b9139d6df514205cc997ba1be6aa677f55fc1a38703ff7f8dd76f881f6653202774c35e8107a0093a7e66bbcea287b47250bd7ac13d732972e91594

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/cache.rb

@@ -5,7 +5,7 @@ module FaradayThrottler
       @store = store
     end
 
-    def set(key, resp)
+    def set(key, resp, _ = {})
       mutex.synchronize { store[key] = resp }
     end
 

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
 
@@ -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
@@ -143,7 +147,6 @@ module FaradayThrottler
 
     def request_stick?(cache_key)
       counter = cache.get(cache_key).to_i
-      p "#{counter}, #{cache_key}"
       if counter < rate
         cache.set(cache_key, counter + 1)
         true
@@ -160,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/redis_cache.rb

@@ -2,14 +2,14 @@ module FaradayThrottler
   class RedisCache
     NAMESPACE = 'throttler:cache:'.freeze
 
-    def initialize(redis: Redis.new, ttl: 0)
+    def initialize(redis: Redis.new, default_ttl: 60)
       @redis = redis
-      @ttl = ttl
+      @default_ttl = default_ttl
     end
 
-    def set(key, value)
+    def set(key, value, ex: default_ttl)
       opts = {}
-      opts[:ex] = ttl if ttl > 0
+      opts[:ex] = ex if ex > 0
       redis.set [NAMESPACE, key].join, value, opts
     end
 
@@ -18,6 +18,6 @@ module FaradayThrottler
     end
 
     private
-    attr_reader :redis, :ttl
+    attr_reader :redis, :default_ttl
   end
 end

data/lib/faraday_throttler/version.rb

@@ -1,3 +1,3 @@
 module FaradayThrottler
-  VERSION = "0.0.5"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-throttler-rx
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 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