prop 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65fa8acae93ced0dce793a91e6e050268560387d
-  data.tar.gz: b5086f3161ff68f0f27907360861d602184de0d2
+  metadata.gz: 498e7350ae324646b31fc30a658b2443db9d3c63
+  data.tar.gz: 0dcb095217edd32a792d28ce7d2f4f1a0326a161
 SHA512:
-  metadata.gz: 702914150a4438bfe43f5d4ef9ea3abc2686d4c1705d4072864b449790797fbecd8cb6133e89044286b5eab6ffc02d38807ee6393e245f93b692bedf4cbc3dee
-  data.tar.gz: 0d7cfde00a0c68bb2ac1ba644f603cc9ae91c6603e875df6b1eb5f0491473ec8db43411fcbb21116b69bbe2f318a7f60b45f9746b97899db921607d726cf14db
+  metadata.gz: 58474567c9da9f71375bb6d6f8495cb3a6de8c40d80745893666d1f76a68c76cf37d6cec7c193ff09ba23531e9cdcbec2f1a67211b8ace2c1a374853cfbd9b31
+  data.tar.gz: 296742370594a33d4247a3dc90b61597e27dac960eb56701bd7b18661b110673022ed27222ea58de7230b547e8f2bb1f684ed44ed47cf035ba88bca2a62ec4e5

data/lib/prop.rb

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

data/lib/prop/interval_strategy.rb

@@ -10,18 +10,22 @@ module Prop
       end
 
       def counter(cache_key, options)
-        Prop::Limiter.cache.read(cache_key).to_i
+        cache.read(cache_key).to_i
       end
 
       # options argument is kept for api consistency for all strategies
-      def change(cache_key, amount, options = {})
+      def increment(cache_key, amount, options = {})
         raise ArgumentError, "Change amount must be a Fixnum, was #{amount.class}" unless amount.is_a?(Fixnum)
-        cache = Prop::Limiter.cache
         cache.increment(cache_key, amount) || (cache.write(cache_key, amount, raw: true) && amount) # WARNING: potential race condition
       end
 
+      def decrement(cache_key, amount, options = {})
+        raise ArgumentError, "Change amount must be a Fixnum, was #{amount.class}" unless amount.is_a?(Fixnum)
+        cache.decrement(cache_key, amount) || (cache.write(cache_key, 0, raw: true) && 0) # WARNING: potential race condition
+      end
+
       def reset(cache_key)
-        Prop::Limiter.cache.write(cache_key, zero_counter, raw: true)
+        cache.write(cache_key, zero_counter, raw: true)
       end
 
       def compare_threshold?(counter, operator, options)
@@ -66,6 +70,10 @@ module Prop
       def validate_positive_integer(option, key)
         raise ArgumentError.new("#{key.inspect} must be a positive Integer") if !option.is_a?(Fixnum) || option <= 0
       end
+
+      def cache
+        Prop::Limiter.cache
+      end
     end
   end
 end

data/lib/prop/leaky_bucket_strategy.rb

@@ -17,13 +17,21 @@ module Prop
 
       # WARNING: race condition
       # this increment is not atomic, so it might miss counts when used frequently
-      def change(cache_key, amount, options)
+      def increment(cache_key, amount, options)
         counter = counter(cache_key, options)
         counter[:bucket] += amount
         Prop::Limiter.cache.write(cache_key, counter)
         counter
       end
 
+      def decrement(cache_key, amount, options)
+        counter = counter(cache_key, options)
+        counter[:bucket] -= amount
+        counter[:bucket] = 0 unless counter[:bucket] > 0
+        Prop::Limiter.cache.write(cache_key, counter)
+        counter
+      end
+
       def reset(cache_key)
         Prop::Limiter.cache.write(cache_key, zero_counter)
       end

data/lib/prop/limiter.rb

@@ -20,7 +20,7 @@ module Prop
       end
 
       def cache=(cache)
-        [:read, :write, :increment].each do |method|
+        [:read, :write, :increment, :decrement].each do |method|
           next if cache.respond_to?(method)
           raise ArgumentError, "Cache needs to respond to #{method}"
         end
@@ -146,10 +146,9 @@ module Prop
       def _throttle(handle, key, cache_key, options)
         return [false, @strategy.zero_counter] if disabled?
 
-        amount = options.key?(:decrement) ?
-          -(options.fetch(:decrement)) :
-          options.fetch(:increment, 1)
-        counter = @strategy.change(cache_key, amount, options)
+        counter = options.key?(:decrement) ?
+          @strategy.decrement(cache_key, options.fetch(:decrement), options) :
+          @strategy.increment(cache_key, options.fetch(:increment, 1), options)
 
         if @strategy.compare_threshold?(counter, :>, options)
           before_throttle_callback &&

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prop
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake