diff options
author | José Valim <jose.valim@gmail.com> | 2009-12-25 21:46:01 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-12-25 21:47:47 +0100 |
commit | 88ba056043e22c4c60dde6b07df897e502f49491 (patch) | |
tree | bbb1cac1a430a99aaada9743d02dfcc8b127828a /actionmailer/lib/action_mailer/part.rb | |
parent | ee70d1b6ad9b79d2c3d284e78af4e20416575ea8 (diff) | |
download | rails-88ba056043e22c4c60dde6b07df897e502f49491.tar.gz rails-88ba056043e22c4c60dde6b07df897e502f49491.tar.bz2 rails-88ba056043e22c4c60dde6b07df897e502f49491.zip |
Refactor multiple parts logic and move Utils to PartContainer.
Diffstat (limited to 'actionmailer/lib/action_mailer/part.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/part.rb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/actionmailer/lib/action_mailer/part.rb b/actionmailer/lib/action_mailer/part.rb index 9ff962c39a..716eaae86e 100644 --- a/actionmailer/lib/action_mailer/part.rb +++ b/actionmailer/lib/action_mailer/part.rb @@ -4,7 +4,7 @@ module ActionMailer # and add them to the +parts+ list of the mailer, it is easier # to use the helper methods in ActionMailer::PartContainer. class Part - include PartContainer, Utils + include PartContainer extend AdvAttrAccessor # Represents the body of the part, as a string. This should not be a @@ -83,16 +83,8 @@ module ActionMailer @parts.unshift Part.new(:charset => charset, :body => @body, :content_type => 'text/plain') @body = nil end - - @parts.each do |p| - prt = (TMail::Mail === p ? p : p.to_mail(defaults)) - part.parts << prt - end - - if real_content_type =~ /multipart/ - ctype_attrs.delete 'charset' - part.set_content_type(real_content_type, nil, ctype_attrs) - end + + setup_multiple_parts(part, real_content_type, ctype_attrs) end headers.each { |k,v| part[k] = v } |