actionlimiter 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a45ffa8e18273c24ca2f9407c0909fbc719fb88c49295676256940eecfe3a73f
-  data.tar.gz: e0904db27c728ac00ce0774533a33bf154902682cc867a0a5ed8a313d8c04037
+  metadata.gz: 1fbed327377343485ea3ebb2a43e3ce29bc3d2826f6811eb7b3bba2103f0f027
+  data.tar.gz: c87c179c826f2b799659c25e1992f52de9710e138d55f265f02fcdee9df6cc42
 SHA512:
-  metadata.gz: 99d0dc2ec88875dee1d954c146b0c1d2aefb9aa3bcce808e39dc0fb5dae936b176123a3e0ef78691744fd531c9fbc6c5303057738aba636718308cccee1c6527
-  data.tar.gz: 642c0875a2112631fc652c869cef869b6953e36244c55d4d547c07269e250a57ac34767c6386ec42652384a1078dcde3c4cd66590576dac5acb54c84f4813b1d
+  metadata.gz: 8e0241fb370cb2e09816b59385577c8466670365071b744874b557376d83824f81861971ca813fa5e236dc276efe053e0e10019ced218dbc148e264511e5eb0e
+  data.tar.gz: 5ae2fb87768adad6eb01fee00d61f2299038e756ba90c4c9f05b45a04170ec15656f77822bda045d28fbf7422c86d3db444b3c9afca215d2e20b04c3e908a52f

data/README.md

@@ -1,6 +1,6 @@
 # ActionLimiter
 
-[![Unit Test](https://github.com/angryboat/actionlimiter/actions/workflows/testing.yml/badge.svg)](https://github.com/angryboat/actionlimiter/actions/workflows/testing.yml) [![Linters](https://github.com/angryboat/actionlimiter/actions/workflows/linting.yml/badge.svg)](https://github.com/angryboat/actionlimiter/actions/workflows/linting.yml)
+[![Ruby Gem](https://github.com/angryboat/actionlimiter/actions/workflows/ruby-gem.yml/badge.svg?event=push)](https://github.com/angryboat/actionlimiter/actions/workflows/ruby-gem.yml)
 
 Provides Redis backed rate limiting for Rails applications.
 

data/lib/action_limiter/middleware/ip.rb

@@ -63,7 +63,7 @@ module ActionLimiter
       def _call(env)
         remote_ip = env.fetch('action_dispatch.remote_ip')
         bucket_key = Digest::MD5.hexdigest(remote_ip.to_s)
-        bucket = @token_bucket.increment(bucket_key, Time.now)
+        bucket = @token_bucket.increment_and_return_bucket(bucket_key, Time.now)
 
         env['action_limiter.ip_bucket'] = bucket
 

data/lib/action_limiter/scripts/token_bucket.lua

@@ -13,6 +13,6 @@ local bucket_name = KEYS[1]
 
 redis.call('ZREMRANGEBYSCORE', bucket_name, '-inf', min)
 redis.call('ZADD', bucket_name, ts, ts)
-redis.call('EXPIRE', bucket_name, period * 5)
+redis.call('EXPIRE', bucket_name, period + 2)
 
 return redis.call('ZCARD', bucket_name)

data/lib/action_limiter/token_bucket.rb

@@ -78,7 +78,7 @@ module ActionLimiter
     def increment_and_return_bucket(bucket, time)
       ActionLimiter.instrument('action_limiter.token_bucket.increment') do
         ActionLimiter.with_redis_connection do |connection|
-          value = connection.evalsha(@script_hash, [bucket_key(bucket)], [period.to_s, time.to_f])
+          value = connection.evalsha(@script_hash, [bucket_key(bucket)], [period.to_s, time.to_f.to_s])
           Bucket.new(name: bucket, value: value, max_size: size, period: period)
         end
       end

data/lib/action_limiter/version.rb

@@ -3,5 +3,5 @@
 module ActionLimiter
   ##
   # The current version number
-  VERSION = '1.0.0.beta2'
+  VERSION = '1.0.0.beta3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionlimiter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Maddie Schipper
@@ -50,6 +50,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Redis backed token bucket rate limting implementation.
 
   '