@@ -2,7 +2,13 @@ = rufus-scheduler CHANGELOG.txt -== rufus-scheduler - 2.0.2 not yet released +== rufus-scheduler - 2.0.3 not yet released + +- made sure Schedulables with a call(job) method were OK when passed as second + parameter (thanks Nate Wiger) + + +== rufus-scheduler - 2.0.2 released 2009/10/31 - unified JobQueue and CronJobQueue, and handed @last_second management to the latter CHANGELOG.txt @@ -10,6 +10,7 @@ == Feedback +- Nate Wiger (Schedulable call/trigger issue) - Aldric (readme errors) - Kenneth Kalmer (daemon-kit) - Chris Evans, :timeout tests on JRuby CREDITS.txt @@ -179,6 +179,16 @@ Sometimes passing a block isn't that convenient : rufus-scheduler accepts anything that responds to a call method with a unique parameter (it will pass the job) as a 'schedulable'. +For compatibility with older (1.x) versions, schedulables with a trigger methods are accepted : + + class JobThing + def trigger (params) + job = params[:job] + end + end + +The 'params' correspond to the scheduler job params, and the key :job points to the rufus-scheduler job for the schedulable that is passed to a 'call schedulable'. + == looking up jobs README.rdoc @@ -265,7 +265,7 @@ module Rufus::Scheduler def combine_opts (schedulable, opts) - if schedulable.respond_to?(:trigger) + if schedulable.respond_to?(:trigger) || schedulable.respond_to?(:call) opts[:schedulable] = schedulable lib/rufus/sc/scheduler.rb @@ -36,7 +36,7 @@ describe Rufus::Scheduler::Schedulable do @s.in '1s', :schedulable => j - sleep 1.5 + sleep 1.4 j.value.class.should.equal(Hash) j.value[:job].class.should.equal(Rufus::Scheduler::InJob) @@ -48,10 +48,32 @@ describe Rufus::Scheduler::Schedulable do @s.in '1s', :schedulable => j - sleep 1.5 + sleep 1.4 j.value.class.should.equal(Rufus::Scheduler::InJob) end + it 'should accept trigger schedulables as second param' do + + j = JobAlpha.new + + @s.in '1s', j + + sleep 1.4 + + j.value.class.should.equal(Hash) + j.value[:job].class.should.equal(Rufus::Scheduler::InJob) + end + + it 'should accept call schedulables as second param' do + + j = JobBravo.new + + @s.in '1s', j + + sleep 1.4 + + j.value.class.should.equal(Rufus::Scheduler::InJob) + end end spec/schedulable_spec.rb cff3bb58abbc80f76adbe2120e6002c2e7eea766 John Mettraux jmettraux@gmail.com http://github.com/jmettraux/rufus-scheduler/commit/6a8c1eded989c6436d1e87e93c00ef23cca705b0 6a8c1eded989c6436d1e87e93c00ef23cca705b0 2009-11-03T16:57:20-08:00 2009-11-03T16:57:20-08:00 made sure Schedulables with a call(job) method were OK when passed as second parameter (thanks Nate Wiger). Closes gh-2 f367d999df653427cfd3259b734dd88a58065c63 John Mettraux jmettraux@gmail.com