resque-throttle 0.2.9 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/lib/resque/resque.rb

@@ -7,7 +7,7 @@ module Resque
   class ThrottledError < RuntimeError; end
       
   def enqueue_with_throttle(klass, *args)
-    if should_throttle?(klass)
+    if should_throttle?(klass, args)
       raise ThrottledError.new("#{klass} with key #{klass.key} has exceeded it's throttle limit")
     end
     enqueue_without_throttle(klass, *args)
@@ -17,15 +17,15 @@ module Resque
 
   private
    
-  def should_throttle?(klass)
+  def should_throttle?(klass, *args)
     return false if !throttle_job?(klass) || klass.disabled
-    return true if key_found?(klass)
-    redis.set(klass.key, true, klass.can_run_every)
+    return true if key_found?(klass, args)
+    redis.set(klass.key(args), true, klass.can_run_every)
     return false
   end
 
-  def key_found?(klass)
-     redis.get(klass.key)
+  def key_found?(klass, *args)
+     redis.get(klass.key(args))
   end
 
   def throttle_job?(klass)

data/resque-throttle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-throttle}
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott J. Tamosunas"]
-  s.date = %q{2010-02-22}
+  s.date = %q{2010-02-26}
   s.description = %q{resque-throttle is an extension to the resque queue system that restricts the frequency in which certain jobs are run. Add more description here.}
   s.email = %q{tamosunas@gmail.com}
   s.extra_rdoc_files = [

data/test/resque/resque_test.rb

@@ -6,15 +6,15 @@ class ResqueTest < Test::Unit::TestCase
     setup do
       Resque.redis.flush_all
       assert_nil Resque.redis.get(OneHourThrottledJob.key)
-      @bogus_args = [1, 2]
+      @bogus_args = "bogus_arg"
     end
 
     context "#enqueue" do
       should "add a throttled job key to the set with the proper TTL (Expire)" do
         Resque.expects(:enqueue_without_throttle).returns(true) 
-        assert Resque.enqueue(OneHourThrottledJob, @bogus_args)
-        assert Resque.redis.get(OneHourThrottledJob.key)
-        assert_equal 3600, Resque.redis.ttl(OneHourThrottledJob.key)
+        assert Resque.enqueue(IdentifierThrottledJob, @bogus_args)
+        assert Resque.redis.keys('*').include?("resque:IdentifierThrottledJob:my_bogus_arg")
+        assert_equal 3600, Resque.redis.ttl(IdentifierThrottledJob.key(@bogus_args))
       end
       
       context "job has not reached throttle limit" do

data/test/resque/throttled_job_test.rb

@@ -20,7 +20,7 @@ class ThrottledJobTest < Test::Unit::TestCase
 
       context "#identifier" do
         should "return an additional key identifier used in storing the key in the redis SET" do
-          assert_equal "my_identifier", IdetifierThrottledJob.identifier
+          assert_equal "my_identifier", IdentifierThrottledJob.identifier("identifier")
         end
 
         should "return nil if not defined" do
@@ -41,7 +41,7 @@ class ThrottledJobTest < Test::Unit::TestCase
 
     context "#key" do
       should "consist of the class name and the identifier" do
-        assert_equal "IdetifierThrottledJob:my_identifier", IdetifierThrottledJob.key
+        assert_equal "IdentifierThrottledJob:my_identifier", IdentifierThrottledJob.key("identifier")
       end
 
       should "consist of just the class name if the identifier is not provided" do

data/test/test_helper.rb

@@ -28,7 +28,7 @@ class OneHourThrottledJob < Resque::ThrottledJob
   end
 end
 
-class IdetifierThrottledJob < Resque::ThrottledJob
+class IdentifierThrottledJob < Resque::ThrottledJob
   @queue = :some_queue
 
   throttle :can_run_every => 3600
@@ -37,7 +37,8 @@ class IdetifierThrottledJob < Resque::ThrottledJob
   end
   
   def self.identifier(*args)
-    "my_identifier"
+    first, second = *args
+    "my_#{first}"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque-throttle
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors: 
 - Scott J. Tamosunas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -08:00
+date: 2010-02-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency