congestion 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d59f5a0250e61d9968b5f465c84877d74de027e3
-  data.tar.gz: 664e2b1cd954b180b1652c1b00b4188c7b7577a6
+SHA256:
+  metadata.gz: 74d38ac534e68ff635448423e59608ea399916f7932262dcaa22447a194ab9aa
+  data.tar.gz: 435974e094f5c37727c69aa80449776bbd7fd85ea71d54b35e9f3b0bad714f36
 SHA512:
-  metadata.gz: c71112f0a9ba8d2b6d3321a3d0294f69ea881c8c80e2a07014582d1168d8fbb6d8a41bc1854033c9bc24b8aa567f2517ad5034135d25fee75f3872096ff4c6eb
-  data.tar.gz: 1e756869cd2ad93afb3c9e2b4767d651b84576c93f753f0a437be785b1af748c2ead59d805211863e64fb67ed1dd5f39476a834246c97eace97a661dedade055
+  metadata.gz: bc94b2ca6204b54f2df7981250bb847fd8e618c4f3a2e9369e44a9f4e18eda6f8e9b5ab08ff7e603955765068401f7618cb247f5f61553a16b94d294c3e56346
+  data.tar.gz: c7b9073c138665cd1115a02a2c14f00ccc6074787b1311e732e43e3f34adc0f2c2f9082cb0b10baf59d750cad42c34af0b1cc612d9a7d9899915d4af1a49e5d2

data/.travis.yml

@@ -7,5 +7,9 @@ rvm:
   - jruby-19mode
 services:
   - redis-server
-jruby_before_script: &jruby_before_script
+jruby_before_script:
   - bundle exec jbundle install
+addons:
+  code_climate:
+    repo_token:
+      secure: IRJtjJW5EFgmD8dVa/E338jrnsry1FuKRpz943HKUG0AT2b3PgSafm4DCIycnxCEtvwmTrh75ZNt/9jUQyEktO5NM4f2V2WqlL53wVJPiRwr7kyySbPSeZF6D8/1M95yTphmL6yJ2gLtuJA35lG+hTPq+VkMAQGGu5NcwNp6HkU=

data/README.md

@@ -3,9 +3,15 @@
 [![Build Status](https://travis-ci.org/parrish/Congestion.svg?branch=master)](https://travis-ci.org/parrish/Congestion)
 [![Test Coverage](https://codeclimate.com/github/parrish/Congestion/badges/coverage.svg)](https://codeclimate.com/github/parrish/Congestion)
 [![Code Climate](https://codeclimate.com/github/parrish/Congestion/badges/gpa.svg)](https://codeclimate.com/github/parrish/Congestion)
+[![Gem Version](https://badge.fury.io/rb/congestion.svg)](http://badge.fury.io/rb/congestion)
 
 A Redis rate limiter that provides both time-based limits and quantity-based limits based on [classdojo/rolling-rate-limiter](https://github.com/classdojo/rolling-rate-limiter).
 
+## Middleware
+
+- [Sidekiq-Congestion](https://github.com/parrish/Sidekiq-Congestion)
+- [Rack-Congestion](https://github.com/parrish/Rack-Congestion)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/congestion.gemspec

@@ -22,11 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency     'redis', '>= 3.1'
   spec.add_runtime_dependency     'connection_pool', '>= 2.0'
   spec.add_development_dependency 'bundler', '>= 1.5'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'rspec-its', '~> 1.2'
   spec.add_development_dependency 'guard-rspec', '~> 4.5'
   spec.add_development_dependency 'timecop', '~> 0.7'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'codeclimate-test-reporter'
 end

data/lib/congestion/rate_limiter.rb

@@ -84,20 +84,31 @@ module Congestion
 
     def add_request
       unless options[:track_rejected]
-        redis.zadd key, current_time, current_time
+        add_request = redis.multi do |t|
+          t.zadd key, current_time, current_time # [0] - key added
+          t.ttl key                              # [1] - key ttl
+        end
+        # TTL is -1 if not set, https://redis.io/commands/ttl
+        if add_request[1] == -1
+          # ensure we set the expire TTL on the request key
+          # using the raw interval here after the 'get_requests' limit check
+          # should be close enough to the actual interval folks desire
+          redis.pexpire key, options[:interval]
+        end
       end
     end
 
     def get_requests
       @requests ||= redis.multi do |t|
-        t.zremrangebyscore key, 0, expired_at   # [0] - clear old requests
-        t.zcount key, '-inf', '+inf'            # [1] - number of requests
-        t.zrange key, 0, 0                      # [2] - first request
-        t.zrange key, -1, -1                    # [3] - last request
-        t.pexpire key, options[:interval]       # [4] - expire request key
-
-        # [5] - Add the request if tracking rejected
-        t.zadd(key, current_time, current_time) if options[:track_rejected]
+        t.zremrangebyscore key, 0, expired_at     # [0] - clear old requests
+        t.zcount key, '-inf', '+inf'              # [1] - number of requests
+        t.zrange key, 0, 0                        # [2] - first request
+        t.zrange key, -1, -1                      # [3] - last request
+        if options[:track_rejected]
+          t.zadd(key, current_time, current_time) # [4] - Add the request if tracking rejected
+        end
+        # ensure the TTL is set after we've added the key if tracking rejected
+        t.pexpire key, options[:interval]         # [5] - expire request key
       end
     end
   end

data/lib/congestion/version.rb

@@ -1,3 +1,3 @@
 module Congestion
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: congestion
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Redis rate limiter that provides both time-based limits and quantity-based
   limits
 email:
@@ -193,8 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Redis rate limiter