rapidity 0.0.3.59007 → 0.0.4.64534

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40693850bff25145da969b8f51894fbb7b01dc774ab6534e38cad3c4c461cbc7
-  data.tar.gz: be8657014c79b06a6e7191d3e2aff293720ac5e9418591d3a4e962de4e4774eb
+  metadata.gz: af052ec73bab58f49e7004d63d9dea9ab27247df2bb012d874c30a1c387a9d3f
+  data.tar.gz: a5ff8b93f6ad5f12656a67ea9e938aea0ab4f06494ecab38bd5da234829eb2b4
 SHA512:
-  metadata.gz: f18ecca6be2877265cfa7d2afa434d515668502ea820a7fa0a41c805ab59e6163acda6c52b46dddc2c8396265e05ea8947c6b2f48e4c8c4dec3544ee23ac33e0
-  data.tar.gz: 28869c4c007d2dba9012c006c5b09ab7157d0ce592a4ad891f365c5036096c28a9b9ddb1d85d17ecf31c744be07f09cdf924a6a4d73e594f200e416e8ce24e8c
+  metadata.gz: ba8b36082e31aadc9e083d6974da24d42ecf91253cf96a9fab6a31ca1d57665662e53bca693754edf90adc6f581314f831173a9a365d90352a1d6e7a6ebf4d1c
+  data.tar.gz: 7144440be367435bb07ca46820f4e6f2256772c0ffb3c448f49376a868156a88cff4fd9add2d734d6b156944c5fe25e97cf69c20fbce3adb2612b94b72609150

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rapidity (0.0.3.59007)
+    rapidity (0.0.4.64534)
       activesupport
       connection_pool
       redis
@@ -58,7 +58,7 @@ GEM
     psych (3.3.2)
     public_suffix (4.0.6)
     rainbow (3.0.0)
-    redis (4.4.0)
+    redis (4.5.0)
     reek (6.0.4)
       kwalify (~> 0.7.0)
       parser (~> 3.0.0)
@@ -142,4 +142,4 @@ DEPENDENCIES
   timeouter
 
 BUNDLED WITH
-   2.2.14
+   2.2.27

data/lib/rapidity/limiter.rb

@@ -29,13 +29,13 @@ module Rapidity
     # Get current counter
     # @return remaining counter value
     def remains
-      _, result = @pool.with do |conn|
+      results = @pool.with do |conn|
         conn.multi do
           conn.set(key('remains'), threshold, ex: interval, nx: true)
           conn.get(key('remains'))
         end
       end
-      result.to_i
+      results[1].to_i #=> conn.get(key('remains'))
     end
 
     # Obtain values from counter
@@ -43,24 +43,35 @@ module Rapidity
     def obtain(count = 5)
       count = count.abs
 
-      _, taken = @pool.with do |conn|
+      results = @pool.with do |conn|
         conn.multi do
           conn.set(key('remains'), threshold, ex: interval, nx: true)
           conn.decrby(key('remains'), count)
         end
       end
 
+      taken = results[1].to_i #=> conn.decrby(key('remains'), count)
+
       if taken < 0
         overflow = taken.abs
         to_return = [count, overflow].min
 
-        @pool.with do |conn|
+        results = @pool.with do |conn|
           conn.multi do
             conn.set(key('remains'), threshold - to_return, ex: interval, nx: true)
             conn.incrby(key('remains'), to_return)
+            conn.ttl(key('remains'))
           end
         end
 
+        ttl = results[2].to_i #=> conn.ttl(key('remains'))
+
+        # reset if no ttl present
+        if ttl == -1 
+          STDERR.puts "ERROR[#{Time.now}]: TTL for key #{key('remains').inspect} disappeared!"
+          @pool.with {|c| c.expire(key('remains'), interval) } 
+        end
+
         count - to_return
       else
         count

data/lib/rapidity/version.rb

@@ -1,6 +1,6 @@
 module Rapidity
 
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapidity
 version: !ruby/object:Gem::Version
-  version: 0.0.3.59007
+  version: 0.0.4.64534
 platform: ruby
 authors:
 - Yurusov Vlad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport