better_rate_limit 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eedeebfe87d1f95a4541b994bcabec39ac02250827174c12da04b612209e4f6
-  data.tar.gz: 0aee3a1cf32a3e59c8b1307dd6364f6610272366267d4c59644741df3d9006b6
+  metadata.gz: 7501160c6bba347fbc8eb40116c5a46c9d500b01d77116ed49e98c8985fb79da
+  data.tar.gz: 5ab03fac755181baffa23f4f876bcd331e71295ce56902d11b5d476ac1797ce6
 SHA512:
-  metadata.gz: 162d31096ed6a08dc8ca38b18becb34512f25abd99297bd9b03ac7dd0208499dea1fd8ba2871584a9929ba45555734e8a8611c2b3d64df663b3a60128f007ae3
-  data.tar.gz: b28194386480e1ec62fca06ea62ba8de6ec41eedae07d97710e9afb1bf5af09923fe5f1465a93f3cd85c167f5c18300f74b8242e35eeffed95af66a165ec7c8a
+  metadata.gz: 35dabbd3e4cf261c6edc4e87e4ed55793ce492f7992b4dc4fa7ce32d41478fd8c2da7557f4ce19f394dd2e24005a979c211ae5adb23a1d20eadf177f38033778
+  data.tar.gz: 92f051eb2ecbe4ab682757ca066ecc2c53680a8f7cb8a938a9772f0dc30c2fe92cdee7d27c1d8deb81c1862ebd43bbc63c1a68c19d23f3228bfce285d4b7ddc7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    better_rate_limit (0.1.6)
+    better_rate_limit (0.1.9)
       actionpack (>= 5.0)
       redis (>= 3.3)
 
@@ -29,6 +29,7 @@ GEM
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     crass (1.0.6)
     erubi (1.10.0)
     i18n (1.9.1)
@@ -59,7 +60,10 @@ GEM
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rake (12.3.3)
-    redis (4.3.1)
+    redis (5.0.3)
+      redis-client (>= 0.7.4)
+    redis-client (0.8.0)
+      connection_pool
     thread_safe (0.3.6)
     timecop (0.9.1)
     tzinfo (1.2.9)

data/lib/action_controller/better_rate_limit.rb

@@ -9,15 +9,15 @@ module ActionController
     module ClassMethods
       def rate_limit(max, options)
         rate_limits << Limit.build(max, controller_path, {
-                                        if: options[:if],
-                                        unless: options[:unless],
-                                        every: options[:every],
-                                        name: options[:name] || controller_path,
-                                        scope: options[:scope] || -> { real_ip },
-                                        only: options[:only] || [],
-                                        except: options[:except] || [],
-                                        clear_if: options[:clear_if]
-                                      })
+                                     if: options[:if],
+                                     unless: options[:unless],
+                                     every: options[:every],
+                                     name: options[:name] || controller_path,
+                                     scope: options[:scope] || -> { real_ip },
+                                     only: options[:only] || [],
+                                     except: options[:except] || [],
+                                     clear_if: options[:clear_if]
+                                   })
 
         before_action :perform_rate_limiting
         after_action :clear_keys
@@ -61,11 +61,12 @@ module ActionController
     private
 
     def json?
-      request.xhr? || request.format === :json
+      request.xhr? || request.format == :json
     end
 
     def real_ip
-      request.headers['X-Forwarded-For'].try(:split, ',').try(:[], -2..-2).try(:first).try(:strip)
+      request.headers['X-Forwarded-For'].try(:split, ',').try(:last,
+                                                              ::BetterRateLimit.configuration.proxies_to_trust).try(:first).try(:strip)
     end
 
     def under_rate_limit?(limit)

data/lib/better_rate_limit/configuration.rb

@@ -2,7 +2,7 @@
 
 module BetterRateLimit
   class Configuration
-    attr_accessor :ignore, :redis_client
+    attr_accessor :ignore, :redis_client, :proxies_to_trust
 
     def initialize
       @ignore = false

data/lib/better_rate_limit/version.rb

@@ -1,3 +1,3 @@
 module BetterRateLimit
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_rate_limit
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Pablo Fonseca
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Rate limit requests