resque-scheduler 2.0.0.d → 2.0.0.e

data/test/scheduler_args_test.rb

@@ -80,4 +80,14 @@ context "scheduling jobs with arguments" do
     SomeIvarJob.expects(:perform).once.with('first_key' => {'second_key' => 'value'})
     Resque.reserve('ivar').perform
   end
+  
+  test "poll_sleep_amount defaults to 5" do
+    assert_equal 5, Resque::Scheduler.poll_sleep_amount
+  end
+  
+  test "poll_sleep_amount is settable" do
+    Resque::Scheduler.poll_sleep_amount = 1
+    assert_equal 1, Resque::Scheduler.poll_sleep_amount    
+  end
+  
 end

data/test/scheduler_test.rb

@@ -31,10 +31,10 @@ class Resque::SchedulerTest < Test::Unit::TestCase
   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
-  
+
   def test_enqueue_from_config_with_custom_class_job_in_the_resque_queue
     FakeJob.stubs(:scheduled).once.returns(true).with(:ivar, 'SomeIvarJob', '/tmp')
     Resque::Scheduler.enqueue_from_config('cron' => "* * * * *", 'class' => 'SomeIvarJob', 'custom_job_class' => 'Resque::SchedulerTest::FakeJob', 'args' => "/tmp")
@@ -78,6 +78,25 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     assert_equal(1, Resque::Scheduler.rufus_scheduler.all_jobs.size)
   end
 
+  def test_enqueue_constantizes
+    # The job should be loaded, since a missing rails_env means ALL envs.
+    ENV['RAILS_ENV'] = 'production'
+    config = {'cron' => "* * * * *", 'class' => 'SomeRealClass', 'args' => "/tmp"}
+    Resque::Job.expects(:create).with(SomeRealClass.queue, SomeRealClass, '/tmp')
+    Resque::Scheduler.enqueue_from_config(config)
+  end
+
+  def test_enqueue_runs_hooks
+    # The job should be loaded, since a missing rails_env means ALL envs.
+    ENV['RAILS_ENV'] = 'production'
+    config = {'cron' => "* * * * *", 'class' => 'SomeRealClass', 'args' => "/tmp"}
+
+    Resque::Job.expects(:create).with(SomeRealClass.queue, SomeRealClass, '/tmp')
+    SomeRealClass.expects(:after_enqueue_example)
+
+    Resque::Scheduler.enqueue_from_config(config)
+  end
+
   def test_config_makes_it_into_the_rufus_scheduler
     assert_equal(0, Resque::Scheduler.rufus_scheduler.all_jobs.size)
 
@@ -87,53 +106,53 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     assert_equal(1, Resque::Scheduler.rufus_scheduler.all_jobs.size)
     assert Resque::Scheduler.scheduled_jobs.include?(:some_ivar_job)
   end
-  
+
   def test_can_reload_schedule
     Resque::Scheduler.dynamic = true
     Resque.schedule = {"some_ivar_job" => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp"}}
-  
+
     Resque::Scheduler.load_schedule!
 
     assert_equal(1, Resque::Scheduler.rufus_scheduler.all_jobs.size)
     assert Resque::Scheduler.scheduled_jobs.include?("some_ivar_job")
-    
+
     Resque.redis.del(:schedules)
     Resque.redis.hset(:schedules, "some_ivar_job2", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
     ))
-    
+
     Resque::Scheduler.reload_schedule!
-    
+
     assert_equal(1, Resque::Scheduler.rufus_scheduler.all_jobs.size)
-    
+
     assert_equal '/tmp/2', Resque.schedule["some_ivar_job2"]["args"]
     assert Resque::Scheduler.scheduled_jobs.include?("some_ivar_job2")
   end
-  
+
   def test_load_schedule_job
     Resque::Scheduler.load_schedule_job("some_ivar_job", {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp"})
-    
+
     assert_equal(1, Resque::Scheduler.rufus_scheduler.all_jobs.size)
     assert_equal(1, Resque::Scheduler.scheduled_jobs.size)
     assert Resque::Scheduler.scheduled_jobs.keys.include?("some_ivar_job")
   end
-  
+
   def test_load_schedule_job_with_no_cron
     Resque::Scheduler.load_schedule_job("some_ivar_job", {'class' => 'SomeIvarJob', 'args' => "/tmp"})
-    
+
     assert_equal(0, Resque::Scheduler.rufus_scheduler.all_jobs.size)
     assert_equal(0, Resque::Scheduler.scheduled_jobs.size)
     assert !Resque::Scheduler.scheduled_jobs.keys.include?("some_ivar_job")
   end
-  
+
   def test_load_schedule_job_with_blank_cron
     Resque::Scheduler.load_schedule_job("some_ivar_job", {'cron' => '', 'class' => 'SomeIvarJob', 'args' => "/tmp"})
-    
+
     assert_equal(0, Resque::Scheduler.rufus_scheduler.all_jobs.size)
     assert_equal(0, Resque::Scheduler.scheduled_jobs.size)
     assert !Resque::Scheduler.scheduled_jobs.keys.include?("some_ivar_job")
   end
-  
+
   def test_update_schedule
     Resque::Scheduler.dynamic = true
     Resque.schedule = {
@@ -141,9 +160,9 @@ class Resque::SchedulerTest < Test::Unit::TestCase
       "another_ivar_job" => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/5"},
       "stay_put_job"     => {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp"}
     }
-    
+
     Resque::Scheduler.load_schedule!
-    
+
     Resque.set_schedule("some_ivar_job",
       {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
     )
@@ -154,9 +173,9 @@ class Resque::SchedulerTest < Test::Unit::TestCase
       {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp"}
     )
     Resque.remove_schedule("another_ivar_job")
-    
+
     Resque::Scheduler.update_schedule
-    
+
     assert_equal(3, Resque::Scheduler.rufus_scheduler.all_jobs.size)
     assert_equal(3, Resque::Scheduler.scheduled_jobs.size)
     %w(some_ivar_job new_ivar_job stay_put_job).each do |job_name|
@@ -167,7 +186,7 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     assert !Resque.schedule.keys.include?("another_ivar_job")
     assert_equal 0, Resque.redis.scard(:schedules_changed)
   end
-  
+
   def test_update_schedule_with_mocks
     Resque::Scheduler.dynamic = true
     Resque.schedule = {
@@ -175,12 +194,12 @@ class Resque::SchedulerTest < Test::Unit::TestCase
       "another_ivar_job"  => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/5"},
       "stay_put_job"  => {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp"}
     }
-    
+
     Resque::Scheduler.load_schedule!
-    
+
     Resque::Scheduler.rufus_scheduler.expects(:unschedule).with(Resque::Scheduler.scheduled_jobs["some_ivar_job"].job_id)
     Resque::Scheduler.rufus_scheduler.expects(:unschedule).with(Resque::Scheduler.scheduled_jobs["another_ivar_job"].job_id)
-    
+
     Resque.set_schedule("some_ivar_job",
       {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
     )
@@ -191,9 +210,9 @@ class Resque::SchedulerTest < Test::Unit::TestCase
       {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp"}
     )
     Resque.remove_schedule("another_ivar_job")
-    
+
     Resque::Scheduler.update_schedule
-    
+
     assert_equal(3, Resque::Scheduler.scheduled_jobs.size)
     %w(some_ivar_job new_ivar_job stay_put_job).each do |job_name|
       assert Resque::Scheduler.scheduled_jobs.keys.include?(job_name)
@@ -203,33 +222,33 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     assert !Resque.schedule.keys.include?("another_ivar_job")
     assert_equal 0, Resque.redis.scard(:schedules_changed)
   end
-  
+
   def test_set_schedules
     Resque::Scheduler.dynamic = true
     Resque.schedule = {"my_ivar_job" => {
       'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/75"
     }}
-    assert_equal({'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/75"}, 
+    assert_equal({'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/75"},
       Resque.decode(Resque.redis.hget(:schedules, "my_ivar_job")))
   end
-  
+
   def test_set_schedule
     Resque.set_schedule("some_ivar_job", {
       'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/22"
     })
-    assert_equal({'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/22"}, 
+    assert_equal({'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/22"},
       Resque.decode(Resque.redis.hget(:schedules, "some_ivar_job")))
     assert Resque.redis.sismember(:schedules_changed, "some_ivar_job")
   end
-  
+
   def test_get_schedule
     Resque.redis.hset(:schedules, "some_ivar_job2", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/33"}
     ))
-    assert_equal({'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/33"}, 
+    assert_equal({'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/33"},
       Resque.get_schedule("some_ivar_job2"))
   end
-  
+
   def test_remove_schedule
     Resque.redis.hset(:schedules, "some_ivar_job3", Resque.encode(
       {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/44"}

data/test/test_helper.rb

@@ -59,11 +59,11 @@ def context(*args, &block)
   klass = Class.new(defined?(ActiveSupport::TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase) do
     def self.test(name, &block)
       define_method("test_#{name.gsub(/\W/,'_')}", &block) if block
-    end 
-    def self.xtest(*args) end 
-    def self.setup(&block) define_method(:setup, &block) end 
-    def self.teardown(&block) define_method(:teardown, &block) end 
-  end 
+    end
+    def self.xtest(*args) end
+    def self.setup(&block) define_method(:setup, &block) end
+    def self.teardown(&block) define_method(:teardown, &block) end
+  end
   (class << klass; self end).send(:define_method, :name) { name.gsub(/\W/,'_') }
   klass.class_eval &block
 end
@@ -76,3 +76,9 @@ end
 class SomeIvarJob < SomeJob
   @queue = :ivar
 end
+
+class SomeRealClass
+  def self.queue
+    :some_real_queue
+  end
+end

metadata

@@ -1,120 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: resque-scheduler
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 2
-  - 0
-  - 0
-  - d
-  version: 2.0.0.d
+version: !ruby/object:Gem::Version
+  version: 2.0.0.e
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Ben VandenBos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-03 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2163772500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: redis
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2163772500
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: &2163770620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: resque
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2163770620
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: &2163770140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 8
-        - 0
-        version: 1.8.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.15.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rufus-scheduler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2163770140
+- !ruby/object:Gem::Dependency
+  name: rufus-scheduler
+  requirement: &2163769660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2163769660
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2163769160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2163769160
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2163768680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: |-
-  Light weight job scheduling on top of Resque.
-      Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
-      Also supports queueing jobs on a fixed, cron-like schedule.
-email: 
+  prerelease: false
+  version_requirements: *2163768680
+description: ! "Light weight job scheduling on top of Resque.\n    Adds methods enqueue_at/enqueue_in
+  to schedule jobs in the future.\n    Also supports queueing jobs on a fixed, cron-like
+  schedule."
+email:
 - bvandenbos@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -138,39 +109,31 @@ files:
 - test/scheduler_args_test.rb
 - test/scheduler_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/bvandenbos/resque-scheduler
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3350821914372278115
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Light weight job scheduling on top of Resque
 test_files: []
-