mail 1.4.3 → 1.5.0

data/CHANGELOG.rdoc

@@ -1,3 +1,17 @@
+== Sun Jan  3 00:08:06 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Version bump to 1.5.0
+
+* Major API change in Message#field_name.  This WILL break your applications that use Mail.  Message#field_name now returns good, intelligent, default values.  You can still access the field object by calling Message#[:field_name] or Message#['field_name'].
+
+== Sat Jan  2 04:12:53 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Message-ID, Content-ID, References et al, now return the default value of the message ID without the angle brackets, as per RFC 2822, "Semantically, the angle bracket characters are not part of the msg-id; the msg-id is what is contained between the two angle bracket characters."
+
+* Message class now has getter and setter methods for all the supported field types explicitly.  This allows us to return a "default" value for all fields.
+
+* All address fields, when called from Message#to or Message#from or the like, return either a string of the address spec (mikel@test.lindsaar.net) if it is a single entry, or an array of address specs if there is more than one ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+
 == Mon 28 Dec 2009 01:21:52 UTC Mikel Lindsaar <raasdnil@gmail.com>
 
 * Added sorting of parts, default is text/plain, then text/enriched and text/html.  Access through  Body#set_sort_order and Body#sort_parts! (called from Body#encode automatically)

data/README.rdoc

@@ -290,12 +290,12 @@ Or even all emails:
  mail.envelope.from   #=> 'mikel@test.lindsaar.net'
  mail.from.addresses  #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
  mail.sender.address  #=> 'mikel@test.lindsaar.net'
- mail.to.addresses    #=> ['bob@test.lindsaar.net']
- mail.cc.addresses    #=> ['sam@test.lindsaar.net']
- mail.subject.to_s    #=> "This is the subject"
+ mail.to              #=> 'bob@test.lindsaar.net'
+ mail.cc              #=> 'sam@test.lindsaar.net'
+ mail.subject         #=> "This is the subject"
  mail.date.to_s       #=> '21 Nov 1997 09:55:06 -0600'
  mail.message_id      #=> '<4D6AA7EB.6490534@xxx.xxx>'
- mail.body            #=> 'This is the body of the email...
+ mail.body.decoded    #=> 'This is the body of the email...
 
 Many more methods available.
 
@@ -311,8 +311,8 @@ Many more methods available.
  mail.epilogue            #=> "Text after the last part"
  mail.parts.map { |p| p.content_type }  #=> ['text/plain', 'application/pdf']
  mail.parts.map { |p| p.class }         #=> [Mail::Message, Mail::Message]
- mail.parts[0].mime_parameters          #=> {'charset' => 'ISO-8859-1'}
- mail.parts[1].mime_parameters          #=> {'name' => 'my.pdf'}
+ mail.parts[0].content_type_parameters  #=> {'charset' => 'ISO-8859-1'}
+ mail.parts[1].content_type_parameters  #=> {'name' => 'my.pdf'}
 
 Mail generates a tree of parts.  Each message has many or no parts.  Each part
 is another message which can have many or no parts.

data/Rakefile

@@ -12,7 +12,7 @@ require 'bundler'
 
 spec = Gem::Specification.new do |s|
   s.name        = "mail"
-  s.version     = "1.4.3"
+  s.version     = "1.5.0"
   s.author      = "Mike Lindsaar"
   s.email       = "raasdnil@gmail.com"
   s.homepage    = "http://github.com/mikel/mail"

data/lib/mail/body.rb

@@ -108,8 +108,8 @@ module Mail
         # OK, 10000 is arbitrary... if anyone actually wants to explicitly sort 10000 parts of a
         # single email message... please show me a use case and I'll put more work into this method,
         # in the meantime, it works :)
-        a_order = order.index(a.content_type.string.downcase) || 10000
-        b_order = order.index(b.content_type.string.downcase) || 10000
+        a_order = order.index(a[:content_type].string.downcase) || 10000
+        b_order = order.index(b[:content_type].string.downcase) || 10000
         a_order <=> b_order
       end
     end

data/lib/mail/field.rb

