Changeset 8621

Timestamp:

01/11/08 01:57:23 (6 months ago)

Author:

rick

Message:

Updated TMail to version 1.2.1 (2.0 stable) [raasdnil]

Files:

• branches/2-0-stable/actionmailer/CHANGELOG (modified) (1 diff)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor.rb (modified) (1 diff)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1 (moved) (moved from branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.1.0)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/encode.rb (modified) (12 diffs)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/header.rb (modified) (2 diffs)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/interface.rb (modified) (37 diffs)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/mail.rb (modified) (4 diffs)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/mailbox.rb (modified) (1 diff)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/net.rb (modified) (1 diff)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/quoting.rb (modified) (5 diffs)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/scanner_r.rb (modified) (2 diffs)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/scanner.rb (modified) (1 diff)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/utils.rb (modified) (3 diffs)
• branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/version.rb (modified) (1 diff)
• branches/2-0-stable/actionmailer/test/mail_service_test.rb (modified) (1 diff)

branches/2-0-stable/actionmailer/CHANGELOG

@@ -2 +2 @@
-
-* Fixed that you don't have to call super in ActionMailer::TestCase#setup #10406 [jamesgolick]
+
+* Updated TMail to version 1.2.1 [raasdnil]
+
+* Fixed test in mail_service_test.rb => 'test_decode_encoded_attachment_filename' which had an incorrect decode value (should have spaces in the file after decode) [raasdnil]
-
-

branches/2-0-stable/actionmailer/lib/action_mailer/vendor.rb

@@ -3 +3 @@
-
-begin
-1.0
+2.1
-rescue Gem::LoadError
-1.0
+2.1
-end
-

branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/encode.rb

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-require 'nkf'
-.rb
+
-require 'tmail/stringio'
-require 'tmail/utils'
@@ -53 +52 @@
-    end
-    module_function :create_dest
-
+
-    def encoded( eol = "\r\n", charset = 'j', dest = nil )
-      accept_strategy Encoder, eol, charset, dest
-    end
-
+
-    def decoded( eol = "\n", charset = 'e', dest = nil )
-      # Turn the E-Mail into a string and return it with all
@@ -63 +62 @@
-      accept_strategy Decoder, eol, charset, dest
-    end
-
+
-    alias to_s decoded
-
+
-    def accept_strategy( klass, eol, charset, dest = nil )
-      dest ||= ''
@@ -71 +70 @@
-      dest
-    end
-
+
-  end
-
@@ -122 +121 @@
-      @f << decode(str)
-    end
-
+
-    def space
-      @f << ' '
@@ -132 +131 @@
-      @f << str
-    end
-
+
-    def meta( str )
-      @f << str
@@ -183 +182 @@
-
-    SPACER       = "\t"
-
+
+
-
-    OPTIONS = {
@@ -203 +203 @@
-      @preserve_quotes
-    end
-
+
-    def preserve_quotes
-      @preserve_quotes
@@ -379 +379 @@
-      end
-    end
-
+
-    METHOD_ID = {
-      ?j => :extract_J,
@@ -452 +452 @@
-      # puts "+ #{lwsp.inspect}"
-      fold if restsize() <= 0
-
+(@folded)
-      @lwsp = lwsp
-    end
-
-
+(folded = false)
-      # puts '---- flush ----'
-      # puts "spc >>>#{@lwsp.inspect}<<<"
-      # puts "txt >>>#{@text.inspect}<<<"
-      @f << @lwsp << @text
-
+
+
+
+
+
-      @text = ''
-      @lwsp = ''
@@ -468 +472 @@
-    def fold
-      # puts '---- fold ----'
-
+
+
+
+
+
+
+
-      @curlen = 0
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-
@@ -477 +514 @@
-    end
-
+    def mazsize(whitespace_location)
+      # Per RFC2822, the maximum length of a line is 998 chars
+      RFC_2822_MAX_LENGTH - (@curlen + @lwsp.size + whitespace_location)
+    end
+
-  end
-

branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/header.rb

@@ -55 +55 @@
-      end
-
+      # Returns a HeaderField object matching the header you specify in the "name" param.
+      # Requires an initialized TMail::Port to be passed in.
+      #
+      # The method searches the header of the Port you pass into it to find a match on
+      # the header line you pass.  Once a match is found, it will unwrap the matching line
+      # as needed to return an initialized HeaderField object.
+      #
+      # If you want to get the Envelope sender of the email object, pass in "EnvelopeSender",
+      # if you want the From address of the email itself, pass in 'From'.
+      #
+      # This is because a mailbox doesn't have the : after the From that designates the
+      # beginning of the envelope sender (which can be different to the from address of 
+      # the emial)
+      #
+      # Other fields can be passed as normal, "Reply-To", "Received" etc.
+      #
+      # Note: Change of behaviour in 1.2.1 => returns nil if it does not find the specified
+      # header field, otherwise returns an instantiated object of the correct header class
+      # 
+      # For example:
+      #   port = TMail::FilePort.new("/test/fixtures/raw_email_simple")
+      #   h = TMail::HeaderField.new_from_port(port, "From")
+      #   h.addrs.to_s #=> "Mikel Lindsaar <mikel@nowhere.com>"
+      #   h = TMail::HeaderField.new_from_port(port, "EvelopeSender")
+      #   h.addrs.to_s #=> "mike@anotherplace.com.au"
+      #   h = TMail::HeaderField.new_from_port(port, "SomeWeirdHeaderField")
+      #   h #=> nil
-      def new_from_port( port, name, conf = DEFAULT_CONFIG )
-
+
+
+
+
+
+
-        str = nil
-        port.ropen {|f|
@@ -67 +99 @@
-            end
-        }
-
+ if str
-      end
-

branches/2-0-stable/actionmailer/lib/action_mailer/vendor/tmail-1.2.1/tmail/interface.rb

@@ -1 +1 @@
-=begin rdoc
-
-Facad
+interfac
-
-=end
@@ -30 +30 @@
-#++
-
+# TMail::Mail objects get accessed primarily through the methods in this file.
+# 
+# 
+
-require 'tmail/utils'
-
@@ -36 +40 @@
-  class Mail
-
+    # Allows you to query the mail object with a string to get the contents
+    # of the field you want.
+    # 
+    # Returns a string of the exact contnts of the field
+    # 
+    #  mail.from = "mikel <mikel@lindsaar.net>"
+    #  mail.header_string("From") #=> "mikel <mikel@lindsaar.net>"
-    def header_string( name, default = nil )
-      h = @header[name.downcase] or return default
@@ -41 +52 @@
-    end
-
-##
-## attributes
-##
+:stopdoc:
+--
+== Attributes
-
-    include TextUtils
@@ -93 +104 @@
-    private :addrs2specs
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    def date( default = nil )
-      if h = @header['date']
@@ -105 +121 @@
-    end
-
+    # Destructively sets the date of the mail object with the passed Time instance,
+    # returns a Time instance set to the date/time of the mail
+    # 
+    # Example:
+    # 
+    #  now = Time.now
+    #  mail.date = now
+    #  mail.date #=> Sat Nov 03 18:47:50 +1100 2007
+    #  mail.date.class #=> Time
-    def date=( time )
-      if time
@@ -114 +139 @@
-    end
-
+    # Returns the time of the mail message formatted to your taste using a 
+    # strftime format string.  If no date set returns nil by default or whatever value
+    # you pass as the second optional parameter.
+    # 
+    #  time = Time.now # (on Nov 16 2007)
+    #  mail.date = time
+    #  mail.strftime("%D") #=> "11/16/07"
-    def strftime( fmt, default = nil )
-      if t = date
@@ -122 +154 @@
-    end
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def to_addrs( default = nil )
-      if h = @header['to']
@@ -134 +176 @@
-    end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      if h = @header['cc']
-        h.addrs
@@ -142 +196 @@
-    end
-
+    # Return a TMail::Addresses instance for each entry in the "Bcc:" field of the mail object header.
+    # 
+    # If the "Bcc:" field does not exist, will return nil by default or the value you
+    # pass as the optional parameter.
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.bcc_addrs #=> nil
+    #  mail.bcc_addrs([]) #=> []
+    #  mail.bcc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.bcc_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def bcc_addrs( default = nil )
-      if h = @header['bcc']
@@ -150 +216 @@
-    end
-
+    # Destructively set the to field of the "To:" header to equal the passed in string.
+    # 
+    # TMail will parse your contents and turn each valid email address into a TMail::Address 
+    # object before assigning it to the mail message.
+    #
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.to = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.to_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def to_addrs=( arg )
-      set_addrfield 'to', arg
-    end
-
+    # Destructively set the to field of the "Cc:" header to equal the passed in string.
+    # 
+    # TMail will parse your contents and turn each valid email address into a TMail::Address 
+    # object before assigning it to the mail message.
+    #
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.cc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.cc_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def cc_addrs=( arg )
-      set_addrfield 'cc', arg
-    end
-
+    # Destructively set the to field of the "Bcc:" header to equal the passed in string.
+    # 
+    # TMail will parse your contents and turn each valid email address into a TMail::Address 
+    # object before assigning it to the mail message.
+    #
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.bcc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.bcc_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def bcc_addrs=( arg )
-      set_addrfield 'bcc', arg
-    end
-
+    # Returns who the email is to as an Array of email addresses as opposed to an Array of 
+    # TMail::Address objects which is what Mail#to_addrs returns
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.to = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.to #=>  ["mikel@me.org", "mikel@you.org"]
-    def to( default = nil )
-      addrs2specs(to_addrs(nil)) || default
-    end
-
+    # Returns who the email cc'd as an Array of email addresses as opposed to an Array of 
+    # TMail::Address objects which is what Mail#to_addrs returns
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.cc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.cc #=>  ["mikel@me.org", "mikel@you.org"]
-    def cc( default = nil )
-      addrs2specs(cc_addrs(nil)) || default
-    end
-
+    # Returns who the email bcc'd as an Array of email addresses as opposed to an Array of 
+    # TMail::Address objects which is what Mail#to_addrs returns
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.bcc = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.bcc #=>  ["mikel@me.org", "mikel@you.org"]
-    def bcc( default = nil )
-      addrs2specs(bcc_addrs(nil)) || default
-    end
-
+    # Destructively sets the "To:" field to the passed array of strings (which should be valid 
+    # email addresses)
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.to = ["mikel@abc.com", "Mikel <mikel@xyz.com>"]
+    #  mail.to #=>  ["mikel@abc.org", "mikel@xyz.org"]
+    #  mail['to'].to_s #=> "mikel@abc.com, Mikel <mikel@xyz.com>"
-    def to=( *strs )
-      set_string_array_attr 'To', strs
-    end
-
+    # Destructively sets the "Cc:" field to the passed array of strings (which should be valid 
+    # email addresses)
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.cc = ["mikel@abc.com", "Mikel <mikel@xyz.com>"]
+    #  mail.cc #=>  ["mikel@abc.org", "mikel@xyz.org"]
+    #  mail['cc'].to_s #=> "mikel@abc.com, Mikel <mikel@xyz.com>"
-    def cc=( *strs )
-      set_string_array_attr 'Cc', strs
-    end
-
+    # Destructively sets the "Bcc:" field to the passed array of strings (which should be valid 
+    # email addresses)
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.bcc = ["mikel@abc.com", "Mikel <mikel@xyz.com>"]
+    #  mail.bcc #=>  ["mikel@abc.org", "mikel@xyz.org"]
+    #  mail['bcc'].to_s #=> "mikel@abc.com, Mikel <mikel@xyz.com>"
-    def bcc=( *strs )
-      set_string_array_attr 'Bcc', strs
-    end
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def from_addrs( default = nil )
-      if h = @header['from']
@@ -198 +355 @@
-    end
-
+    # Destructively set the to value of the "From:" header to equal the passed in string.
+    # 
+    # TMail will parse your contents and turn each valid email address into a TMail::Address 
+    # object before assigning it to the mail message.
+    #
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.from_addrs = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.from_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def from_addrs=( arg )
-      set_addrfield 'from', arg
-    end
-
+    # Returns who the email is from as an Array of email address strings instead to an Array of 
+    # TMail::Address objects which is what Mail#from_addrs returns
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.from = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.from #=>  ["mikel@me.org", "mikel@you.org"]
-    def from( default = nil )
-      addrs2specs(from_addrs(nil)) || default
-    end
-
+    # Destructively sets the "From:" field to the passed array of strings (which should be valid 
+    # email addresses)
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.from = ["mikel@abc.com", "Mikel <mikel@xyz.com>"]
+    #  mail.from #=>  ["mikel@abc.org", "mikel@xyz.org"]
+    #  mail['from'].to_s #=> "mikel@abc.com, Mikel <mikel@xyz.com>"
-    def from=( *strs )
-      set_string_array_attr 'From', strs
-    end
-
+    # Returns the "friendly" human readable part of the address
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.from = "Mikel Lindsaar <mikel@abc.com>"
+    #  mail.friendly_from #=> "Mikel Lindsaar"
-    def friendly_from( default = nil )
-      h = @header['from']
@@ -219 +410 @@
-    end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    def reply_to_addrs( default = nil )
-      if h = @header['reply-to']
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def reply_to_addrs=( arg )
-      set_addrfield 'reply-to', arg
-    end
-
+    # Returns who the email is from as an Array of email address strings instead to an Array of 
+    # TMail::Address objects which is what Mail#reply_to_addrs returns
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.reply_to = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.reply_to #=>  ["mikel@me.org", "mikel@you.org"]
-    def reply_to( default = nil )
-      addrs2specs(reply_to_addrs(nil)) || default
-    end
-
+    # Destructively sets the "Reply-To:" field to the passed array of strings (which should be valid 
+    # email addresses)
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.reply_to = ["mikel@abc.com", "Mikel <mikel@xyz.com>"]
+    #  mail.reply_to #=>  ["mikel@abc.org", "mikel@xyz.org"]
+    #  mail['reply_to'].to_s #=> "mikel@abc.com, Mikel <mikel@xyz.com>"
-    def reply_to=( *strs )
-      set_string_array_attr 'Reply-To', strs
-    end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    def sender_addr( default = nil )
-      f = @header['sender'] or return default
@@ -246 +486 @@
-    end
-
+    # Destructively set the to value of the "Sender:" header to equal the passed in argument.
+    # 
+    # TMail will parse your contents and turn each valid email address into a TMail::Address 
+    # object before assigning it to the mail message.
+    #
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.sender_addrs = "Mikel <mikel@me.org>, another Mikel <mikel@you.org>"
+    #  mail.sender_addrs #=>  [#<TMail::Address mikel@me.org>, #<TMail::Address mikel@you.org>]
-    def sender_addr=( addr )
-      if addr
@@ -257 +507 @@
-    end
-
-
+
+
+
+
+
+
+
+
+
-      f = @header['sender'] or return default
-      a = f.addr            or return default
@@ -263 +521 @@
-    end
-
+    # Destructively sets the "Sender:" field to the passed string (which should be a valid 
+    # email address)
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.sender = "mikel@abc.com"
+    #  mail.sender #=>  "mikel@abc.org"
+    #  mail['sender'].to_s #=> "mikel@abc.com"
-    def sender=( str )
-      set_string_attr 'Sender', str
-    end
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def subject( default = nil )
-      if h = @header['subject']
@@ -281 +557 @@
-    alias quoted_subject subject
-
+    # Destructively sets the passed string as the subject of the mail message.
+    # 
+    # Example
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.subject #=> "This subject"
+    #  mail.subject = "Another subject"
+    #  mail.subject #=> "Another subject"
-    def subject=( str )
-      set_string_attr 'Subject', str
-    end
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def message_id( default = nil )
-      if h = @header['message-id']
@@ -297 +591 @@
-    end
-
+    # Destructively sets the message ID of the mail object instance to the passed in string
+    #
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.message_id = "this_is_my_badly_formatted_message_id"
+    #  mail.message_id #=> "this_is_my_badly_formatted_message_id"
-    def message_id=( str )
-      set_string_attr 'Message-Id', str
-    end
-
+    # Returns the "In-Reply-To:" field contents as an array of this mail instance if it exists
+    # 
+    # If the in_reply_to field does not exist, returns nil by default or you can pass in as
+    # the parameter for what you want the default value to be.
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.in_reply_to #=> nil
+    #  mail.in_reply_to([]) #=> []
+    #  TMail::Mail.load("../test/fixtures/raw_email_reply")
+    #  mail.in_reply_to #=> ["<348F04F142D69C21-291E56D292BC@xxxx.net>"]
-    def in_reply_to( default = nil )
-      if h = @header['in-reply-to']
@@ -309 +622 @@
-    end
-
+    # Destructively sets the value of the "In-Reply-To:" field of an email.
+    # 
+    # Accepts an array of a single string of a message id
+    #
+    # Example: 
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.in_reply_to = ["<348F04F142D69C21-291E56D292BC@xxxx.net>"]
+    #  mail.in_reply_to #=> ["<348F04F142D69C21-291E56D292BC@xxxx.net>"]
-    def in_reply_to=( *idstrs )
-      set_string_array_attr 'In-Reply-To', idstrs
-    end
-
+    # Returns the references of this email (prior messages relating to this message)
+    # as an array of message ID strings.  Useful when you are trying to thread an
+    # email.
+    # 
+    # If the references field does not exist, returns nil by default or you can pass in as
+    # the parameter for what you want the default value to be.
+    # 
+    # Example:
+    #
+    #  mail = TMail::Mail.new
+    #  mail.references #=> nil
+    #  mail.references([]) #=> []
+    #  mail = TMail::Mail.load("../test/fixtures/raw_email_reply")
+    #  mail.references #=> ["<473FF3B8.9020707@xxx.org>", "<348F04F142D69C21-291E56D292BC@xxxx.net>"]
-    def references( default = nil )
-      if h = @header['references']
@@ -321 +657 @@
-    end
-
+    # Destructively sets the value of the "References:" field of an email.
+    # 
+    # Accepts an array of strings of message IDs
+    #
+    # Example: 
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.references = ["<348F04F142D69C21-291E56D292BC@xxxx.net>"]
+    #  mail.references #=> ["<348F04F142D69C21-291E56D292BC@xxxx.net>"]
-    def references=( *strs )
-      set_string_array_attr 'References', strs
-    end
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def mime_version( default = nil )
-      if h = @header['mime-version']
@@ -351 +706 @@
-    end
-
+    # Returns the current "Content-Type" of the mail instance.
+    #
+    # If the content_type field does not exist, returns nil by default or you can pass in as
+    # the parameter for what you want the default value to be.
+    # 
+    # Example:
+    #
+    #  mail = TMail::Mail.new
+    #  mail.content_type #=> nil
+    #  mail.content_type([]) #=> []
+    #  mail = TMail::Mail.load("../test/fixtures/raw_email")
+    #  mail.content_type #=> "text/plain"
-    def content_type( default = nil )
-      if h = @header['content-type']
@@ -359 +726 @@
-    end
-
+    # Returns the current main type of the "Content-Type" of the mail instance.
+    #
+    # If the content_type field does not exist, returns nil by default or you can pass in as
+    # the parameter for what you want the default value to be.
+    # 
+    # Example:
+    #
+    #  mail = TMail::Mail.new
+    #  mail.main_type #=> nil
+    #  mail.main_type([]) #=> []
+    #  mail = TMail::Mail.load("../test/fixtures/raw_email")
+    #  mail.main_type #=> "text"
-    def main_type( default = nil )
-      if h = @header['content-type']
@@ -367 +746 @@
-    end
-
+    # Returns the current sub type of the "Content-Type" of the mail instance.
+    #
+    # If the content_type field does not exist, returns nil by default or you can pass in as
+    # the parameter for what you want the default value to be.
+    # 
+    # Example:
+    #
+    #  mail = TMail::Mail.new
+    #  mail.sub_type #=> nil
+    #  mail.sub_type([]) #=> []
+    #  mail = TMail::Mail.load("../test/fixtures/raw_email")
+    #  mail.sub_type #=> "plain"
-    def sub_type( default = nil )
-      if h = @header['content-type']
@@ -375 +766 @@
-    end
-
+    # Destructively sets the "Content-Type:" header field of this mail object
+    # 
+    # Allows you to set the main type, sub type as well as parameters to the field.
+    # The main type and sub type need to be a string.
+    # 
+    # The optional params hash can be passed with keys as symbols and values as a string,
+    # or strings as keys and values.
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.set_content_type("text", "plain")
+    #  mail.to_s #=> "Content-Type: text/plain\n\n"
+    # 
+    #  mail.set_content_type("text", "plain", {:charset => "EUC-KR", :format => "flowed"})
+    #  mail.to_s #=> "Content-Type: text/plain; charset=EUC-KR; format=flowed\n\n"
+    #
+    #  mail.set_content_type("text", "plain", {"charset" => "EUC-KR", "format" => "flowed"})
+    #  mail.to_s #=> "Content-Type: text/plain; charset=EUC-KR; format=flowed\n\n"
-    def set_content_type( str, sub = nil, param = nil )
-      if sub
@@ -395 +805 @@
-    alias content_type= set_content_type
-    
+    # Returns the named type parameter as a string, from the "Content-Type:" header.
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.type_param("charset") #=> nil
+    #  mail.type_param("charset", []) #=> []
+    #  mail.set_content_type("text", "plain", {:charset => "EUC-KR", :format => "flowed"})
+    #  mail.type_param("charset") #=> "EUC-KR"
+    #  mail.type_param("format") #=> "flowed"
-    def type_param( name, default = nil )
-      if h = @header['content-type']
@@ -403 +823 @@
-    end
-
+    # Returns the character set of the email.  Returns nil if no encoding set or returns
+    # whatever default you pass as a parameter - note passing the parameter does NOT change
+    # the mail object in any way.
+    # 
+    # Example:
+    # 
+    #  mail = TMail::Mail.load("path_to/utf8_email")
+    #  mail.charset #=> "UTF-8"
+    # 
+    #  mail = TMail::Mail.new
+    #  mail.charset #=> nil
+    #  mail.charset("US-ASCII") #=> "US-ASCII"
-    def charset( default = nil )
-      if h = @header['content-type']