diff options
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 7 | ||||
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 20 | ||||
| -rwxr-xr-x | actionmailer/test/mail_service_test.rb | 22 | ||||
| -rw-r--r-- | actionmailer/test/url_test.rb | 24 |
5 files changed, 28 insertions, 47 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 85bf21d819..165d28652a 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Make mime version default to 1.0. closes #2323 [ror@andreas-s.net] + * Make sure quoted-printable text is decoded correctly when only portions of the text are encoded. closes #3154. [jon@siliconcircus.com] * Make sure DOS newlines in quoted-printable text are normalized to unix newlines before unquoting. closes #4166 and #4452. [Jamis Buck] diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 00b02c746e..444bea95e0 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -208,9 +208,8 @@ module ActionMailer #:nodoc: # pick a different charset from inside a method with <tt>@charset</tt>. # * <tt>default_content_type</tt> - The default content type used for the main part of the message. Defaults to "text/plain". You # can also pick a different content type from inside a method with <tt>@content_type</tt>. - # * <tt>default_mime_version</tt> - The default mime version used for the message. Defaults to nil. You - # can also pick a different value from inside a method with <tt>@mime_version</tt>. When multipart messages are in - # use, <tt>@mime_version</tt> will be set to "1.0" if it is not set inside a method. + # * <tt>default_mime_version</tt> - The default mime version used for the message. Defaults to "1.0". You + # can also pick a different value from inside a method with <tt>@mime_version</tt>. # * <tt>default_implicit_parts_order</tt> - When a message is built implicitly (i.e. multiple parts are assembled from templates # which specify the content type in their filenames) this variable controls how the parts are ordered. Defaults to # ["text/html", "text/enriched", "text/plain"]. Items that appear first in the array have higher priority in the mail client @@ -257,7 +256,7 @@ module ActionMailer #:nodoc: @@default_content_type = "text/plain" cattr_accessor :default_content_type - @@default_mime_version = nil + @@default_mime_version = "1.0" cattr_accessor :default_mime_version @@default_implicit_parts_order = [ "text/html", "text/enriched", "text/plain" ] diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 75690b49ad..8a30e39a2b 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -8,3 +8,23 @@ ActiveSupport::Deprecation.debug = true $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers" ActionMailer::Base.template_root = "#{File.dirname(__FILE__)}/fixtures" + +class MockSMTP + def self.deliveries + @@deliveries + end + + def initialize + @@deliveries = [] + end + + def sendmail(mail, from, to) + @@deliveries << [mail, from, to] + end +end + +class Net::SMTP + def self.start(*args) + yield MockSMTP.new + end +end diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 544413b328..ccded61b7c 100755 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -1,25 +1,5 @@ require "#{File.dirname(__FILE__)}/abstract_unit" -class MockSMTP - def self.deliveries - @@deliveries - end - - def initialize - @@deliveries = [] - end - - def sendmail(mail, from, to) - @@deliveries << [mail, from, to] - end -end - -class Net::SMTP - def self.start(*args) - yield MockSMTP.new - end -end - class FunkyPathMailer < ActionMailer::Base self.template_root = "#{File.dirname(__FILE__)}/fixtures/path.with.dots" @@ -274,6 +254,7 @@ class ActionMailerTest < Test::Unit::TestCase def new_mail( charset="utf-8" ) mail = TMail::Mail.new + mail.mime_version = "1.0" if charset mail.set_content_type "text", "plain", { "charset" => charset } end @@ -315,7 +296,6 @@ class ActionMailerTest < Test::Unit::TestCase expected.body = "Hello there, \n\nMr. #{@recipient}" expected.from = "system@loudthinking.com" expected.date = Time.local(2004, 12, 12) - expected.mime_version = nil created = nil assert_nothing_raised { created = TestMailer.create_signed_up(@recipient) } diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb index b953154515..ded343cfc5 100644 --- a/actionmailer/test/url_test.rb +++ b/actionmailer/test/url_test.rb @@ -1,25 +1,5 @@ require "#{File.dirname(__FILE__)}/abstract_unit" -class MockSMTP - def self.deliveries - @@deliveries - end - - def initialize - @@deliveries = [] - end - - def sendmail(mail, from, to) - @@deliveries << [mail, from, to] - end -end - -class Net::SMTP - def self.start(*args) - yield MockSMTP.new - end -end - class TestMailer < ActionMailer::Base def signed_up_with_url(recipient) @recipients = recipient @@ -40,7 +20,7 @@ class TestMailer < ActionMailer::Base end end -class ActionMailerTest < Test::Unit::TestCase +class ActionMailerUrlTest < Test::Unit::TestCase include ActionMailer::Quoting def encode( text, charset="utf-8" ) @@ -49,6 +29,7 @@ class ActionMailerTest < Test::Unit::TestCase def new_mail( charset="utf-8" ) mail = TMail::Mail.new + mail.mime_version = "1.0" if charset mail.set_content_type "text", "plain", { "charset" => charset } end @@ -74,7 +55,6 @@ class ActionMailerTest < Test::Unit::TestCase expected.body = "Hello there, \n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting" expected.from = "system@loudthinking.com" expected.date = Time.local(2004, 12, 12) - expected.mime_version = nil created = nil assert_nothing_raised { created = TestMailer.create_signed_up_with_url(@recipient) } |