dj_remixes 0.0.18 → 0.0.20

data/lib/dj_remixes/{rails3 → action_mailer}/action_mailer.rb

@@ -9,7 +9,7 @@ module Mail
         message = Marshal.load(self.mail)
         message.deliver_without_worker
       end
-    end
+    end # MailmanWorker
     
     def deliver_with_worker
       if ActionMailer::Base.delivery_method == :test
@@ -22,6 +22,5 @@ module Mail
     
     alias_method_chain :deliver, :worker
     
-  end # Base
-end # ActionMailer
-
+  end # Message
+end # Mail

data/lib/dj_remixes/action_mailer/action_mailer_railtie.rb

@@ -0,0 +1,11 @@
+module DJ
+  class ActionMailerRailtie < Rails::Railtie
+
+    initializer "dj.configure_action_mailer_initialization" do
+      ActiveSupport.on_load(:action_mailer) do
+        require File.join(File.dirname(__FILE__), 'action_mailer')
+        require File.join(File.dirname(__FILE__), 'unique_validator')
+      end
+    end
+  end
+end

data/lib/dj_remixes/active_record_railtie.rb

@@ -0,0 +1,12 @@
+module DJ
+  class ActiveRecordRailtie < Rails::Railtie
+
+    initializer "dj.configure_active_record_initialization" do
+      ActiveSupport.on_load(:active_record) do
+        Delayed::Worker.guess_backend
+        
+        require File.join(File.dirname(__FILE__), 'requires')
+      end
+    end
+  end
+end

data/lib/dj_remixes/requires.rb

@@ -0,0 +1,13 @@
+%w{dj_remixes 
+   worker 
+   attributes 
+   callbacks 
+   priority 
+   run_at 
+   unique 
+   re_enqueue 
+   hoptoad 
+   unique_validator
+  }.each do |f|
+  require File.expand_path(File.join(File.dirname(__FILE__), f))
+end

data/lib/dj_remixes/worker.rb

@@ -1,7 +1,6 @@
 module DJ
   class Worker
     
-    attr_accessor :run_at
     attr_accessor :worker_class_name
     
     class << self
@@ -12,10 +11,6 @@ module DJ
       
     end
     
-    def run_at
-      return @run_at ||= Time.now
-    end
-    
     def dj_object=(dj)
       @dj_object = dj.id
     end

data/lib/dj_remixes.rb

@@ -1,26 +1,3 @@
-# Dir.glob(File.join(File.dirname(__FILE__), 'dj_remixes', '**/*.rb')).each do |f|
-#   require File.expand_path(f)
-# end
-# require 'delayed_job'
-
-Delayed::Worker.guess_backend
-
 path = File.join(File.dirname(__FILE__), 'dj_remixes')
-
-require File.join(path, 'dj_remixes')
-require File.join(path, 'worker')
-require File.join(path, 'attributes')
-require File.join(path, 'callbacks')
-require File.join(path, 'priority')
-require File.join(path, 'run_at')
-require File.join(path, 'unique')
-require File.join(path, 're_enqueue')
-require File.join(path, 'hoptoad')
-
-if Rails.version.match(/^2/)
-  # require File.join(path, 'rails2', 'action_mailer')
-  # require File.join(path, 'rails2', 'unique_validator')
-else
-  require File.join(path, 'rails3', 'railtie')
-  require File.join(path, 'rails3', 'unique_validator')
-end
+require File.join(path, 'action_mailer', 'active_record_railtie')
+require File.join(path, 'action_mailer', 'action_mailer_railtie')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - markbates
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -04:00
+date: 2010-07-21 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -28,17 +28,19 @@ extra_rdoc_files:
 - README
 - LICENSE
 files: 
+- lib/dj_remixes/action_mailer/action_mailer.rb
+- lib/dj_remixes/action_mailer/action_mailer_railtie.rb
+- lib/dj_remixes/active_record_railtie.rb
 - lib/dj_remixes/attributes.rb
 - lib/dj_remixes/callbacks.rb
 - lib/dj_remixes/dj_remixes.rb
 - lib/dj_remixes/hoptoad.rb
 - lib/dj_remixes/priority.rb
-- lib/dj_remixes/rails3/action_mailer.rb
-- lib/dj_remixes/rails3/railtie.rb
-- lib/dj_remixes/rails3/unique_validator.rb
 - lib/dj_remixes/re_enqueue.rb
+- lib/dj_remixes/requires.rb
 - lib/dj_remixes/run_at.rb
 - lib/dj_remixes/unique.rb
+- lib/dj_remixes/unique_validator.rb
 - lib/dj_remixes/worker.rb
 - lib/dj_remixes.rb
 - README

data/lib/dj_remixes/rails3/railtie.rb

@@ -1,10 +0,0 @@
-module DJ
-  class Railtie < Rails::Railtie
-
-    initializer "dj.configure_rails_initialization" do
-      ActiveSupport.on_load(:action_mailer) do
-        require File.join(File.dirname(__FILE__), 'action_mailer')
-      end
-    end
-  end
-end