rapidity 0.0.1 → 0.0.4.64534

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567c4170351523c2e8850ea4980d0a5099c4bab64bddc1bd60d789aa1eb9d2be
-  data.tar.gz: f148f201500e64d68fe23bf101c7ed21c42d8bc3486c1ee783b97e7117d24711
+  metadata.gz: af052ec73bab58f49e7004d63d9dea9ab27247df2bb012d874c30a1c387a9d3f
+  data.tar.gz: a5ff8b93f6ad5f12656a67ea9e938aea0ab4f06494ecab38bd5da234829eb2b4
 SHA512:
-  metadata.gz: 9ccac974c7d5bfd96b49a61c98f7db8a731667e97cb614c8a34d465173540f9b8f05e1dea8d6797ee4c4f8112b38471d28b8d92008a9722da9b1080a947b7d8c
-  data.tar.gz: a0ec68f61eb62c09be61637629d56d628b66af4b03ca0eb31351d9434b24bbb6233314b7e1864c3d28acf04b4827a5bdbb1d25d2f00b6593381e6cc00307f177
+  metadata.gz: ba8b36082e31aadc9e083d6974da24d42ecf91253cf96a9fab6a31ca1d57665662e53bca693754edf90adc6f581314f831173a9a365d90352a1d6e7a6ebf4d1c
+  data.tar.gz: 7144440be367435bb07ca46820f4e6f2256772c0ffb3c448f49376a868156a88cff4fd9add2d734d6b156944c5fe25e97cf69c20fbce3adb2612b94b72609150

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rapidity (0.0.1)
+    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.3.1)
+    redis (4.5.0)
     reek (6.0.4)
       kwalify (~> 0.7.0)
       parser (~> 3.0.0)
@@ -123,6 +123,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -141,4 +142,4 @@ DEPENDENCIES
   timeouter
 
 BUNDLED WITH
-   2.2.13
+   2.2.27

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2014-2021 Рнд Софт
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/rapidity/composer.rb

@@ -1,4 +1,3 @@
-
 require 'ostruct'
 
 require_relative './limiter'
@@ -9,30 +8,30 @@ module Rapidity
 
     attr_reader :limits, :limiters, :name, :namespace
 
-    # Combine multiple limits 
+    # Combine multiple limits
     # @params pool - inititalized Redis pool
     # @params name - limiter name - part of the Redis key name
     # @params limits - multiple limits definition
 
     ## limits example
     # ```ruby`
-    #limits = [
+    # limits = [
     #  { threshold: 2, interval: 1 },   # 2 events per second
     #  { threshold: 9, interval: 5 },   # 9 events per 5 seconds
     #  { threshold: 20, interval: 20 }, # 20 events per 20 seconds
     #  { threshold: 42, interval: 60 }, # 42 events per 60 seconds
-    #]
-    #```
-
+    # ]
+    # ```
     # @params namespace - namespace for Redis keys
-    def initialize pool, name:, limits: [], namespace: 'rapidity'
+    def initialize(pool, name:, limits: [], namespace: 'rapidity')
       @limits = limits
       @name = name
       @namespace = namespace
-      
+
       @limiters = @limits.map.each_with_index do |l, i|
         limit = OpenStruct.new(l)
-        ::Rapidity::Limiter.new(pool, name: "#{i}_#{name}_#{limit.limit}/#{limit.interval}", interval: limit.interval, threshold: limit.threshold, namespace: namespace)
+        ::Rapidity::Limiter.new(pool, name: "#{i}_#{name}_#{limit.threshold}/#{limit.interval}",
+          interval: limit.interval, threshold: limit.threshold, namespace: namespace)
       end
     end
 
@@ -48,8 +47,9 @@ module Rapidity
         break if count == 0
       end
 
-      return count
+      count
     end
 
   end
-end
+end
+

data/lib/rapidity/limiter.rb

@@ -1,4 +1,3 @@
-
 require 'connection_pool'
 require 'redis'
 
@@ -14,12 +13,12 @@ module Rapidity
     # @params interval - interval in seconds to apply this limit
     # @params threshold - maximum available events for this interval
     # @params namespace - namespace for Redis keys
-    def initialize pool, name:, interval: 10, threshold: 10, namespace: 'rapidity'
+    def initialize(pool, name:, interval: 10, threshold: 10, namespace: 'rapidity')
       @pool = pool
       @interval = interval
       @threshold = threshold
       @name = name
-      
+
       @namespace = namespace
     end
 
@@ -30,43 +29,55 @@ 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
 
-      obtained = if taken < 0
+      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
 
-        count - overflow
+        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
       end
-
-      return obtained
     end
 
   end
-end
+end
+

data/lib/rapidity/version.rb

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

data/lib/rapidity.rb

@@ -5,7 +5,7 @@ require_relative 'rapidity/composer'
 
 module Rapidity
 
-  
+
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapidity
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4.64534
 platform: ruby
 authors:
 - Yurusov Vlad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,47 +54,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timeouter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: timeouter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +231,7 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - lib/rapidity.rb
 - lib/rapidity/composer.rb
 - lib/rapidity/limiter.rb
@@ -246,14 +247,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple distributed Redis-backed rate limiter