delayed_job 1.8.3 → 1.8.4

data/VERSION

@@ -1 +1 @@
-1.8.3
+1.8.4

data/delayed_job.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_job}
-  s.version = "1.8.3"
+  s.version = "1.8.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers", "Tobias L\303\274tke"]
-  s.date = %q{2009-09-28}
+  s.date = %q{2009-10-06}
   s.description = %q{Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.}
   s.email = %q{tobi@leetsoft.com}
   s.extra_rdoc_files = [

data/lib/delayed/command.rb

@@ -67,7 +67,7 @@ module Delayed
       
       Delayed::Worker.new(@options).start  
     rescue => e
-      logger.fatal e
+      Rails.logger.fatal e
       STDERR.puts e.message
       exit 1
     end

data/lib/delayed/job.rb

@@ -65,10 +65,9 @@ module Delayed
     # Reschedule the job in the future (when a job fails).
     # Uses an exponential scale depending on the number of failed attempts.
     def reschedule(message, backtrace = [], time = nil)
-      if self.attempts < MAX_ATTEMPTS
+      if (self.attempts += 1) < MAX_ATTEMPTS
         time ||= Job.db_time_now + (attempts ** 4) + 5
 
-        self.attempts    += 1
         self.run_at       = time
         self.last_error   = message + "\n" + backtrace.join("\n")
         self.unlock

data/lib/delayed/message_sending.rb

@@ -3,6 +3,10 @@ module Delayed
     def send_later(method, *args)
       Delayed::Job.enqueue Delayed::PerformableMethod.new(self, method.to_sym, args)
     end
+
+    def send_at(time, method, *args)
+      Delayed::Job.enqueue(Delayed::PerformableMethod.new(self, method.to_sym, args), 0, time)
+    end
     
     module ClassMethods
       def handle_asynchronously(method)

data/spec/delayed_method_spec.rb

@@ -125,4 +125,26 @@ describe 'random ruby objects' do
     job.payload_object.perform.should == 'Once upon...'
   end
 
+  context "send_at" do
+    it "should queue a new job" do
+      lambda do
+        "string".send_at(1.hour.from_now, :length)
+      end.should change { Delayed::Job.count }.by(1)
+    end
+    
+    it "should schedule the job in the future" do
+      time = 1.hour.from_now
+      job = "string".send_at(time, :length)
+      job.run_at.should == time
+    end
+    
+    it "should store payload as PerformableMethod" do
+      job = "string".send_at(1.hour.from_now, :count, 'r')
+      job.payload_object.class.should   == Delayed::PerformableMethod
+      job.payload_object.method.should  == :count
+      job.payload_object.args.should    == ['r']
+      job.payload_object.perform.should == 1
+    end
+  end
+
 end

data/spec/job_spec.rb

@@ -152,29 +152,46 @@ describe Delayed::Job do
     lambda { job.payload_object.perform }.should raise_error(Delayed::DeserializationError)
   end
   
-  it "should be failed if it failed more than MAX_ATTEMPTS times and we don't want to destroy jobs" do
-    default = Delayed::Job.destroy_failed_jobs
-    Delayed::Job.destroy_failed_jobs = false
-
-    @job = Delayed::Job.create :payload_object => SimpleJob.new, :attempts => 50
-    @job.reload.failed_at.should == nil
-    @job.reschedule 'FAIL'
-    @job.reload.failed_at.should_not == nil
-
-    Delayed::Job.destroy_failed_jobs = default
-  end
-
-  it "should be destroyed if it failed more than MAX_ATTEMPTS times and we want to destroy jobs" do
-    default = Delayed::Job.destroy_failed_jobs
-    Delayed::Job.destroy_failed_jobs = true
-
-    @job = Delayed::Job.create :payload_object => SimpleJob.new, :attempts => 50
-    @job.should_receive(:destroy)
-    @job.reschedule 'FAIL'
-
-    Delayed::Job.destroy_failed_jobs = default
+  context "reschedule" do
+    before do
+      @job = Delayed::Job.create :payload_object => SimpleJob.new
+    end
+    
+    context "and we want to destroy jobs" do
+      before do
+        Delayed::Job.destroy_failed_jobs = true
+      end
+      
+      it "should be destroyed if it failed more than MAX_ATTEMPTS times" do
+        @job.should_receive(:destroy)
+        Delayed::Job::MAX_ATTEMPTS.times { @job.reschedule 'FAIL' }
+      end
+      
+      it "should not be destroyed if failed fewer than MAX_ATTEMPTS times" do
+        @job.should_not_receive(:destroy)
+        (Delayed::Job::MAX_ATTEMPTS - 1).times { @job.reschedule 'FAIL' }
+      end
+    end
+    
+    context "and we don't want to destroy jobs" do
+      before do
+        Delayed::Job.destroy_failed_jobs = false
+      end
+      
+      it "should be failed if it failed more than MAX_ATTEMPTS times" do
+        @job.reload.failed_at.should == nil
+        Delayed::Job::MAX_ATTEMPTS.times { @job.reschedule 'FAIL' }
+        @job.reload.failed_at.should_not == nil
+      end
+
+      it "should not be failed if it failed fewer than MAX_ATTEMPTS times" do
+        (Delayed::Job::MAX_ATTEMPTS - 1).times { @job.reschedule 'FAIL' }
+        @job.reload.failed_at.should == nil
+      end
+      
+    end
   end
-
+  
   it "should fail after MAX_RUN_TIME" do
     @job = Delayed::Job.create :payload_object => LongRunningJob.new
     Delayed::Job.reserve_and_run_one_job(1.second)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job
 version: !ruby/object:Gem::Version 
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 -04:00
+date: 2009-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: []