prop 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2dd0390e5bbcf9ae63a8f2955d271b307b4d50
-  data.tar.gz: 66836a3d9ccb4189bc45edd01a94714d051eb620
+  metadata.gz: ea6891496856bc79f150b138e0c771f613d2214d
+  data.tar.gz: 93efa5eb27652eb0c8bb907f3d7439bd5d4f8260
 SHA512:
-  metadata.gz: 8eab2e9e05c2a3c7e9e7b4cc84c483f532eccfbf86559c10f44df4dc03f6f267a5054f55a9a82f1fe9fe22744841638520dcb98e3d31063e441c04c8cae06b7f
-  data.tar.gz: dbc80fce9d3466f41194c4595dd4e3847d82879225c0ae8c5bae0a3903dfc8345792b36ce8447a7f3cc31cdf54a8900ab222e5e1dc3f9bf302ab615da5e8bb7a
+  metadata.gz: 2690c81fcd19c6c292e7782f15347e0fcb80f3e60d19e34c073e4e0b4b7b20d7c83ca9eef7e9c0ffcf8bf87f42270171a7f96c68cddabff130e2ac88859ad01f
+  data.tar.gz: aa0ae06e67099a0b782404aa559c45af195e2f51967a1004d71dea15d98d3f88341ca47833f337a2f8b86a52b6b89dab9eac7b0df548fd8a67ccc4876d5bf405

data/lib/prop.rb

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

data/lib/prop/limiter.rb

@@ -70,9 +70,10 @@ module Prop
       # (optional) a block of code that this throttle is guarding
       #
       # Returns true if the threshold for this handle has been reached, else returns false
-      def throttle(handle, key = nil, options = {}, &block)
+      def throttle(handle, key = nil, options = {})
         options, cache_key = prepare(handle, key, options)
-        _throttle(handle, key, cache_key, options, &block).first
+        throttled = _throttle(handle, key, cache_key, options).first
+        block_given? && !throttled ? yield : throttled
       end
 
       # Public: Records a single action for the given handle/key combination.
@@ -86,7 +87,7 @@ module Prop
       # Returns the value of the block if given a such, otherwise the current count of the throttle
       def throttle!(handle, key = nil, options = {}, &block)
         options, cache_key = prepare(handle, key, options)
-        throttled, counter = _throttle(handle, key, cache_key, options, &block)
+        throttled, counter = _throttle(handle, key, cache_key, options)
 
         if throttled
           raise Prop::RateLimited.new(options.merge(
@@ -158,7 +159,6 @@ module Prop
 
           [result, counter]
         else
-          yield if block_given?
           [false, counter]
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prop
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake