prop 0.7.5 → 0.7.6

data/lib/prop.rb

@@ -2,7 +2,7 @@ require "prop/limiter"
 require "forwardable"
 
 module Prop
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 
   # Short hand for accessing Prop::Limiter methods
   class << self

data/lib/prop/limiter.rb

@@ -57,7 +57,8 @@ module Prop
           if at_threshold?(counter, options[:threshold])
             raise Prop::RateLimited.new(options.merge(:cache_key => cache_key, :handle => handle))
           else
-            counter = writer.call(cache_key, counter + [ 1, options[:increment].to_i ].max)
+            increment = options.key?(:increment) ? options[:increment].to_i : 1
+            counter   = writer.call(cache_key, counter + increment)
           end
         end
 

data/prop.gemspec

@@ -13,7 +13,7 @@ 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.7.5'
+  s.version           = '0.7.6'
   s.date              = '2012-04-06'
   s.rubyforge_project = 'prop'
 

data/test/test_limiter.rb

@@ -51,6 +51,12 @@ class TestLimiter < Test::Unit::TestCase
             should "raise Prop::RateLimited" do
               assert_raises(Prop::RateLimited) { Prop.throttle!(:something) { "wibble" }}
             end
+
+            should "raise even if given :increment => 0" do
+              value = Prop.count(:something)
+              assert_raises(Prop::RateLimited) { Prop.throttle!(:something, nil, :increment => 0) { "wibble" }}
+              assert_equal value, Prop.count(:something)
+            end
           end
 
           context "not given a block" do
@@ -75,6 +81,10 @@ class TestLimiter < Test::Unit::TestCase
             should "return the updated throttle count" do
               assert_equal Prop.count(:something) + 1, Prop.throttle!(:something)
             end
+
+            should "not update count if passed an increment of 0" do
+              assert_equal Prop.count(:something), Prop.throttle!(:something, nil, :increment => 0)
+            end
           end
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prop
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - Morten Primdahl