rails-action_throttling 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fdff74259b724951350ac06ccfc81553ca6db375e96c5b8a9b77087e7785275
-  data.tar.gz: b50b7feb2ff1e4ccf8df7bebcd1217387aca28593cd2b6511f41428b2d74a334
+  metadata.gz: 160f1ac8a6f56f24b75028edd56a27877bb8dc5d42750a86f6202dd0c142890d
+  data.tar.gz: 77c4d7913576a41054fce1e026753fd35af8fdce3407b6d345a0ed1a6df42b3d
 SHA512:
-  metadata.gz: bc3385aad2cc23603ef63bac816e91d03f118444b5e14719367f3560ffb35c9717f4c8e29ea2d9f2c7756dfaeb6faa400d739b56077e7cfc3160d44425322c92
-  data.tar.gz: 81b49da9623ca3ff30ce9e08229b4864f5b37a34fcb81430e83bbdbb9bb939a2d24fabd388df7516447c503171fdc291c602e55e92a7b73857d8f2b5888a1eda
+  metadata.gz: 0ac62c6c1e7d5c2f50fd97de965175003b0f60fba58b1cd8f223c37fb54930e91756aaefbe953ea976552a0a69dd1addb21be8896e15827b795e7356bb9cc93c
+  data.tar.gz: 82b31893a480cdbfabcc36250e2293cdf4f87eb95ec7a20c3f416d1f8f1032b3185090cba3e627e22423681ff1b62f12b07a0c870f5226233c736a2ef8d1c4f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails-action_throttling (0.1.0)
+    rails-action_throttling (0.1.1)
       activesupport (~> 5.2)
       http-errors (~> 0.1)
       redis (~> 4.0)

data/README.md

@@ -11,13 +11,13 @@ Configure your bucket. There are no default values for this, since we can't know
 ```ruby
 ActionThrottling.configure do |config|
   # The bucket_key is evaluated inside your application context
-  config.bucket_key = Proc.new { current_user.bucket }
+  config.bucket_key = Proc.new { current_user.id }
 
   # Set the interval in which the bucket is regenerated
-  config.regenerate_interval = 10.minutes
+  config.regenerate_interval = Proc.new { current_user.regenerate_interval }
 
-  # Sets the number of tokens to be pub back into the bucket
-  config.regenerate_amount = 100
+  # Sets the number of tokens to be put back into the bucket
+  config.regenerate_amount = Proc.new { current_user.regenerate_amount }
 
   # (optional) If you're not running on a completely vanilla redis connection,
   # you can supply your own redis instance here.
@@ -33,7 +33,7 @@ def show
   # Based on the configuration above, this will allow the user to call this
   # endpoint 100 times every minute.
   #
-  # This will call the `deduct(1)` method on the configured `config.bucket` (see
+  # This will call the `deduct(1)` method on the configured `config.bucket_key` (see
   # above)
   cost 1
   # ...
@@ -44,7 +44,7 @@ If you have something like a create method, or some complex method that's costly
 
 ```ruby
 def complex_method
-  # This will call `deduct(25)` on the `config.bucket` (see above)
+  # This will call `deduct(25)` on the `config.bucket_key` (see above)
   cost 25
   # ...
 end

data/lib/action_throttling.rb

@@ -11,7 +11,7 @@ module ActionThrottling
     def cost(price)
       # If last time the bucket was called is older than the regeneration limit
       # regenerate the bucket.
-      regenerate if last_called < regeneration_time
+      regenerate if expired?
 
       # Deduct the price from the bucket. If it's below zero we raiss a
       # HttpError::ToManyRequests exception/
@@ -20,17 +20,29 @@ module ActionThrottling
       end
 
       # Store when the cost was last called so we can calculate regeneration
-      redis.set last_call_key, Time.now.httpdate
+      update_call_time
     end
 
     private
 
+      def update_call_time
+        redis.set last_call_key, Time.now.httpdate
+      end
+
+      def expired?
+        last_called < regeneration_time
+      end
+
       def last_call_key
         "#{bucket_key}-last-call"
       end
 
       def regenerate
-        redis.set bucket_key, ActionThrottling.configuration.regenerate_amount
+        redis.set bucket_key, regenerate_amount
+      end
+
+      def regenerate_amount
+        instance_eval &ActionThrottling.configuration.regenerate_amount
       end
 
       def last_called
@@ -47,7 +59,7 @@ module ActionThrottling
       end
 
       def regeneration_time
-        ActionThrottling.configuration.regenerate_interval.ago
+        instance_eval(&ActionThrottling.configuration.regenerate_interval).ago
       end
 
       def redis

data/lib/action_throttling/version.rb

@@ -1,3 +1,3 @@
 module ActionThrottling
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-action_throttling
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Emil Kampp