rack-attack 1.3.0 → 1.3.1

data/README.md

@@ -83,7 +83,11 @@ Note that `req` is a [Rack::Request](http://rack.rubyforge.org/doc/classes/Rack/
 
 ## Responses
 
-Customize the response of throttled requests using an object that adheres to the [Rack app interface](http://rack.rubyforge.org/doc/SPEC.html).
+Customize the response of blacklisted and throttled requests using an object that adheres to the [Rack app interface](http://rack.rubyforge.org/doc/SPEC.html).
+
+    Rack:Attack.blacklisted_response = lambda do |env|
+      [ 503, {}, ['Blocked']]
+    end
 
     Rack:Attack.throttled_response = lambda do |env|
       # name and other data about the matched throttle
@@ -96,16 +100,9 @@ Customize the response of throttled requests using an object that adheres to the
       [ 503, {}, [body]]
     end
 
-Similarly for blacklisted responses:
-
-    Rack:Attack.blacklisted_response = lambda do |env|
-      [ 503, {}, ['Blocked']]
-    end
-
-For responses that did not exceed a throttle limit, Rack::Attack annotates the environment with match data.
-For example, in out `reqs/ip` throttle above, a matching request would have:
+For responses that did not exceed a throttle limit, Rack::Attack annotates the env with match data:
 
-    request.env['rack.attack.throttle_data']['req/ip'] # => { :period => 1, :limit => 5, :count => n }
+    request.env['rack.attack.throttle_data'][name] # => { :count => n, :period => p, :limit => l }
 
 ## Logging & Instrumentation
 

data/lib/rack/attack/cache.rb

@@ -9,11 +9,13 @@ module Rack
       end
 
       def count(unprefixed_key, period)
-        key = "#{prefix}:#{Time.now.to_i/period}:#{unprefixed_key}"
-        result = store.increment(key, 1)
+        epoch_time = Time.now.to_i
+        expires_in = period - (epoch_time % period)
+        key = "#{prefix}:#{epoch_time/period}:#{unprefixed_key}"
+        result = store.increment(key, 1, :expires_in => expires_in)
         # NB: Some stores return nil when incrementing uninitialized values
         if result.nil?
-          store.write(key, 1)
+          store.write(key, 1, :expires_in => expires_in)
         end
         result || 1
       end

data/lib/rack/attack/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Attack
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-attack
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Block & throttle abusive requests