rack-pooledthrottle 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93f678ed4ba1803eb76022038615a86360dcf110
-  data.tar.gz: 487c6c5332cc4469e6bba491a2233210d0db9468
+  metadata.gz: 609e48e88cc5bdf316fc4c338d6a6ba797f3c47c
+  data.tar.gz: 4f4b687d62cdd26a8cb428a01b798c8d3ed274fb
 SHA512:
-  metadata.gz: 8c4f7308d1fa6628ce4fbfee90a68719de280646f5a47d4a79056cdd95d3835f906489a21c75f74213ceea3b1c6eb7eb49527b5d2fbdfaa80746964f57cf4328
-  data.tar.gz: 4d39db54a3c1a065ad50ece2638705639281fdedb982087ae1ecd8d334feaef1f20bb9228a0f5bd0f6af349a2e5edbd4b3affb32e548a7f7a78544083acac04a
+  metadata.gz: 93cdde36423b6acd0504b487a9f26668a338f9b9dc3e801373fd77b7a1f8ef09983cbe85b1429df5d20f6ebd695410583c7dea7b4de4f7152bdea069919b5933
+  data.tar.gz: 43429d571f259b333d9cb978c5708c70922e469c45b34e8ef03ce2b6f3590b7ce31a22c180e832329352d3dc2157664b4a1c83a1272b4a95b9d1ce5f8badfbb7

data/lib/rack/pooledthrottle/throttle.rb

@@ -13,13 +13,25 @@ module Rack
       end
 
       protected
+      
+      def throttled_request?(request)
+        if f = options[:throttled_request]
+          f.call(request)
+        else
+          true
+        end
+      end
 
       def allowed?(request)
-        case
-          when whitelisted?(request) then true
-          when blacklisted?(request) then false
-          else
-            query_cache?(request)
+        if throttled_request?(request)
+          case
+            when whitelisted?(request) then true
+            when blacklisted?(request) then false
+            else
+              query_cache?(request)
+          end
+        else
+          true
         end
       end
 

data/lib/rack/pooledthrottle/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Pooledthrottle
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/memecached_spec.rb

@@ -28,11 +28,19 @@ describe Rack::PooledThrottle::MemcachedThrottle do
     expect(last_response.body).to show_allowed_response
   end
   
-  it 'expect a passing message' do 
+  it 'expect a failing message' do 
     4.times {get '/foo'}
     expect(last_response.body).to show_throttled_response
   end
   
+  it 'expect a failing message' do 
+    @options[:max] = 0
+    @options[:message] = 'GO AWAY!'
+    get '/foo'
+    expect(last_response.body).to match(/GO AWAY/)
+  end
+  
+  
   it "should return true if whitelisted" do
     allow(app).to receive(:whitelisted?).and_return(true)
     4.times {get "/foo"}
@@ -83,5 +91,12 @@ describe Rack::PooledThrottle::MemcachedThrottle do
     3.times {get '/foo', email: 'scott@kickofflabs.com'}
     expect(last_response.body).to show_throttled_response
   end
+  
+  it 'should allow certain requests to not be throttled' do 
+    @options[:max] = 0
+    @options[:throttled_request] = ->(request){!request.path.end_with?('foo')}
+    get '/foo'
+    expect(last_response.body).to show_allowed_response
+  end
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-pooledthrottle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Scott Watermasysk