actionlimiter 1.0.0.beta2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a45ffa8e18273c24ca2f9407c0909fbc719fb88c49295676256940eecfe3a73f
-  data.tar.gz: e0904db27c728ac00ce0774533a33bf154902682cc867a0a5ed8a313d8c04037
+  metadata.gz: f6d76f1d615f1668d12ed5a37407579aa6f398f622b409f1e425d40a5e3d22b9
+  data.tar.gz: b39112826f0e034c2758fb41578ed9b936d1a3d305d97a157391065e64b13b17
 SHA512:
-  metadata.gz: 99d0dc2ec88875dee1d954c146b0c1d2aefb9aa3bcce808e39dc0fb5dae936b176123a3e0ef78691744fd531c9fbc6c5303057738aba636718308cccee1c6527
-  data.tar.gz: 642c0875a2112631fc652c869cef869b6953e36244c55d4d547c07269e250a57ac34767c6386ec42652384a1078dcde3c4cd66590576dac5acb54c84f4813b1d
+  metadata.gz: e9919e7a48c0206b3a8ad53ae77ea1d1881823dbad7dfd22620922f86560184426c0880cd3130eabcc069e5dbf1adba13e84d0f0d86606d5c81d8cad40f61f2b
+  data.tar.gz: '0294d97901f27645b413ad03e48e6dfaf11102b6154c7ba6951f7c8ac0a331bc7fd39701877d969ba6c03afd6ca6f2672d0f7eb91ca7a43d5103e710b80e9196'

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

@@ -43,9 +43,6 @@ module ActionLimiter
       @period = period.to_i
       @size = size.to_i
       @namespace = namespace&.to_s || 'action_limiter/token_bucket'
-      @script_hash = ActionLimiter.with_redis_connection do |connection|
-        connection.script(:load, ActionLimiter::SCRIPTS.fetch(:token_bucket))
-      end
     end
 
     ##
@@ -78,7 +75,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
@@ -86,6 +83,12 @@ module ActionLimiter
 
     private
 
+    def script_hash
+      @script_hash ||= ActionLimiter.with_redis_connection do |connection|
+        connection.script(:load, ActionLimiter::SCRIPTS.fetch(:token_bucket))
+      end
+    end
+
     def bucket_key(bucket)
       "#{namespace}/#{bucket}"
     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'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionlimiter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0
 platform: ruby
 authors:
 - Maddie Schipper
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-21 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -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.
 
   '
@@ -93,9 +107,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: