test/fixtures/html_multipart.txt @@ -283,8 +283,13 @@ module Astrotrain @body = @body.join("\n") @html = @html.join("\n") else - @body = @mail.body - @html = '' + if @mail.content_type == 'text/html' + @html = @mail.body + @body = '' + else + @body = @mail.body + @html = '' + end end if !@mail.charset @body = convert_to_utf8(@body) lib/astrotrain/message.rb @@ -4,13 +4,7 @@ To: xyz@astrotrain.com Message-ID: <11644553.1741252281981737.JavaMail.root@astrotrain> Subject: ABC DEF MIME-Version: 1.0 -Content-Type: multipart/mixed; - boundary="----=_Part_1695_189596019.1252281981305" -X-Mailer: Railo Mail - -------=_Part_1695_189596019.1252281981305 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable -<p>ABC</p> -------=_Part_1695_189596019.1252281981305-- \ No newline at end of file +<p>ABC</p> \ No newline at end of file test/fixtures/html.txt @@ -387,6 +387,21 @@ class Astrotrain::MessageTest < Astrotrain::TestCase end end + describe "with only HTML body in a multipart message" do + before :all do + @raw = mail(:html_multipart) + @message = Astrotrain::Message.parse(@raw) + end + + it "parses emtpy body" do + assert_equal '', @message.body + end + + it "parses HTML body" do + assert_equal "<p>ABC</p>\n------", @message.html + end + end + describe "with only HTML body" do before :all do @raw = mail(:html) @@ -398,7 +413,7 @@ class Astrotrain::MessageTest < Astrotrain::TestCase end it "parses HTML body" do - assert_equal "<p>ABC</p>\n------", @message.html + assert_equal "<p>ABC</p>", @message.html end end test/message_test.rb 7def86f570f9bfde55aa1047f9ac9d8604cfe45b rick technoweenie@gmail.com http://github.com/entp/astrotrain/commit/e29c7bb38964e578196d8aada0b45a3b5e6a9b15 e29c7bb38964e578196d8aada0b45a3b5e6a9b15 2009-11-05T12:31:50-08:00 2009-11-05T12:31:50-08:00 support html bodies in single part emails eb5dab905e4d43aba022dd63e3e976be4f487c62 rick technoweenie@gmail.com