improved-rack-throttle 0.7.1 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dea077855e9d5f1e7aa8126af311c58f518e2abf
+  data.tar.gz: d1c0ce949e3a7152adfb1b9b6ae96896021d5e81
+SHA512:
+  metadata.gz: 77a62c9ad00ee3aff04a413e5e186a261cd925c9b46e281dd167604fee5b3df2451daf4eb775f1c3b94a4b1e1fb16feddd35828763ed33666dc62df7c5bfc6cb
+  data.tar.gz: ab2f078f3380a13826fbb30f47292540ae59c8cf3269f1fa4ce051825962574d7d9e6021709058381dabb7035cd610b4ce05d2575e57f196292abb4aa00bde8f

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
+  - "2.1.3"
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/Gemfile

@@ -3,10 +3,11 @@ source "http://rubygems.org"
 gem "rack", ">= 1.0.0"
 
 group :development, :test do
-  gem 'timecop',   '~> 0.5.2'
-  gem 'rack-test', '~> 0.6.2'
-  gem 'rspec',     '~> 2.11.0'
-  gem 'yard' ,     '>= 0.5.5'
+  gem 'timecop', "<= 0.6.2.2"
+  gem 'rack-test'
+  gem 'rspec'
+  gem 'yard'
+  gem "simplecov", :require => false
   gem 'redcarpet'
   gem 'rake'
   gem 'jeweler'

data/Gemfile.lock

@@ -1,31 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.6)
-    rack (1.4.4)
+    json (1.8.0)
+    multi_json (1.7.6)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.3)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
-    redcarpet (2.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    timecop (0.5.9.1)
-    yard (0.8.3)
+    redcarpet (2.3.0)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.1)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.1)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    timecop (0.6.1)
+    yard (0.8.6.1)
 
 PLATFORMS
   ruby
@@ -33,9 +42,10 @@ PLATFORMS
 DEPENDENCIES
   jeweler
   rack (>= 1.0.0)
-  rack-test (~> 0.6.2)
+  rack-test
   rake
   redcarpet
-  rspec (~> 2.11.0)
-  timecop (~> 0.5.2)
-  yard (>= 0.5.5)
+  rspec
+  simplecov
+  timecop (<= 0.6.2.2)
+  yard

data/README.md

@@ -3,6 +3,7 @@ HTTP Request Rate Limiter for Rack Applications
 
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/bensomers/improved-rack-throttle)
 [![Dependency Status](https://gemnasium.com/bensomers/improved-rack-throttle.png)](https://gemnasium.com/bensomers/improved-rack-throttle)
+[![Build Status](https://travis-ci.org/bensomers/improved-rack-throttle.png?branch=master)](https://travis-ci.org/bensomers/improved-rack-throttle)
 
 This is a [Rack][] middleware that provides logic for rate-limiting incoming
 HTTP requests to Rack applications. You can use `Rack::Throttle` with any
@@ -37,7 +38,7 @@ Examples
 
     # config/application.rb
     require 'rack/throttle'
-    
+
     class Application < Rails::Application
       config.middleware.use Rack::Throttle::Interval
     end
@@ -47,18 +48,18 @@ Examples
     #!/usr/bin/env ruby -rubygems
     require 'sinatra'
     require 'rack/throttle'
-    
+
     use Rack::Throttle::Interval
-    
+
     get('/hello') { "Hello, world!\n" }
 
 ### Adding throttling to a Rackup application
 
     #!/usr/bin/env rackup
     require 'rack/throttle'
-    
+
     use Rack::Throttle::Interval
-    
+
     run lambda { |env| [200, {'Content-Type' => 'text/plain'}, "Hello, world!\n"] }
 
 ### Enforcing a minimum 3-second interval between requests
@@ -86,19 +87,19 @@ Examples
 ### Storing the rate-limiting counters in a GDBM database
 
     require 'gdbm'
-    
+
     use Rack::Throttle::Interval, :cache => GDBM.new('tmp/throttle.db')
 
 ### Storing the rate-limiting counters on a Memcached server
 
     require 'memcached'
-    
+
     use Rack::Throttle::Interval, :cache => Memcached.new, :key_prefix => :throttle
 
 ### Storing the rate-limiting counters on a Redis server
 
     require 'redis'
-    
+
     use Rack::Throttle::Interval, :cache => Redis.new, :key_prefix => :throttle
 
 ### Scoping the rate-limit to a specific path and method
@@ -188,8 +189,6 @@ status code by passing in a `:code => 503` option when constructing a
 
 Documentation
 -------------
-UNDER DEVELOPMENT
-
 <http://rubydoc.info/gems/improved-rack-throttle>
 
 * {Rack::Throttle}
@@ -229,7 +228,7 @@ as follows:
 
 Authors
 -------
-* [Ben Somers](mailto:somers.ben@gmail.com) - <http://www.somanyrobots.com>
+* [Ben Somers](mailto:somers.ben@gmail.com) - <http://www.github.com/bensomers>
 * [Arto Bendiken](mailto:arto.bendiken@gmail.com) - <http://ar.to/>
 * [Brendon Murphy](mailto:disposable.20.xternal@spamourmet.com>) - <http://www.techfreak.net/>
 

data/Rakefile

@@ -28,8 +28,6 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-task :default => :spec
-
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
@@ -39,3 +37,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/improved-rack-throttle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "improved-rack-throttle"
-  s.version = "0.7.1"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Somers", "Arto Bendiken", "Brendon Murphy"]
-  s.date = "2013-05-09"
+  s.date = "2014-09-22"
   s.description = "Rack middleware for rate-limiting incoming HTTP requests."
   s.email = "somers.ben@gmail.com"
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "README.md",
@@ -55,37 +56,40 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/bensomers/improved-rack-throttle"
   s.licenses = ["Public Domain"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.0.3"
   s.summary = "HTTP request rate limiter for Rack applications."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
-      s.add_development_dependency(%q<timecop>, ["~> 0.5.2"])
-      s.add_development_dependency(%q<rack-test>, ["~> 0.6.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.5.5"])
+      s.add_development_dependency(%q<timecop>, ["<= 0.6.2.2"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<redcarpet>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 1.0.0"])
-      s.add_dependency(%q<timecop>, ["~> 0.5.2"])
-      s.add_dependency(%q<rack-test>, ["~> 0.6.2"])
-      s.add_dependency(%q<rspec>, ["~> 2.11.0"])
-      s.add_dependency(%q<yard>, [">= 0.5.5"])
+      s.add_dependency(%q<timecop>, ["<= 0.6.2.2"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<redcarpet>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 1.0.0"])
-    s.add_dependency(%q<timecop>, ["~> 0.5.2"])
-    s.add_dependency(%q<rack-test>, ["~> 0.6.2"])
-    s.add_dependency(%q<rspec>, ["~> 2.11.0"])
-    s.add_dependency(%q<yard>, [">= 0.5.5"])
+    s.add_dependency(%q<timecop>, ["<= 0.6.2.2"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<redcarpet>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/rack/throttle/limiters/limiter.rb

@@ -23,7 +23,6 @@ module Rack; module Throttle
     def initialize(app, options = {})
       rules = options.delete(:rules) || {}
       @app, @options, @matchers = app, options, []
-      @matchers += Array(rules[:ip]).map { |rule| IpMatcher.new(rule) } if rules[:ip]
       @matchers += Array(rules[:url]).map { |rule| UrlMatcher.new(rule) } if rules[:url]
       @matchers += Array(rules[:user_agent]).map { |rule| UserAgentMatcher.new(rule) } if rules[:user_agent]
       @matchers += Array(rules[:method]).map { |rule| MethodMatcher.new(rule) } if rules[:method]
@@ -197,7 +196,8 @@ module Rack; module Throttle
     #
     # @return [Array(Integer, Hash, #each)]
     def rate_limit_exceeded
-      headers = respond_to?(:retry_after) ? {'Retry-After' => retry_after.to_f.ceil.to_s} : {}
+      return_retry_after = options[:return_retry_after] || false
+      headers = (respond_to?(:retry_after) && return_retry_after) ? {'Retry-After' => retry_after.to_f.ceil.to_s} : {}
       http_error(options[:code] || 403, options[:message] || 'Rate Limit Exceeded', headers)
     end
 

data/lib/rack/throttle/limiters/sliding_window.rb

@@ -2,8 +2,8 @@ module Rack; module Throttle
   ##
   # This rate limiter strategy throttles the application with
   # a sliding window (implemented as a leaky bucket). It operates
-  # on second-level resolution. It takes :burst and :average 
-  # options, which correspond to the maximum size of a traffic 
+  # on second-level resolution. It takes :burst and :average
+  # options, which correspond to the maximum size of a traffic
   # burst, and the maximum allowed average traffic level.
   class SlidingWindow < Limiter
     ##
@@ -18,7 +18,7 @@ module Rack; module Throttle
     end
 
     ##
-    # Returns `true` if the request conforms to the 
+    # Returns `true` if the request conforms to the
     # specified :average and :burst rules
     #
     # @param  [Rack::Request] request
@@ -29,7 +29,7 @@ module Rack; module Throttle
       bucket = cache_get(key) rescue nil
       bucket ||= LeakyBucket.new(options[:burst], options[:average])
       bucket.maximum, bucket.outflow = options[:burst], options[:average]
-      bucket.leak! 
+      bucket.leak!
       bucket.increment!
       allowed = !bucket.full?
       begin
@@ -44,6 +44,15 @@ module Rack; module Throttle
       end
     end
 
+    ##
+    # Returns the number of seconds before the client is allowed to retry an
+    # HTTP request.
+    #
+    # @return [Float]
+    def retry_after
+      @retry_after ||= (1.0 / options[:average].to_f)
+    end
+
     ###
     # LeakyBucket is an internal class used to implement the
     # SlidingWindow limiter strategy. It is a (slightly tweaked)
@@ -67,7 +76,7 @@ module Rack; module Throttle
         loss = (outflow * time).to_f
         if loss > 0
           @count -= loss
-          @last_touched = t 
+          @last_touched = t
         end
       end
 

data/lib/rack/throttle/matchers/url_matcher.rb

@@ -4,7 +4,7 @@ module Rack; module Throttle
   # requested. For instance, you may care about limiting requests
   # to a machine-consumed API, but not be concerned about requests
   # coming from browsers.
-  # UrlMatchers take Regexp object to matcha gainst the request path.
+  # UrlMatchers take Regexp object to match against the request path.
   class UrlMatcher < Matcher
     ###
     # @param [Rack::Request] request

data/lib/rack/throttle/version.rb

@@ -1,8 +1,8 @@
 module Rack; module Throttle
   module VERSION
     MAJOR = 0
-    MINOR = 7
-    TINY  = 1
+    MINOR = 8
+    TINY  = 0
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/spec/limiters/daily_spec.rb

@@ -10,18 +10,18 @@ describe Rack::Throttle::Daily do
 
   it "should be allowed if not seen this day" do
     get "/foo"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should be allowed if seen fewer than the max allowed per day" do
     2.times { get "/foo" }
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should not be allowed if seen more times than the max allowed per day" do
     4.times { get "/foo" }
-    last_response.body.should show_throttled_response
+    expect(last_response.body).to show_throttled_response
   end
-  
+
   # TODO mess with time travelling and requests to make sure no overlap
 end

data/spec/limiters/hourly_spec.rb

@@ -10,18 +10,18 @@ describe Rack::Throttle::Hourly do
 
   it "should be allowed if not seen this hour" do
     get "/foo"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should be allowed if seen fewer than the max allowed per hour" do
     2.times { get "/foo" }
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should not be allowed if seen more times than the max allowed per hour" do
     4.times { get "/foo" }
-    last_response.body.should show_throttled_response
+    expect(last_response.body).to show_throttled_response
   end
-  
+
   # TODO mess with time travelling and requests to make sure no overlap
 end

data/spec/limiters/interval_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Rack::Throttle::Interval do
   include Rack::Test::Methods
-  
+
   def app
     @target_app ||= example_target_app
     @app ||= Rack::Throttle::Interval.new(@target_app, :min => 0.1)
@@ -11,9 +11,9 @@ describe Rack::Throttle::Interval do
 
   it "should allow the request if the source has not been seen" do
     get "/foo"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should allow the request if the source has not been seen in the current interval" do
     Timecop.freeze do
       get "/foo"
@@ -21,25 +21,25 @@ describe Rack::Throttle::Interval do
         get "/foo"
       end
     end
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should not allow the request if the source has been seen inside the current interval" do
     Timecop.freeze do
       2.times { get "/foo" }
     end
-    last_response.body.should show_throttled_response
+    expect(last_response.body).to show_throttled_response
   end
-  
+
   it "should gracefully allow the request if the cache bombs on getting" do
-    app.should_receive(:cache_get).and_raise(StandardError)
+    expect(app).to receive(:cache_get).and_raise(StandardError)
     get "/foo"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should gracefully allow the request if the cache bombs on setting" do
-    app.should_receive(:cache_set).and_raise(StandardError)
+    expect(app).to receive(:cache_set).and_raise(StandardError)
     get "/foo"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
 end

data/spec/limiters/limiter_spec.rb

@@ -7,44 +7,44 @@ describe Rack::Throttle::Limiter do
     @target_app ||= example_target_app
     @app ||= Rack::Throttle::Limiter.new(@target_app)
   end
-  
+
   describe "basic calling" do
     it "should return the example app" do
       get "/foo"
-      last_response.body.should show_allowed_response
+      expect(last_response.body).to show_allowed_response
     end
-  
+
     it "should call the application if allowed" do
-      app.should_receive(:allowed?).and_return(true)
+      expect(app).to receive(:allowed?).and_return(true)
       get "/foo"
-      last_response.body.should show_allowed_response
+      expect(last_response.body).to show_allowed_response
     end
-  
+
     it "should give a rate limit exceeded message if not allowed" do
-      app.should_receive(:allowed?).and_return(false)
+      expect(app).to receive(:allowed?).and_return(false)
       get "/foo"
-      last_response.body.should show_throttled_response
+      expect(last_response.body).to show_throttled_response
     end
   end
-  
+
   describe "allowed?" do
     it "should return true if whitelisted" do
-      app.should_receive(:whitelisted?).and_return(true)
+      expect(app).to receive(:whitelisted?).and_return(true)
       get "/foo"
-      last_response.body.should show_allowed_response
+      expect(last_response.body).to show_allowed_response
     end
-    
+
     it "should return false if blacklisted" do
-      app.should_receive(:blacklisted?).and_return(true)
+      expect(app).to receive(:blacklisted?).and_return(true)
       get "/foo"
-      last_response.body.should show_throttled_response
+      expect(last_response.body).to show_throttled_response
     end
-    
+
     it "should return true if not whitelisted or blacklisted" do
-      app.should_receive(:whitelisted?).and_return(false)
-      app.should_receive(:blacklisted?).and_return(false)
+      expect(app).to receive(:whitelisted?).and_return(false)
+      expect(app).to receive(:blacklisted?).and_return(false)
       get "/foo"
-      last_response.body.should show_allowed_response
+      expect(last_response.body).to show_allowed_response
     end
   end
 

data/spec/limiters/sliding_window_spec.rb

@@ -19,28 +19,28 @@ describe Rack::Throttle::SlidingWindow do
 
   it "should allow the request if the source has not been seen at all" do
     get "/foo"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should allow the request if the rate is above-average but within the burst rule" do
     Timecop.freeze(@time) { get "/foo" }
     Timecop.freeze(@time + 0.5) { get "/foo" }
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
 
    it "should not allow the request if the rate is greater than the burst rule" do
     Timecop.freeze(@time) { get "/foo" }
     Timecop.freeze(@time + 0.3) { get "/foo" }
     Timecop.freeze(@time + 0.6) { get "/foo" }
-    last_response.body.should show_throttled_response
+    expect(last_response.body).to show_throttled_response
   end
-  
+
   it "should allow the request if the rate is less than the average" do
     Timecop.freeze(@time) { get "/foo" }
     Timecop.freeze(@time + 0.5) { get "/foo" }
     Timecop.freeze(@time + 2) { get "/foo" }
 
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
 
   it "should not allow the request if the rate is more than the average" do
@@ -49,19 +49,19 @@ describe Rack::Throttle::SlidingWindow do
     Timecop.freeze(@time + 1) { get "/foo" }
     Timecop.freeze(@time + 1.5) { get "/foo" }
 
-    last_response.body.should show_throttled_response
+    expect(last_response.body).to show_throttled_response
   end
 
   it "should gracefully allow the request if the cache bombs on getting" do
-    app.should_receive(:cache_get).and_raise(StandardError)
+    expect(app).to receive(:cache_get).and_raise(StandardError)
     get "/foo"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should gracefully allow the request if the cache bombs on setting" do
-    app.should_receive(:cache_set).and_raise(StandardError)
+    expect(app).to receive(:cache_set).and_raise(StandardError)
     get "/foo"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
 end
 

data/spec/matchers/method_matcher_spec.rb

@@ -9,19 +9,19 @@ describe Rack::Throttle::MethodMatcher do
   end
 
   it "should not bother checking if the path doesn't match the rule" do
-    app.should_not_receive(:allowed?)
+    expect(app).not_to receive(:allowed?)
     get "/foo"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should check if the path matches the rule" do
-    app.should_receive(:allowed?).and_return(false)
+    expect(app).to receive(:allowed?).and_return(false)
     post "/foo"
-    last_response.body.should show_throttled_response
+    expect(last_response.body).to show_throttled_response
   end
 
   it "should append the rule to the cache key" do
     post "/foo"
-    app.send(:cache_key, last_request).should == "127.0.0.1:meth-post"
+    expect(app.send(:cache_key, last_request)).to eq "127.0.0.1:meth-post"
   end
 end

data/spec/matchers/url_matcher_spec.rb

@@ -9,20 +9,20 @@ describe Rack::Throttle::UrlMatcher do
   end
 
   it "should not bother checking if the path doesn't match the rule" do
-    app.should_not_receive(:allowed?)
+    expect(app).not_to receive(:allowed?)
     get "/bar"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
-  
+
   it "should check if the path matches the rule" do
-    app.should_receive(:allowed?).and_return(false)
+    expect(app).to receive(:allowed?).and_return(false)
     get "/foo"
-    last_response.body.should show_throttled_response
+    expect(last_response.body).to show_throttled_response
   end
 
   it "should append the rule to the cache key" do
     get "/foo"
-    app.send(:cache_key, last_request).should == "127.0.0.1:url-/foo/"
+    expect(app.send(:cache_key, last_request)).to eq "127.0.0.1:url-/foo/"
   end
 end
 

data/spec/matchers/user_agent_matcher_spec.rb

@@ -9,20 +9,20 @@ describe Rack::Throttle::UserAgentMatcher do
   end
 
   it "should not bother checking if the path doesn't match the rule" do
-    app.should_not_receive(:allowed?)
+    expect(app).not_to receive(:allowed?)
     get "/foo"
-    last_response.body.should show_allowed_response
+    expect(last_response.body).to show_allowed_response
   end
 
   it "should check if the path matches the rule" do
-    app.should_receive(:allowed?).and_return(false)
+    expect(app).to receive(:allowed?).and_return(false)
     header 'User-Agent', 'blahdeblah GoogleBot owns your soul'
     get "/foo"
-    last_response.body.should show_throttled_response
+    expect(last_response.body).to show_throttled_response
   end
 
   it "should append the rule to the cache key" do
     get "/foo"
-    app.send(:cache_key, last_request).should == "127.0.0.1:ua-/google/i"
+    expect(app.send(:cache_key, last_request)).to eq "127.0.0.1:ua-/google/i"
   end
 end

data/spec/spec_helper.rb

@@ -3,9 +3,14 @@ require "rack/test"
 require "rack/throttle"
 require "timecop"
 
+unless RUBY_VERSION.match(/1\.8/)
+  require 'simplecov'
+  SimpleCov.start
+end
+
 def example_target_app
   @target_app = double("Example Rack App")
-  @target_app.stub(:call).with(any_args()).and_return([200, {}, "Example App Body"])
+  allow(@target_app).to receive(:call).with(any_args()).and_return([200, {}, "Example App Body"])
   @target_app
 end
 
@@ -13,34 +18,34 @@ RSpec::Matchers.define :show_allowed_response do
   match do |body|
     body.include?("Example App Body")
   end
-  
-  failure_message_for_should do
-    "expected response to show the allowed response" 
-  end 
 
-  failure_message_for_should_not do
-    "expected response not to show the allowed response" 
+  failure_message do
+    "expected response to show the allowed response"
   end
-  
+
+  failure_message_when_negated do
+    "expected response not to show the allowed response"
+  end
+
   description do
     "expected the allowed response"
-  end 
+  end
 end
 
 RSpec::Matchers.define :show_throttled_response do
   match do |body|
     body.include?("Rate Limit Exceeded")
   end
-  
-  failure_message_for_should do
-    "expected response to show the throttled response" 
-  end 
 
-  failure_message_for_should_not do
-    "expected response not to show the throttled response" 
+  failure_message do
+    "expected response to show the throttled response"
+  end
+
+  failure_message do
+    "expected response not to show the throttled response"
   end
-  
+
   description do
     "expected the throttled response"
-  end 
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: improved-rack-throttle
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Ben Somers
@@ -11,134 +10,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - <=
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - <=
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.2.2
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Rack middleware for rate-limiting incoming HTTP requests.
@@ -149,6 +146,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -186,29 +184,26 @@ files:
 homepage: http://github.com/bensomers/improved-rack-throttle
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4496223408765979053
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTTP request rate limiter for Rack applications.
 test_files: []
+has_rdoc: