resque_unit 0.4.1 → 0.4.2

data/lib/resque_unit/resque.rb

@@ -208,7 +208,7 @@ module Resque
       
     # If an exception occurs during the job execution, look for an
     # on_failure hook then re-raise.
-    rescue => e
+    rescue Object => e
       failure_hooks.each { |hook| job_class.send(hook, e, *job_payload["args"]) }
       raise e
     end
@@ -217,7 +217,7 @@ module Resque
   class Job
     extend Helpers
     def self.create(queue, klass_name, *args)
-      Resque.enqueue_unit(queue, {"class" => constantize(klass_name), "args" => args})
+      Resque.enqueue_unit(queue, {"class" => constantize(klass_name).to_s, "args" => args})
     end
   end
 

data/lib/resque_unit/scheduler.rb

@@ -19,7 +19,7 @@ module ResqueUnit
     end
     
     def enqueue_with_timestamp(timestamp, klass, *args)
-      enqueue_unit(queue_for(klass), {"class" => klass, "args" => args, "timestamp" => timestamp})
+      enqueue_unit(queue_for(klass), {"class" => klass.name, "args" => args, "timestamp" => timestamp})
     end
 
     def remove_delayed(klass, *args)
@@ -28,6 +28,12 @@ module ResqueUnit
       args ||= []
       encoded_job_payloads.delete_if { |e| e = Resque.decode(e); e["class"] == klass.to_s && e["args"] == args }
     end
+
+    def remove_delayed_job_from_timestamp(timestamp, klass, *args)
+      encoded_job_payloads = Resque.queue(queue_for(klass))
+      args ||= []
+      encoded_job_payloads.delete_if { |e| e = Resque.decode(e); e["class"] == klass.to_s && e["timestamp"] == timestamp.to_s && e["args"] == args }
+    end
   end
 
   Resque.send(:extend, Scheduler)

data/test/resque_unit_scheduler_test.rb

@@ -18,12 +18,12 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
     end
 
     should "fail the assert_queued_in(300, job) assertion" do
-      assert_raise Test::Unit::AssertionFailedError do 
+      assert_raise Test::Unit::AssertionFailedError do
         assert_queued_in(300, MediumPriorityJob)
       end
     end
 
-    should "pass the assert_not_queued_in(300, job) assertion" do 
+    should "pass the assert_not_queued_in(300, job) assertion" do
       assert_not_queued_in(300, MediumPriorityJob)
     end
 
@@ -31,7 +31,7 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
       setup do
         Resque.remove_delayed(MediumPriorityJob)
       end
-      should "pass the assert_not_queued_at(@time, MediumPriorityJob) assertion" do 
+      should "pass the assert_not_queued_at(@time, MediumPriorityJob) assertion" do
         assert_not_queued_at(300, MediumPriorityJob)
       end
 
@@ -42,7 +42,7 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "A task that schedules a resque job in 5 minutes with arguments" do
     setup { Resque.enqueue_in(600, JobWithArguments, 1, "test") }
     should "pass the assert_queued_in(600, JobWithArguments) assertion" do
@@ -53,8 +53,8 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
       assert_queued_in(600, JobWithArguments, [1, 'test'])
     end
 
-    should "fail the assert_queued_in(600, JobWithArguments, [2, 'test']) assertion" do 
-      assert_raise Test::Unit::AssertionFailedError do 
+    should "fail the assert_queued_in(600, JobWithArguments, [2, 'test']) assertion" do
+      assert_raise Test::Unit::AssertionFailedError do
         assert_queued_in(600, JobWithArguments, [2, 'test'])
       end
     end
@@ -63,7 +63,7 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
       setup do
         Resque.remove_delayed(JobWithArguments, 1, 'test')
       end
-      should "pass the assert_not_queued_at(@time, JobWithArguments, 1, 'test') assertion" do 
+      should "pass the assert_not_queued_at(@time, JobWithArguments, 1, 'test') assertion" do
         assert_not_queued_at(600, JobWithArguments, 1, 'test')
       end
 
@@ -86,26 +86,26 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
         assert_queued_in(600, JobWithArguments, [1, 'test'])
       end
 
-      should "still fail the assert_queued_in(600, JobWithArguments, [2, 'test']) assertion" do 
-        assert_raise Test::Unit::AssertionFailedError do 
+      should "still fail the assert_queued_in(600, JobWithArguments, [2, 'test']) assertion" do
+        assert_raise Test::Unit::AssertionFailedError do
           assert_queued_in(600, JobWithArguments, [2, 'test'])
         end
       end
     end
   end
-    
+
   context "A task that schedules a resque job on Sept. 6, 2016 at 6am" do
     setup do
       @time = Time.mktime(2016, 9, 6, 6)
       Resque.enqueue_at(@time, MediumPriorityJob)
     end
 
