prop 0.6.5 → 0.6.6

data/lib/prop.rb

@@ -7,7 +7,7 @@ class Object
 end
 
 class Prop
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 
   class RateLimitExceededError < RuntimeError
     attr_accessor :handle, :retry_after, :description
@@ -54,7 +54,7 @@ class Prop
 
     def throttle!(handle, key = nil, options = {})
       options   = sanitized_prop_options(handle, key, options)
-      cache_key = sanitized_prop_key(key, options[:interval])
+      cache_key = sanitized_prop_key(handle, key, options)
       counter   = reader.call(cache_key).to_i
 
       return counter if disabled?
@@ -68,21 +68,21 @@ class Prop
 
     def throttled?(handle, key = nil, options = {})
       options   = sanitized_prop_options(handle, key, options)
-      cache_key = sanitized_prop_key(key, options[:interval])
+      cache_key = sanitized_prop_key(handle, key, options)
 
       reader.call(cache_key).to_i >= options[:threshold]
     end
 
     def reset(handle, key = nil, options = {})
       options   = sanitized_prop_options(handle, key, options)
-      cache_key = sanitized_prop_key(key, options[:interval])
+      cache_key = sanitized_prop_key(handle, key, options)
 
       writer.call(cache_key, 0)
     end
 
     def query(handle, key = nil, options = {})
       options   = sanitized_prop_options(handle, key, options)
-      cache_key = sanitized_prop_key(key, options[:interval])
+      cache_key = sanitized_prop_key(handle, key, options)
 
       reader.call(cache_key).to_i
     end
@@ -91,9 +91,9 @@ class Prop
     private
 
     # Builds the expiring cache key
-    def sanitized_prop_key(key, interval)
-      window    = (Time.now.to_i / interval)
-      cache_key = "#{normalize_cache_key(key)}/#{ window }"
+    def sanitized_prop_key(handle, key, options)
+      window    = (Time.now.to_i / options[:interval])
+      cache_key = normalize_cache_key([handle, key, window])
       "prop/#{Digest::MD5.hexdigest(cache_key)}"
     end
 

data/prop.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'prop'
-  s.version           = '0.6.5'
-  s.date              = '2011-12-13'
+  s.version           = '0.6.6'
+  s.date              = '2012-03-31'
   s.rubyforge_project = 'prop'
 
   ## Make sure your summary is short. The description may be as long

data/test/test_prop.rb

@@ -179,5 +179,19 @@ class TestProp < Test::Unit::TestCase
       end
     end
 
+    context 'different handles with the same interval' do
+      setup do
+        Prop.configure(:api_requests, :threshold => 100, :interval => 30)
+        Prop.configure(:login_attempts, :threshold => 10, :interval => 30)
+      end
+
+      should 'be counted separately' do
+        user_id = 42
+        Prop.throttle!(:api_requests, user_id)
+        assert_equal(1, Prop.count(:api_requests, user_id))
+        assert_equal(0, Prop.count(:login_attempts, user_id))
+      end
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prop
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-13 00:00:00 -08:00
-default_executable: 
+date: 2012-03-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  requirement: *id001
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bundler
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  requirement: *id002
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  requirement: *id003
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,8 +71,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  requirement: *id004
+  type: :development
+  version_requirements: *id004
 description: Gem for implementing rate limits.
 email: primdahl@me.com
 executables: []
@@ -92,7 +91,6 @@ files:
 - prop.gemspec
 - test/helper.rb
 - test/test_prop.rb
-has_rdoc: true
 homepage: http://github.com/morten/prop
 licenses: []
 
@@ -122,9 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prop
-rubygems_version: 1.5.3
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 2
 summary: Gem for implementing rate limits.
 test_files: 
 - test/test_prop.rb
+has_rdoc: