@@ -77,8 +77,15 @@ module TMail delete_if {|n,v| v.empty? } end + def enforced_message_id=(val) + @message_id_enforced = true + self.message_id = val + end + def add_message_id( fqdn = nil ) - self.message_id = ::TMail::new_message_id(fqdn) + unless @message_id_enforced + self.message_id = ::TMail::new_message_id(fqdn) + end end def add_date lib/tmail/net.rb @@ -1,5 +1,6 @@ == Mon Nov 17 11:49:30 UTC 2008 Mikel Lindsaar <raasdnil@gmail.com> +* Closes #22681 - Ability to set messageid. Message id will not be overwritten if user calls mail.enforced_message_id=(new_message_id) before calling mail.ready_to_send * Closed #20788 - Allow multiple dots in email address. (Alexey Merejine) * Closed #21696 - Allow message ids to have two '@' symbols in them (Nicolas Fouché) log/BugTrackingLog.txt @@ -981,4 +981,22 @@ class ContentDispositionHeaderTester < Test::Unit::TestCase assert_equal("To: Mikel@me.com,\r\n\t mikel@you.com\r\n\r\n", h.encoded) end + def test_adding_custom_message_id + fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email") + mail = TMail::Mail.parse(fixture) + message_id = "<12345@me.com>" + mail.enforced_message_id = message_id + mail.ready_to_send + assert_equal(message_id, mail.message_id) + end + + def test_not_adding_custom_message_id + fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email") + mail = TMail::Mail.parse(fixture) + message_id = mail.message_id + mail.message_id = "<12345@me.com>" + mail.ready_to_send + assert_not_equal(message_id, mail.message_id) + end + end test/test_header.rb a0c06f0d33a46161d4cff10d3b23fbc8aaa68ec4 mikel raasdnil@gmail.com http://github.com/mikel/tmail/commit/cf300a07ecdc557e5e744099dc7a9a552145177f cf300a07ecdc557e5e744099dc7a9a552145177f 2008-11-17T06:57:57-08:00 2008-11-17T06:57:57-08:00 Closes #22681 - Ability to set messageid. Message id will not be overwritten if user calls mail.enforced_message_id=(val) before calling mail.ready_to_send 2c2d1aae9a248c3ce7d92e0abb20fe4424e140f4 mikel raasdnil@gmail.com