prorate 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e00071a8bb75be7ca3c74ecaf662e049f5c55cae7cb867c9851062efd5b8073
-  data.tar.gz: 277671f9b2dcce7d032e9f9f38b294ced2ca953cd0f85b940d488f3ff306ee38
+  metadata.gz: 941127ba358ced7518e1c69224680aadb4beceac96127013f77f26dd8013619d
+  data.tar.gz: 9e517111477fc854e1404bedbd89126d0002f3d98386091180e757d9dcfdf992
 SHA512:
-  metadata.gz: 40e22d2cdb70cb407b7cc2135624a373e95e83514cfa8bb2f42a6106b40640b458a017212967fb533ba080e3e4707199a1fb1e2414b68f1289e1d24b15b05fbc
-  data.tar.gz: 269d8ef7d384c08c928d3bed3412b2e7ae470e696ff03042744c79bd696962a9a7a82d099de8a153aef344029f40e8640d4e772bee90054b64b4f0183c96d2c9
+  metadata.gz: 6478f0fb8c2df29254cae40e47ba5ffaa6bf09fce03543907edce681056e342eed6fdca57b4025449081c7c768f435ecb9e33cb2a76cc727500dd34b63c7b65c
+  data.tar.gz: 0e2a1376cd72013f9511b87a01143003c8ffe7a093004b9dbe13130008fef006e65452d1000e6998d997599f11120b883bca5f09eaeab5462b3eb6297f5e3cf7

data/lib/prorate/rate_limit.lua

@@ -31,7 +31,8 @@ local key_lifetime = math.ceil(max_bucket_capacity / leak_rate)
 
 local blocked_until = redis.call("GET", block_key)
 if blocked_until then
-  return {(tonumber(blocked_until) - now), 0}
+  -- see https://redis.io/docs/manual/programmability/lua-api/ : floats should be returned as strings or they will be cast into integers
+  return {(tostring(tonumber(blocked_until) - now)), -1}
 end
 
 -- get current bucket level. The throttle key might not exist yet in which
@@ -49,7 +50,7 @@ if (new_bucket_level + n_tokens) <= max_bucket_capacity then
   retval = {0, math.ceil(new_bucket_level)}
 else
   redis.call("SETEX", block_key, block_duration, now + block_duration)
-  retval = {block_duration, 0}
+  retval = {tostring(block_duration), -1}
 end
 
 -- Save the new bucket level

data/lib/prorate/throttle.rb

@@ -95,7 +95,7 @@ module Prorate
         block_for: @block_for,
         n_tokens: n_tokens)
 
-      if remaining_block_time > 0
+      if bucket_level == -1
         @logger.warn do
           "Throttle %s exceeded limit of %d in %d seconds and is blocked for the next %d seconds" % [@name, @limit, @period, remaining_block_time]
         end

data/lib/prorate/version.rb

@@ -1,3 +1,3 @@
 module Prorate
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/prorate.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'wetransfer_style', '0.6.5'
   spec.add_development_dependency 'yard', '~> 0.9'
-  spec.add_development_dependency 'pry', '~> 0.13.1'
+  spec.add_development_dependency 'pry', '~> 0.14.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prorate
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.2
 description: Can be used to implement all kinds of throttles
 email:
 - me@julik.nl
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Time-restricted rate limiter using Redis