brianjlandau-resque-scheduler 1.10.9 → 1.10.10

data/brianjlandau-resque-scheduler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brianjlandau-resque-scheduler}
-  s.version = "1.10.9"
+  s.version = "1.10.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben VandenBos", "Brian Landau"]

data/lib/resque/scheduler.rb

@@ -116,13 +116,14 @@ module Resque
           handle_shutdown do
             if item = Resque.next_item_for_timestamp(timestamp)
               log "queuing #{item['class']} [delayed]"
-              queue = item['queue'] || Resque.queue_from_class(constantize(item['class']))
+              klass = constantize(item['class'])
+              queue = item['queue'] || Resque.queue_from_class(klass)
               # Support custom job classes like job with status
               if (job_klass = item['custom_job_class']) && (job_klass != 'Resque::Job')
                 # custom job classes not supporting the same API calls must implement the #schedule method
                 constantize(job_klass).scheduled(queue, item['class'], *item['args'])
               else
-                Resque::Job.create(queue, item['class'], *item['args'])
+                Resque::Job.create(queue, klass, *item['args'])
               end
             end
           end
@@ -140,14 +141,15 @@ module Resque
       def enqueue_from_config(config)
         args = config['args'] || config[:args]
         klass_name = config['class'] || config[:class]
+        klass = constantize(klass_name)
         params = args.nil? ? [] : Array(args)
-        queue = config['queue'] || config[:queue] || Resque.queue_from_class(constantize(klass_name))
+        queue = config['queue'] || config[:queue] || Resque.queue_from_class(klass)
         # Support custom job classes like job with status
         if (job_klass = config['custom_job_class']) && (job_klass != 'Resque::Job')
           # custom job classes not supporting the same API calls must implement the #schedule method
           constantize(job_klass).scheduled(queue, klass_name, *params)
         else
-          Resque::Job.create(queue, klass_name, *params)
+          Resque::Job.create(queue, klass, *params)
         end        
       end
 

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.10.9'
+  Version = '1.10.10'
 end

data/test/delayed_queue_test.rb

@@ -116,7 +116,7 @@ class Resque::DelayedQueueTest < Test::Unit::TestCase
     Resque.enqueue_at(t, SomeIvarJob)
 
     # 2 SomeIvarJob jobs should be created in the "ivar" queue
-    Resque::Job.expects(:create).twice.with('ivar', 'SomeIvarJob', nil)
+    Resque::Job.expects(:create).twice.with('ivar', SomeIvarJob, nil)
     Resque.expects(:queue_from_class).never # Should NOT need to load the class
     Resque::Scheduler.handle_delayed_items
   end
@@ -128,7 +128,7 @@ class Resque::DelayedQueueTest < Test::Unit::TestCase
     Resque.enqueue_at(t, SomeIvarJob)
 
     # 2 SomeIvarJob jobs should be created in the "ivar" queue
-    Resque::Job.expects(:create).twice.with('ivar', 'SomeIvarJob', nil)
+    Resque::Job.expects(:create).twice.with('ivar', SomeIvarJob, nil)
     Resque.expects(:queue_from_class).never # Should NOT need to load the class
 
     Resque::Scheduler.enqueue_delayed_items_for_timestamp(t)
@@ -144,7 +144,7 @@ class Resque::DelayedQueueTest < Test::Unit::TestCase
     # Since we didn't specify :queue when calling delayed_push, it will be forced
     # to load the class to figure out the queue.  This is the upgrade case from 1.0.4
     # to 1.0.5.
-    Resque::Job.expects(:create).once.with(:ivar, 'SomeIvarJob', nil)
+    Resque::Job.expects(:create).once.with(:ivar, SomeIvarJob, nil)
 
     Resque::Scheduler.handle_delayed_items
   end

data/test/scheduler_test.rb

@@ -13,13 +13,8 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     Resque::Scheduler.send(:class_variable_set, :@@scheduled_jobs, {})
   end
 
-  def test_enqueue_from_config_puts_stuff_in_the_resque_queue_without_class_loaded
-    Resque::Job.stubs(:create).once.returns(true).with('joes_queue', 'BigJoesJob', '/tmp')
-    Resque::Scheduler.enqueue_from_config('cron' => "* * * * *", 'class' => 'BigJoesJob', 'args' => "/tmp", 'queue' => 'joes_queue')
-  end
-  
   def test_enqueue_from_config_puts_stuff_in_the_resque_queue
-    Resque::Job.stubs(:create).once.returns(true).with(:ivar, 'SomeIvarJob', '/tmp')
+    Resque::Job.stubs(:create).once.returns(true).with(:ivar, SomeIvarJob, '/tmp')
     Resque::Scheduler.enqueue_from_config('cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp")
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brianjlandau-resque-scheduler
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 1
   - 10
-  - 9
-  version: 1.10.9
+  - 10
+  version: 1.10.10
 platform: ruby
 authors: 
 - Ben VandenBos