better_rate_limit 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ffd49df2965a97b61d730cbb292bf827c1e67efd36578a04b4832b65b6a23a9
-  data.tar.gz: 96b221bcb3b9328097cc4ba11fb7d8b9c514d0b19654f1e723933139f4725938
+  metadata.gz: 05720aabc13993c0e8fc708415d4464b6db86b9cdcffab16e9f32b6dabfaa935
+  data.tar.gz: 4e2c18b7928c45e3276e92d87eb080d977bcde352abe3f55c482afa815806808
 SHA512:
-  metadata.gz: 5be3857423b38f9f56211922c084bc9ba4717f665b6571882c760d169b8b93e0d90959d9758ebb01153ab39ed7079ab47c05d32324fef347bb8a06889d2613d9
-  data.tar.gz: 68e6449f5bd8b32ce388f437c07b16af85bcd41b16ff84509d2cb15c4db74fd73c671d89df00919c78717b1b5e7a1a63e5e568c34dc983f27f1f70f50350356a
+  metadata.gz: a081b16c393cc95387701e41eba68c5109aa8fcb574324042f55830828879d06f14c87a859f667b90b3df56108cb92b2e5d5954272e4169aa2e35d1517da69f8
+  data.tar.gz: 0db7a65a4135753ebe34fc6c0f34126ede4f41360fb4a3cab4999b2934c244423f9d46cd23c2b31cd18412826399462d256ddc9d41abc89d0feaf64541a64f0c

data/.travis.yml

@@ -2,5 +2,5 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.5
+  - 2.6.6
 before_install: gem install bundler -v 2.1.4

data/Gemfile.lock

@@ -1,44 +1,44 @@
 PATH
   remote: .
   specs:
-    better_rate_limit (0.1.3)
+    better_rate_limit (0.1.6)
       actionpack (>= 5.0)
       redis (>= 3.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionpack (5.2.6.2)
+      actionview (= 5.2.6.2)
+      activesupport (= 5.2.6.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionview (5.2.6.2)
+      activesupport (= 5.2.6.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.4.3)
+    activesupport (5.2.6.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    erubi (1.9.0)
-    i18n (1.8.5)
+    erubi (1.10.0)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.6.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.15.0)
     mocha (1.11.2)
     mock_redis (0.25.0)
     nokogiri (1.10.10)
@@ -47,8 +47,8 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     rack (2.2.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -56,13 +56,13 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rake (12.3.3)
-    redis (4.2.1)
+    redis (4.3.1)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/README.md

@@ -41,6 +41,15 @@ ActiveSupport::Notifications.subscribe /rate_limit/ do |_name, _start, _finish,
 end
 ```
 
+### Configuration
+You can ignore the throttle by using the following configuration
+```ruby
+BetterRateLimit.configure do |config|
+  config.ignore = true
+end
+```
+Useful to ignore the throttle on tests.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/better_rate_limit/configuration.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module BetterRateLimit
+  class Configuration
+    attr_accessor :ignore, :redis_client
+
+    def initialize
+      @ignore = false
+    end
+  end
+end

data/lib/better_rate_limit/redis_connection.rb

@@ -2,6 +2,12 @@
 
 require 'redis'
 
+class MissingRedisConfigError < StandardError
+  def initialize
+    super 'Redis client not set'
+  end
+end
+
 module BetterRateLimit
   module RedisConnection
     def self.included(host)
@@ -10,7 +16,7 @@ module BetterRateLimit
 
     module ClassMethods
       def redis_client
-        @redis_client ||= Redis.new(url: ENV.fetch('REDIS_URL', 'redis://localhost:6379'))
+        @redis_client ||= BetterRateLimit.configuration.redis_client
       end
     end
   end

data/lib/better_rate_limit/throttle.rb

@@ -10,22 +10,28 @@ module BetterRateLimit
 
     class << self
       def throttle(key, limit:, time_window:)
+        raise MissingRedisConfigError unless redis_client
+        return true if BetterRateLimit.configuration.ignore
+
         now = Time.now.utc
         timestamps_count = redis_client.llen key
 
         if timestamps_count < limit
-          redis_client.multi do
-            redis_client.rpush key, now
-            redis_client.expire key, time_window.to_i
+          redis_client.multi do |pipeline|
+            pipeline.rpush key, now
+            pipeline.expire key, time_window.to_i
           end
           true
         else
           first = redis_client.lpop(key)
-          redis_client.multi do
-            redis_client.rpush key, now
-            redis_client.expire key, time_window.to_i
+
+          redis_client.multi do |pipeline|
+            pipeline.rpush key, now
+            pipeline.expire key, time_window.to_i
           end
 
+          return false unless first
+
           passing = first.to_time(:utc) < time_window.ago
 
           unless passing

data/lib/better_rate_limit/version.rb

@@ -1,3 +1,3 @@
 module BetterRateLimit
-  VERSION = "0.1.4"
+  VERSION = "0.1.7"
 end

data/lib/better_rate_limit.rb

@@ -1,4 +1,21 @@
 require 'action_controller'
+require 'better_rate_limit/configuration'
+
+module BetterRateLimit
+  class << self
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    def configure
+      yield configuration
+    end
+
+    def reset_configuration
+      @configuration = Configuration.new
+    end
+  end
+end
 
 module ActionController
   autoload :BetterRateLimit, 'action_controller/better_rate_limit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_rate_limit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Pablo Fonseca
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -58,6 +58,7 @@ files:
 - bin/setup
 - lib/action_controller/better_rate_limit.rb
 - lib/better_rate_limit.rb
+- lib/better_rate_limit/configuration.rb
 - lib/better_rate_limit/limit.rb
 - lib/better_rate_limit/redis_connection.rb
 - lib/better_rate_limit/throttle.rb
@@ -83,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Rate limit requests