dj_remixes 0.1.0 → 0.2.0

data/lib/dj_remixes/action_mailer/action_mailer.rb

@@ -4,8 +4,10 @@ module Mail
     class MailmanWorker < DJ::Worker
       priority :urgent
       run_at {1.year.ago}
-      
-      def perform
+
+      def perform   
+        # Force loading of the class first to avoid the dreaded 'undefined class/module' error
+        eval(self.klass)
         message = Marshal.load(self.mail)
         message.deliver_without_worker
       end
@@ -15,8 +17,7 @@ module Mail
       if ActionMailer::Base.delivery_method == :test
         deliver_without_worker
       else
-        puts self
-        Mail::Message::MailmanWorker.enqueue(:mail => Marshal.dump(self))
+        Mail::Message::MailmanWorker.enqueue(:mail => Marshal.dump(self), :klass => self.delivery_handler.name)
         return self
       end
     end

data/lib/dj_remixes/callbacks.rb

@@ -11,10 +11,10 @@ module DJ
     
     def success(job)
       job.touch(:finished_at)
-      self.enqueue_again
+      self.enqueue_again if self.respond_to?(:enqueue_again)
     end
     
-    def failure(job, error)
+    def error(job, error)
       job.update_attributes(:started_at => nil)
     end
     

data/lib/dj_remixes/dj_remixes.rb

@@ -10,19 +10,3 @@ module DJ
   end
   
 end
-
-Delayed::Worker.backend.send(:class_eval) do
-  def invoke_job_with_callbacks
-    payload_object.before(self) if payload_object.respond_to?(:before)
-    begin
-      invoke_job_without_callbacks
-      payload_object.success(self) if payload_object.respond_to?(:success)
-    rescue Exception => e
-      payload_object.failure(self, e) if payload_object.respond_to?(:failure)
-      raise e
-    ensure
-      payload_object.after(self) if payload_object.respond_to?(:after)
-    end
-  end
-  alias_method_chain :invoke_job, :callbacks
-end

data/lib/dj_remixes/hoptoad.rb

@@ -3,12 +3,12 @@ if Object.const_defined?(:HoptoadNotifier)
     class Worker
     
       # Report Errors to Hoptoad:
-      def failure_with_hoptoad(job, error)
+      def error_with_hoptoad(job, error)
         HoptoadNotifier.notify_or_ignore(error, :cgi_data => self.dj_object.attributes)
-        failure_without_hoptoad(job, error)
+        error_without_hoptoad(job, error)
       end
     
-      alias_method_chain :failure, :hoptoad
+      alias_method_chain :error, :hoptoad
     
     end # Worker
   end # DJ

data/lib/dj_remixes/re_enqueue.rb

@@ -36,7 +36,7 @@ module DJ
     def enqueue_again # :nodoc:
       if self.class.re_enqueuable
         new_worker = self.clone()
-        new_worker.enqueue
+        new_worker.enqueue!
       end
     end
     

data/lib/dj_remixes/requires.rb

@@ -1,8 +1,8 @@
 require 'mark_facets'
 %w{dj_remixes 
    worker 
-   attributes 
    callbacks 
+   attributes 
    priority 
    run_at 
    unique 

data/lib/dj_remixes/worker.rb

@@ -6,7 +6,7 @@ module DJ
     class << self
       
       def enqueue(*args)
-        self.new(*args).enqueue
+        self.new(*args).enqueue!
       end
       
     end
@@ -27,14 +27,14 @@ module DJ
       end
     end
     
-    def enqueue(priority = self.priority, run_at = self.run_at)
+    def enqueue!(priority = self.priority, run_at = self.run_at)
       job = DJ.enqueue(self, priority, run_at)
       job.worker_class_name = self.worker_class_name
       job.save
       return job
     end
     
-    alias_method :save, :enqueue
+    alias_method :save, :enqueue!
     
     # Needs to be implemented by subclasses! It's only here
     # so people can hook into it.

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - markbates
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -04:00
+date: 2010-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2149284955517614999
+      hash: 3113747627345364661
       segments: 
       - 0
       version: "0"