fine_tune 0.3.0 → 0.4.0

data/.travis.yml

@@ -2,4 +2,7 @@ sudo: false
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
+  - 2.2.0
+  - jruby
 before_install: gem install bundler -v 1.12.5

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/laknath/fine_tune.svg?branch=master)](https://travis-ci.org/laknath/fine_tune)
+[![Gem Version](https://badge.fury.io/rb/fine_tune.svg)](https://badge.fury.io/rb/fine_tune)
 
 # FineTune - a flexible rate limiting/monitoring library
 

data/lib/fine_tune/base.rb

@@ -64,7 +64,8 @@ module FineTune
     #       # some calculation ...
     #     end
 
-    def throttle(name, id, options)
+    def throttle(name, id, options = {})
+      options[:validate] = true
       strategy, key, options = current_strategy(name, id, options)
       count = strategy.increment(key, options)
       comp = strategy.compare?(count, options)
@@ -79,7 +80,7 @@ module FineTune
     #
     # Attributes and options are same as for +throttle+.
 
-    def throttle!(name, id, options)
+    def throttle!(name, id, options = {})
       throttle(name, id, options) do |count, comp, key, strategy, opts|
         yield count, comp, key, strategy, opts if block_given?
 
@@ -90,7 +91,7 @@ module FineTune
     # Returns true if current count exceeds the given limits.
     #
     # Attributes and options are same as for +throttle+.
-    def rate_exceeded?(name, id, options)
+    def rate_exceeded?(name, id, options = {})
       strategy, key, options = current_strategy(name, id, options)
       strategy.compare?(strategy.count(key, options), options) >= 0
     end
@@ -98,7 +99,7 @@ module FineTune
     # Returns the current event count.
     #
     # Attributes and options are same as for +throttle+.
-    def count(name, id, options)
+    def count(name, id, options = {})
       strategy, key, options = current_strategy(name, id, options)
       strategy.count(key, options)
     end
@@ -106,7 +107,7 @@ module FineTune
     # Resets the counter for the given resource identifer to 0.
     #
     # Attributes and options are same as for +throttle+.
-    def reset(name, id, options)
+    def reset(name, id, options = {})
       strategy, key, options = current_strategy(name, id, options)
       strategy.reset(key, options)
     end
@@ -143,7 +144,7 @@ module FineTune
       options = (limits[name] || {}).merge(options)
       strategy = self.class.find_strategy(options[:strategy])
 
-      if strategy.validate?(options)
+      if !options.delete(:validate) || strategy.validate?(options)
         key = strategy.build_key(name, id, options)
       end
 

data/lib/fine_tune/strategies/base.rb

@@ -26,7 +26,8 @@ module FineTune
       end
 
       def increment(key, options)
-        raise "not defined"
+        count(key, options) +
+          (options && options[:step] || 1)
       end
 
       def count(key, options)

data/lib/fine_tune/strategies/leaky_bucket.rb

@@ -39,8 +39,8 @@ module FineTune
       # * +:average+ - can be used to override default_average ie: 10
       # * +:window+ - can be used to override default_window  ie: 3600 (one hour)
       def increment(key, options)
-        count = count(key, options)
-        count = [maximum(options), count + 1].min
+        count = super(key, options)
+        count = [maximum(options), count].min
         adapter.write(key, {count: count, timestamp: Time.now.to_i})
         count
       end

data/lib/fine_tune/version.rb

@@ -1,3 +1,3 @@
 module FineTune
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fine_tune
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler