prop 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/prop.rb

@@ -26,15 +26,15 @@ class Prop
       raise RuntimeError.new("Invalid interval setting") unless defaults[:interval].to_i > 0
 
       define_prop_class_method "throttle_#{handle}!" do |*args|
-        throttle!(sanitized_prop_options(handle, args, defaults))
+        throttle!(sanitized_prop_options([ handle ] + args, defaults))
       end
 
       define_prop_class_method "throttle_#{handle}?" do |*args|
-        throttle?(sanitized_prop_options(handle, args, defaults))
+        throttle?(sanitized_prop_options([ handle ] + args, defaults))
       end
 
       define_prop_class_method "reset_#{handle}" do |*args|
-        reset(sanitized_prop_options(handle, args, defaults))
+        reset(sanitized_prop_options([ handle ] + args, defaults))
       end
     end
 
@@ -71,13 +71,9 @@ class Prop
     end
 
     # Sanitizes the option set and sets defaults
-    def sanitized_prop_options(handle, args, defaults)
-      key  = handle.to_s
-      key << "/#{normalize_cache_key(args.first)}" if args.first
-
-      options = { :key => key, :threshold => defaults[:threshold].to_i, :interval => defaults[:interval].to_i }
-      options = options.merge(args.last) if args.last.is_a?(Hash)
-      options
+    def sanitized_prop_options(args, defaults)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      { :key => normalize_cache_key(args), :threshold => defaults[:threshold].to_i, :interval => defaults[:interval].to_i }.merge(options)
     end
 
     # Simple key expansion only supports arrays and primitives

data/prop.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{prop}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]

data/test/test_prop.rb

@@ -46,8 +46,8 @@ class TestProp < Test::Unit::TestCase
         assert_equal 2, Prop.throttle_hello_there!(5)
         assert_equal 1, Prop.throttle_hello_there!('mister')
         assert_equal 2, Prop.throttle_hello_there!('mister')
-        assert_equal 1, Prop.throttle_hello_there!(['mister', 5])
-        assert_equal 2, Prop.throttle_hello_there!(['mister', 5])
+        assert_equal 1, Prop.throttle_hello_there!('mister', 5)
+        assert_equal 2, Prop.throttle_hello_there!('mister', 5)
       end
 
       should "not shadow undefined methods" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prop
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Morten Primdahl