speed_limiter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b360a3c2df8c37b8ac47eec08222e784ef475966c5938c93f1206e56c2ec353d
-  data.tar.gz: 34a890cdbdf74a0fcb25b2140c124ec6f6487ebf2aec4115084fabbc2a437ddd
+  metadata.gz: dcefe51efe099102f75381a902006faa8655f7207c7c971e0e0b0f356dc9c5e0
+  data.tar.gz: c3a3647ea48bb31a95dcd1bc70ddcb72c0402e4474c459e88271666021ba878f
 SHA512:
-  metadata.gz: 0ed1f8c6f934e2955b5fd398f6cead553eff69e3e93cb2816a6a3cb41f61fe0848980b0fe1310d17f531ce8f4266de80b0599b7416d1c4d4d8bbda9a61f92c43
-  data.tar.gz: 6ef932d30fc72b180b2e968b3f57e75621b15d36b1afc33488cd80a2fa1e0c26802650db1902f97fac29c4294905f12abe17fdb1c99b7200772f77f7c5bab89e
+  metadata.gz: bcfa6c8194738f83b7f688cc8211a79d10d8cee564a9b5099694c2730e71a1305c3d78dedad1b06654105d7da4b9070c9abb9d98aee97eca566eeaff32aed531
+  data.tar.gz: cb88e0be3f91a53919d019009c35cadad7e50a46e719f06405b13912f24f195030a06686e7d28241d30a26bdf516946b7f1ca37cb429473bda189815f85cc1c7

data/lib/speed_limiter/config.rb

@@ -14,5 +14,9 @@ module SpeedLimiter
     end
 
     alias no_limit? no_limit
+
+    def redis_client
+      @redis_client ||= SpeedLimiter::Redis.new(@redis || ::Redis.new(url: redis_url))
+    end
   end
 end

data/lib/speed_limiter/throttle.rb

@@ -22,6 +22,8 @@ module SpeedLimiter
     end
     attr_reader :config, :params, :block
 
+    delegate %i[redis_client] => :config
+
     delegate %i[key redis_key limit period on_throttled create_state] => :params
 
     # @yield [state]
@@ -58,7 +60,7 @@ module SpeedLimiter
       return block.call(create_state) if config.no_limit?
 
       loop do
-        count, ttl = redis.increment(redis_key, period)
+        count, ttl = redis_client.increment(redis_key, period)
 
         break(block.call(create_state(count: count, ttl: ttl))) if count <= limit
 
@@ -67,20 +69,16 @@ module SpeedLimiter
     end
 
     def wait_for_interval(count)
-      ttl = redis.ttl(redis_key)
+      ttl = redis_client.ttl(redis_key)
       return if ttl.negative?
 
       config.on_throttled.call(create_state(count: count, ttl: ttl)) if config.on_throttled.respond_to?(:call)
       on_throttled.call(create_state(count: count, ttl: ttl)) if on_throttled.respond_to?(:call)
 
-      ttl = redis.ttl(redis_key)
+      ttl = redis_client.ttl(redis_key)
       return if ttl.negative?
 
       sleep ttl
     end
-
-    def redis
-      @redis ||= SpeedLimiter::Redis.new(config.redis || ::Redis.new(url: config.redis_url))
-    end
   end
 end

data/lib/speed_limiter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SpeedLimiter
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: speed_limiter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - yuhei mukoyama