delayed_job_extras 0.12.2 → 0.13.0

data/lib/delayed_job_extras/job.rb

@@ -54,19 +54,6 @@ module Delayed
       end
     end
     
-    def validate_with_unique
-      validate_without_unique
-      if self.payload_object.respond_to?(:unique?) && 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
-    
     def pending?
       self.started_at.nil? && self.finished_at.nil?
     end

data/lib/delayed_job_extras/unique_dj_validator.rb

@@ -0,0 +1,19 @@
+# Rails 3 style validation:
+class UniqueDJValidator < ActiveModel::Validator
+  def validate()
+    
+    if record.payload_object.respond_to?(:unique?) && record.new_record?
+      if record.payload_object.unique?
+        if Delayed::Job.count(:all, :conditions => {:worker_class_name => record.worker_class_name, :finished_at => nil}) > 0
+          record.errors.add_to_base("Only one #{record.worker_class_name} can be queued at a time!")
+        end
+      end
+    end
+  end
+end
+
+module Delayed
+  class Job < ActiveRecord::Base
+    validates_with UniqueDJValidator
+  end
+end

data/lib/delayed_job_extras/validate_with_unique.rb

@@ -0,0 +1,17 @@
+# Rails 2 style validation:
+module Delayed
+  class Job < ActiveRecord::Base
+    def validate_with_unique
+      validate_without_unique
+      if self.payload_object.respond_to?(:unique?) && 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
+  end
+end

data/lib/delayed_job_extras.rb

@@ -12,4 +12,10 @@ require File.join(path, 'worker')
 require File.join(path, 'action_mailer')
 
 require File.join(path, 'hoptoad')
-# require File.join(path, 'acts_as_paranoid')
+# require File.join(path, 'acts_as_paranoid')
+
+if Rails.version.match(/^2/)
+  require File.join(path, 'validate_with_unique')
+else
+  require File.join(path, 'unique_dj_validator')
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 12
-  - 2
-  version: 0.12.2
+  - 13
+  - 0
+  version: 0.13.0
 platform: ruby
 authors: 
 - markbates
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -04:00
+date: 2010-05-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,8 @@ files:
 - lib/delayed_job_extras/hoptoad.rb
 - lib/delayed_job_extras/job.rb
 - lib/delayed_job_extras/performable_method.rb
+- lib/delayed_job_extras/unique_dj_validator.rb
+- lib/delayed_job_extras/validate_with_unique.rb
 - lib/delayed_job_extras/worker.rb
 - lib/delayed_job_extras.rb
 - lib/delayed_job_test_enhancements.rb