brianjlandau-resque-scheduler 1.10.3 → 1.10.4

data/brianjlandau-resque-scheduler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brianjlandau-resque-scheduler}
-  s.version = "1.10.3"
+  s.version = "1.10.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben VandenBos", "Brian Landau"]
-  s.date = %q{2010-10-20}
+  s.date = %q{2010-10-21}
   s.description = %q{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.}

data/lib/resque/scheduler.rb

@@ -168,7 +168,7 @@ module Resque
       end
       
       def update_schedule
-        schedule_from_redis = Resque.decode(Resque.redis.get(:schedule))
+        schedule_from_redis = Resque.get_schedule
         if !schedule_from_redis.nil? && !schedule_from_redis.empty? && schedule_from_redis != Resque.schedule
           # unload schedules that no longer exist
           (Resque.schedule.keys - schedule_from_redis.keys).each do |name|

data/lib/resque_scheduler.rb

@@ -36,7 +36,15 @@ module ResqueScheduler
   
   # reloads the schedule from redis
   def reload_schedule!
-    @schedule = decode(redis.get(:schedule))
+    @schedule = get_schedule
+  end
+  
+  def get_schedule
+    redis.hgetall(:schedule).tap do |h|
+      h.each do |name, config|
+        h[name] = decode(config)
+      end
+    end
   end
 
   # This method is nearly identical to +enqueue+ only it also

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.10.3'
+  Version = '1.10.4'
 end

data/test/scheduler_test.rb

@@ -7,6 +7,7 @@ class Resque::SchedulerTest < Test::Unit::TestCase
   end
 
   def setup
+    Resque.redis.del(:schedule)
     Resque::Scheduler.mute = true
     Resque::Scheduler.clear_schedule!
     Resque::Scheduler.send(:class_variable_set, :@@scheduled_jobs, {})
@@ -77,18 +78,19 @@ class Resque::SchedulerTest < Test::Unit::TestCase
   
   def test_can_reload_schedule
     Resque.schedule = {"some_ivar_job" => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp"}}
-    Resque.redis.set(:schedule, Resque.encode({
-      "some_ivar_job" => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp"}
-    }))
+    Resque.redis.hset(:schedule, "some_ivar_job", Resque.encode(
+      {'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.set(:schedule, Resque.encode({
-      "some_ivar_job2" => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
-    }))
+    Resque.redis.del(:schedule)
+    Resque.redis.hset(:schedule, "some_ivar_job2", Resque.encode(
+      {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
+    ))
     
     Resque::Scheduler.reload_schedule!
     
@@ -131,11 +133,15 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     
     Resque::Scheduler.load_schedule!
     
-    Resque.redis.set(:schedule, Resque.encode({
-      "some_ivar_job" => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"},
-      "new_ivar_job"  => {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp/3"},
-      "stay_put_job"  => {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp"}
-    }))
+    Resque.redis.hset(:schedule, "some_ivar_job", Resque.encode(
+      {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
+    ))
+    Resque.redis.hset(:schedule, "new_ivar_job", Resque.encode(
+      {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp/3"}
+    ))
+    Resque.redis.hset(:schedule, "stay_put_job", Resque.encode(
+      {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp"}
+    ))
     
     Resque::Scheduler.update_schedule
     
@@ -161,11 +167,15 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     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.redis.set(:schedule, Resque.encode({
-      "some_ivar_job" => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"},
-      "new_ivar_job"  => {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp/3"},
-      "stay_put_job"  => {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp"}
-    }))
+    Resque.redis.hset(:schedule, "some_ivar_job", Resque.encode(
+      {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp/2"}
+    ))
+    Resque.redis.hset(:schedule, "new_ivar_job", Resque.encode(
+      {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp/3"}
+    ))
+    Resque.redis.hset(:schedule, "stay_put_job", Resque.encode(
+      {'cron' => "* * * * *", 'class' => 'SomeJob', 'args' => "/tmp"}
+    ))
     
     Resque::Scheduler.update_schedule
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brianjlandau-resque-scheduler
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: false
   segments: 
   - 1
   - 10
-  - 3
-  version: 1.10.3
+  - 4
+  version: 1.10.4
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 -04:00
+date: 2010-10-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency