Don't require Rails and ActionMailer since delayed_job can be used in…

… plain ol' ruby apps with Active Record
pat · Sep 6, 2010 · fa5aab7 · fa5aab7
1 parent 7232cf1
commit fa5aab7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/delayed_job.rb b/lib/delayed_job.rb
@@ -2,11 +2,11 @@
 
 require File.dirname(__FILE__) + '/delayed/message_sending'
 require File.dirname(__FILE__) + '/delayed/performable_method'
-require File.dirname(__FILE__) + '/delayed/performable_mailer'
+require File.dirname(__FILE__) + '/delayed/performable_mailer' if defined?(ActionMailer)
 require File.dirname(__FILE__) + '/delayed/yaml_ext'
 require File.dirname(__FILE__) + '/delayed/backend/base'
 require File.dirname(__FILE__) + '/delayed/worker'
-require File.dirname(__FILE__) + '/delayed/railtie'
+require File.dirname(__FILE__) + '/delayed/railtie' if defined?(Rails::Railtie)
 
 Object.send(:include, Delayed::MessageSending)   
 Module.send(:include, Delayed::MessageSending::ClassMethods)