simple_throttle 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25cae7f3e3702407aca9ce8b20dd4a2016cdefffd9220261a0397150b10796de
-  data.tar.gz: f460f12908747e7d8d5431a7ed13274fa6eec4980a60b95949d78e553b297fb0
+  metadata.gz: cd25dd96b13df27a165952bee5a5ff4fd6731c164c88aaa586e2c990a47650d3
+  data.tar.gz: 4298862682b63ef05bebf1e70abb62bf1dad5e7c3a23835e4c9ad94ed38c8cd5
 SHA512:
-  metadata.gz: 96a6efaf9ed64b918ef077296bc1b04c36ef10f8e0e08948e505bf5203b79c4673a0435dc052c750249fb5dd7de1f9b71cab1790743aee10508bef72546bf3bc
-  data.tar.gz: 5dd505cf1da9506c505598013ab644367da24b9542687d5cf2e1f8a5cb571ad685388bd1dad8621598035d5810a615ce85baf65efc272aa6f1642fc637cf187b
+  metadata.gz: 52eda43dd29e5c4ceadb806c0a132abeb30737365aea897a33815e7aa40ca518ea97ed4506c3b612e4729f08e9e3534877dd9f3d6890925cdb8bf7afdc4a5e70
+  data.tar.gz: 839f5e758fe348fa974dd3b8e3b2d37827002ab39db178058095344ed90c94b25aeb6a477d93ac042a9d291bf3afd8bbf13672b60a91233fa09cb13861a94bf1

data/CHANGELOG.md

@@ -4,12 +4,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.0.4
+- Fix wait_time method to match the documentation from [bc-swoop](https://github.com/bc-swoop)
+
+## 1.0.3
+
+### Changed
+- Ensure that arguments sent to Redis Lua script are cast to integers.
+
 ## 1.0.2
 
 ### Added
-- Throttle insances can now specify the Redis instance to override the global setting
-- Redis instance now defaults to the default redis instance: `Redis.new`
-- Optimize loading LUA script to Redis; now done globally instead of per throttle instance
+- Throttle insances can now specify the Redis instance to override the global setting.
+- Redis instance now defaults to the default redis instance: `Redis.new`.
+- Optimize loading LUA script to Redis; now done globally instead of per throttle instance.
 
 
 ## 1.0.1

data/README.md

@@ -60,7 +60,7 @@ $ gem install simple_throttle
 
 ## Contributing
 
-Open a pull request on GitHub.
+Fork the repository and open a pull request on GitHub.
 
 Please use the [standardrb](https://github.com/testdouble/standard) syntax and lint your code with `standardrb --fix` before submitting.
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.4

data/lib/simple_throttle.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "redis"
+
 # Create a simple throttle that can be used to limit the number of request for a resouce
 # per time period. These objects are thread safe.
 class SimpleThrottle
@@ -41,7 +42,15 @@ class SimpleThrottle
 
   class << self
     # Add a global throttle that can be referenced later with the [] method.
-    def add(name, limit:, ttl:, redis: nil)
+    # This can be used to configure global throttles that you want to setup once
+    # and then use in multiple places.
+    #
+    # @param name [String] unique name for the throttle
+    # @param ttl [Numeric] number of seconds that the throttle will remain active
+    # @param limit [Integer] number of allowed requests within the throttle ttl
+    # @param redis [Redis, Proc] Redis instance to use or a Proc that yields a Redos instance
+    # @return [void]
+    def add(name, ttl:, limit:, redis: nil)
       @lock.synchronize do
         @throttles ||= {}
         @throttles[name.to_s] = new(name, limit: limit, ttl: ttl, redis: redis)
@@ -49,6 +58,9 @@ class SimpleThrottle
     end
 
     # Returns a globally defined throttle with the specfied name.
+    #
+    # @param name [String, Symbol] name of the throttle
+    # @return [SimpleThrottle]
     def [](name)
       if defined?(@throttles) && @throttles
         @throttles[name.to_s]
@@ -60,11 +72,17 @@ class SimpleThrottle
     # it will be invoked at runtime to get the instance. Use this method if your Redis instance
     # isn't constant (for example if you're in a forking environment and re-initialize connections
     # on fork)
+    #
+    # @param client [Redis, Proc]
+    # @yieldreturn [Redis]
+    # @return [void]
     def set_redis(client = nil, &block)
       @redis_client = (client || block)
     end
 
     # Return the Redis instance where the throttles are stored.
+    #
+    # @return [Redis]
     def redis
       @redis_client ||= Redis.new
       if @redis_client.is_a?(Proc)
@@ -93,32 +111,39 @@ class SimpleThrottle
 
   attr_reader :name, :limit, :ttl
 
-  # Create a new throttle
+  # Create a new throttle.
+  #
   # @param name [String] unique name for the throttle
   # @param ttl [Numeric] number of seconds that the throttle will remain active
   # @param limit [Integer] number of allowed requests within the throttle ttl
-  # @param redis [Redis] Redis client to use
+  # @param redis [Redis, Proc] Redis instance to use or a Proc that yields a Redos instance
   def initialize(name, ttl:, limit:, redis: nil)
     @name = name.to_s
     @name = name.dup.freeze unless name.frozen?
-    @limit = limit
-    @ttl = ttl
+    @limit = limit.to_i
+    @ttl = ttl.to_f
     @redis = redis
   end
 
   # Returns true if the limit for the throttle has not been reached yet. This method
   # will also track the throttled resource as having been invoked on each call.
+  #
+  # @return [Boolean]
   def allowed!
     size = current_size(true)
     size < limit
   end
 
   # Reset a throttle back to zero.
+  #
+  # @return [void]
   def reset!
     redis_client.del(redis_key)
   end
 
   # Peek at the current number for throttled calls being tracked.
+  #
+  # @return [Integer]
   def peek
     current_size(false)
   end
@@ -126,6 +151,8 @@ class SimpleThrottle
   # Returns when the next resource call should be allowed. Note that this doesn't guarantee that
   # calling allow! will return true if the wait time is zero since other processes or threads can
   # claim the resource.
+  #
+  # @return [Float]
   def wait_time
     if peek < limit
       0.0
@@ -133,7 +160,7 @@ class SimpleThrottle
       first = redis_client.lindex(redis_key, 0).to_f / 1000.0
       delta = Time.now.to_f - first
       delta = 0.0 if delta < 0
-      delta
+      ttl - delta
     end
   end
 
@@ -152,7 +179,7 @@ class SimpleThrottle
   def current_size(push)
     push_arg = (push ? 1 : 0)
     time_ms = (Time.now.to_f * 1000).round
-    ttl_ms = ttl * 1000
+    ttl_ms = (ttl * 1000).ceil
     self.class.send(:execute_lua_script, redis: redis_client, keys: [redis_key], args: [limit, ttl_ms, time_ms, push_arg])
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_throttle
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - We Heart It
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis