mail 2.7.1 → 2.9.1

data/lib/mail/field.rb

@@ -23,8 +23,6 @@ module Mail
   #     sections 3 and 4 of this standard.
   #
   class Field
-
-    include Utilities
     include Comparable
 
     STRUCTURED_FIELDS = %w[ bcc cc content-description content-disposition
@@ -38,40 +36,68 @@ module Mail
     KNOWN_FIELDS = STRUCTURED_FIELDS + ['comments', 'subject']
 
     FIELDS_MAP = {
-      "to" => ToField,
-      "cc" => CcField,
-      "bcc" => BccField,
-      "message-id" => MessageIdField,
-      "in-reply-to" => InReplyToField,
-      "references" => ReferencesField,
-      "subject" => SubjectField,
-      "comments" => CommentsField,
-      "keywords" => KeywordsField,
-      "date" => DateField,
-      "from" => FromField,
-      "sender" => SenderField,
-      "reply-to" => ReplyToField,
-      "resent-date" => ResentDateField,
-      "resent-from" => ResentFromField,
-      "resent-sender" =>  ResentSenderField,
-      "resent-to" => ResentToField,
-      "resent-cc" => ResentCcField,
-      "resent-bcc" => ResentBccField,
-      "resent-message-id" => ResentMessageIdField,
-      "return-path" => ReturnPathField,
-      "received" => ReceivedField,
-      "mime-version" => MimeVersionField,
-      "content-transfer-encoding" => ContentTransferEncodingField,
-      "content-description" => ContentDescriptionField,
-      "content-disposition" => ContentDispositionField,
-      "content-type" => ContentTypeField,
-      "content-id" => ContentIdField,
-      "content-location" => ContentLocationField,
+      "to" => "ToField",
+      "cc" => "CcField",
+      "bcc" => "BccField",
+      "message-id" => "MessageIdField",
+      "in-reply-to" => "InReplyToField",
+      "references" => "ReferencesField",
+      "subject" => "SubjectField",
+      "comments" => "CommentsField",
+      "keywords" => "KeywordsField",
+      "date" => "DateField",
+      "from" => "FromField",
+      "sender" => "SenderField",
+      "reply-to" => "ReplyToField",
+      "resent-date" => "ResentDateField",
+      "resent-from" => "ResentFromField",
+      "resent-sender" => "ResentSenderField",
+      "resent-to" => "ResentToField",
+      "resent-cc" => "ResentCcField",
+      "resent-bcc" => "ResentBccField",
+      "resent-message-id" => "ResentMessageIdField",
+      "return-path" => "ReturnPathField",
+      "received" => "ReceivedField",
+      "mime-version" => "MimeVersionField",
+      "content-transfer-encoding" => "ContentTransferEncodingField",
+      "content-description" => "ContentDescriptionField",
+      "content-disposition" => "ContentDispositionField",
+      "content-type" => "ContentTypeField",
+      "content-id" => "ContentIdField",
+      "content-location" => "ContentLocationField",
     }
 
-    FIELD_NAME_MAP = FIELDS_MAP.inject({}) do |map, (field, field_klass)|
-      map.update(field => field_klass::CAPITALIZED_FIELD)
-    end
+    FIELD_NAME_MAP = {
+      "to" => "To",
+      "cc" => "Cc",
+      "bcc" => "Bcc",
+      "message-id" => "Message-ID",
+      "in-reply-to" => "In-Reply-To",
+      "references" => "References",
+      "subject" => "Subject",
+      "comments" => "Comments",
+      "keywords" => "Keywords",
+      "date" => "Date",
+      "from" => "From",
+      "sender" => "Sender",
+      "reply-to" => "Reply-To",
+      "resent-date" => "Resent-Date",
+      "resent-from" => "Resent-From",
+      "resent-sender" => "Resent-Sender",
+      "resent-to" => "Resent-To",
+      "resent-cc" => "Resent-Cc",
+      "resent-bcc" => "Resent-Bcc",
+      "resent-message-id" => "Resent-Message-ID",
+      "return-path" => "Return-Path",
+      "received" => "Received",
+      "mime-version" => "MIME-Version",
+      "content-transfer-encoding" => "Content-Transfer-Encoding",
+      "content-description" => "Content-Description",
+      "content-disposition" => "Content-Disposition",
+      "content-type" => "Content-Type",
+      "content-id" => "Content-ID",
+      "content-location" => "Content-Location",
+    }
 
     # Generic Field Exception
     class FieldError < StandardError
@@ -121,7 +147,7 @@ module Mail
       #
       #  Mail::Field.parse("field-name: field data")
       #  # => #<Mail::Field …>
-      def parse(field, charset = nil)
+      def parse(field, charset = 'utf-8')
         name, value = split(field)
         if name && value
           new name, value, charset
@@ -132,7 +158,7 @@ module Mail
         if raw_field.index(Constants::COLON)
           name, value = raw_field.split(Constants::COLON, 2)
           name.rstrip!
-          if name =~ /\A#{Constants::FIELD_NAME}\z/
+          if /\A#{Constants::FIELD_NAME}\z/.match?(name)
             [ name.rstrip, value.strip ]
           else
             Kernel.warn "WARNING: Ignoring unparsable header #{raw_field.inspect}: invalid header name syntax: #{name.inspect}"
@@ -145,6 +171,11 @@ module Mail
         warn "WARNING: Ignoring unparsable header #{raw_field.inspect}: #{error.class}: #{error.message}"
         nil
       end
+
+      def field_class_for(name) #:nodoc:
+        class_name = FIELDS_MAP[name.to_s.downcase]
+        Mail.const_get(class_name) if class_name
+      end
     end
 
     attr_reader :unparsed_value
@@ -163,10 +194,8 @@ module Mail
     #  # => #<Mail::Field …>
     def initialize(name, value = nil, charset = 'utf-8')
       case
-      when name.index(COLON)
-        Kernel.warn 'Passing an unparsed header field to Mail::Field.new is deprecated and will be removed in Mail 2.8.0. Use Mail::Field.parse instead.'
-        @name, @unparsed_value = self.class.split(name)
-        @charset = Utilities.blank?(value) ? charset : value
+      when name.index(Constants::COLON)
+        raise ArgumentError, 'Passing an unparsed header field to Mail::Field.new is not supported in Mail 2.8.0+. Use Mail::Field.parse instead.'
       when Utilities.blank?(value)
         @name = name
         @unparsed_value = nil
@@ -176,11 +205,12 @@ module Mail
         @unparsed_value = value
         @charset = charset
       end
-      @name = FIELD_NAME_MAP[@name.to_s.downcase] || @name
+      klass = self.class.field_class_for(@name)
+      @name = klass ? klass::NAME : @name
     end
 
-    def field=(value)
-      @field = value
+    def field=(field)
+      @field = field
     end
 
     def field
@@ -209,81 +239,65 @@ module Mail
       end.join(" ")}>"
     end
 
-    def update(name, value)
-      @field = create_field(name, value, @charset)
-    end
-
-    def same( other )
-      return false unless other.kind_of?(self.class)
-      match_to_s(other.name, self.name)
+    def same(other)
+      other.kind_of?(self.class) && Utilities.match_to_s(other.name, name)
     end
 
-    def ==( other )
-      return false unless other.kind_of?(self.class)
-      match_to_s(other.name, self.name) && match_to_s(other.value, self.value)
+    def ==(other)
+      same(other) && Utilities.match_to_s(other.value, value)
     end
 
-    def responsible_for?( val )
-      name.to_s.casecmp(val.to_s) == 0
+    def responsible_for?(field_name)
+      name.to_s.casecmp(field_name.to_s) == 0
     end
 
-    def <=>( other )
-      self.field_order_id <=> other.field_order_id
+    def <=>(other)
+      field_order_id <=> other.field_order_id
     end
 
     def field_order_id
-      @field_order_id ||= (FIELD_ORDER_LOOKUP[self.name.to_s.downcase] || 100)
+      @field_order_id ||= FIELD_ORDER_LOOKUP.fetch(self.name.to_s.downcase, 100)
     end
 
     def method_missing(name, *args, &block)
       field.send(name, *args, &block)
     end
 
-    if RUBY_VERSION >= '1.9.2'
-      def respond_to_missing?(method_name, include_private)
-        field.respond_to?(method_name, include_private) || super
-      end
-    else
-      def respond_to?(method_name, include_private = false)
-        field.respond_to?(method_name, include_private) || super
-      end
+    def respond_to_missing?(method_name, include_private)
+      field.respond_to?(method_name, include_private) || super
     end
 
-    FIELD_ORDER = %w[ return-path received
-                      resent-date resent-from resent-sender resent-to
-                      resent-cc resent-bcc resent-message-id
-                      date from sender reply-to to cc bcc
-                      message-id in-reply-to references
-                      subject comments keywords
-                      mime-version content-type content-transfer-encoding
-                      content-location content-disposition content-description ]
-
-    FIELD_ORDER_LOOKUP = Hash[FIELD_ORDER.each_with_index.to_a]
+    FIELD_ORDER_LOOKUP = Hash[%w[
+      return-path received
+      resent-date resent-from resent-sender resent-to
+      resent-cc resent-bcc resent-message-id
+      date from sender reply-to to cc bcc
+      message-id in-reply-to references
+      subject comments keywords
+      mime-version content-type content-transfer-encoding
+      content-location content-disposition content-description
+    ].each_with_index.to_a]
 
     private
 
     def create_field(name, value, charset)
-      new_field(name, value, charset)
+      parse_field(name, value, charset)
     rescue Mail::Field::ParseError => e
       field = Mail::UnstructuredField.new(name, value)
       field.errors << [name, value, e]
       field
     end
 
-    def new_field(name, value, charset)
+    def parse_field(name, value, charset)
       value = unfold(value) if value.is_a?(String)
 
-      if klass = field_class_for(name)
-        klass.new(value, charset)
+      if klass = self.class.field_class_for(name)
+        klass.parse(value, charset)
       else
-        OptionalField.new(name, value, charset)
+        OptionalField.parse(name, value, charset)
       end
     end
 
-    def field_class_for(name)
-      FIELDS_MAP[name.to_s.downcase]
-    end
-
     # 2.2.3. Long Header Fields
     #
     #  The process of moving from this folded multiple-line representation
@@ -293,7 +307,7 @@ module Mail
     #  treated in its unfolded form for further syntactic and semantic
     #  evaluation.
     def unfold(string)
-      string.gsub(/#{Constants::CRLF}(#{Constants::WSP})/m, '\1')
+      string.gsub(Constants::UNFOLD_WS, '\1')
     end
   end
 end

data/lib/mail/field_list.rb

@@ -2,12 +2,40 @@
 # frozen_string_literal: true
 module Mail
 
-  # Field List class provides an enhanced array that keeps a list of 
+  # Field List class provides an enhanced array that keeps a list of
   # email fields in order.  And allows you to insert new fields without
   # having to worry about the order they will appear in.
   class FieldList < Array
+    def has_field?(field_name)
+      any? { |f| f.responsible_for? field_name }
+    end
+
+    def get_field(field_name)
+      fields = select_fields(field_name)
+      case fields.size
+      when 0; nil
+      when 1; fields.first
+      else fields
+      end
+    end
 
-    include Enumerable
+    def add_field(field)
+      if field.singular?
+        replace_field field
+      else
+        insert_field field
+      end
+    end
+    alias_method :<<, :add_field
+
+    def replace_field(field)
+      if first_offset = index { |f| f.responsible_for? field.name }
+        delete_field field.name
+        insert first_offset, field
+      else
+        insert_field field
+      end
+    end
 
     # Insert the field in sorted order.
     #
@@ -15,20 +43,45 @@ module Mail
     #   Copyright (C) 2001-2013 Python Software Foundation.
     #   Licensed under <http://docs.python.org/license.html>
     #   From <http://hg.python.org/cpython/file/2.7/Lib/bisect.py>
-    def <<( new_field )
-      lo = 0
-      hi = size
-
+    def insert_field(field)
+      lo, hi = 0, size
       while lo < hi
         mid = (lo + hi).div(2)
-        if new_field < self[mid]
+        if field < self[mid]
           hi = mid
         else
           lo = mid + 1
         end
       end
 
-      insert(lo, new_field)
+      insert lo, field
+    end
+
+    def delete_field(name)
+      delete_if { |f| f.responsible_for? name }
+    end
+
+    def summary
+      map { |f| "<#{f.name}: #{f.value}>" }.join(", ")
+    end
+
+    private
+
+    def select_fields(field_name)
+      fields = select { |f| f.responsible_for? field_name }
+      if fields.size > 1 && singular?(field_name)
+        Array(fields.detect { |f| f.errors.size == 0 } || fields.first)
+      else
+        fields
+      end
+    end
+
+    def singular?(field_name)
+      if klass = Mail::Field.field_class_for(field_name)
+        klass.singular?
+      else
+        false
+      end
     end
   end
 end

data/lib/mail/fields/bcc_field.rb

@@ -1,68 +1,49 @@
 # encoding: utf-8
 # frozen_string_literal: true
-# 
-# = Blind Carbon Copy Field
-# 
-# The Bcc field inherits from StructuredField and handles the Bcc: header
-# field in the email.
-# 
-# Sending bcc to a mail message will instantiate a Mail::Field object that
-# has a BccField as its field type.  This includes all Mail::CommonAddress
-# module instance metods.
-# 
-# Only one Bcc field can appear in a header, though it can have multiple
-# addresses and groups of addresses.
-# 
-# == Examples:
-# 
-#  mail = Mail.new
-#  mail.bcc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.bcc    #=> ['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].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']
-# 
-require 'mail/fields/common/common_address'
 
 module Mail
-  class BccField < StructuredField
-    
-    include Mail::CommonAddress
-    
-    FIELD_NAME = 'bcc'
-    CAPITALIZED_FIELD = 'Bcc'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      @charset = charset
-      super(CAPITALIZED_FIELD, value, charset)
-      self
-    end
-    
-    def include_in_headers=(include_in_headers)
-      @include_in_headers = include_in_headers
-    end
+  # = Blind Carbon Copy Field
+  #
+  # The Bcc field inherits from StructuredField and handles the Bcc: header
+  # field in the email.
+  #
+  # Sending bcc to a mail message will instantiate a Mail::Field object that
+  # has a BccField as its field type.  This includes all Mail::CommonAddress
+  # module instance metods.
+  #
+  # Only one Bcc field can appear in a header, though it can have multiple
+  # addresses and groups of addresses.
+  #
+  # == Examples:
+  #
+  #  mail = Mail.new
+  #  mail.bcc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+  #  mail.bcc    #=> ['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].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']
+  class BccField < CommonAddressField #:nodoc:
+    NAME = 'Bcc'
 
-    def include_in_headers
-      defined?(@include_in_headers) ? @include_in_headers : self.include_in_headers = false
+    attr_accessor :include_in_headers
+
+    def initialize(value = nil, charset = nil)
+      super
+      self.include_in_headers = false
     end
 
     # Bcc field should not be :encoded by default
     def encoded
       if include_in_headers
-        do_encode(CAPITALIZED_FIELD)
+        super
       else
         ''
       end
     end
-    
-    def decoded
-      do_decode
-    end
-    
   end
 end

data/lib/mail/fields/cc_field.rb

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

data/lib/mail/fields/comments_field.rb

@@ -1,42 +1,31 @@
 # encoding: utf-8
 # frozen_string_literal: true
-# 
-# = Comments Field
-# 
-# The Comments field inherits from UnstructuredField and handles the Comments:
-# header field in the email.
-# 
-# Sending comments to a mail message will instantiate a Mail::Field object that
-# has a CommentsField as its field type.
-#  
-# An email header can have as many comments fields as it wants.  There is no upper
-# limit, the comments field is also optional (that is, no comment is needed)
-# 
-# == Examples:
-# 
-#  mail = Mail.new
-#  mail.comments = 'This is a comment'
-#  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 = "This is another comment"
-#  mail[:comments].map { |c| c.to_s } 
-#  #=> ['This is a comment', "This is another comment"]
-#
+
 module Mail
-  class CommentsField < UnstructuredField
-    
-    FIELD_NAME = 'comments'
-    CAPITALIZED_FIELD = 'Comments'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      @charset = charset
-      super(CAPITALIZED_FIELD, value)
-      self.parse
-      self
-    end
-    
+  # = Comments Field
+  #
+  # The Comments field inherits from UnstructuredField and handles the Comments:
+  # header field in the email.
+  #
+  # Sending comments to a mail message will instantiate a Mail::Field object that
+  # has a CommentsField as its field type.
+  #
+  # An email header can have as many comments fields as it wants.  There is no upper
+  # limit, the comments field is also optional (that is, no comment is needed)
+  #
+  # == Examples:
+  #
+  #  mail = Mail.new
+  #  mail.comments = 'This is a comment'
+  #  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 = "This is another comment"
+  #  mail[:comments].map { |c| c.to_s }
+  #  #=> ['This is a comment', "This is another comment"]
+  class CommentsField < NamedUnstructuredField #:nodoc:
+    NAME = 'Comments'
   end
 end