rack-throttle 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a65f5195779a2af8c7340f1e52dd0c19e6036e234eeaf934518a307b05a208e4
-  data.tar.gz: e69a0f3ee004f59b3a6808f9165a2c82b1729dde0ed344e7192998eb5c522f3a
+  metadata.gz: ff38a72f8ae91886b4c8db0cf2abab7ed33d908f19bf676b2d013f06a270d846
+  data.tar.gz: 3bed6513dc33088624b4abfca5ab9edd56bee3aabfab7fec69d08dc627084efa
 SHA512:
-  metadata.gz: 0e0a36ff42888850b8e1532133706342637e070998d815ff5358a7a36235a3c7a4eabe5f0514ad463bdb7fea13e84ce4ce21b63e47f7352be5c03877c4c3ffb1
-  data.tar.gz: 4d84b627410ff12bf7a81ac3ad19c681397287748d4d9306d1d5f447a918849488b04bb1b33f1057018a4519abbc309460aa109772193c7c4a81e13c23fe65bf
+  metadata.gz: 8a158cf9982fe6790481e861974a34a5c496d861c5af791b72d07548375a94bd7228bb9a63ad9736433316d86d0ca552690bd764a3eb758222edaa728213703f
+  data.tar.gz: ae8658e3cc10b7ae80ea684f6b8cb4e34876f9c4915416d37f71f556a3e497a02ac5ca2d277dd4fa35c71cc07b368c109af6167b3cf8d11e57beb4406841b43b

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/rack/throttle/rules.rb

@@ -14,7 +14,7 @@ module Rack
       def rules
         @rules ||= begin
           rs = options[:rules]
-          rs.sort_by { |r| r[:path].to_s }.reverse
+          rs.sort_by { |r| [r[:proc].to_s, r[:path].to_s] }.reverse
         end
       end
     
@@ -32,7 +32,7 @@ module Rack
 
       def whitelisted?(request)
         return true if ip_whitelisted?(IPAddr.new(ip(request)))
-        return true if path_whitelisted?(request)
+        return true if rule_whitelisted?(request)
         false
       end
 
@@ -40,7 +40,7 @@ module Rack
         !!ips.find { |ip| ip.include?(request_ip) }
       end 
 
-      def path_whitelisted?(request)
+      def rule_whitelisted?(request)
         rule = rule_for(request)
         rule ? rule[:whitelisted] : false
       end
@@ -48,7 +48,8 @@ module Rack
       def rule_for(request)
         rules.find do |rule|
           next unless rule[:method] == request.request_method.to_s
-          next unless path_matches?(rule, request.path.to_s)
+          next if rule[:proc] && rule[:proc].call(request) == false
+          next if rule[:path] && !path_matches?(rule, request.path.to_s)
           rule
         end
       end
@@ -66,11 +67,23 @@ module Rack
 
       def client_identifier(request)
         if (rule = rule_for(request)) 
-          "#{ip(request)}_#{rule[:method]}_#{rule[:path]}"
+          client_identifier_for_rule(request, rule)
         else
           ip(request)
         end
       end
+          
+      def client_identifier_for_rule(request, rule)
+        if rule[:proc]
+          "#{rule[:method]}_#{rule[:proc].call(request)}"
+        elsif rule[:path]
+          "#{ip(request)}_#{rule[:method]}_#{rule[:path]}"
+        elsif rule[:method]
+          "#{ip(request)}_#{rule[:method]}"
+        else
+          raise NotImplementedError
+        end
+      end
 
       def ip(request)
         request.ip.to_s

data/lib/rack/throttle/version.rb

@@ -1,7 +1,7 @@
 module Rack; module Throttle
   module VERSION
     MAJOR = 0
-    MINOR = 6
+    MINOR = 7
     TINY  = 0
     EXTRA = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-throttle
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Arto Bendiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler