prop 2.7.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8d392029c77c453e5fc0d6a82fcb8401dc3ebabb01586b15bca7ab961df2d8f
-  data.tar.gz: ba93851562644df3cfea26c2d41d4e49fe52e4f7d5ca614313ab6cbd911c1293
+  metadata.gz: cbbc31d7770e04a3a7142fe8b7cb300cd2b3aeac66eb4e779be6030490e6563d
+  data.tar.gz: c6278f0489ab81f3e0feb100334faca7042552a008b7381ef9b95043093f34b3
 SHA512:
-  metadata.gz: d41e52e89027cba93e67df82d5b65f654921c8c8c1b109e6eb6653f01d9a20fe493a9975fec89d817b886a25a3871a468a83ea3270fc94c94e2503905a04e772
-  data.tar.gz: f4024c8ae24cbca19eeade5491532e26ee270428a048a135c62ff43ffcbe7df4770bb1babb6424fc5b2c92634326162fa732be7aa548867dfcf66773a992ad63
+  metadata.gz: 15ebfffc8652e339fcb9a419d843ac18f9bfaa3e804d7289231d22edd944de25d23025d147dabf303f45b8787c14877b6c6019e5ed5351b10d462b2572f153d0
+  data.tar.gz: df16b882ca625eeccd2c11b67574eee8f905996199dee963b05e188c292e92f0a6d8361293698ab65f5bfadbe190882ed2f105172df5184da050276cba775325

data/README.md

@@ -31,6 +31,17 @@ Prop.before_throttle do |handle, key, threshold, interval|
 end
 ```
 
+## Setting an After Evaluated Callback
+
+You can define an optional callback that is invoked when a rate limit is checked. The callback will be invoked regardless
+of the result of the evaluation.
+
+```ruby
+Prop.after_evaluated do |handle, counter, options|
+  Rails.logger.info "Prop #{handle} has just been check. current value: #{counter}"
+end
+````
+
 ## Defining thresholds
 
 Example: Limit on accepted emails per hour from a given user, by defining a threshold and interval (in seconds):
@@ -43,7 +54,7 @@ Prop.configure(:mails_per_hour, threshold: 0, interval: 1.hour, description: "Al
 ```
 
 ```ruby
-# Throws Prop::RateLimitExceededError if the threshold/interval has been reached
+# Throws Prop::RateLimited if the threshold/interval has been reached
 Prop.throttle!(:mails_per_hour)
 
 # Prop can be used to guard a block of code

data/lib/prop/interval_strategy.rb

@@ -10,7 +10,7 @@ module Prop
       end
 
       def counter(cache_key, options)
-        cache.read(cache_key).to_i
+        cache.read(cache_key, raw: true).to_i
       end
 
       # options argument is kept for api consistency for all strategies

data/lib/prop/limiter.rb

@@ -9,7 +9,7 @@ module Prop
   class Limiter
 
     class << self
-      attr_accessor :handles, :before_throttle_callback, :cache
+      attr_accessor :handles, :before_throttle_callback, :cache, :after_evaluated_callback
 
       def read(&blk)
         raise "Use .cache = "
@@ -39,6 +39,10 @@ module Prop
         self.before_throttle_callback = blk
       end
 
+      def after_evaluated(&blk)
+        self.after_evaluated_callback = blk
+      end
+
       # Public: Registers a handle for rate limiting
       #
       # handle   - the name of the handle you wish to use in your code, e.g. :login_attempt
@@ -150,13 +154,18 @@ module Prop
         return [false, strategy.zero_counter] if disabled?
 
         if leaky_bucket_strategy?(strategy)
-          return Prop::LeakyBucketStrategy._throttle_leaky_bucket(handle, key, cache_key, options)
+          is_over_limit, bucket_info_hash = Prop::LeakyBucketStrategy._throttle_leaky_bucket(handle, key, cache_key, options)
+          bucket_counter = bucket_info_hash.fetch(:bucket)
+          after_evaluated_callback.call(handle, bucket_counter, options.merge(bucket_info_hash)) if after_evaluated_callback
+          return [is_over_limit, bucket_info_hash]
         end
 
         counter = options.key?(:decrement) ?
           strategy.decrement(cache_key, options.fetch(:decrement), options) :
           strategy.increment(cache_key, options.fetch(:increment, 1), options)
 
+        after_evaluated_callback.call(handle, counter, options) if after_evaluated_callback
+
         if strategy.compare_threshold?(counter, :>, options)
           before_throttle_callback &&
             before_throttle_callback.call(handle, key, options[:threshold], options[:interval])

data/lib/prop.rb

@@ -3,12 +3,12 @@ require "prop/limiter"
 require "forwardable"
 
 module Prop
-  VERSION = "2.7.0"
+  VERSION = "2.9.0"
 
   # Short hand for accessing Prop::Limiter methods
   class << self
     extend Forwardable
     def_delegators :"Prop::Limiter", :read, :write, :cache, :cache=, :configure, :configurations, :disabled, :before_throttle
-    def_delegators :"Prop::Limiter", :throttle, :throttle!, :throttled?, :count, :query, :reset
+    def_delegators :"Prop::Limiter", :throttle, :throttle!, :throttled?, :count, :query, :reset, :after_evaluated
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prop
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: primdahl@me.com
@@ -38,14 +38,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Gem for implementing rate limits.