@@ -69,7 +69,7 @@ module Mail
       case
       when name =~ /:/ && value.blank?   # Field.new("field-name: field data")
         name, value = split(name)
-        create_field(name, value.to_s)
+        create_field(name, value)
       when name !~ /:/ && value.blank?  # Field.new("field-name")
         create_field(name, nil)
       else                              # Field.new("field-name", "value")

data/lib/mail/fields/bcc_field.rb

@@ -16,16 +16,15 @@
 # 
 #  mail = Mail.new
 #  mail.bcc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.bcc    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::BccField:0x180e1c4
+#  mail.bcc    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 #  mail[:bcc]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::BccField:0x180e1c4
 #  mail['bcc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::BccField:0x180e1c4
 #  mail['Bcc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::BccField:0x180e1c4
 # 
-#  mail.bcc.to_s      #=> ''      # Bcc field does not get output into an email
-#  mail.bcc.encoded   #=> ''      # Bcc field does not get output into an email
-#  mail.bcc.decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.bcc.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.bcc.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:bcc].encoded   #=> ''      # Bcc field does not get output into an email
+#  mail[:bcc].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+#  mail[:bcc].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+#  mail[:bcc].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
 module Mail
   class BccField < StructuredField

data/lib/mail/fields/cc_field.rb

@@ -16,14 +16,15 @@
 # 
 #  mail = Mail.new
 #  mail.cc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.cc    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::CcField:0x180e1c4
+#  mail.cc    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 #  mail[:cc]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::CcField:0x180e1c4
 #  mail['cc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::CcField:0x180e1c4
 #  mail['Cc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::CcField:0x180e1c4
 # 
-#  mail.cc.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.cc.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.cc.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:cc].encoded   #=> 'Cc: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+#  mail[:cc].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+#  mail[:cc].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+#  mail[:cc].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
 module Mail
   class CcField < StructuredField

data/lib/mail/fields/comments_field.rb

@@ -15,19 +15,15 @@
 # 
 #  mail = Mail.new
 #  mail.comments = 'This is a comment'
-#  mail.comments    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::CommentsField:0x180e1c4
+#  mail.comments    #=> 'This is a comment'
 #  mail[:comments]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::CommentsField:0x180e1c4
 #  mail['comments'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::CommentsField:0x180e1c4
 #  mail['comments'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::CommentsField:0x180e1c4
 # 
-#  mail.comments.to_s  #=> 'This is a comment'
-# 
 #  mail.comments = "This is another comment"
-#  mail.comments.map { |c| c.to_s } 
+#  mail[:comments].map { |c| c.to_s } 
 #  #=> ['This is a comment', "This is another comment"]
-#  mail.comments.to_s # Probably not what you want to do in this case
-#  #=> "This is a commentThis is another comment" 
-# 
+#
 module Mail
   class CommentsField < UnstructuredField
     

data/lib/mail/fields/common/common_address.rb

@@ -44,6 +44,14 @@ module Mail
         tree.group_names
       end
       
+      def default
+        if addresses.length == 1
+          addresses[0]
+        else
+          addresses
+        end
+      end
+      
       private
       
       def do_encode(field_name)

data/lib/mail/fields/common/common_date.rb

@@ -9,6 +9,10 @@ module Mail
         ::DateTime.parse("#{element.date_string} #{element.time_string}")
       end
 
+      def default
+        date_time
+      end
+
       private
       
       def do_encode(field_name)

data/lib/mail/fields/common/common_field.rb

@@ -31,6 +31,10 @@ module Mail
         decoded
       end
       
+      def default
+        decoded
+      end
+      
       def field_length
         @length ||= name.length + value.length + ': '.length
       end
@@ -41,7 +45,7 @@ module Mail
 
       private
 
-      def strip_field(field_name, string) 
+      def strip_field(field_name, string)
         string.to_s.gsub(/#{field_name}:\s+/i, '')
       end
 

data/lib/mail/fields/common/common_message_id.rb

@@ -24,6 +24,14 @@ module Mail
         element.message_ids
       end
       
+      def default
+        if message_ids.length == 1
+          message_ids[0]
+        else
+          message_ids
+        end
+      end
+
       private
       
       def do_encode(field_name)

data/lib/mail/fields/content_transfer_encoding_field.rb

@@ -33,6 +33,6 @@ module Mail
     def decoded
       value
     end
-
+    
   end
 end

data/lib/mail/fields/content_type_field.rb

@@ -45,6 +45,10 @@ module Mail
       "#{main_type}/#{sub_type}"
     end
     
+    def default
+      decoded
+    end
+    
     alias :content_type :string
     
     def parameters

data/lib/mail/fields/date_field.rb

@@ -15,13 +15,11 @@
 # 
 #  mail = Mail.new
 #  mail.date = 'Mon, 24 Nov 1997 14:22:01 -0800'
-#  mail.date    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
-#  mail[:date]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
-#  mail['date'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
-#  mail['Date'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
-# 
+#  mail.date       #=> #<DateTime: 211747170121/86400,-1/3,2299161>
 #  mail.date.to_s  #=> 'Mon, 24 Nov 1997 14:22:01 -0800'
-#  mail.date.date_time #=> #<DateTime: 211747170121/86400,-1/3,2299161>
+#  mail[:date]     #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
+#  mail['date']    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
+#  mail['Date']    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
 # 
 module Mail
   class DateField < StructuredField
@@ -37,7 +35,9 @@ module Mail
         self.value = Time.now.strftime('%a, %d %b %Y %H:%M:%S %z')
         self
       else
-        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+        value = strip_field(FIELD_NAME, args.last)
+        value = ::DateTime.parse(value.to_s).strftime('%a, %d %b %Y %H:%M:%S %z')
+        super(CAPITALIZED_FIELD, value)
       end
     end
     

data/lib/mail/fields/from_field.rb

@@ -16,14 +16,15 @@
 # 
 #  mail = Mail.new
 #  mail.from = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.from    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
+#  mail.from    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 #  mail[:from]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
 #  mail['from'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
 #  mail['From'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
 # 
-#  mail.from.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.from.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.from.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:from].encoded   #=> 'from: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+#  mail[:from].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+#  mail[:from].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+#  mail[:from].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
 module Mail
   class FromField < StructuredField

data/lib/mail/fields/in_reply_to_field.rb

@@ -19,13 +19,12 @@
 # 
 #  mail = Mail.new
 #  mail.in_reply_to = '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
-#  mail.in_reply_to    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::InReplyToField:0x180e1c4
+#  mail.in_reply_to    #=> '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
 #  mail[:in_reply_to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::InReplyToField:0x180e1c4
 #  mail['in_reply_to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::InReplyToField:0x180e1c4
 #  mail['In-Reply-To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::InReplyToField:0x180e1c4
 # 
-#  mail.in_reply_to.to_s  #=> '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
-#  mail.in_reply_to.message_ids #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
+#  mail[:in_reply_to].message_ids #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
 # 
 module Mail
   class InReplyToField < StructuredField

data/lib/mail/fields/keywords_field.rb

@@ -26,6 +26,10 @@ module Mail
     def decoded
       keywords.join(', ')
     end
+
+    def default
+      keywords
+    end
     
   end
 end

data/lib/mail/fields/message_id_field.rb

@@ -20,14 +20,13 @@
 # 
 #  mail = Mail.new
 #  mail.message_id = '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
-#  mail.message_id    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::MessageIdField:0x180e1c4
+#  mail.message_id    #=> '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
 #  mail[:message_id]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::MessageIdField:0x180e1c4
 #  mail['message_id'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::MessageIdField:0x180e1c4
 #  mail['Message-ID'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::MessageIdField:0x180e1c4
 # 
-#  mail.message_id.to_s         #=> '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
-#  mail.message_id.message_id   #=> 'F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom'
-#  mail.message_id.message_ids  #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
+#  mail[:message_id].message_id   #=> 'F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom'
+#  mail[:message_id].message_ids  #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
 # 
 module Mail
   class MessageIdField < StructuredField

data/lib/mail/fields/references_field.rb

@@ -19,13 +19,12 @@
 # 
 #  mail = Mail.new
 #  mail.references = '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
-#  mail.references    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReferencesField:0x180e1c4
+#  mail.references    #=> '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
 #  mail[:references]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReferencesField:0x180e1c4
 #  mail['references'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReferencesField:0x180e1c4
 #  mail['References'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReferencesField:0x180e1c4
 # 
-#  mail.references.to_s  #=> '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
-#  mail.references.message_ids #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
+#  mail[:references].message_ids #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
 # 
 module Mail
   class ReferencesField < StructuredField

data/lib/mail/fields/reply_to_field.rb

@@ -16,14 +16,15 @@
 # 
 #  mail = Mail.new
 #  mail.reply_to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.reply_to    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReplyToField:0x180e1c4
+#  mail.reply_to    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 #  mail[:reply_to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReplyToField:0x180e1c4
 #  mail['reply-to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReplyToField:0x180e1c4
 #  mail['Reply-To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ReplyToField:0x180e1c4
 # 
-#  mail.reply_to.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.reply_to.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.reply_to.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:reply_to].encoded   #=> 'Reply-To: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+#  mail[:reply_to].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+#  mail[:reply_to].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+#  mail[:reply_to].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
 module Mail
   class ReplyToField < StructuredField

data/lib/mail/fields/resent_bcc_field.rb

@@ -16,14 +16,15 @@
 # 
 #  mail = Mail.new
 #  mail.resent_bcc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_bcc    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentBccField:0x180e1c4
+#  mail.resent_bcc    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 #  mail[:resent_bcc]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentBccField:0x180e1c4
 #  mail['resent-bcc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentBccField:0x180e1c4
 #  mail['Resent-Bcc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentBccField:0x180e1c4
 # 
-#  mail.resent_bcc.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_bcc.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.resent_bcc.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:resent_bcc].encoded   #=> 'Resent-Bcc: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+#  mail[:resent_bcc].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+#  mail[:resent_bcc].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+#  mail[:resent_bcc].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
 module Mail
   class ResentBccField < StructuredField

data/lib/mail/fields/resent_cc_field.rb

@@ -16,14 +16,15 @@
 # 
 #  mail = Mail.new
 #  mail.resent_cc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_cc    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentCcField:0x180e1c4
+#  mail.resent_cc    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 #  mail[:resent_cc]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentCcField:0x180e1c4
 #  mail['resent-cc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentCcField:0x180e1c4
 #  mail['Resent-Cc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentCcField:0x180e1c4
 # 
-#  mail.resent_cc.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_cc.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.resent_cc.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:resent_cc].encoded   #=> 'Resent-Cc: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+#  mail[:resent_cc].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+#  mail[:resent_cc].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+#  mail[:resent_cc].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
 module Mail
   class ResentCcField < StructuredField

data/lib/mail/fields/resent_date_field.rb

@@ -10,7 +10,15 @@ module Mail
     CAPITALIZED_FIELD = 'Resent-Date'
     
     def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+      if args.last.blank?
+        self.name = CAPITALIZED_FIELD
+        self.value = Time.now.strftime('%a, %d %b %Y %H:%M:%S %z')
+        self
+      else
+        value = strip_field(FIELD_NAME, args.last)
+        value = ::DateTime.parse(value.to_s).strftime('%a, %d %b %Y %H:%M:%S %z')
+        super(CAPITALIZED_FIELD, value)
+      end
     end
     
     def encoded

data/lib/mail/fields/resent_from_field.rb

@@ -13,17 +13,18 @@
 # addresses and groups of addresses.
 # 
 # == Examples:
-# 
+#
 #  mail = Mail.new
 #  mail.resent_from = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_from    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentFromField:0x180e1c4
+#  mail.resent_from    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 #  mail[:resent_from]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentFromField:0x180e1c4
 #  mail['resent-from'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentFromField:0x180e1c4
 #  mail['Resent-From'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentFromField:0x180e1c4
 # 
-#  mail.resent_from.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_from.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.resent_from.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:resent_from].encoded   #=> 'Resent-From: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+#  mail[:resent_from].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+#  mail[:resent_from].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+#  mail[:resent_from].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
 module Mail
   class ResentFromField < StructuredField