Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

latest updates

  • Loading branch information...
commit d201d39437c754fa38b14dd4168fab601399918e 1 parent 2107921
@mikel mikel authored
View
22 actionmailer/lib/action_mailer/base.rb
@@ -354,6 +354,8 @@ class Base < AbstractController::Base
# Alias controller_path to mailer_name so render :partial in views work.
alias :controller_path :mailer_name
+ class_inheritable_accessor :delivery_method
+
class << self
def mailer_name
@@ -361,21 +363,17 @@ def mailer_name
end
attr_writer :mailer_name
+ # Mail uses the same defaults as Rails, except for the file delivery method
+ # save location so we just add this here.
def delivery_settings
- @delivery_settings ||= { :file => { :location => defined?(Rails.root) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails" },
- :smtp => { :address => "localhost",
- :port => 25,
- :domain => 'localhost.localdomain',
- :user_name => nil,
- :password => nil,
- :authentication => nil,
- :enable_starttls_auto => true },
- :sendmail => { :location => '/usr/sbin/sendmail',
- :arguments => '-i -t' }
- }
+ @delivery_settings ||= {:file => {:location => defined?(Rails.root) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"}}
end
- attr_writer :delivery_method
+ # Setup the default settings for Mail delivery
+ Mail.defaults do
+ method = ActionMailer::Base.delivery_method ||= :smtp
+ delivery_method method
+ end
alias :controller_path :mailer_name
View
1  actionmailer/test/mail_layout_test.rb
@@ -1,6 +1,7 @@
require 'abstract_unit'
class AutoLayoutMailer < ActionMailer::Base
+
def hello(recipient)
recipients recipient
subject "You have a mail"
Please sign in to comment.
Something went wrong with that request. Please try again.