* Closed #18516 - Fix TMail::Mail#preamble, and add #preamble= (Charl…

…es Lowe)

lib/tmail/mail.rb

@@ -452,10 +452,12 @@ def each( &block )
     end
 
     def quoted_body
-      parse_body
-      @body_port.ropen {|f|
-          return f.read
-      }
+      body_port.ropen {|f| return f.read }
+    end
+
+    def quoted_body= str
+      body_port.wopen { |f| f.write str }
+      str
     end
 
     def body=( str )
@@ -477,8 +479,8 @@ def body=( str )
       str
     end
 
-    alias preamble  body
-    alias preamble= body=
+    alias preamble  quoted_body
+    alias preamble= quoted_body=
 
     def epilogue
       parse_body

log/BugTrackingLog.txt

@@ -1,3 +1,8 @@
+== Sat Mar  1 23:34:40 GMT 2008 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Closed #18516 - Fix TMail::Mail#preamble, and add #preamble= (Charles Lowe)
+* Closed #18515 - Removed ftools from test case (Charles Lowe)
+
 == Fri Feb 22 15:28:16 GMT 2008 Mikel Lindsaar <raasdnil@gmail.com>
 
 * A _LOT_ more documentation, almost ready for the next release

test/test_mail.rb

@@ -714,4 +714,30 @@ def test_nested_attachments_are_recognized_correctly
     assert_equal "application/pkcs7-signature", mail.attachments.last.content_type
   end
 
+  def test_preamble_read
+    fixture = File.read("#{File.dirname(__FILE__)}/fixtures/raw_email4")
+    mail = TMail::Mail.parse(fixture)
+    assert_equal 'This is a multi-part message in MIME format.', mail.preamble.strip
+  end
+
+  def test_preamble_write
+    mail = TMail::Mail.new
+    part = TMail::Mail.parse("Content-Type: text/plain\n\nBlah")
+    mail.parts << part
+    mail.preamble = 'This is the preamble'
+    # normalize the boundary to something non-random to assert against
+    str = mail.encoded
+    result = str.gsub(str[/boundary="(.*?)"/, 1], 'boundary')
+    expected =<<EOF
+Content-Type: multipart/mixed; boundary="boundary"
+
+This is the preamble
+--boundary
+Content-Type: text/plain
+
+Blah
+--boundary--
+EOF
+    assert_equal(crlf(expected), result)
+  end
 end