berater 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3452315467fe2c079071179703283dd9ea92eb8e6abcc959905f40e16f3e2414
-  data.tar.gz: 90d783190f15f57c3ac44dc2afc89fb5a000a392163ab9a8351ff498e323901a
+  metadata.gz: 04cc88a51db5eca83f7843c1d34cf86213a0ca412fd404e3fff88b3b6994ea8d
+  data.tar.gz: 4eb67771a03cd0f4179d8d80655efcad738cb877b2fb5813399f136dc743090c
 SHA512:
-  metadata.gz: 228f67adfb24027a6ea3c7b090c64aecee1a38e64ed00f7272b0c1af273dbcc73bbec8112fbb15595133cd450b45ac10f603e30ad252218d41e66d5206cc549d
-  data.tar.gz: 9068fd600128bb11f718318fa41f1030d17cd5ad36b9ce5884cbdc5f105fe56f92da73568dc60f12f6e1c7a64402652381259a64524c80889465d4c794a91e69
+  metadata.gz: 9715ae524f7b0fdbbd60d352546ac86a0984f4a5e8966351ae00057e976c391076c270677b29f83c813043c24ad6fa7cae571f224df6400e98fa43bdb4f06cb6
+  data.tar.gz: 16999ff18ea843d12ce6b847b79ddf3bc2b4372cf01371a63d36213ccc27717e06e8794f6b4a519a59af7cba1afaed3cc3ca92a5baed60302e6f1fe114dd29ac

data/lib/berater.rb

@@ -1,15 +1,10 @@
-require 'berater/base_limiter'
-require 'berater/concurrency_limiter'
-require 'berater/inhibitor'
-require 'berater/rate_limiter'
-require 'berater/unlimiter'
 require 'berater/version'
 
 
 module Berater
   extend self
 
-  Overloaded = BaseLimiter::Overloaded
+  class Overloaded < StandardError; end
 
   MODES = {}
 
@@ -56,6 +51,13 @@ module Berater
 
 end
 
+# load and register limiters
+require 'berater/base_limiter'
+require 'berater/concurrency_limiter'
+require 'berater/inhibitor'
+require 'berater/rate_limiter'
+require 'berater/unlimiter'
+
 Berater.register(:concurrency, Berater::ConcurrencyLimiter)
 Berater.register(:inhibited, Berater::Inhibitor)
 Berater.register(:rate, Berater::RateLimiter)

data/lib/berater/base_limiter.rb

@@ -1,8 +1,6 @@
 module Berater
   class BaseLimiter
 
-    class Overloaded < StandardError; end
-
     attr_reader :options
 
     def initialize(**opts)

data/lib/berater/concurrency_limiter.rb

@@ -62,7 +62,8 @@ module Berater
     LUA_SCRIPT = <<~LUA.gsub(/^\s*(--.*\n)?/, '')
       local key = KEYS[1]
       local capacity = tonumber(ARGV[1])
-      local ttl = tonumber(ARGV[2])
+      local ts = tonumber(ARGV[2])
+      local ttl = tonumber(ARGV[3])
 
       local exists
       local count
@@ -124,7 +125,11 @@ module Berater
         ).limit(&block)
       end
 
-      count, lock_id = redis.eval(LUA_SCRIPT, [ key ], [ capacity, timeout ])
+      count, lock_id = redis.eval(
+        LUA_SCRIPT,
+        [ key ],
+        [ capacity, Time.now.to_i, timeout ]
+      )
 
       raise Incapacitated unless lock_id
 

data/lib/berater/version.rb

@@ -1,3 +1,3 @@
 module Berater
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berater
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis