rails_rate_limiter 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cc8d075f4e6bd2d140fdb831d6a6e58cb2c2a365
-  data.tar.gz: d6a11b2be61a472611ec5fd818d57818df007f76
+SHA256:
+  metadata.gz: bf0a533c1192e113e76a12f6ef39c7ccb149acf02fb7a99b58d7fbcb98d223db
+  data.tar.gz: '0497b4b08ff06fbe0f62c5d2426f03c8bccf8ccab172064f627bef56a8ff8d68'
 SHA512:
-  metadata.gz: a262c89d7d090c57e34620397458f1897cb75afa674f856a073a4c1f37c098a9643317ba6bb4eae57fdc38b5dcc222f23d07507df3d5be79c53c7a153224cb14
-  data.tar.gz: d610bc4f55ce3daf8b35f55d928d04afe9c0788c1f1c5b1bf962d6b4b522ce70e600385f1b5561c1565f909c36a9aa292a11f0eeb71692533b9a7a42ae48dfdf
+  metadata.gz: 88645a319feabdc3baf70855f463a86bf6e2df978e39749f87da263d4b154a1522656d5712112a3ef2992a4bf6c45daa275b66f69537752eda18db7c213e4ec2
+  data.tar.gz: 8dbbb42486361fd33ee1d5619e3e3bd3394fc87b04a31729a4a0aad322f9d11a3d9edf116464b5d12d9c372a44fec107fee3cf781ae49b422d453d0e6c1d618a

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rails_rate_limiter (0.1.2)
+    rails_rate_limiter (0.2.1)
       rails (>= 4.2)
-      redis (~> 3.0)
+      redis (>= 3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -56,24 +56,24 @@ GEM
     crass (1.0.4)
     diff-lcs (1.3)
     erubi (1.7.1)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     mock_redis (0.17.3)
-    nio4r (2.3.1)
+    nio4r (2.5.4)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     pry (0.11.3)
@@ -107,7 +107,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
-    redis (3.3.5)
+    redis (4.2.5)
     rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -125,10 +125,10 @@ GEM
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    sprockets (3.7.1)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -136,9 +136,9 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
@@ -152,4 +152,4 @@ DEPENDENCIES
   rspec-rails
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/rails_rate_limiter.svg)](https://badge.fury.io/rb/rails_rate_limiter)
+
 # RailsRateLimiter
 
 This is a high level rate limiting gem for Ruby on Rails using Redis. It limits amount of requests on controller's level, that allows you to customize rate limiting options using everything that available in your action, e.g. `current_user`.

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "rails_rate_limiter"
+require 'bundler/setup'
+require 'rails_rate_limiter'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require 'pry'
+Pry.start
 
-require "irb"
-IRB.start(__FILE__)
+# require "irb"
+# IRB.start(__FILE__)

data/lib/rails_rate_limiter.rb

@@ -56,7 +56,7 @@ module RailsRateLimiter
   private
 
   def check_rate_limits(strategy, limit, per, pattern, client, block)
-    requester = pattern || request.remote_ip
+    requester = compute_requester_pattern(pattern || request.remote_ip)
 
     strategy_class =
       "RailsRateLimiter::Strategies::#{strategy.classify}".constantize
@@ -66,4 +66,11 @@ module RailsRateLimiter
     # a wrong context that leads to not preventing action execution after render
     instance_exec result, &block
   end
+
+  def compute_requester_pattern(requester)
+    return "ip_#{requester}" unless requester.respond_to?(:call)
+    # instance_exec is using here because simple block.call executes block in
+    # a wrong context that leads to not preventing action execution after render
+    "custom_#{instance_exec(&requester)}"
+  end
 end

data/lib/rails_rate_limiter/strategies/sliding_window_log.rb

@@ -12,12 +12,12 @@ module RailsRateLimiter
       #   requests per time period.
       # @param per [Fixnum, Lambda, Proc] :per Time period in seconds.
       # @param requester [Lambda, Proc] Identifies request
-      # @param client [Object] Redis client
+      # @param client [Object, Proc] Redis client
       def initialize(limit, per, requester, client = nil)
         @limit = limit.respond_to?(:call) ? limit.call : limit
         @expires_in = calculate_expires_in(per)
-        @requester_pattern = compute_requester_pattern(requester)
-        @client = client
+        @requester_pattern = requester
+        @client = client.is_a?(Proc) ? client.call : client # Redis client already responds to #call so we have to strict
       end
 
       def run
@@ -62,11 +62,6 @@ module RailsRateLimiter
         value = per.respond_to?(:call) ? per.call : per
         (value.to_f * TIMESTAMP_ACCURACY).to_i
       end
-
-      def compute_requester_pattern(requester)
-        return "ip_#{requester}" unless requester.respond_to?(:call)
-        "custom_#{requester.call}"
-      end
     end
   end
 end

data/lib/rails_rate_limiter/version.rb

@@ -1,3 +1,3 @@
 module RailsRateLimiter
-  VERSION = "0.1.3"
+  VERSION = "0.2.1"
 end

data/rails_rate_limiter.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'rails', '>= 4.2'
-  spec.add_runtime_dependency 'redis', '~> 3.0'
+  spec.add_runtime_dependency 'redis', '>= 3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_rate_limiter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Ruslan Kotov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,14 +28,14 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -151,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Requests rate limiting library for Ruby on Rails