rapidity 0.0.2.59005 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 004e68dd80ed2ad9d0956207e413d092320406ef7d889956de8e93d9bf9b7327
-  data.tar.gz: c2c05a95c87bb97655d0d0cf827a6db4294933315e2dc518c7fb398a4b82725d
+  metadata.gz: e5b2867053a9585cf900e8b33f71993636e8b685fea22a0735d03a45d7c36c44
+  data.tar.gz: 32d6e2e8dc7b06b5951044cf9d375ecf62e0e3c9093a184d6c71213066da387b
 SHA512:
-  metadata.gz: e2eceaa1080720fdd72a47498dc7843f1387124d5519757eacf2217c6b85cf6384b7853cb904d33437de83bc2bad4d6a9b3db923331876687868157672913a6a
-  data.tar.gz: 5d581e6817bb736228e333fcb6586c882a2ea9b8e98a0d3b3911b2dca08985d922fb1fc0e5f8f46e35a01a84cd9a2400def848482c5c2d8d5f21c1abeb922e3d
+  metadata.gz: 47d2226e37cddfa6d743f550ca4522909874e5f0476be4447bc5aac7afe16aa43ca70f64c8196d805e23db104af705088e79af4ec7a1d0192830297950678b56
+  data.tar.gz: 7fa7c1e532876677d1f4aef57cc36cb310b61382c5ca630cdc4b90e115eeb01e6020e419e66d322d89e424647c602294ed776c399b5eaff124a8fcc3fd8e5bcb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rapidity (0.0.2.59005)
+    rapidity (0.0.4)
       activesupport
       connection_pool
       redis
@@ -142,4 +142,4 @@ DEPENDENCIES
   timeouter
 
 BUNDLED WITH
-   2.2.14
+   2.2.27

data/lib/rapidity/limiter.rb

@@ -29,36 +29,49 @@ 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
     # @return count succesfuly obtained send slots
     def obtain(count = 5)
-      _, taken = @pool.with do |conn|
+      count = count.abs
+
+      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.2'.freeze
+  VERSION = '0.0.4'.freeze
 
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rapidity
 version: !ruby/object:Gem::Version
-  version: 0.0.2.59005
+  version: 0.0.4
 platform: ruby
 authors:
 - Yurusov Vlad
 - Samoilenko Yuri
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -232,14 +232,15 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- README.md
 - lib/rapidity.rb
 - lib/rapidity/composer.rb
 - lib/rapidity/limiter.rb
 - lib/rapidity/version.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -254,8 +255,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.8
+signing_key:
 specification_version: 4
 summary: Simple distributed Redis-backed rate limiter
 test_files: []