-    should "pass the assert_queued_at(@time, MediumPriorityJob) assertion" do 
+    should "pass the assert_queued_at(@time, MediumPriorityJob) assertion" do
       assert_queued_at(@time, MediumPriorityJob)
     end
 
-    should "fail the assert_queued_at(@time - 100, MediumPriorityJob) assertion" do 
-      assert_raise Test::Unit::AssertionFailedError do 
+    should "fail the assert_queued_at(@time - 100, MediumPriorityJob) assertion" do
+      assert_raise Test::Unit::AssertionFailedError do
         assert_queued_at(@time - 100, MediumPriorityJob)
       end
     end
@@ -118,7 +118,7 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
       setup do
         Resque.remove_delayed(MediumPriorityJob)
       end
-      should "pass the assert_not_queued_at(@time, MediumPriorityJob) assertion" do 
+      should "pass the assert_not_queued_at(@time, MediumPriorityJob) assertion" do
         assert_not_queued_at(@time, MediumPriorityJob)
       end
 
@@ -128,5 +128,74 @@ class ResqueUnitSchedulerTest < Test::Unit::TestCase
         end
       end
     end
+
+    context "and then the job is removed with #remove_delayed_job_with_timestamp" do
+      setup do
+        Resque.remove_delayed_job_from_timestamp(@time, MediumPriorityJob)
+      end
+
+      should "pass the assert_not_queued_at(@time, MediumPriorityJob) assertion" do
+        assert_not_queued_at(@time, MediumPriorityJob)
+      end
+
+      should "fail the assert_queued_at(@time, MediumPriorityJob) assertion" do
+        assert_raise Test::Unit::AssertionFailedError do
+          assert_queued_at(@time, MediumPriorityJob)
+        end
+      end
+    end
+  end
+
+  context "A task that schedules a resque job with arguments on on Sept. 6, 2016 at 6am" do
+    setup do
+      @time = Time.mktime(2016, 9, 6, 6)
+      Resque.enqueue_at(@time, JobWithArguments, 1, "test")
+    end
+
+    should "pass the assert_queued_at(@time, JobWithArguments, *args) assertion" do
+      assert_queued_at(@time, JobWithArguments, [1, "test"])
+    end
+
+    should "fail the assert_queued_at(@time - 100, JobWithArguments, *args) assertion" do
+      assert_raise Test::Unit::AssertionFailedError do
+        assert_queued_at(@time - 100, JobWithArguments, [1, "test"])
+      end
+    end
+
+    should "pass the assert_not_queued_at(@time - 100, JobWithArguments, *args) assertion" do
+      assert_not_queued_at(@time - 100, JobWithArguments, [1, "test"])
+    end
+
+    context "and then the job is removed with #remove_delayed" do
+      setup do
+        Resque.remove_delayed(JobWithArguments, 1, "test")
+      end
+
+      should "pass the assert_not_queued_at(@time, JobWithArguments, *args) assertion" do
+        assert_not_queued_at(@time, JobWithArguments, [1, "test"])
+      end
+
+      should "fail the assert_queued_at(@time, JobWithArguments, *args) assertion" do
+        assert_raise Test::Unit::AssertionFailedError do
+          assert_queued_at(@time, JobWithArguments, [1, "test"])
+        end
+      end
+    end
+
+    context "and then the job is removed with #remove_delayed_job_from_timestamp" do
+      setup do
+        Resque.remove_delayed_job_from_timestamp(@time, JobWithArguments, 1, "test")
+      end
+
+      should "pass the assert_not_queued_at(@time, JobWithArguments, *args) assertion" do
+        assert_not_queued_at(@time, JobWithArguments, [1, "test"])
+      end
+
+      should "fail the assert_queued_at(@time, MediumPriorityJob, *args) assertion" do
+        assert_raise Test::Unit::AssertionFailedError do
+          assert_queued_at(@time, JobWithArguments, [1, "test"])
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_unit
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000Z
+date: 2012-03-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70242270906860 !ruby/object:Gem::Requirement
+  requirement: &70334013235640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70242270906860
+  version_requirements: *70334013235640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70242270906100 !ruby/object:Gem::Requirement
+  requirement: &70334013235240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242270906100
+  version_requirements: *70334013235240
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70242270904960 !ruby/object:Gem::Requirement
+  requirement: &70334013234780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242270904960
+  version_requirements: *70334013234780
 description: 
 email: justin@uberweiss.org
 executables: []
@@ -80,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2544515951238107368
+      hash: 504436930256171136
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -89,10 +89,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2544515951238107368
+      hash: 504436930256171136
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Test::Unit support for resque job queueing