delayed_job_extras 0.3.0 → 0.4.0

data/lib/delayed_job_extras/job.rb

@@ -10,6 +10,7 @@ module Delayed
     
     def payload_object=(object)
       self.worker_class_name = object.worker_class_name if object.respond_to?(:worker_class_name)
+      @payload_object = object
       self['handler'] = object.to_yaml
     end
     
@@ -32,6 +33,19 @@ module Delayed
       !self.started_at.nil? && !self.finished_at.nil?
     end
     
+    def validate_with_unique
+      validate_without_unique
+      if self['handler'] && self.payload_object && self.payload_object.is_a?(DJ::Worker) && self.new_record?
+        if self.payload_object.unique?
+          if Delayed::Job.count(:all, :conditions => {:worker_class_name => self.worker_class_name, :finished_at => nil}) > 0
+            self.errors.add_to_base("Only one #{self.worker_class_name} can be queued at a time!")
+          end
+        end
+      end
+    end
+    
+    alias_method_chain :validate, :unique
+    
     class << self
       
       def stats(start_date = 1.day.ago.beginning_of_day, end_date = Time.now.beginning_of_day)

data/lib/delayed_job_extras/worker.rb

@@ -5,6 +5,12 @@ module DJ
     
     attr_accessor :dj_object
     attr_accessor :logger
+    attr_accessor :__original_args
+    
+    def initialize(*args)
+      self.__original_args = *args
+      return self
+    end
     
     def priority=(x)
       @priority = x
@@ -41,6 +47,17 @@ module DJ
     def enqueue(priority = self.priority, run_at = self.run_at)
       Delayed::Job.enqueue(self, priority, run_at)
     end
+    
+    def reenqueue
+      job = self.class.new(*self.__original_args)
+      yield job if block_given?
+      self.dj_object.touch(:finished_at) if self.dj_object
+      job.enqueue
+    end
+    
+    def unique?
+      false
+    end
 
     class << self
       

data/lib/delayed_job_test_enhancements.rb

@@ -1,14 +1,15 @@
 module Delayed
   class Job
+    
     def self.enqueue(obj, *args)
       if obj.respond_to?(:dj_object)
         if obj.dj_object.nil?
           obj.dj_object = Delayed::Job.new
-          obj.dj_object.id = 1
         end
       end
       obj.perform
       obj.respond_to?(:dj_object) ? obj.dj_object : nil
     end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job_extras
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 -04:00
+date: 2009-09-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency