prop 2.2.5 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d749e4483b80fc4abe3ab44ba034c349bafaf521dc00c4ad059e3e9bc683e88a
-  data.tar.gz: d00a838d4b8f14cf9eb5a440e6a6fce475f6fb09d9937e2ebf6c0d66701ef82e
+  metadata.gz: db081ee0a96819c4b270c57e0205527b122d93b214b2c42af7d50159cfb140d1
+  data.tar.gz: f8ef4abcc3cb6762b70a993fed0446321585a14e685cbb91a1e37f355fe507e1
 SHA512:
-  metadata.gz: 36474a7d324d76381193d6e39928e1a9e07ba6e15e2bbec050db8bff9d3d2f0eeb4fb713f3882864fbc4ef3c65bb5343a7d99ae6ecf588326c62e1672da28274
-  data.tar.gz: f68780e2c3cc1196a10e24e14949b8ee9b348d72c321bf4aa98e918031b423bf467ccefdda0cbd77dfdb9090403603540358b3a3561bbd17e6ce46d705cf7b72
+  metadata.gz: 7ff690ae0b93ebe4f15d05bb5e8b2b7f5f983607a56a9c9d1ad04c19a9de1aaa21b38b70d5763b091b5db6cd10c9890b3eb33bd5ca910b055f682eb0b5b23b07
+  data.tar.gz: 268563b7482c713097888855260875a19777cdd20982496bec4644dfd1b494dde6666d09b10789617fd8d905d9a18b98265dfebcf1609b20734c46ee56e1a24b

data/lib/prop.rb

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

data/lib/prop/limiter.rb

@@ -72,8 +72,8 @@ module Prop
       #
       # Returns true if the threshold for this handle has been reached, else returns false
       def throttle(handle, key = nil, options = {})
-        options, cache_key = prepare(handle, key, options)
-        throttled = _throttle(handle, key, cache_key, options).first
+        options, cache_key, strategy = prepare(handle, key, options)
+        throttled = _throttle(strategy, handle, key, cache_key, options).first
         block_given? && !throttled ? yield : throttled
       end
 
@@ -87,8 +87,8 @@ module Prop
       # Raises Prop::RateLimited if the threshold for this handle has been reached
       # 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)
+        options, cache_key, strategy = prepare(handle, key, options)
+        throttled, counter = _throttle(strategy, handle, key, cache_key, options)
 
         if throttled
           raise Prop::RateLimited.new(options.merge(
@@ -108,9 +108,9 @@ module Prop
       #
       # Returns true if a call to `throttle!` with same parameters would raise, otherwise false
       def throttled?(handle, key = nil, options = {})
-        options, cache_key = prepare(handle, key, options)
-        counter = @strategy.counter(cache_key, options)
-        @strategy.compare_threshold?(counter, :>=, options)
+        options, cache_key, strategy = prepare(handle, key, options)
+        counter = strategy.counter(cache_key, options)
+        strategy.compare_threshold?(counter, :>=, options)
       end
 
       # Public: Resets a specific throttle
@@ -120,8 +120,8 @@ module Prop
       #
       # Returns nothing
       def reset(handle, key = nil, options = {})
-        _options, cache_key = prepare(handle, key, options)
-        @strategy.reset(cache_key)
+        _options, cache_key, strategy = prepare(handle, key, options)
+        strategy.reset(cache_key)
       end
 
       # Public: Counts the number of times the given handle/key combination has been hit in the current window
@@ -131,8 +131,8 @@ module Prop
       #
       # Returns a count of hits in the current window
       def count(handle, key = nil, options = {})
-        options, cache_key = prepare(handle, key, options)
-        @strategy.counter(cache_key, options)
+        options, cache_key, strategy = prepare(handle, key, options)
+        strategy.counter(cache_key, options)
       end
       alias :query :count
 
@@ -143,18 +143,18 @@ module Prop
 
       private
 
-      def _throttle(handle, key, cache_key, options)
-        return [false, @strategy.zero_counter] if disabled?
+      def _throttle(strategy, handle, key, cache_key, options)
+        return [false, strategy.zero_counter] if disabled?
 
         counter = options.key?(:decrement) ?
-          @strategy.decrement(cache_key, options.fetch(:decrement), options) :
-          @strategy.increment(cache_key, options.fetch(:increment, 1), options)
+          strategy.decrement(cache_key, options.fetch(:decrement), options) :
+          strategy.increment(cache_key, options.fetch(:increment, 1), options)
 
-        if @strategy.compare_threshold?(counter, :>, options)
+        if strategy.compare_threshold?(counter, :>, options)
           before_throttle_callback &&
             before_throttle_callback.call(handle, key, options[:threshold], options[:interval])
 
-          result = if options[:first_throttled] && @strategy.first_throttled?(counter, options)
+          result = if options[:first_throttled] && strategy.first_throttled?(counter, options)
             :first_throttled
           else
             true
@@ -177,11 +177,11 @@ module Prop
 
         options = Prop::Options.build(key: key, params: params, defaults: defaults)
 
-        @strategy = options.fetch(:strategy)
+        strategy = options.fetch(:strategy)
 
-        cache_key = @strategy.build(key: key, handle: handle, interval: options[:interval])
+        cache_key = strategy.build(key: key, handle: handle, interval: options[:interval])
 
-        [ options, cache_key ]
+        [ options, cache_key, strategy ]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prop
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.3.0
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake