mail 2.4.4 → 2.6.3

data/lib/mail/field.rb

@@ -5,11 +5,11 @@ module Mail
   # Provides a single class to call to create a new structured or unstructured
   # field.  Works out per RFC what field of field it is being given and returns
   # the correct field of class back on new.
-  # 
+  #
   # ===Per RFC 2822
-  #  
+  #
   #  2.2. Header Fields
-  #  
+  #
   #     Header fields are lines composed of a field name, followed by a colon
   #     (":"), followed by a field body, and terminated by CRLF.  A field
   #     name MUST be composed of printable US-ASCII characters (i.e.,
@@ -19,12 +19,12 @@ module Mail
   #     used in header "folding" and  "unfolding" as described in section
   #     2.2.3.  All field bodies MUST conform to the syntax described in
   #     sections 3 and 4 of this standard.
-  #  
+  #
   class Field
-    
-    include Patterns
+
+    include Utilities
     include Comparable
-    
+
     STRUCTURED_FIELDS = %w[ bcc cc content-description content-disposition
                             content-id content-location content-transfer-encoding
                             content-type date from in-reply-to keywords message-id
@@ -34,7 +34,43 @@ module Mail
                             return-path sender to ]
 
     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,
+    }
+
+    FIELD_NAME_MAP = FIELDS_MAP.inject({}) do |map, (field, field_klass)|
+      map.update(field => field_klass::CAPITALIZED_FIELD)
+    end
+
     # Generic Field Exception
     class FieldError < StandardError
     end
@@ -55,84 +91,104 @@ module Mail
     # Raised when attempting to set a structured field's contents to an invalid syntax
     class SyntaxError < FieldError #:nodoc:
     end
-    
+
     # Accepts a string:
-    # 
+    #
     #  Field.new("field-name: field data")
-    # 
+    #
     # Or name, value pair:
-    # 
+    #
     #  Field.new("field-name", "value")
-    # 
+    #
     # Or a name by itself:
-    # 
+    #
     #  Field.new("field-name")
-    # 
+    #
     # Note, does not want a terminating carriage return.  Returns
     # self appropriately parsed.  If value is not a string, then
     # it will be passed through as is, for example, content-type
-    # field can accept an array with the type and a hash of 
+    # field can accept an array with the type and a hash of
     # parameters:
-    # 
+    #
     #  Field.new('content-type', ['text', 'plain', {:charset => 'UTF-8'}])
     def initialize(name, value = nil, charset = 'utf-8')
       case
-      when name =~ /:/                  # Field.new("field-name: field data")
-        charset = value unless value.blank?
-        name, value = split(name)
-        create_field(name, value, charset)
-      when name !~ /:/ && value.blank?  # Field.new("field-name")
-        create_field(name, nil, charset)
+      when name.index(COLON)            # Field.new("field-name: field data")
+        @charset = value.blank? ? charset : value
+        @name = name[FIELD_PREFIX]
+        @raw_value = name
+        @value = nil
+      when value.blank?                 # Field.new("field-name")
+        @name = name
+        @value = nil
+        @raw_value = nil
+        @charset = charset
       else                              # Field.new("field-name", "value")
-        create_field(name, value, charset)
+        @name = name
+        @value = value
+        @raw_value = nil
+        @charset = charset
       end
-      return self
+      @name = FIELD_NAME_MAP[@name.to_s.downcase] || @name
     end
 
     def field=(value)
       @field = value
     end
-    
+
     def field
-      @field
+      _, @value = split(@raw_value) if @raw_value && !@value
+      @field ||= create_field(@name, @value, @charset)
     end
-    
+
     def name
-      field.name
+      @name
     end
-    
+
     def value
       field.value
     end
-    
+
     def value=(val)
-      create_field(name, val, charset)
+      @field = create_field(name, val, @charset)
     end
-    
+
     def to_s
       field.to_s
     end
-    
+
+    def inspect
+      "#<#{self.class.name} 0x#{(object_id * 2).to_s(16)} #{instance_variables.map do |ivar|
+        "#{ivar}=#{instance_variable_get(ivar).inspect}"
+      end.join(" ")}>"
+    end
+
     def update(name, value)
-      create_field(name, value, charset)
+      @field = create_field(name, value, @charset)
     end
-    
+
     def same( other )
-      match_to_s(other.name, field.name)
+      match_to_s(other.name, self.name)
     end
-    
+
+    def responsible_for?( val )
+      name.to_s.casecmp(val.to_s) == 0
+    end
+
     alias_method :==, :same
-    
+
     def <=>( other )
-      self_order = FIELD_ORDER.rindex(self.name.to_s.downcase) || 100
-      other_order = FIELD_ORDER.rindex(other.name.to_s.downcase) || 100
-      self_order <=> other_order
+      self.field_order_id <=> other.field_order_id
     end
-    
+
+    def field_order_id
+      @field_order_id ||= (FIELD_ORDER_LOOKUP[self.name.to_s.downcase] || 100)
+    end
+
     def method_missing(name, *args, &block)
       field.send(name, *args, &block)
     end
-    
+
     FIELD_ORDER = %w[ return-path received
                       resent-date resent-from resent-sender resent-to
                       resent-cc resent-bcc resent-message-id
@@ -141,94 +197,51 @@ module Mail
                       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]
+
     private
-    
+
     def split(raw_field)
-      match_data = raw_field.mb_chars.match(/^(#{FIELD_NAME})\s*:\s*(#{FIELD_BODY})?$/)
-      [match_data[1].to_s.mb_chars.strip, match_data[2].to_s.mb_chars.strip]
+      match_data = raw_field.mb_chars.match(FIELD_SPLIT)
+      [match_data[1].to_s.mb_chars.strip, match_data[2].to_s.mb_chars.strip.to_s]
     rescue
-      STDERR.puts "WARNING: Could not parse (and so ignorning) '#{raw_field}'"
+      STDERR.puts "WARNING: Could not parse (and so ignoring) '#{raw_field}'"
+    end
+
+    # 2.2.3. Long Header Fields
+    #
+    #  The process of moving from this folded multiple-line representation
+    #  of a header field to its single line representation is called
+    #  "unfolding". Unfolding is accomplished by simply removing any CRLF
+    #  that is immediately followed by WSP.  Each header field should be
+    #  treated in its unfolded form for further syntactic and semantic
+    #  evaluation.
+    def unfold(string)
+      string.gsub(/[\r\n \t]+/m, ' ')
     end
-    
+
     def create_field(name, value, charset)
+      value = unfold(value) if value.is_a?(String)
+
       begin
-        self.field = new_field(name, value, charset)
+        new_field(name, value, charset)
       rescue Mail::Field::ParseError => e
-        self.field = Mail::UnstructuredField.new(name, value)
-        self.field.errors << [name, value, e]
-        self.field
+        field = Mail::UnstructuredField.new(name, value)
+        field.errors << [name, value, e]
+        field
       end
     end
 
     def new_field(name, value, charset)
-      # Could do this with constantize and make it "as DRY as", but a simple case 
-      # statement is, well, simpler... 
-      case name.to_s.downcase
-      when /^to$/i
-        ToField.new(value, charset)
-      when /^cc$/i
-        CcField.new(value, charset)
-      when /^bcc$/i
-        BccField.new(value, charset)
-      when /^message-id$/i
-        MessageIdField.new(value, charset)
-      when /^in-reply-to$/i
-        InReplyToField.new(value, charset)
-      when /^references$/i
-        ReferencesField.new(value, charset)
-      when /^subject$/i
-        SubjectField.new(value, charset)
-      when /^comments$/i
-        CommentsField.new(value, charset)
-      when /^keywords$/i
-        KeywordsField.new(value, charset)
-      when /^date$/i
-        DateField.new(value, charset)
-      when /^from$/i
-        FromField.new(value, charset)
-      when /^sender$/i
-        SenderField.new(value, charset)
-      when /^reply-to$/i
-        ReplyToField.new(value, charset)
-      when /^resent-date$/i
-        ResentDateField.new(value, charset)
-      when /^resent-from$/i
-        ResentFromField.new(value, charset)
-      when /^resent-sender$/i 
-        ResentSenderField.new(value, charset)
-      when /^resent-to$/i
-        ResentToField.new(value, charset)
-      when /^resent-cc$/i
-        ResentCcField.new(value, charset)
-      when /^resent-bcc$/i
-        ResentBccField.new(value, charset)
-      when /^resent-message-id$/i
-        ResentMessageIdField.new(value, charset)
-      when /^return-path$/i
-        ReturnPathField.new(value, charset)
-      when /^received$/i
-        ReceivedField.new(value, charset)
-      when /^mime-version$/i
-        MimeVersionField.new(value, charset)
-      when /^content-transfer-encoding$/i
-        ContentTransferEncodingField.new(value, charset)
-      when /^content-description$/i
-        ContentDescriptionField.new(value, charset)
-      when /^content-disposition$/i
-        ContentDispositionField.new(value, charset)
-      when /^content-type$/i
-        ContentTypeField.new(value, charset)
-      when /^content-id$/i
-        ContentIdField.new(value, charset)
-      when /^content-location$/i
-        ContentLocationField.new(value, charset)
-      else 
+      lower_case_name = name.to_s.downcase
+      if field_klass = FIELDS_MAP[lower_case_name]
+        field_klass.new(value, charset)
+      else
         OptionalField.new(name, value, charset)
       end
-      
     end
 
   end
-  
+
 end

data/lib/mail/field_list.rb

@@ -8,26 +8,26 @@ module Mail
 
     include Enumerable
 
+    # Insert the field in sorted order.
+    #
+    # Heavily based on bisect.insort from Python, which is:
+    #   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 )
-      current_entry = self.rindex(new_field)
-      if current_entry
-        self.insert((current_entry + 1), new_field)
-      else
-        insert_idx = -1
-        self.each_with_index do |item, idx|
-          case item <=> new_field
-          when -1
-            next
-          when 0
-            next
-          when 1
-            insert_idx = idx
-            break
-          end
+      lo = 0
+      hi = size
+
+      while lo < hi
+        mid = (lo + hi).div(2)
+        if new_field < self[mid]
+          hi = mid
+        else
+          lo = mid + 1
         end
-        insert(insert_idx, new_field)
       end
+
+      insert(lo, new_field)
     end
-    
   end
-end
+end

data/lib/mail/fields/bcc_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending bcc to a mail message will instantiate a Mail::Field object that
-# has a BccField as it's field type.  This includes all Mail::CommonAddress
+# 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
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.bcc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  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

data/lib/mail/fields/cc_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending cc to a mail message will instantiate a Mail::Field object that
-# has a CcField as it's field type.  This includes all Mail::CommonAddress
+# 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
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.cc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  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

data/lib/mail/fields/comments_field.rb

@@ -6,7 +6,7 @@
 # header field in the email.
 # 
 # Sending comments to a mail message will instantiate a Mail::Field object that
-# has a CommentsField as it's field type.
+# 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)

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

@@ -6,7 +6,7 @@ module Mail
       
     def parse(val = value)
       unless val.blank?
-        @tree = AddressList.new(encode_if_needed(val))
+        @address_list = AddressList.new(encode_if_needed(val))
       else
         nil
       end
@@ -20,54 +20,60 @@ module Mail
       Encodings.address_encode(val, charset)
     end
     
-    # Allows you to iterate through each address object in the syntax tree
+    # Allows you to iterate through each address object in the address_list
     def each
-      tree.addresses.each do |address|
+      address_list.addresses.each do |address|
         yield(address)
       end
     end
 
     # Returns the address string of all the addresses in the address list
     def addresses
-      list = tree.addresses.map { |a| a.address }
+      list = address_list.addresses.map { |a| a.address }
       Mail::AddressContainer.new(self, list)
     end
 
     # Returns the formatted string of all the addresses in the address list
     def formatted
-      list = tree.addresses.map { |a| a.format }
+      list = address_list.addresses.map { |a| a.format }
       Mail::AddressContainer.new(self, list)
     end
   
     # Returns the display name of all the addresses in the address list
     def display_names
-      list = tree.addresses.map { |a| a.display_name }
+      list = address_list.addresses.map { |a| a.display_name }
       Mail::AddressContainer.new(self, list)
     end
   
     # Returns the actual address objects in the address list
     def addrs
-      list = tree.addresses
+      list = address_list.addresses
       Mail::AddressContainer.new(self, list)
     end
   
     # Returns a hash of group name => address strings for the address list
     def groups
-      @groups = Hash.new
-      tree.group_recipients.each do |group|
-        @groups[group.group_name.text_value.to_str] = get_group_addresses(group.group_list)
-      end
-      @groups
+      address_list.addresses_grouped_by_group
     end
   
     # Returns the addresses that are part of groups
     def group_addresses
-      groups.map { |k,v| v.map { |a| a.format } }.flatten
+      decoded_group_addresses
+    end
+
+    # Returns a list of decoded group addresses
+    def decoded_group_addresses
+      groups.map { |k,v| v.map { |a| a.decoded } }.flatten
+    end
+
+    # Returns a list of encoded group addresses
+    def encoded_group_addresses
+      groups.map { |k,v| v.map { |a| a.encoded } }.flatten
     end
 
     # Returns the name of all the groups in a string
     def group_names # :nodoc:
-      tree.group_names
+      address_list.group_names
     end
   
     def default
@@ -81,15 +87,20 @@ module Mail
       when val.blank?
         parse(encoded)
       else
-        parse((formatted + [val]).join(", "))
+        self.value = [self.value, val].reject {|a| a.blank? }.join(", ")
       end
     end
+
+    def value=(val)
+      super
+      parse(self.value)
+    end
   
     private
   
     def do_encode(field_name)
       return '' if value.blank?
-      address_array = tree.addresses.reject { |a| group_addresses.include?(a.encoded) }.compact.map { |a| a.encoded }
+      address_array = address_list.addresses.reject { |a| encoded_group_addresses.include?(a.encoded) }.compact.map { |a| a.encoded }
       address_text  = address_array.join(", \r\n\s")
       group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.encoded }.join(", \r\n\s")};" }
       group_text  = group_array.join(" \r\n\s")
@@ -99,7 +110,7 @@ module Mail
 
     def do_decode
       return nil if value.blank?
-      address_array = tree.addresses.reject { |a| group_addresses.include?(a.decoded) }.map { |a| a.decoded }
+      address_array = address_list.addresses.reject { |a| decoded_group_addresses.include?(a.decoded) }.map { |a| a.decoded }
       address_text  = address_array.join(", ")
       group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.decoded }.join(", ")};" }
       group_text  = group_array.join(" ")
@@ -107,15 +118,14 @@ module Mail
       return_array.join(", ")
     end
 
-    # Returns the syntax tree of the Addresses
-    def tree # :nodoc:
-      @tree ||= AddressList.new(value)
+    def address_list # :nodoc:
+      @address_list ||= AddressList.new(value)
     end
   
     def get_group_addresses(group_list)
       if group_list.respond_to?(:addresses)
-        group_list.addresses.map do |address_tree|
-          Mail::Address.new(address_tree)
+        group_list.addresses.map do |address|
+          Mail::Address.new(address)
         end
       else
         []

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

@@ -13,7 +13,6 @@ module Mail
     def parse(val = value)
       unless val.blank?
         @element = Mail::DateTimeElement.new(val)
-        @tree = @element.tree
       else
         nil
       end
@@ -32,11 +31,5 @@ module Mail
     def element
       @element ||= Mail::DateTimeElement.new(value)
     end
-    
-    # Returns the syntax tree of the Date
-    def tree
-      @tree ||= element.tree
-    end
-    
   end
 end

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

@@ -1,6 +1,7 @@
 # encoding: utf-8
 module Mail
   module CommonField # :nodoc:
+    include Mail::Constants
 
     def name=(value)
       @name = value
@@ -22,7 +23,7 @@ module Mail
     end
 
     def to_s
-      decoded
+      decoded.to_s
     end
 
     def default
@@ -34,7 +35,7 @@ module Mail
     end
 
     def responsible_for?( val )
-      name.to_s.downcase == val.to_s.downcase
+      name.to_s.casecmp(val.to_s) == 0
     end
 
     private
@@ -43,9 +44,15 @@ module Mail
       if value.is_a?(Array)
         value
       else
-        value.to_s.gsub(/#{field_name}:\s+/i, '')
+        value.to_s.sub(/#{field_name}:\s+/i, EMPTY)
       end
     end
 
+    FILENAME_RE = /\b(filename|name)=([^;"\r\n]+\s[^;"\r\n]+)/
+    def ensure_filename_quoted(value)
+      if value.is_a?(String)
+        value.sub! FILENAME_RE, '\1="\2"'
+      end
+    end
   end
 end

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

@@ -31,14 +31,18 @@ module Mail
     end
 
     private
-    
+
     def do_encode(field_name)
-      %Q{#{field_name}: #{do_decode}\r\n}
+      %Q{#{field_name}: #{formated_message_ids("\r\n ")}\r\n}
     end
-    
+
     def do_decode
-      "#{message_ids.map { |m| "<#{m}>" }.join(' ')}" if message_ids
+      formated_message_ids(' ')
     end
-    
+
+    def formated_message_ids(join)
+      message_ids.map{ |m| "<#{m}>" }.join(join) if message_ids
+    end
+
   end
 end

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

@@ -18,7 +18,7 @@ module Mail
       exact = nil
       each do |k,v|
         if k =~ /^#{key_pattern}(\*|$)/i
-          if $1 == '*'
+          if $1 == ASTERISK
             pairs << [k, v]
           else
             exact = k
@@ -40,7 +40,7 @@ module Mail
     end
 
     def encoded
-      map.sort { |a,b| a.first.to_s <=> b.first.to_s }.map do |key_name, value|
+      map.sort_by { |a| a.first.to_s }.map! do |key_name, value|
         unless value.ascii_only?
           value = Mail::Encodings.param_encode(value)
           key_name = "#{key_name}*"
@@ -50,7 +50,7 @@ module Mail
     end
 
     def decoded
-      map.sort { |a,b| a.first.to_s <=> b.first.to_s }.map do |key_name, value|
+      map.sort_by { |a| a.first.to_s }.map! do |key_name, value|
         %Q{#{key_name}=#{quote_token(value)}}
       end.join("; ")
     end