resque-scheduler 1.0.5 → 1.0.6

data/LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2010 Ben VandenBos
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/lib/resque/scheduler.rb

@@ -1,4 +1,3 @@
-require 'rufus-scheduler'
 require 'rufus/scheduler'
 require 'thwait'
 
@@ -71,7 +70,7 @@ module Resque
               handle_shutdown do
                 if item = Resque.next_item_for_timestamp(timestamp)
                   log "queuing #{item['class']} [delayed]"
-                  queue = item['queue'] || queue_from_class(constantize(item['class']))
+                  queue = item['queue'] || Resque.queue_from_class(constantize(item['class']))
                   Job.create(queue, item['class'], *item['args'])
                 end
               end
@@ -136,4 +135,4 @@ module Resque
 
   end
 
-end
+end

data/lib/resque_scheduler/server.rb

@@ -26,7 +26,7 @@ module ResqueScheduler
         post "/schedule/requeue" do
           config = Resque.schedule[params['job_name']]
           Resque::Scheduler.enqueue_from_config(config)
-          redirect url("/queues")
+          redirect url("/overview")
         end
         
         get "/delayed" do

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.0.5'
+  Version = '1.0.6'
 end

data/test/delayed_queue_test.rb

@@ -112,8 +112,20 @@ 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')
-    Resque::Scheduler.expects(:queue_from_class).never # Should NOT need to load the class
+    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
+
+  def test_works_with_out_specifying_queue__upgrade_case
+    t = Time.now - 60
+    Resque.delayed_push(t, :class => 'SomeIvarJob')
+
+    # 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::Scheduler.handle_delayed_items
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque-scheduler
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -08:00
+date: 2010-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,10 +62,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README.markdown
 files: 
 - .gitignore
 - HISTORY.md
+- LICENSE
 - README.markdown
 - Rakefile
 - lib/resque/scheduler.rb