improved-rack-throttle 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea077855e9d5f1e7aa8126af311c58f518e2abf
-  data.tar.gz: d1c0ce949e3a7152adfb1b9b6ae96896021d5e81
+  metadata.gz: de9d89ff0b5442cec2f406a016bce0ff6d97b308
+  data.tar.gz: 022ac60a09f2655dcf993b8892c2605aeb278884
 SHA512:
-  metadata.gz: 77a62c9ad00ee3aff04a413e5e186a261cd925c9b46e281dd167604fee5b3df2451daf4eb775f1c3b94a4b1e1fb16feddd35828763ed33666dc62df7c5bfc6cb
-  data.tar.gz: ab2f078f3380a13826fbb30f47292540ae59c8cf3269f1fa4ce051825962574d7d9e6021709058381dabb7035cd610b4ce05d2575e57f196292abb4aa00bde8f
+  metadata.gz: 96c2e827d860790ced263b32bebfaeb87d08c5de1a24531d09ed03fbdcd904ea9e2811b499332add090385b24923830b1de8a7e27536e7a6ed0db4bee5b30390
+  data.tar.gz: 4e68494c77b26233c22bdfa50c13ba1273b7da107399db3663c4ad025bd439366273761962582932910a32fe9cb4687ddde641b8c80d305002940d9aa7ce8538

data/Gemfile.lock

@@ -1,40 +1,75 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.6)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    docile (1.1.5)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.12.2)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.3)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
+      oauth2
+    hashie (3.3.2)
+    highline (1.6.21)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
-    multi_json (1.7.6)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    json (1.8.2)
+    jwt (1.2.1)
+    mini_portile (0.6.2)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.0.4)
-    rdoc (4.0.1)
+    rake (10.4.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    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)
+    redcarpet (3.2.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
       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)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    timecop (0.6.1)
-    yard (0.8.6.1)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    thread_safe (0.3.4)
+    timecop (0.6.2.2)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby

data/README.md

@@ -66,6 +66,12 @@ Examples
 
     use Rack::Throttle::Interval, :min => 3.0
 
+### Allowing a maximum of 100 requests per hour, for the foo basic auth
+user
+
+    use Rack::Throttle::Hourly,   :max => 100, :rules => {:basic_auth =>
+/foo/}
+
 ### Allowing a maximum of 100 requests per hour
 
     use Rack::Throttle::Hourly,   :max => 100
@@ -200,6 +206,7 @@ Documentation
   * {Rack::Throttle::MethodMatcher}
   * {Rack::Throttle::UrlMatcher}
   * {Rack::Throttle::UserAgentMatcher}
+  * {Rack::Throttle::BasicAuthMatcher}
 
 Dependencies
 ------------

data/improved-rack-throttle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "improved-rack-throttle"
-  s.version = "0.8.0"
+  s.version = "0.9.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 = "2014-09-22"
+  s.date = "2015-01-27"
   s.description = "Rack middleware for rate-limiting incoming HTTP requests."
   s.email = "somers.ben@gmail.com"
   s.extra_rdoc_files = [

data/lib/rack/throttle.rb

@@ -13,5 +13,6 @@ module Rack
     autoload :UrlMatcher,       'rack/throttle/matchers/url_matcher'
     autoload :MethodMatcher,    'rack/throttle/matchers/method_matcher'
     autoload :UserAgentMatcher, 'rack/throttle/matchers/user_agent_matcher'
+    autoload :BasicAuthMatcher, 'rack/throttle/matchers/basic_auth_matcher'
   end
 end

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

@@ -26,6 +26,7 @@ module Rack; module Throttle
       @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]
+      @matchers += Array(rules[:basic_auth]).map { |rule| BasicAuthMatcher.new(rule) } if rules[:basic_auth]
     end
 
     ##

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

@@ -26,14 +26,14 @@ module Rack; module Throttle
     def allowed?(request)
       t1 = request_start_time(request)
       key = cache_key(request)
-      bucket = cache_get(key) rescue nil
+      bucket = Marshal.load(cache_get(key)) rescue nil
       bucket ||= LeakyBucket.new(options[:burst], options[:average])
       bucket.maximum, bucket.outflow = options[:burst], options[:average]
       bucket.leak!
       bucket.increment!
       allowed = !bucket.full?
       begin
-        cache_set(key, bucket)
+        cache_set(key, Marshal.dump(bucket))
         allowed
       rescue StandardError => e
         allowed = true

data/lib/rack/throttle/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: improved-rack-throttle
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Ben Somers
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack