Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 460 lines (396 sloc) 18.368 kB
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
1 require 'action_mailer/adv_attr_accessor'
2 require 'action_mailer/part'
5ddffc8 @jamis Allow for nested parts in multipart mails #1570 [Flurin Egger]
jamis authored
3 require 'action_mailer/part_container'
bde3df2 @jamis Correctly normalize newlines in outgoing emails before encoding the b…
jamis authored
4 require 'action_mailer/utils'
508c26c @jamis BCC headers are removed when sending via SMTP
jamis authored
5 require 'tmail/net'
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
6
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
7 module ActionMailer
db045db @dhh Initial
dhh authored
8 # Usage:
9 #
10 # class ApplicationMailer < ActionMailer::Base
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
11 # # Set up properties
475bd74 @dhh Fix docs (closes #2598)
dhh authored
12 # # Properties can also be specified via accessor methods
13 # # (i.e. self.subject = "foo") and instance variables (@subject = "foo").
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
14 # def signup_notification(recipient)
15 # recipients recipient.email_address_with_name
16 # subject "New account information"
2789b5d @dhh Tuned documentation for release (AM)
dhh authored
17 # body { "account" => recipient }
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
18 # from "system@example.com"
19 # end
20 #
21 # # explicitly specify multipart messages
22 # def signup_notification(recipient)
23 # recipients recipient.email_address_with_name
24 # subject "New account information"
25 # from "system@example.com"
26 #
27 # part :content_type => "text/html",
28 # :body => render_message("signup-as-html", :account => recipient)
29 #
30 # part "text/plain" do |p|
31 # p.body = render_message("signup-as-plain", :account => recipient)
32 # p.transfer_encoding = "base64"
33 # end
34 # end
35 #
36 # # attachments
37 # def signup_notification(recipient)
38 # recipients recipient.email_address_with_name
39 # subject "New account information"
40 # from "system@example.com"
41 #
42 # attachment :content_type => "image/jpeg",
43 # :body => File.read("an-image.jpg")
44 #
45 # attachment "application/pdf" do |a|
46 # a.body = generate_your_pdf_here()
47 # end
db045db @dhh Initial
dhh authored
48 # end
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
49 #
50 # # implicitly multipart messages
51 # def signup_notification(recipient)
52 # recipients recipient.email_address_with_name
53 # subject "New account information"
54 # from "system@example.com"
55 # body(:account => "recipient")
56 #
57 # # ActionMailer will automatically detect and use multipart templates,
58 # # where each template is named after the name of the action, followed
59 # # by the content type. Each such detected template will be added as
60 # # a separate part to the message.
61 # #
62 # # for example, if the following templates existed:
63 # # * signup_notification.text.plain.rhtml
64 # # * signup_notification.text.html.rhtml
65 # # * signup_notification.text.xml.rxml
66 # # * signup_notification.text.x-yaml.rhtml
67 # #
68 # # Each would be rendered and added as a separate part to the message,
69 # # with the corresponding content type. The same body hash is passed to
70 # # each template.
db045db @dhh Initial
dhh authored
71 # end
72 # end
73 #
475bd74 @dhh Fix docs (closes #2598)
dhh authored
74 # # After this, post_notification will look for "templates/application_mailer/post_notification.rhtml"
db045db @dhh Initial
dhh authored
75 # ApplicationMailer.template_root = "templates"
76 #
77 # ApplicationMailer.create_comment_notification(david, hello_world) # => a tmail object
78 # ApplicationMailer.deliver_comment_notification(david, hello_world) # sends the email
c927aa0 @dhh Updated documentation
dhh authored
79 #
80 # = Configuration options
81 #
82 # These options are specified on the class level, like <tt>ActionMailer::Base.template_root = "/my/templates"</tt>
83 #
84 # * <tt>template_root</tt> - template root determines the base from which template references will be made.
85 #
86 # * <tt>logger</tt> - the logger is used for generating information on the mailing run if available.
87 # Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
88 #
89 # * <tt>server_settings</tt> - Allows detailed configuration of the server:
475bd74 @dhh Fix docs (closes #2598)
dhh authored
90 # * <tt>:address</tt> Allows you to use a remote mail server. Just change it from its default "localhost" setting.
91 # * <tt>:port</tt> On the off chance that your mail server doesn't run on port 25, you can change it.
c927aa0 @dhh Updated documentation
dhh authored
92 # * <tt>:domain</tt> If you need to specify a HELO domain, you can do it here.
475bd74 @dhh Fix docs (closes #2598)
dhh authored
93 # * <tt>:user_name</tt> If your mail server requires authentication, set the username in this setting.
94 # * <tt>:password</tt> If your mail server requires authentication, set the password in this setting.
c927aa0 @dhh Updated documentation
dhh authored
95 # * <tt>:authentication</tt> If your mail server requires authentication, you need to specify the authentication type here.
96 # This is a symbol and one of :plain, :login, :cram_md5
97 #
98 # * <tt>raise_delivery_errors</tt> - whether or not errors should be raised if the email fails to be delivered.
99 #
100 # * <tt>delivery_method</tt> - Defines a delivery method. Possible values are :smtp (default), :sendmail, and :test.
101 # Sendmail is assumed to be present at "/usr/sbin/sendmail".
102 #
103 # * <tt>perform_deliveries</tt> - Determines whether deliver_* methods are actually carried out. By default they are,
104 # but this can be turned off to help functional testing.
105 #
106 # * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with delivery_method :test. Most useful
107 # for unit and functional testing.
af56c80 @dhh Updated documentation
dhh authored
108 #
109 # * <tt>default_charset</tt> - The default charset used for the body and to encode the subject. Defaults to UTF-8. You can also
5c98152 @jamis Better multipart support with implicit multipart/alternative and sort…
jamis authored
110 # pick a different charset from inside a method with <tt>@charset</tt>.
475bd74 @dhh Fix docs (closes #2598)
dhh authored
111 # * <tt>default_content_type</tt> - The default content type used for the main part of the message. Defaults to "text/plain". You
5c98152 @jamis Better multipart support with implicit multipart/alternative and sort…
jamis authored
112 # can also pick a different content type from inside a method with <tt>@content_type</tt>.
dca4d4e @jamis Multipart messages specify a MIME-Version header automatically #2003 …
jamis authored
113 # * <tt>default_mime_version</tt> - The default mime version used for the message. Defaults to nil. You
114 # can also pick a different value from inside a method with <tt>@mime_version</tt>. When multipart messages are in
115 # use, <tt>@mime_version</tt> will be set to "1.0" if it is not set inside a method.
475bd74 @dhh Fix docs (closes #2598)
dhh authored
116 # * <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
117 # which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to
118 # ["text/html", "text/enriched", "text/plain"]. Items that appear first in the array have higher priority in the mail client
119 # and appear last in the mime encoded message. You can also pick a different order from inside a method with
120 # <tt>@implicit_parts_order</tt>.
db045db @dhh Initial
dhh authored
121 class Base
0fe8e3d @dhh Added a config example in README #1626 [courtenay]
dhh authored
122 include AdvAttrAccessor, PartContainer
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
123
01b1a87 @dhh Added reusable reloading support through the inclusion of the Relodab…
dhh authored
124 # Action Mailer subclasses should be reloaded by the dispatcher in Rails
125 # when Dependencies.mechanism = :load.
5cbc062 @dhh Just go with Subclasses instead of OnlySubclasses
dhh authored
126 include Reloadable::Subclasses
1bce58b @seckar Add Reloadable::OnlySubclasses which handles the common case where a …
seckar authored
127
c927aa0 @dhh Updated documentation
dhh authored
128 private_class_method :new #:nodoc:
db045db @dhh Initial
dhh authored
129
130 cattr_accessor :template_root
131 cattr_accessor :logger
132
133 @@server_settings = {
134 :address => "localhost",
135 :port => 25,
136 :domain => 'localhost.localdomain',
137 :user_name => nil,
138 :password => nil,
139 :authentication => nil
140 }
141 cattr_accessor :server_settings
142
143 @@raise_delivery_errors = true
144 cattr_accessor :raise_delivery_errors
145
146 @@delivery_method = :smtp
147 cattr_accessor :delivery_method
148
149 @@perform_deliveries = true
150 cattr_accessor :perform_deliveries
151
152 @@deliveries = []
153 cattr_accessor :deliveries
154
3fad0cd @dhh Added support for charsets for both subject and body. The default cha…
dhh authored
155 @@default_charset = "utf-8"
156 cattr_accessor :default_charset
157
100fd72 @jamis Added a "content_type" accessor to allow messages to explicitly speci…
jamis authored
158 @@default_content_type = "text/plain"
159 cattr_accessor :default_content_type
dca4d4e @jamis Multipart messages specify a MIME-Version header automatically #2003 …
jamis authored
160
161 @@default_mime_version = nil
162 cattr_accessor :default_mime_version
100fd72 @jamis Added a "content_type" accessor to allow messages to explicitly speci…
jamis authored
163
5c98152 @jamis Better multipart support with implicit multipart/alternative and sort…
jamis authored
164 @@default_implicit_parts_order = [ "text/html", "text/enriched", "text/plain" ]
165 cattr_accessor :default_implicit_parts_order
166
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
167 # Specify the BCC addresses for the message
168 adv_attr_accessor :bcc
169
170 # Define the body of the message. This is either a Hash (in which case it
171 # specifies the variables to pass to the template when it is rendered),
172 # or a string, in which case it specifies the actual text of the message.
173 adv_attr_accessor :body
174
175 # Specify the CC addresses for the message.
176 adv_attr_accessor :cc
177
178 # Specify the charset to use for the message. This defaults to the
179 # +default_charset+ specified for ActionMailer::Base.
180 adv_attr_accessor :charset
181
182 # Specify the content type for the message. This defaults to <tt>text/plain</tt>
183 # in most cases, but can be automatically set in some situations.
184 adv_attr_accessor :content_type
185
186 # Specify the from address for the message.
187 adv_attr_accessor :from
188
189 # Specify additional headers to be added to the message.
190 adv_attr_accessor :headers
191
192 # Specify the order in which parts should be sorted, based on content-type.
193 # This defaults to the value for the +default_implicit_parts_order+.
194 adv_attr_accessor :implicit_parts_order
195
196 # Override the mailer name, which defaults to an inflected version of the
197 # mailer's class name. If you want to use a template in a non-standard
198 # location, you can use this to specify that location.
199 adv_attr_accessor :mailer_name
200
201 # Defaults to "1.0", but may be explicitly given if needed.
202 adv_attr_accessor :mime_version
203
204 # The recipient addresses for the message, either as a string (for a single
205 # address) or an array (for multiple addresses).
206 adv_attr_accessor :recipients
207
208 # The date on which the message was sent. If not set (the default), the
209 # header will be set by the delivery agent.
210 adv_attr_accessor :sent_on
211
212 # Specify the subject of the message.
213 adv_attr_accessor :subject
214
215 # Specify the template name to use for current message. This is the "base"
216 # template name, without the extension or directory, and may be used to
217 # have multiple mailer methods share the same template.
218 adv_attr_accessor :template
165097e @dhh Added access to custom headers, like cc, bcc, and reply-to #268 [Andr…
dhh authored
219
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
220 # The mail object instance referenced by this mailer.
221 attr_reader :mail
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
222
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
223 class << self
224 def method_missing(method_symbol, *parameters)#:nodoc:
225 case method_symbol.id2name
226 when /^create_([_a-z]\w*)/ then new($1, *parameters).mail
227 when /^deliver_([_a-z]\w*)/ then new($1, *parameters).deliver!
228 when "new" then nil
229 else super
230 end
231 end
232
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
233 # Receives a raw email, parses it into an email object, decodes it,
234 # instantiates a new mailer, and passes the email object to the mailer
235 # object's #receive method. If you want your mailer to be able to
236 # process incoming messages, you'll need to implement a #receive
237 # method that accepts the email object as a parameter:
238 #
239 # class MyMailer < ActionMailer::Base
240 # def receive(mail)
241 # ...
242 # end
243 # end
244 def receive(raw_email)
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
245 logger.info "Received mail:\n #{raw_email}" unless logger.nil?
246 mail = TMail::Mail.parse(raw_email)
247 mail.base64_decode
248 new.receive(mail)
249 end
250
251 # Deliver the given mail object directly. This can be used to deliver
252 # a preconstructed mail object, like:
253 #
254 # email = MyMailer.create_some_mail(parameters)
255 # email.set_some_obscure_header "frobnicate"
256 # MyMailer.deliver(email)
257 def deliver(mail)
258 new.deliver!(mail)
259 end
260 end
261
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
262 # Instantiate a new mailer object. If +method_name+ is not +nil+, the mailer
263 # will be initialized according to the named method. If not, the mailer will
264 # remain uninitialized (useful when you only need to invoke the "receive"
265 # method, for instance).
2789b5d @dhh Tuned documentation for release (AM)
dhh authored
266 def initialize(method_name=nil, *parameters) #:nodoc:
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
267 create!(method_name, *parameters) if method_name
268 end
269
270 # Initialize the mailer via the given +method_name+. The body will be
271 # rendered and a new TMail::Mail object created.
2789b5d @dhh Tuned documentation for release (AM)
dhh authored
272 def create!(method_name, *parameters) #:nodoc:
f474f33 @jamis Move mailer initialization to a separate (overridable) method, so tha…
jamis authored
273 initialize_defaults(method_name)
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
274 send(method_name, *parameters)
275
276 # If an explicit, textual body has not been set, we check assumptions.
277 unless String === @body
278 # First, we look to see if there are any likely templates that match,
279 # which include the content-type in their file name (i.e.,
dca4d4e @jamis Multipart messages specify a MIME-Version header automatically #2003 …
jamis authored
280 # "the_template_file.text.html.rhtml", etc.). Only do this if parts
281 # have not already been specified manually.
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
282 if @parts.empty?
813a8b9 @jamis Allow template to be explicitly specified #1448 [tuxie@dekadance.se]
jamis authored
283 templates = Dir.glob("#{template_path}/#{@template}.*")
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
284 templates.each do |path|
f2ee215 @jeremy Stricter matching for implicitly multipart filenames excludes files e…
jeremy authored
285 # TODO: don't hardcode rhtml|rxml
286 next unless md = /^([^\.]+)\.([^\.]+\.[^\+]+)\.(rhtml|rxml)$/.match(File.basename(path))
287 template_name = "#{md.captures[0]}.#{md.captures[1]}"
288 content_type = md.captures[1].gsub('.', '/')
289 @parts << Part.new(:content_type => content_type,
053cb22 @jamis Use the real charset for parts generated by a template, instead of th…
jamis authored
290 :disposition => "inline", :charset => charset,
f2ee215 @jeremy Stricter matching for implicitly multipart filenames excludes files e…
jeremy authored
291 :body => render_message(template_name, @body))
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
292 end
5c98152 @jamis Better multipart support with implicit multipart/alternative and sort…
jamis authored
293 unless @parts.empty?
294 @content_type = "multipart/alternative"
8373b55 @jamis * Don't add charset to content-type header for a part that contains s…
jamis authored
295 @charset = nil
5c98152 @jamis Better multipart support with implicit multipart/alternative and sort…
jamis authored
296 @parts = sort_parts(@parts, @implicit_parts_order)
297 end
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
298 end
db045db @dhh Initial
dhh authored
299
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
300 # Then, if there were such templates, we check to see if we ought to
301 # also render a "normal" template (without the content type). If a
302 # normal template exists (or if there were no implicit parts) we render
303 # it.
304 template_exists = @parts.empty?
34df9be @jamis Template paths with dot chars in them no longer mess up implicit temp…
jamis authored
305 template_exists ||= Dir.glob("#{template_path}/#{@template}.*").any? { |i| File.basename(i).split(".").length == 2 }
813a8b9 @jamis Allow template to be explicitly specified #1448 [tuxie@dekadance.se]
jamis authored
306 @body = render_message(@template, @body) if template_exists
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
307
308 # Finally, if there are other message parts and a textual body exists,
309 # we shift it onto the front of the parts and set the body to nil (so
310 # that create_mail doesn't try to render it in addition to the parts).
311 if !@parts.empty? && String === @body
312 @parts.unshift Part.new(:charset => charset, :body => @body)
313 @body = nil
425aa50 @dhh Added receiver method for incoming email
dhh authored
314 end
db045db @dhh Initial
dhh authored
315 end
316
dca4d4e @jamis Multipart messages specify a MIME-Version header automatically #2003 …
jamis authored
317 # If this is a multipart e-mail add the mime_version if it is not
318 # already set.
319 @mime_version ||= "1.0" if !@parts.empty?
320
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
321 # build the mail object itself
322 @mail = create_mail
323 end
db045db @dhh Initial
dhh authored
324
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
325 # Delivers a TMail::Mail object. By default, it delivers the cached mail
326 # object (from the #create! method). If no cached mail object exists, and
327 # no alternate has been given as the parameter, this will fail.
59f1df1 @jamis Update/extend ActionMailer documentation (rdoc)
jamis authored
328 def deliver!(mail = @mail)
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
329 raise "no mail object available for delivery!" unless mail
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
330 logger.info "Sent mail:\n #{mail.encoded}" unless logger.nil?
256e800 @dhh Fixed quoting for all address headers, not just to #955 [Jamis Buck] …
dhh authored
331
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
332 begin
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
333 send("perform_delivery_#{delivery_method}", mail) if perform_deliveries
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
334 rescue Object => e
335 raise e if raise_delivery_errors
336 end
3fad0cd @dhh Added support for charsets for both subject and body. The default cha…
dhh authored
337
eda1719 @jamis ActionMailer::Base.deliver(email) had been accidentally removed, but …
jamis authored
338 return mail
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
339 end
3fad0cd @dhh Added support for charsets for both subject and body. The default cha…
dhh authored
340
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
341 private
f474f33 @jamis Move mailer initialization to a separate (overridable) method, so tha…
jamis authored
342 # Set up the default values for the various instance variables of this
343 # mailer. Subclasses may override this method to provide different
344 # defaults.
345 def initialize_defaults(method_name)
95e8740 @dhh Allow Mailers to have custom initialize methods that set default inst…
dhh authored
346 @charset ||= @@default_charset.dup
347 @content_type ||= @@default_content_type.dup
348 @implicit_parts_order ||= @@default_implicit_parts_order.dup
349 @template ||= method_name
350 @mailer_name ||= Inflector.underscore(self.class.name)
351 @parts ||= []
352 @headers ||= {}
353 @body ||= {}
dca4d4e @jamis Multipart messages specify a MIME-Version header automatically #2003 …
jamis authored
354 @mime_version = @@default_mime_version.dup if @@default_mime_version
f474f33 @jamis Move mailer initialization to a separate (overridable) method, so tha…
jamis authored
355 end
356
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
357 def render_message(method_name, body)
ae1e852 @jamis Add a unified render method to ActionMailer (delegates to ActionView:…
jamis authored
358 render :file => method_name, :body => body
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
359 end
ae1e852 @jamis Add a unified render method to ActionMailer (delegates to ActionView:…
jamis authored
360
361 def render(opts)
362 body = opts.delete(:body)
363 initialize_template_class(body).render(opts)
364 end
365
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
366 def template_path
ae1e852 @jamis Add a unified render method to ActionMailer (delegates to ActionView:…
jamis authored
367 "#{template_root}/#{mailer_name}"
db045db @dhh Initial
dhh authored
368 end
369
5ec990a @jamis Helper support for ActionMailer
jamis authored
370 def initialize_template_class(assigns)
371 ActionView::Base.new(template_path, assigns, self)
372 end
373
5c98152 @jamis Better multipart support with implicit multipart/alternative and sort…
jamis authored
374 def sort_parts(parts, order = [])
375 order = order.collect { |s| s.downcase }
376
377 parts = parts.sort do |a, b|
378 a_ct = a.content_type.downcase
379 b_ct = b.content_type.downcase
380
381 a_in = order.include? a_ct
382 b_in = order.include? b_ct
383
384 s = case
385 when a_in && b_in
386 order.index(a_ct) <=> order.index(b_ct)
387 when a_in
388 -1
389 when b_in
390 1
391 else
392 a_ct <=> b_ct
393 end
394
395 # reverse the ordering because parts that come last are displayed
396 # first in mail clients
397 (s * -1)
398 end
399
400 parts
401 end
402
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
403 def create_mail
404 m = TMail::Mail.new
74a612c @dhh Added that delivery errors are caught in a way so the mail is still r…
dhh authored
405
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
406 m.subject, = quote_any_if_necessary(charset, subject)
407 m.to, m.from = quote_any_address_if_necessary(charset, recipients, from)
408 m.bcc = quote_address_if_necessary(bcc, charset) unless bcc.nil?
409 m.cc = quote_address_if_necessary(cc, charset) unless cc.nil?
74a612c @dhh Added that delivery errors are caught in a way so the mail is still r…
dhh authored
410
dca4d4e @jamis Multipart messages specify a MIME-Version header automatically #2003 …
jamis authored
411 m.mime_version = mime_version unless mime_version.nil?
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
412 m.date = sent_on.to_time rescue sent_on if sent_on
413 headers.each { |k, v| m[k] = v }
db045db @dhh Initial
dhh authored
414
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
415 if @parts.empty?
100fd72 @jamis Added a "content_type" accessor to allow messages to explicitly speci…
jamis authored
416 m.set_content_type content_type, nil, { "charset" => charset }
bde3df2 @jamis Correctly normalize newlines in outgoing emails before encoding the b…
jamis authored
417 m.body = Utils.normalize_new_lines(body)
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
418 else
419 if String === body
420 part = TMail::Mail.new
bde3df2 @jamis Correctly normalize newlines in outgoing emails before encoding the b…
jamis authored
421 part.body = Utils.normalize_new_lines(body)
100fd72 @jamis Added a "content_type" accessor to allow messages to explicitly speci…
jamis authored
422 part.set_content_type content_type, nil, { "charset" => charset }
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
423 part.set_content_disposition "inline"
424 m.parts << part
425 end
3fad0cd @dhh Added support for charsets for both subject and body. The default cha…
dhh authored
426
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
427 @parts.each do |p|
428 part = (TMail::Mail === p ? p : p.to_mail(self))
429 m.parts << part
430 end
3b4eb7a @jamis Allow specific "multipart/xxx" content-type to be set on multipart me…
jamis authored
431
432 m.set_content_type(content_type, nil, { "charset" => charset }) if content_type =~ /multipart/
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
433 end
256e800 @dhh Fixed quoting for all address headers, not just to #955 [Jamis Buck] …
dhh authored
434
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
435 @mail = m
256e800 @dhh Fixed quoting for all address headers, not just to #955 [Jamis Buck] …
dhh authored
436 end
437
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
438 def perform_delivery_smtp(mail)
508c26c @jamis BCC headers are removed when sending via SMTP
jamis authored
439 destinations = mail.destinations
440 mail.ready_to_send
441
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
442 Net::SMTP.start(server_settings[:address], server_settings[:port], server_settings[:domain],
443 server_settings[:user_name], server_settings[:password], server_settings[:authentication]) do |smtp|
508c26c @jamis BCC headers are removed when sending via SMTP
jamis authored
444 smtp.sendmail(mail.encoded, mail.from, destinations)
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
445 end
256e800 @dhh Fixed quoting for all address headers, not just to #955 [Jamis Buck] …
dhh authored
446 end
447
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
448 def perform_delivery_sendmail(mail)
449 IO.popen("/usr/sbin/sendmail -i -t","w+") do |sm|
bb62568 @dhh Fix problem with sendmail delivery where headers should be delimited …
dhh authored
450 sm.print(mail.encoded.gsub(/\r/, ''))
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
451 sm.flush
256e800 @dhh Fixed quoting for all address headers, not just to #955 [Jamis Buck] …
dhh authored
452 end
453 end
454
359caef @jamis A very thorough refactoring, resulting in new mail property setters a…
jamis authored
455 def perform_delivery_test(mail)
456 deliveries << mail
457 end
db045db @dhh Initial
dhh authored
458 end
459 end
Something went wrong with that request. Please try again.