Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 618 lines (540 sloc) 25.667 kB
a9751a7 @josevalim Refactor ActionMailer layout and remove legacy one.
josevalim authored
1 require 'active_support/core_ext/class'
616ebb8 @josevalim Remove unused code paths and require mail only when it's needed.
josevalim authored
2 require 'mail'
a288082 @mikel Adding :transfer_encoding -> :content_transfer_encoding as part of Tm…
mikel authored
3 require 'action_mailer/tmail_compat'
a63caa4 Get tests to run (with failures) without old base around
Yehuda Katz + Carl Lerche authored
4
c4590d5 @dhh Fixed docs
dhh authored
5 module ActionMailer #:nodoc:
98dc582 @lifo Merge docrails.
lifo authored
6 # Action Mailer allows you to send email from your application using a mailer model and views.
db045db @dhh Initial
dhh authored
7 #
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
8 # = Mailer Models
20bd4bd @dhh Updated docs and otherwise
dhh authored
9 #
98dc582 @lifo Merge docrails.
lifo authored
10 # To use Action Mailer, you need to create a mailer model.
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
11 #
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
12 # $ script/generate mailer Notifier
13 #
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
14 # The generated model inherits from ActionMailer::Base. Emails are defined by creating methods within the model which are then
15 # used to set variables to be used in the mail template, to change options on the mail, or
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
16 # to add attachments.
17 #
18 # Examples:
19 #
20 # class Notifier < ActionMailer::Base
21 # def signup_notification(recipient)
22 # recipients recipient.email_address_with_name
c3f53f4 @lifo Merge docrails
lifo authored
23 # bcc ["bcc@example.com", "Order Watcher <watcher@example.com>"]
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
24 # from "system@example.com"
25 # subject "New account information"
ee70d1b @josevalim adv_attr_accessors in ActionMailer are not sent to the views, use the…
josevalim authored
26 #
27 # @account = recipient
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
28 # end
29 # end
30 #
31 # Mailer methods have the following configuration methods available.
32 #
33 # * <tt>recipients</tt> - Takes one or more email addresses. These addresses are where your email will be delivered to. Sets the <tt>To:</tt> header.
34 # * <tt>subject</tt> - The subject of your email. Sets the <tt>Subject:</tt> header.
35 # * <tt>from</tt> - Who the email you are sending is from. Sets the <tt>From:</tt> header.
36 # * <tt>cc</tt> - Takes one or more email addresses. These addresses will receive a carbon copy of your email. Sets the <tt>Cc:</tt> header.
cf6299d Add ActionMailer#reply_to. [#245 state:resolved]
Adam authored
37 # * <tt>bcc</tt> - Takes one or more email addresses. These addresses will receive a blind carbon copy of your email. Sets the <tt>Bcc:</tt> header.
38 # * <tt>reply_to</tt> - Takes one or more email addresses. These addresses will be listed as the default recipients when replying to your email. Sets the <tt>Reply-To:</tt> header.
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
39 # * <tt>sent_on</tt> - The date on which the message was sent. If not set, the header wil be set by the delivery agent.
40 # * <tt>content_type</tt> - Specify the content type of the message. Defaults to <tt>text/plain</tt>.
41 # * <tt>headers</tt> - Specify additional headers to be set for the message, e.g. <tt>headers 'X-Mail-Count' => 107370</tt>.
42 #
5c0d38f @dhh Fixed that a return-path header would be ignored (closes #7572) [joost]
dhh authored
43 # When a <tt>headers 'return-path'</tt> is specified, that value will be used as the 'envelope from'
44 # address. Setting this is useful when you want delivery notifications sent to a different address than
45 # the one in <tt>from</tt>.
46 #
20bd4bd @dhh Updated docs and otherwise
dhh authored
47 #
48 # = Mailer views
49 #
98dc582 @lifo Merge docrails.
lifo authored
50 # Like Action Controller, each mailer class has a corresponding view directory
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
51 # in which each method of the class looks for a template with its name.
21187c0 @dhh Apply the rest of Chads patch
dhh authored
52 # To define a template to be used with a mailing, create an <tt>.erb</tt> file with the same name as the method
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
53 # in your mailer model. For example, in the mailer defined above, the template at
21187c0 @dhh Apply the rest of Chads patch
dhh authored
54 # <tt>app/views/notifier/signup_notification.erb</tt> would be used to generate the email.
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
55 #
56 # Variables defined in the model are accessible as instance variables in the view.
57 #
58 # Emails by default are sent in plain text, so a sample view for our model example might look like this:
59 #
60 # Hi <%= @account.name %>,
61 # Thanks for joining our service! Please check back often.
62 #
20bd4bd @dhh Updated docs and otherwise
dhh authored
63 # You can even use Action Pack helpers in these views. For example:
64 #
65 # You got a new note!
ee70d1b @josevalim adv_attr_accessors in ActionMailer are not sent to the views, use the…
josevalim authored
66 # <%= truncate(@note.body, 25) %>
67 #
68 # If you need to access the subject, from or the recipients in the view, you can do that through mailer object:
69 #
70 # You got a new note from <%= mailer.from %>!
71 # <%= truncate(@note.body, 25) %>
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
72 #
20bd4bd @dhh Updated docs and otherwise
dhh authored
73 #
4809dcc * Remove default_url_options from mailer generator
Cody Fauser authored
74 # = Generating URLs
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
75 #
4809dcc * Remove default_url_options from mailer generator
Cody Fauser authored
76 # URLs can be generated in mailer views using <tt>url_for</tt> or named routes.
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
77 # Unlike controllers from Action Pack, the mailer instance doesn't have any context about the incoming request,
78 # so you'll need to provide all of the details needed to generate a URL.
20bd4bd @dhh Updated docs and otherwise
dhh authored
79 #
4809dcc * Remove default_url_options from mailer generator
Cody Fauser authored
80 # When using <tt>url_for</tt> you'll need to provide the <tt>:host</tt>, <tt>:controller</tt>, and <tt>:action</tt>:
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
81 #
4809dcc * Remove default_url_options from mailer generator
Cody Fauser authored
82 # <%= url_for(:host => "example.com", :controller => "welcome", :action => "greeting") %>
20bd4bd @dhh Updated docs and otherwise
dhh authored
83 #
4809dcc * Remove default_url_options from mailer generator
Cody Fauser authored
84 # When using named routes you only need to supply the <tt>:host</tt>:
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
85 #
4809dcc * Remove default_url_options from mailer generator
Cody Fauser authored
86 # <%= users_url(:host => "example.com") %>
87 #
88 # You will want to avoid using the <tt>name_of_route_path</tt> form of named routes because it doesn't make sense to
89 # generate relative URLs in email messages.
90 #
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
91 # It is also possible to set a default host that will be used in all mailers by setting the <tt>:host</tt> option in
4809dcc * Remove default_url_options from mailer generator
Cody Fauser authored
92 # the <tt>ActionMailer::Base.default_url_options</tt> hash as follows:
93 #
94 # ActionMailer::Base.default_url_options[:host] = "example.com"
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
95 #
dc4eec1 @lifo Merge docrails:
lifo authored
96 # This can also be set as a configuration option in <tt>config/environment.rb</tt>:
4809dcc * Remove default_url_options from mailer generator
Cody Fauser authored
97 #
98 # config.action_mailer.default_url_options = { :host => "example.com" }
20bd4bd @dhh Updated docs and otherwise
dhh authored
99 #
4809dcc * Remove default_url_options from mailer generator
Cody Fauser authored
100 # If you do decide to set a default <tt>:host</tt> for your mailers you will want to use the
101 # <tt>:only_path => false</tt> option when using <tt>url_for</tt>. This will ensure that absolute URLs are generated because
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
102 # the <tt>url_for</tt> view helper will, by default, generate relative URLs when a <tt>:host</tt> option isn't
4809dcc * Remove default_url_options from mailer generator
Cody Fauser authored
103 # explicitly provided.
20bd4bd @dhh Updated docs and otherwise
dhh authored
104 #
105 # = Sending mail
106 #
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
107 # Once a mailer action and template are defined, you can deliver your message or create it and save it
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
108 # for delivery later:
109 #
110 # Notifier.deliver_signup_notification(david) # sends the email
111 # mail = Notifier.create_signup_notification(david) # => a tmail object
112 # Notifier.deliver(mail)
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
113 #
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
114 # You never instantiate your mailer class. Rather, your delivery instance
115 # methods are automatically wrapped in class methods that start with the word
116 # <tt>deliver_</tt> followed by the name of the mailer method that you would
117 # like to deliver. The <tt>signup_notification</tt> method defined above is
118 # delivered by invoking <tt>Notifier.deliver_signup_notification</tt>.
119 #
20bd4bd @dhh Updated docs and otherwise
dhh authored
120 #
121 # = HTML email
122 #
21187c0 @dhh Apply the rest of Chads patch
dhh authored
123 # To send mail as HTML, make sure your view (the <tt>.erb</tt> file) generates HTML and
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
124 # set the content type to html.
125 #
126 # class MyMailer < ActionMailer::Base
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
127 # def signup_notification(recipient)
46f30f9 @lifo Merge documentation changes from docrails.
lifo authored
128 # recipients recipient.email_address_with_name
129 # subject "New account information"
130 # from "system@example.com"
131 # body :account => recipient
132 # content_type "text/html"
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
133 # end
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
134 # end
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
135 #
20bd4bd @dhh Updated docs and otherwise
dhh authored
136 #
137 # = Multipart email
138 #
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
139 # You can explicitly specify multipart messages:
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
140 #
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
141 # class ApplicationMailer < ActionMailer::Base
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
142 # def signup_notification(recipient)
143 # recipients recipient.email_address_with_name
144 # subject "New account information"
145 # from "system@example.com"
46f30f9 @lifo Merge documentation changes from docrails.
lifo authored
146 # content_type "multipart/alternative"
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
147 #
148 # part :content_type => "text/html",
149 # :body => render_message("signup-as-html", :account => recipient)
150 #
151 # part "text/plain" do |p|
152 # p.body = render_message("signup-as-plain", :account => recipient)
a288082 @mikel Adding :transfer_encoding -> :content_transfer_encoding as part of Tm…
mikel authored
153 # p.content_transfer_encoding = "base64"
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
154 # end
155 # end
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
156 # end
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
157 #
98dc582 @lifo Merge docrails.
lifo authored
158 # Multipart messages can also be used implicitly because Action Mailer will automatically
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
159 # detect and use multipart templates, where each template is named after the name of the action, followed
160 # by the content type. Each such detected template will be added as separate part to the message.
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
161 #
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
162 # For example, if the following templates existed:
21187c0 @dhh Apply the rest of Chads patch
dhh authored
163 # * signup_notification.text.plain.erb
164 # * signup_notification.text.html.erb
165 # * signup_notification.text.xml.builder
166 # * signup_notification.text.x-yaml.erb
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
167 #
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
168 # Each would be rendered and added as a separate part to the message,
46f30f9 @lifo Merge documentation changes from docrails.
lifo authored
169 # with the corresponding content type. The content type for the entire
170 # message is automatically set to <tt>multipart/alternative</tt>, which indicates
171 # that the email contains multiple different representations of the same email
172 # body. The same body hash is passed to each template.
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
173 #
46f30f9 @lifo Merge documentation changes from docrails.
lifo authored
174 # Implicit template rendering is not performed if any attachments or parts have been added to the email.
175 # This means that you'll have to manually add each part to the email and set the content type of the email
176 # to <tt>multipart/alternative</tt>.
20bd4bd @dhh Updated docs and otherwise
dhh authored
177 #
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
178 # = Attachments
20bd4bd @dhh Updated docs and otherwise
dhh authored
179 #
0a407bc ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, …
Marcel Molina authored
180 # Attachments can be added by using the +attachment+ method.
181 #
182 # Example:
183 #
184 # class ApplicationMailer < ActionMailer::Base
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
185 # # attachments
186 # def signup_notification(recipient)
187 # recipients recipient.email_address_with_name
188 # subject "New account information"
189 # from "system@example.com"
190 #
191 # attachment :content_type => "image/jpeg",
192 # :body => File.read("an-image.jpg")
193 #
194 # attachment "application/pdf" do |a|
195 # a.body = generate_your_pdf_here()
196 # end
db045db @dhh Initial
dhh authored
197 # end
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
198 # end
c927aa0 @dhh Updated documentation
dhh authored
199 #
20bd4bd @dhh Updated docs and otherwise
dhh authored
200 #
c927aa0 @dhh Updated documentation
dhh authored
201 # = Configuration options
202 #
203 # These options are specified on the class level, like <tt>ActionMailer::Base.template_root = "/my/templates"</tt>
204 #
64092de @fxn Improve documentation coverage and markup
fxn authored
205 # * <tt>template_root</tt> - Determines the base from which template references will be made.
c927aa0 @dhh Updated documentation
dhh authored
206 #
207 # * <tt>logger</tt> - the logger is used for generating information on the mailing run if available.
208 # Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
209 #
64092de @fxn Improve documentation coverage and markup
fxn authored
210 # * <tt>smtp_settings</tt> - Allows detailed configuration for <tt>:smtp</tt> delivery method:
dc4eec1 @lifo Merge docrails:
lifo authored
211 # * <tt>:address</tt> - Allows you to use a remote mail server. Just change it from its default "localhost" setting.
212 # * <tt>:port</tt> - On the off chance that your mail server doesn't run on port 25, you can change it.
213 # * <tt>:domain</tt> - If you need to specify a HELO domain, you can do it here.
214 # * <tt>:user_name</tt> - If your mail server requires authentication, set the username in this setting.
215 # * <tt>:password</tt> - If your mail server requires authentication, set the password in this setting.
b2504f8 @josh Tidy up ActionMailer rendering logic to take advantage of view path c…
josh authored
216 # * <tt>:authentication</tt> - If your mail server requires authentication, you need to specify the authentication type here.
46f30f9 @lifo Merge documentation changes from docrails.
lifo authored
217 # This is a symbol and one of <tt>:plain</tt>, <tt>:login</tt>, <tt>:cram_md5</tt>.
c2e7851 @josevalim Add ActionMailer::Base#enable_starttls_auto option for enabling/disab…
josevalim authored
218 # * <tt>:enable_starttls_auto</tt> - When set to true, detects if STARTTLS is enabled in your SMTP server and starts to use it.
219 # It works only on Ruby >= 1.8.7 and Ruby >= 1.9. Default is true.
c927aa0 @dhh Updated documentation
dhh authored
220 #
46f30f9 @lifo Merge documentation changes from docrails.
lifo authored
221 # * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method.
222 # * <tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>.
223 # * <tt>:arguments</tt> - The command line arguments. Defaults to <tt>-i -t</tt>.
dc4eec1 @lifo Merge docrails:
lifo authored
224 #
fbe6c3c @edavis10 Adds a :file delivery_method to save email to a file on disk
edavis10 authored
225 # * <tt>file_settings</tt> - Allows you to override options for the <tt>:file</tt> delivery method.
226 # * <tt>:location</tt> - The directory into which emails will be written. Defaults to the application <tt>tmp/mails</tt>.
227 #
dc4eec1 @lifo Merge docrails:
lifo authored
228 # * <tt>raise_delivery_errors</tt> - Whether or not errors should be raised if the email fails to be delivered.
c927aa0 @dhh Updated documentation
dhh authored
229 #
fbe6c3c @edavis10 Adds a :file delivery_method to save email to a file on disk
edavis10 authored
230 # * <tt>delivery_method</tt> - Defines a delivery method. Possible values are <tt>:smtp</tt> (default), <tt>:sendmail</tt>, <tt>:test</tt>,
f4f7677 @matthewrudy abstract all of the ActionMailer delivery methods into their own clas…
matthewrudy authored
231 # and <tt>:file</tt>. Or you may provide a custom delivery method object eg. MyOwnDeliveryMethodClass.new
c927aa0 @dhh Updated documentation
dhh authored
232 #
dc4eec1 @lifo Merge docrails:
lifo authored
233 # * <tt>perform_deliveries</tt> - Determines whether <tt>deliver_*</tt> methods are actually carried out. By default they are,
c927aa0 @dhh Updated documentation
dhh authored
234 # but this can be turned off to help functional testing.
235 #
64092de @fxn Improve documentation coverage and markup
fxn authored
236 # * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with <tt>delivery_method :test</tt>. Most useful
c927aa0 @dhh Updated documentation
dhh authored
237 # for unit and functional testing.
af56c80 @dhh Updated documentation
dhh authored
238 #
b2504f8 @josh Tidy up ActionMailer rendering logic to take advantage of view path c…
josh authored
239 # * <tt>default_charset</tt> - The default charset used for the body and to encode the subject. Defaults to UTF-8. You can also
46f30f9 @lifo Merge documentation changes from docrails.
lifo authored
240 # pick a different charset from inside a method with +charset+.
c2e7851 @josevalim Add ActionMailer::Base#enable_starttls_auto option for enabling/disab…
josevalim authored
241 #
475bd74 @dhh Fix docs (closes #2598)
dhh authored
242 # * <tt>default_content_type</tt> - The default content type used for the main part of the message. Defaults to "text/plain". You
b2504f8 @josh Tidy up ActionMailer rendering logic to take advantage of view path c…
josh authored
243 # can also pick a different content type from inside a method with +content_type+.
c2e7851 @josevalim Add ActionMailer::Base#enable_starttls_auto option for enabling/disab…
josevalim authored
244 #
46f30f9 @lifo Merge documentation changes from docrails.
lifo authored
245 # * <tt>default_mime_version</tt> - The default mime version used for the message. Defaults to <tt>1.0</tt>. You
246 # can also pick a different value from inside a method with +mime_version+.
c2e7851 @josevalim Add ActionMailer::Base#enable_starttls_auto option for enabling/disab…
josevalim authored
247 #
475bd74 @dhh Fix docs (closes #2598)
dhh authored
248 # * <tt>default_implicit_parts_order</tt> - When a message is built implicitly (i.e. multiple parts are assembled from templates
5c98152 @jamis Better multipart support with implicit multipart/alternative and sort…
jamis authored
249 # which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to
46f30f9 @lifo Merge documentation changes from docrails.
lifo authored
250 # <tt>["text/html", "text/enriched", "text/plain"]</tt>. Items that appear first in the array have higher priority in the mail client
5c98152 @jamis Better multipart support with implicit multipart/alternative and sort…
jamis authored
251 # and appear last in the mime encoded message. You can also pick a different order from inside a method with
46f30f9 @lifo Merge documentation changes from docrails.
lifo authored
252 # +implicit_parts_order+.
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
253 class Base < AbstractController::Base
47e5caa @josevalim Merge Mail with latest Rails and move mail gem to Gemfile.
josevalim authored
254 include Quoting
ee70d1b @josevalim adv_attr_accessors in ActionMailer are not sent to the views, use the…
josevalim authored
255 extend AdvAttrAccessor
a9751a7 @josevalim Refactor ActionMailer layout and remove legacy one.
josevalim authored
256
83f4d86 @dhh Rename the RenderingController module to just plain Rendering
dhh authored
257 include AbstractController::Rendering
976c264 @josevalim Extracted localized_cache.rb from ActionController, added it to Abstr…
josevalim authored
258 include AbstractController::LocalizedCache
a9751a7 @josevalim Refactor ActionMailer layout and remove legacy one.
josevalim authored
259 include AbstractController::Layouts
684c2dc @josevalim Remove ActionMailer helpers and rely on AbstractController one.
josevalim authored
260 include AbstractController::Helpers
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
261
ee70d1b @josevalim adv_attr_accessors in ActionMailer are not sent to the views, use the…
josevalim authored
262 helper ActionMailer::MailHelper
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
263
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
264 include ActionController::UrlWriter
418c3f8 @josevalim Another refactoring on AM. body is deprecated, use render instead.
josevalim authored
265 include ActionMailer::DeprecatedBody
266
c927aa0 @dhh Updated documentation
dhh authored
267 private_class_method :new #:nodoc:
db045db @dhh Initial
dhh authored
268
269 @@raise_delivery_errors = true
270 cattr_accessor :raise_delivery_errors
271
272 @@perform_deliveries = true
273 cattr_accessor :perform_deliveries
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
274
db045db @dhh Initial
dhh authored
275 @@deliveries = []
276 cattr_accessor :deliveries
277
3fad0cd @dhh Added support for charsets for both subject and body. The default cha…
dhh authored
278 @@default_charset = "utf-8"
279 cattr_accessor :default_charset
280
100fd72 @jamis Added a "content_type" accessor to allow messages to explicitly speci…
jamis authored
281 @@default_content_type = "text/plain"
282 cattr_accessor :default_content_type
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
283
45b5555 @jamis Make mime version default to 1.0. closes #2323
jamis authored
284 @@default_mime_version = "1.0"
dca4d4e @jamis Multipart messages specify a MIME-Version header automatically #2003 …
jamis authored
285 cattr_accessor :default_mime_version
100fd72 @jamis Added a "content_type" accessor to allow messages to explicitly speci…
jamis authored
286
c039bcd @mikel Moved sort_parts into Mail, updated mail requirement to 1.4.2
mikel authored
287 # This specifies the order that the parts of a multipart email will be. Usually you put
288 # text/plain at the top so someone without a MIME capable email reader can read the plain
289 # text of your email first.
290 #
291 # Any content type that is not listed here will be inserted in the order you add them to
292 # the email after the content types you list here.
293 @@default_implicit_parts_order = [ "text/plain", "text/enriched", "text/html" ]
5c98152 @jamis Better multipart support with implicit multipart/alternative and sort…
jamis authored
294 cattr_accessor :default_implicit_parts_order
295
ee70d1b @josevalim adv_attr_accessors in ActionMailer are not sent to the views, use the…
josevalim authored
296 @@protected_instance_variables = %w(@parts @mail)
81c416b @josevalim More refactoring on ActionMailer::Base.
josevalim authored
297 cattr_reader :protected_instance_variables
28bf2fa @josh Protect body ivar from being clobbered by the mailer template assigns
josh authored
298
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
299 # Specify the BCC addresses for the message
300 adv_attr_accessor :bcc
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
301
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
302 # Specify the CC addresses for the message.
303 adv_attr_accessor :cc
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
304
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
305 # Specify the charset to use for the message. This defaults to the
306 # +default_charset+ specified for ActionMailer::Base.
307 adv_attr_accessor :charset
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
308
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
309 # Specify the content type for the message. This defaults to <tt>text/plain</tt>
310 # in most cases, but can be automatically set in some situations.
311 adv_attr_accessor :content_type
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
312
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
313 # Specify the from address for the message.
314 adv_attr_accessor :from
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
315
cf6299d Add ActionMailer#reply_to. [#245 state:resolved]
Adam authored
316 # Specify the address (if different than the "from" address) to direct
317 # replies to this message.
318 adv_attr_accessor :reply_to
319
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
320 # Specify additional headers to be added to the message.
321 adv_attr_accessor :headers
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
322
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
323 # Specify the order in which parts should be sorted, based on content-type.
324 # This defaults to the value for the +default_implicit_parts_order+.
325 adv_attr_accessor :implicit_parts_order
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
326
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
327 # Defaults to "1.0", but may be explicitly given if needed.
328 adv_attr_accessor :mime_version
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
329
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
330 # The recipient addresses for the message, either as a string (for a single
331 # address) or an array (for multiple addresses).
332 adv_attr_accessor :recipients
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
333
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
334 # The date on which the message was sent. If not set (the default), the
335 # header will be set by the delivery agent.
336 adv_attr_accessor :sent_on
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
337
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
338 # Specify the subject of the message.
339 adv_attr_accessor :subject
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
340
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
341 # Specify the template name to use for current message. This is the "base"
342 # template name, without the extension or directory, and may be used to
343 # have multiple mailer methods share the same template.
344 adv_attr_accessor :template
165097e @dhh Added access to custom headers, like cc, bcc, and reply-to #268 [Andr…
dhh authored
345
bd5ed65 @technoweenie Update ActionMailer so it treats ActionView the same way that ActionC…
technoweenie authored
346 # Override the mailer name, which defaults to an inflected version of the
347 # mailer's class name. If you want to use a template in a non-standard
348 # location, you can use this to specify that location.
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
349 adv_attr_accessor :mailer_name
418c3f8 @josevalim Another refactoring on AM. body is deprecated, use render instead.
josevalim authored
350
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
351 # Expose the internal mail
352 attr_reader :mail
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
353
418c3f8 @josevalim Another refactoring on AM. body is deprecated, use render instead.
josevalim authored
354 # Alias controller_path to mailer_name so render :partial in views work.
355 alias :controller_path :mailer_name
43d5504 @josevalim Move all render and layout pieces required in ActionMailer from Actio…
josevalim authored
356
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
357 class << self
bd5ed65 @technoweenie Update ActionMailer so it treats ActionView the same way that ActionC…
technoweenie authored
358 attr_writer :mailer_name
359
81c416b @josevalim More refactoring on ActionMailer::Base.
josevalim authored
360 delegate :settings, :settings=, :to => ActionMailer::DeliveryMethod::File, :prefix => :file
361 delegate :settings, :settings=, :to => ActionMailer::DeliveryMethod::Sendmail, :prefix => :sendmail
362 delegate :settings, :settings=, :to => ActionMailer::DeliveryMethod::Smtp, :prefix => :smtp
363
bd5ed65 @technoweenie Update ActionMailer so it treats ActionView the same way that ActionC…
technoweenie authored
364 def mailer_name
365 @mailer_name ||= name.underscore
366 end
367
81c416b @josevalim More refactoring on ActionMailer::Base.
josevalim authored
368 def delivery_method=(method_name)
369 @delivery_method = ActionMailer::DeliveryMethod.lookup_method(method_name)
370 end
371
3cf773b @floehopper ActionMailer should respond_to? to methods handled by method_missing …
floehopper authored
372 def respond_to?(method_symbol, include_private = false) #:nodoc:
373 matches_dynamic_method?(method_symbol) || super
374 end
375
376 def method_missing(method_symbol, *parameters) #:nodoc:
a62e9e9 @mocoso Fix for ActionMailer::Base.method_missing so that it raises NoMethodE…
mocoso authored
377 if match = matches_dynamic_method?(method_symbol)
378 case match[1]
379 when 'create' then new(match[2], *parameters).mail
380 when 'deliver' then new(match[2], *parameters).deliver!
381 when 'new' then nil
c65075f @mocoso Fixed method_missing for ActionMailer so it no longer matches methods…
mocoso authored
382 else super
a62e9e9 @mocoso Fix for ActionMailer::Base.method_missing so that it raises NoMethodE…
mocoso authored
383 end
384 else
385 super
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
386 end
387 end
388
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
389 # Receives a raw email, parses it into an email object, decodes it,
390 # instantiates a new mailer, and passes the email object to the mailer
98dc582 @lifo Merge docrails.
lifo authored
391 # object's +receive+ method. If you want your mailer to be able to
392 # process incoming messages, you'll need to implement a +receive+
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
393 # method that accepts the email object as a parameter:
394 #
395 # class MyMailer < ActionMailer::Base
396 # def receive(mail)
397 # ...
398 # end
399 # end
400 def receive(raw_email)
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
401 logger.info "Received mail:\n #{raw_email}" unless logger.nil?
539d9b3 @mikel More updates... 45 errors left to get it working with Mail gem
mikel authored
402 mail = Mail.new(raw_email)
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
403 new.receive(mail)
404 end
405
406 # Deliver the given mail object directly. This can be used to deliver
407 # a preconstructed mail object, like:
408 #
409 # email = MyMailer.create_some_mail(parameters)
410 # email.set_some_obscure_header "frobnicate"
411 # MyMailer.deliver(email)
412 def deliver(mail)
413 new.deliver!(mail)
414 end
271404e @jeremy Register alternative template engines using ActionMailer::Base.regist…
jeremy authored
415
cb21db1 @josh Treat ActionMailer template_root as a view path set internally to avo…
josh authored
416 def template_root
417 self.view_paths && self.view_paths.first
418 end
419
684c2dc @josevalim Remove ActionMailer helpers and rely on AbstractController one.
josevalim authored
420 # Should template root overwrite the whole view_paths?
61c90a4 @NZKoz Reapply the TemplateFinder first applied in [8669] then reverted in […
NZKoz authored
421 def template_root=(root)
cb21db1 @josh Treat ActionMailer template_root as a view path set internally to avo…
josh authored
422 self.view_paths = ActionView::Base.process_view_paths(root)
61c90a4 @NZKoz Reapply the TemplateFinder first applied in [8669] then reverted in […
NZKoz authored
423 end
3cf773b @floehopper ActionMailer should respond_to? to methods handled by method_missing …
floehopper authored
424
425 private
426 def matches_dynamic_method?(method_name) #:nodoc:
427 method_name = method_name.to_s
c65075f @mocoso Fixed method_missing for ActionMailer so it no longer matches methods…
mocoso authored
428 /^(create|deliver)_([_a-z]\w*)/.match(method_name) || /^(new)$/.match(method_name)
3cf773b @floehopper ActionMailer should respond_to? to methods handled by method_missing …
floehopper authored
429 end
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
430 end
431
81c416b @josevalim More refactoring on ActionMailer::Base.
josevalim authored
432 # Configure delivery method. Check ActionMailer::DeliveryMethod for more
433 # instructions.
434 superclass_delegating_reader :delivery_method
435 self.delivery_method = :smtp
436
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
437 # Add a part to a multipart message, with the given content-type. The
438 # part itself is yielded to the block so that other properties (charset,
439 # body, headers, etc.) can be set on it.
440 def part(params)
441 params = {:content_type => params} if String === params
442 if custom_headers = params.delete(:headers)
443 ActiveSupport::Deprecation.warn('Passing custom headers with :headers => {} is deprecated. ' <<
444 'Please just pass in custom headers directly.', caller[0,10])
445 params.merge!(custom_headers)
446 end
447 part = Mail::Part.new(params)
448 yield part if block_given?
449 @parts << part
450 end
451
452 # Add an attachment to a multipart message. This is simply a part with the
453 # content-disposition set to "attachment".
454 def attachment(params, &block)
455 super # Run deprecation hooks
456
457 params = { :content_type => params } if String === params
458 params = { :content_disposition => "attachment",
459 :content_transfer_encoding => "base64" }.merge(params)
460
461 part(params, &block)
462 end
463
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
464 # Instantiate a new mailer object. If +method_name+ is not +nil+, the mailer
465 # will be initialized according to the named method. If not, the mailer will
466 # remain uninitialized (useful when you only need to invoke the "receive"
467 # method, for instance).
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
468 def initialize(method_name=nil, *args)
d887e46 @jeremy Be sure to invoke the super chain! And initialize response body.
jeremy authored
469 super()
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
470 process(method_name, *args) if method_name
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
471 end
472
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
473 # Process the mailer via the given +method_name+. The body will be
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
474 # rendered and a new Mail object created.
475 def process(method_name, *args)
43d5504 @josevalim Move all render and layout pieces required in ActionMailer from Actio…
josevalim authored
476 initialize_defaults(method_name)
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
477 super
43d5504 @josevalim Move all render and layout pieces required in ActionMailer from Actio…
josevalim authored
478
418c3f8 @josevalim Another refactoring on AM. body is deprecated, use render instead.
josevalim authored
479 # Create e-mail parts
480 create_parts
09f798b @josevalim Instrument create and deliver in ActionMailer.
josevalim authored
481
2aafdc8 @josevalim Use I18n on ActionMailer subjects by default.
josevalim authored
482 # Set the subject if not set yet
4a1f438 @josevalim Change mailer subjects lookup.
josevalim authored
483 @subject ||= I18n.t(:subject, :scope => [:actionmailer, mailer_name, method_name],
484 :default => method_name.humanize)
43d5504 @josevalim Move all render and layout pieces required in ActionMailer from Actio…
josevalim authored
485
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
486 # Build the mail object itself
88ba056 @josevalim Refactor multiple parts logic and move Utils to PartContainer.
josevalim authored
487 create_mail
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
488 end
db045db @dhh Initial
dhh authored
489
15d7cac @mikel Starting again on actionmailer integration with mail
mikel authored
490 # Delivers a Mail object. By default, it delivers the cached mail
98dc582 @lifo Merge docrails.
lifo authored
491 # object (from the <tt>create!</tt> method). If no cached mail object exists, and
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
492 # no alternate has been given as the parameter, this will fail.
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
493 def deliver!(mail = @mail)
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
494 raise "no mail object available for delivery!" unless mail
09f798b @josevalim Instrument create and deliver in ActionMailer.
josevalim authored
495
43d5504 @josevalim Move all render and layout pieces required in ActionMailer from Actio…
josevalim authored
496 if logger
be36455 @jeremy Ruby 1.9 compat: use Array() instead of #to_a.
jeremy authored
497 logger.info "Sent mail to #{Array(recipients).join(', ')}"
fbd3eb7 @jeremy Less verbose mail logging: just recipients for :info log level; the w…
jeremy authored
498 logger.debug "\n#{mail.encoded}"
499 end
256e800 @dhh Fixed quoting for all address headers, not just to #955 [Jamis Buck] …
dhh authored
500
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
501 ActiveSupport::Notifications.instrument(:deliver_mail, :mail => mail) do
09f798b @josevalim Instrument create and deliver in ActionMailer.
josevalim authored
502 begin
f4f7677 @matthewrudy abstract all of the ActionMailer delivery methods into their own clas…
matthewrudy authored
503 self.delivery_method.perform_delivery(mail) if perform_deliveries
09f798b @josevalim Instrument create and deliver in ActionMailer.
josevalim authored
504 rescue Exception => e # Net::SMTP errors or sendmail pipe errors
505 raise e if raise_delivery_errors
506 end
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
507 end
3fad0cd @dhh Added support for charsets for both subject and body. The default cha…
dhh authored
508
09f798b @josevalim Instrument create and deliver in ActionMailer.
josevalim authored
509 mail
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
510 end
3fad0cd @dhh Added support for charsets for both subject and body. The default cha…
dhh authored
511
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
512 private
418c3f8 @josevalim Another refactoring on AM. body is deprecated, use render instead.
josevalim authored
513
f474f33 @jamis Move mailer initialization to a separate (overridable) method, so tha…
jamis authored
514 # Set up the default values for the various instance variables of this
515 # mailer. Subclasses may override this method to provide different
516 # defaults.
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
517 def initialize_defaults(method_name) #:nodoc:
81c416b @josevalim More refactoring on ActionMailer::Base.
josevalim authored
518 @charset ||= @@default_charset.dup
519 @content_type ||= @@default_content_type.dup
95e8740 @dhh Allow Mailers to have custom initialize methods that set default inst…
dhh authored
520 @implicit_parts_order ||= @@default_implicit_parts_order.dup
81c416b @josevalim More refactoring on ActionMailer::Base.
josevalim authored
521 @mime_version ||= @@default_mime_version.dup if @@default_mime_version
522
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
523 @mailer_name ||= self.class.mailer_name.dup
81c416b @josevalim More refactoring on ActionMailer::Base.
josevalim authored
524 @template ||= method_name
525
526 @parts ||= []
95e8740 @dhh Allow Mailers to have custom initialize methods that set default inst…
dhh authored
527 @headers ||= {}
5fdc33c @mrduncan Default sent_on time to now in ActionMailer
mrduncan authored
528 @sent_on ||= Time.now
f474f33 @jamis Move mailer initialization to a separate (overridable) method, so tha…
jamis authored
529
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
530 super # Run deprecation hooks
6228220 @dhh Revert "Revert "Add layout functionality to mailers.""
dhh authored
531 end
532
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
533 def create_parts #:nodoc:
4964d3b @josevalim Make ActionMailer::Base inherit from AbstractController::Base
josevalim authored
534 super # Run deprecation hooks
cb21db1 @josh Treat ActionMailer template_root as a view path set internally to avo…
josh authored
535
418c3f8 @josevalim Another refactoring on AM. body is deprecated, use render instead.
josevalim authored
536 if String === response_body
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
537 @parts.unshift create_inline_part(response_body)
418c3f8 @josevalim Another refactoring on AM. body is deprecated, use render instead.
josevalim authored
538 else
616ebb8 @josevalim Remove unused code paths and require mail only when it's needed.
josevalim authored
539 self.class.template_root.find_all(@template, {}, @mailer_name).each do |template|
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
540 @parts << create_inline_part(render_to_body(:_template => template), template.mime_type)
418c3f8 @josevalim Another refactoring on AM. body is deprecated, use render instead.
josevalim authored
541 end
cb21db1 @josh Treat ActionMailer template_root as a view path set internally to avo…
josh authored
542
418c3f8 @josevalim Another refactoring on AM. body is deprecated, use render instead.
josevalim authored
543 if @parts.size > 1
544 @content_type = "multipart/alternative" if @content_type !~ /^multipart/
545 end
2aafdc8 @josevalim Use I18n on ActionMailer subjects by default.
josevalim authored
546
547 # If this is a multipart e-mail add the mime_version if it is not
548 # already set.
549 @mime_version ||= "1.0" if !@parts.empty?
418c3f8 @josevalim Another refactoring on AM. body is deprecated, use render instead.
josevalim authored
550 end
db045db @dhh Initial
dhh authored
551 end
552
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
553 def create_inline_part(body, mime_type=nil) #:nodoc:
554 ct = mime_type || "text/plain"
555 main_type, sub_type = split_content_type(ct.to_s)
556
557 Mail::Part.new(
558 :content_type => [main_type, sub_type, {:charset => charset}],
559 :content_disposition => "inline",
560 :body => body
561 )
562 end
563
564 def create_mail #:nodoc:
15d7cac @mikel Starting again on actionmailer integration with mail
mikel authored
565 m = Mail.new
74a612c @dhh Added that delivery errors are caught in a way so the mail is still r…
dhh authored
566
cf6299d Add ActionMailer#reply_to. [#245 state:resolved]
Adam authored
567 m.subject, = quote_any_if_necessary(charset, subject)
568 m.to, m.from = quote_any_address_if_necessary(charset, recipients, from)
569 m.bcc = quote_address_if_necessary(bcc, charset) unless bcc.nil?
570 m.cc = quote_address_if_necessary(cc, charset) unless cc.nil?
571 m.reply_to = quote_address_if_necessary(reply_to, charset) unless reply_to.nil?
dca4d4e @jamis Multipart messages specify a MIME-Version header automatically #2003 …
jamis authored
572 m.mime_version = mime_version unless mime_version.nil?
cf6299d Add ActionMailer#reply_to. [#245 state:resolved]
Adam authored
573 m.date = sent_on.to_time rescue sent_on if sent_on
574
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
575 headers.each { |k, v| m[k] = v }
db045db @dhh Initial
dhh authored
576
db0e8ff @jamis Parse content-type apart before using it so that sub-parts of the hea…
jamis authored
577 real_content_type, ctype_attrs = parse_content_type
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
578 main_type, sub_type = split_content_type(real_content_type)
5d9af09 @josh Silence known internal AM deprecation calls
josh authored
579
616ebb8 @josevalim Remove unused code paths and require mail only when it's needed.
josevalim authored
580 if @parts.size == 1 && @parts.first.parts.empty?
a5e6295 @mikel Down to 30 failures total
mikel authored
581 m.content_type([main_type, sub_type, ctype_attrs])
a6eed86 @mikel Removing utils, and updating requires to match
mikel authored
582 m.body = @parts.first.body.encoded
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
583 else
584 @parts.each do |p|
747d568 @mikel 131 tests, 309 assertions, 0 failures, 0 errors
mikel authored
585 m.add_part(p)
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
586 end
616ebb8 @josevalim Remove unused code paths and require mail only when it's needed.
josevalim authored
587
c039bcd @mikel Moved sort_parts into Mail, updated mail requirement to 1.4.2
mikel authored
588 m.body.set_sort_order(@implicit_parts_order)
589 m.body.sort_parts!
3b0e1d9 @josh Prefer string core_ext inflector methods over directly accessing Infl…
josh authored
590
49efa02 @jamis Nil charset caused subject line to be improperly quoted in implicitly…
jamis authored
591 if real_content_type =~ /multipart/
592 ctype_attrs.delete "charset"
a5e6295 @mikel Down to 30 failures total
mikel authored
593 m.content_type([main_type, sub_type, ctype_attrs])
49efa02 @jamis Nil charset caused subject line to be improperly quoted in implicitly…
jamis authored
594 end
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
595 end
256e800 @dhh Fixed quoting for all address headers, not just to #955 [Jamis Buck] …
dhh authored
596
b354496 @mikel Adding default 8bit encoding if the body has non usascii in it
mikel authored
597 m.content_transfer_encoding = '8bit' unless m.body.only_us_ascii?
598
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
599 @mail = m
256e800 @dhh Fixed quoting for all address headers, not just to #955 [Jamis Buck] …
dhh authored
600 end
539d9b3 @mikel More updates... 45 errors left to get it working with Mail gem
mikel authored
601
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
602 def split_content_type(ct) #:nodoc:
539d9b3 @mikel More updates... 45 errors left to get it working with Mail gem
mikel authored
603 ct.to_s.split("/")
604 end
256e800 @dhh Fixed quoting for all address headers, not just to #955 [Jamis Buck] …
dhh authored
605
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
606 def parse_content_type(defaults=nil) #:nodoc:
616ebb8 @josevalim Remove unused code paths and require mail only when it's needed.
josevalim authored
607 if @content_type.blank?
608 [ nil, {} ]
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
609 else
616ebb8 @josevalim Remove unused code paths and require mail only when it's needed.
josevalim authored
610 ctype, *attrs = @content_type.split(/;\s*/)
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
611 attrs = attrs.inject({}) { |h,s| k,v = s.split(/\=/, 2); h[k] = v; h }
616ebb8 @josevalim Remove unused code paths and require mail only when it's needed.
josevalim authored
612 [ctype, {"charset" => @charset}.merge(attrs)]
971f4ff @josevalim DRY ActionMailer code.
josevalim authored
613 end
15d7cac @mikel Starting again on actionmailer integration with mail
mikel authored
614 end
615
db045db @dhh Initial
dhh authored
616 end
617 end
Something went wrong with that request. Please try again.