mail 2.6.4 → 2.9.0

data/lib/mail/fields/resent_cc_field.rb

@@ -1,55 +1,33 @@
 # encoding: utf-8
 # frozen_string_literal: true
-# 
-# = Resent-Cc Field
-# 
-# The Resent-Cc field inherits resent-cc StructuredField and handles the Resent-Cc: header
-# field in the email.
-# 
-# Sending resent_cc to a mail message will instantiate a Mail::Field object that
-# has a ResentCcField as its field type.  This includes all Mail::CommonAddress
-# module instance metods.
-# 
-# Only one Resent-Cc field can appear in a header, though it can have multiple
-# addresses and groups of addresses.
-# 
-# == Examples:
-# 
-#  mail = Mail.new
-#  mail.resent_cc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_cc    #=> ['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].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']
-# 
-require 'mail/fields/common/common_address'
 
 module Mail
-  class ResentCcField < StructuredField
-    
-    include Mail::CommonAddress
-    
-    FIELD_NAME = 'resent-cc'
-    CAPITALIZED_FIELD = 'Resent-Cc'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self
-    end
-    
-    def encoded
-      do_encode(CAPITALIZED_FIELD)
-    end
-    
-    def decoded
-      do_decode
-    end
-    
+  # = Resent-Cc Field
+  #
+  # The Resent-Cc field inherits resent-cc StructuredField and handles the Resent-Cc: header
+  # field in the email.
+  #
+  # Sending resent_cc to a mail message will instantiate a Mail::Field object that
+  # has a ResentCcField as its field type.  This includes all Mail::CommonAddress
+  # module instance metods.
+  #
+  # Only one Resent-Cc field can appear in a header, though it can have multiple
+  # addresses and groups of addresses.
+  #
+  # == Examples:
+  #
+  #  mail = Mail.new
+  #  mail.resent_cc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+  #  mail.resent_cc    #=> ['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].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']
+  class ResentCcField < CommonAddressField #:nodoc:
+    NAME = 'Resent-Cc'
   end
 end

data/lib/mail/fields/resent_date_field.rb

@@ -1,36 +1,10 @@
 # encoding: utf-8
 # frozen_string_literal: true
-# 
-# resent-date     =       "Resent-Date:" date-time CRLF
-require 'mail/fields/common/common_date'
 
 module Mail
-  class ResentDateField < StructuredField
-    
-    include Mail::CommonDate
-    
-    FIELD_NAME = 'resent-date'
-    CAPITALIZED_FIELD = 'Resent-Date'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      if Utilities.blank?(value)
-        value = ::DateTime.now.strftime('%a, %d %b %Y %H:%M:%S %z')
-      else
-        value = strip_field(FIELD_NAME, value)
-        value = ::DateTime.parse(value.to_s).strftime('%a, %d %b %Y %H:%M:%S %z')
-      end
-      super(CAPITALIZED_FIELD, value, charset)
-      self
-    end
-    
-    def encoded
-      do_encode(CAPITALIZED_FIELD)
-    end
-    
-    def decoded
-      do_decode
-    end
-    
+  #
+  # resent-date     =       "Resent-Date:" date-time CRLF
+  class ResentDateField < CommonDateField #:nodoc:
+    NAME = 'Resent-Date'
   end
 end

data/lib/mail/fields/resent_from_field.rb

@@ -1,55 +1,33 @@
 # encoding: utf-8
 # frozen_string_literal: true
-# 
-# = Resent-From Field
-# 
-# The Resent-From field inherits resent-from StructuredField and handles the Resent-From: header
-# field in the email.
-# 
-# Sending resent_from to a mail message will instantiate a Mail::Field object that
-# has a ResentFromField as its field type.  This includes all Mail::CommonAddress
-# module instance metods.
-# 
-# Only one Resent-From field can appear in a header, though it can have multiple
-# 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    #=> ['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].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']
-# 
-require 'mail/fields/common/common_address'
 
 module Mail
-  class ResentFromField < StructuredField
-    
-    include Mail::CommonAddress
-    
-    FIELD_NAME = 'resent-from'
-    CAPITALIZED_FIELD = 'Resent-From'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self
-    end
-    
-    def encoded
-      do_encode(CAPITALIZED_FIELD)
-    end
-    
-    def decoded
-      do_decode
-    end
-    
+  # = Resent-From Field
+  #
+  # The Resent-From field inherits resent-from StructuredField and handles the Resent-From: header
+  # field in the email.
+  #
+  # Sending resent_from to a mail message will instantiate a Mail::Field object that
+  # has a ResentFromField as its field type.  This includes all Mail::CommonAddress
+  # module instance metods.
+  #
+  # Only one Resent-From field can appear in a header, though it can have multiple
+  # 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    #=> ['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].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']
+  class ResentFromField < CommonAddressField #:nodoc:
+    NAME = 'Resent-From'
   end
 end

data/lib/mail/fields/resent_message_id_field.rb

@@ -1,35 +1,10 @@
 # encoding: utf-8
 # frozen_string_literal: true
-# 
-# resent-msg-id   =       "Resent-Message-ID:" msg-id CRLF
-require 'mail/fields/common/common_message_id'
 
 module Mail
-  class ResentMessageIdField < StructuredField
-    
-    include CommonMessageId
-    
-    FIELD_NAME = 'resent-message-id'
-    CAPITALIZED_FIELD = 'Resent-Message-ID'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
-      self
-    end
-    
-    def name
-      'Resent-Message-ID'
-    end
-    
-    def encoded
-      do_encode(CAPITALIZED_FIELD)
-    end
-    
-    def decoded
-      do_decode
-    end
-    
+  #
+  # resent-msg-id   =       "Resent-Message-ID:" msg-id CRLF
+  class ResentMessageIdField < CommonMessageIdField #:nodoc:
+    NAME = 'Resent-Message-ID'
   end
 end

data/lib/mail/fields/resent_sender_field.rb

@@ -1,62 +1,32 @@
 # encoding: utf-8
 # frozen_string_literal: true
-# 
-# = Resent-Sender Field
-# 
-# The Resent-Sender field inherits resent-sender StructuredField and handles the Resent-Sender: header
-# field in the email.
-# 
-# Sending resent_sender to a mail message will instantiate a Mail::Field object that
-# has a ResentSenderField as its field type.  This includes all Mail::CommonAddress
-# module instance metods.
-# 
-# Only one Resent-Sender field can appear in a header, though it can have multiple
-# addresses and groups of addresses.
-# 
-# == Examples:
-# 
-#  mail = Mail.new
-#  mail.resent_sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_sender    #=> ['mikel@test.lindsaar.net']
-#  mail[:resent_sender]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
-#  mail['resent-sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
-#  mail['Resent-Sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
-# 
-#  mail.resent_sender.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_sender.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail.resent_sender.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
-# 
-require 'mail/fields/common/common_address'
 
 module Mail
-  class ResentSenderField < StructuredField
-    
-    include Mail::CommonAddress
-    
-    FIELD_NAME = 'resent-sender'
-    CAPITALIZED_FIELD = 'Resent-Sender'
-
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self
-    end
-
-    def addresses
-      [address.address]
-    end
-
-    def address
-      address_list.addresses.first
-    end
-    
-    def encoded
-      do_encode(CAPITALIZED_FIELD)
-    end
-    
-    def decoded
-      do_decode
-    end
-    
+  # = Resent-Sender Field
+  #
+  # The Resent-Sender field inherits resent-sender StructuredField and handles the Resent-Sender: header
+  # field in the email.
+  #
+  # Sending resent_sender to a mail message will instantiate a Mail::Field object that
+  # has a ResentSenderField as its field type.  This includes all Mail::CommonAddress
+  # module instance metods.
+  #
+  # Only one Resent-Sender field can appear in a header, though it can have multiple
+  # addresses and groups of addresses.
+  #
+  # == Examples:
+  #
+  #  mail = Mail.new
+  #  mail.resent_sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+  #  mail.resent_sender    #=> ['mikel@test.lindsaar.net']
+  #  mail[:resent_sender]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
+  #  mail['resent-sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
+  #  mail['Resent-Sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
+  #
+  #  mail.resent_sender.to_s  #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+  #  mail.resent_sender.addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+  #  mail.resent_sender.formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+  class ResentSenderField < CommonAddressField #:nodoc:
+    NAME = 'Resent-Sender'
   end
 end

data/lib/mail/fields/resent_to_field.rb

@@ -1,55 +1,33 @@
 # encoding: utf-8
 # frozen_string_literal: true
-# 
-# = Resent-To Field
-# 
-# The Resent-To field inherits resent-to StructuredField and handles the Resent-To: header
-# field in the email.
-# 
-# Sending resent_to to a mail message will instantiate a Mail::Field object that
-# has a ResentToField as its field type.  This includes all Mail::CommonAddress
-# module instance metods.
-# 
-# Only one Resent-To field can appear in a header, though it can have multiple
-# addresses and groups of addresses.
-# 
-# == Examples:
-# 
-#  mail = Mail.new
-#  mail.resent_to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_to    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail[:resent_to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
-#  mail['resent-to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
-#  mail['Resent-To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
-# 
-#  mail[:resent_to].encoded   #=> 'Resent-To: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
-#  mail[:resent_to].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail[:resent_to].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail[:resent_to].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
-# 
-require 'mail/fields/common/common_address'
 
 module Mail
-  class ResentToField < StructuredField
-    
-    include Mail::CommonAddress
-    
-    FIELD_NAME = 'resent-to'
-    CAPITALIZED_FIELD = 'Resent-To'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self
-    end
-    
-    def encoded
-      do_encode(CAPITALIZED_FIELD)
-    end
-    
-    def decoded
-      do_decode
-    end
-    
+  # = Resent-To Field
+  #
+  # The Resent-To field inherits resent-to StructuredField and handles the Resent-To: header
+  # field in the email.
+  #
+  # Sending resent_to to a mail message will instantiate a Mail::Field object that
+  # has a ResentToField as its field type.  This includes all Mail::CommonAddress
+  # module instance metods.
+  #
+  # Only one Resent-To field can appear in a header, though it can have multiple
+  # addresses and groups of addresses.
+  #
+  # == Examples:
+  #
+  #  mail = Mail.new
+  #  mail.resent_to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+  #  mail.resent_to    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+  #  mail[:resent_to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
+  #  mail['resent-to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
+  #  mail['Resent-To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
+  #
+  #  mail[:resent_to].encoded   #=> 'Resent-To: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+  #  mail[:resent_to].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+  #  mail[:resent_to].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+  #  mail[:resent_to].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+  class ResentToField < CommonAddressField #:nodoc:
+    NAME = 'Resent-To'
   end
 end

data/lib/mail/fields/return_path_field.rb

@@ -1,65 +1,60 @@
 # encoding: utf-8
 # frozen_string_literal: true
-# 
-# 4.4.3.  REPLY-TO / RESENT-REPLY-TO
-# 
-#    Note:  The "Return-Path" field is added by the mail  transport
-#           service,  at the time of final deliver.  It is intended
-#           to identify a path back to the orginator  of  the  mes-
-#           sage.   The  "Reply-To"  field  is added by the message
-#           originator and is intended to direct replies.
-# 
-# trace           =       [return]
-#                         1*received
-# 
-# return          =       "Return-Path:" path CRLF
-# 
-# path            =       ([CFWS] "<" ([CFWS] / addr-spec) ">" [CFWS]) /
-#                         obs-path
-# 
-# received        =       "Received:" name-val-list ";" date-time CRLF
-# 
-# name-val-list   =       [CFWS] [name-val-pair *(CFWS name-val-pair)]
-# 
-# name-val-pair   =       item-name CFWS item-value
-# 
-# item-name       =       ALPHA *(["-"] (ALPHA / DIGIT))
-# 
-# item-value      =       1*angle-addr / addr-spec /
-#                          atom / domain / msg-id
-# 
-require 'mail/fields/common/common_address'
 
 module Mail
-  class ReturnPathField < StructuredField
-    
-    include Mail::CommonAddress
-    
-    FIELD_NAME = 'return-path'
-    CAPITALIZED_FIELD = 'Return-Path'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      value = nil if value == '<>'
-      self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self
-    end
-    
-    def encoded
-      "#{CAPITALIZED_FIELD}: <#{address}>\r\n"
-    end
-    
-    def decoded
-      do_decode
+  # 4.4.3.  REPLY-TO / RESENT-REPLY-TO
+  #
+  #    Note:  The "Return-Path" field is added by the mail  transport
+  #           service,  at the time of final deliver.  It is intended
+  #           to identify a path back to the orginator  of  the  mes-
+  #           sage.   The  "Reply-To"  field  is added by the message
+  #           originator and is intended to direct replies.
+  #
+  # trace           =       [return]
+  #                         1*received
+  #
+  # return          =       "Return-Path:" path CRLF
+  #
+  # path            =       ([CFWS] "<" ([CFWS] / addr-spec) ">" [CFWS]) /
+  #                         obs-path
+  #
+  # received        =       "Received:" name-val-list ";" date-time CRLF
+  #
+  # name-val-list   =       [CFWS] [name-val-pair *(CFWS name-val-pair)]
+  #
+  # name-val-pair   =       item-name CFWS item-value
+  #
+  # item-name       =       ALPHA *(["-"] (ALPHA / DIGIT))
+  #
+  # item-value      =       1*angle-addr / addr-spec /
+  #                          atom / domain / msg-id
+  #
+  class ReturnPathField < CommonAddressField #:nodoc:
+    NAME = 'Return-Path'
+
+    def self.singular?
+      true
     end
-    
-    def address
-      addresses.first
+
+    def initialize(value = nil, charset = nil)
+      if value == '<>'
+        super nil, charset
+      else
+        super
+      end
     end
-    
+
     def default
       address
     end
-    
+
+    private
+      def do_encode
+        "#{name}: <#{address}>\r\n"
+      end
+
+      def do_decode
+        address
+      end
   end
 end

data/lib/mail/fields/sender_field.rb

@@ -1,67 +1,45 @@
 # encoding: utf-8
 # frozen_string_literal: true
-# 
-# = Sender Field
-# 
-# The Sender field inherits sender StructuredField and handles the Sender: header
-# field in the email.
-# 
-# Sending sender to a mail message will instantiate a Mail::Field object that
-# has a SenderField as its field type.  This includes all Mail::CommonAddress
-# module instance metods.
-# 
-# Only one Sender field can appear in a header, though it can have multiple
-# addresses and groups of addresses.
-# 
-# == Examples:
-# 
-#  mail = Mail.new
-#  mail.sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>'
-#  mail.sender    #=> 'mikel@test.lindsaar.net'
-#  mail[:sender]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
-#  mail['sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
-#  mail['Sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
-# 
-#  mail[:sender].encoded   #=> "Sender: Mikel Lindsaar <mikel@test.lindsaar.net>\r\n"
-#  mail[:sender].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>'
-#  mail[:sender].addresses #=> ['mikel@test.lindsaar.net']
-#  mail[:sender].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>']
-# 
-require 'mail/fields/common/common_address'
 
 module Mail
-  class SenderField < StructuredField
-    
-    include Mail::CommonAddress
-    
-    FIELD_NAME = 'sender'
-    CAPITALIZED_FIELD = 'Sender'
+  # = Sender Field
+  #
+  # The Sender field inherits sender StructuredField and handles the Sender: header
+  # field in the email.
+  #
+  # Sending sender to a mail message will instantiate a Mail::Field object that
+  # has a SenderField as its field type.  This includes all Mail::CommonAddress
+  # module instance metods.
+  #
+  # Only one Sender field can appear in a header, though it can have multiple
+  # addresses and groups of addresses.
+  #
+  # == Examples:
+  #
+  #  mail = Mail.new
+  #  mail.sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>'
+  #  mail.sender    #=> 'mikel@test.lindsaar.net'
+  #  mail[:sender]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
+  #  mail['sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
+  #  mail['Sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
+  #
+  #  mail[:sender].encoded   #=> "Sender: Mikel Lindsaar <mikel@test.lindsaar.net>\r\n"
+  #  mail[:sender].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>'
+  #  mail[:sender].addresses #=> ['mikel@test.lindsaar.net']
+  #  mail[:sender].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>']
+  class SenderField < CommonAddressField #:nodoc:
+    NAME = 'Sender'
 
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self
+    def self.singular?
+      true
     end
 
-    def addresses
-      [address.address]
+    def default
+      address
     end
 
-    def address
-      address_list.addresses.first
-    end
-    
-    def encoded
-      do_encode(CAPITALIZED_FIELD)
-    end
-    
-    def decoded
-      do_decode
-    end
-    
-    def default
-      address.address
+    def addresses
+      Array(super.first)
     end
-    
   end
 end