mail 2.5.2 → 2.6.0

data/lib/mail/field.rb

@@ -22,7 +22,7 @@ module Mail
   #
   class Field
 
-    include Patterns
+    include Utilities
     include Comparable
 
     STRUCTURED_FIELDS = %w[ bcc cc content-description content-disposition
@@ -67,6 +67,10 @@ module Mail
       "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
@@ -110,15 +114,22 @@ module Mail
     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)
+        @charset = value.blank? ? charset : value
+        @name = name[FIELD_PREFIX]
+        @raw_value = name
+        @value = nil
       when name !~ /:/ && value.blank?  # Field.new("field-name")
-        create_field(name, nil, charset)
+        @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)
@@ -126,11 +137,12 @@ module Mail
     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
@@ -138,27 +150,39 @@ module Mail
     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)
@@ -174,37 +198,48 @@ module Mail
                       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 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)
       lower_case_name = name.to_s.downcase
-      header_name = nil
-      FIELDS_MAP.each do |field_name, _|
-        header_name = field_name if lower_case_name == field_name
-      end
-      if header_name
-        FIELDS_MAP[header_name].new(value, charset)
+      if field_klass = FIELDS_MAP[lower_case_name]
+        field_klass.new(value, charset)
       else
         OptionalField.new(name, value, charset)
       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) / 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
@@ -94,7 +100,7 @@ module Mail
   
     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")
@@ -104,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(" ")
@@ -112,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

@@ -22,7 +22,7 @@ module Mail
     end
 
     def to_s
-      decoded
+      decoded.to_s
     end
 
     def default
@@ -43,15 +43,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, '')
       end
     end
 
+    FILENAME_RE = /\b(filename|name)=([^;"\r\n]+\s[^;"\r\n]+)/
     def ensure_filename_quoted(value)
-      if !value.is_a?(Array) and /(.)*\s(filename|name)=[^"](.+\s)+[^"]/.match value
-        value.gsub!(/[^=]+$/, '"\\0"')
+      if value.is_a?(String)
+        value.sub! FILENAME_RE, '\1="\2"'
       end
     end
-
   end
 end

data/lib/mail/fields/content_id_field.rb

@@ -55,8 +55,7 @@ module Mail
     private
     
     def generate_content_id
-      fqdn = ::Socket.gethostname
-      "<#{Mail.random_tag}@#{fqdn}.mail>"
+      "<#{Mail.random_tag}@#{::Socket.gethostname}.mail>"
     end
     
   end

data/lib/mail/fields/content_transfer_encoding_field.rb

@@ -10,8 +10,8 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      value = '7bit' if value.to_s =~ /7-bit/i
-      value = '8bit' if value.to_s =~ /8-bit/i
+      value = '7bit' if value.to_s =~ /7-?bits?/i
+      value = '8bit' if value.to_s =~ /8-?bits?/i
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
@@ -23,12 +23,6 @@ module Mail
       end
     end
     
-    def tree
-      STDERR.puts("tree is deprecated.  Please use encoding to get parse result\n#{caller}")
-      @element ||= Mail::ContentTransferEncodingElement.new(value)
-      @tree ||= @element.tree
-    end
-    
     def element
       @element ||= Mail::ContentTransferEncodingElement.new(value)
     end

data/lib/mail/fields/content_type_field.rb

@@ -180,7 +180,7 @@ module Mail
         params = $2.to_s.split(/\s+/)
         params = params.map { |i| i.to_s.chomp.strip }
         params = params.map { |i| i.split(/\s*\=\s*/) }
-        params = params.map { |i| "#{i[0]}=#{dquote(i[1].to_s)}" }.join('; ')
+        params = params.map { |i| "#{i[0]}=#{dquote(i[1].to_s.gsub(/;$/,""))}" }.join('; ')
         "#{type}; #{params}"
       when val =~ /^\s*$/
         'text/plain'

data/lib/mail/fields/date_field.rb

@@ -1,18 +1,18 @@
 # encoding: utf-8
-# 
+#
 # = Date Field
-# 
+#
 # The Date field inherits from StructuredField and handles the Date: header
 # field in the email.
-# 
+#
 # Sending date to a mail message will instantiate a Mail::Field object that
-# has a DateField as it's field type.  This includes all Mail::CommonAddress
+# has a DateField as its field type.  This includes all Mail::CommonAddress
 # module instance methods.
-# 
+#
 # There must be excatly one Date field in an RFC2822 email.
-# 
+#
 # == Examples:
-# 
+#
 #  mail = Mail.new
 #  mail.date = 'Mon, 24 Nov 1997 14:22:01 -0800'
 #  mail.date       #=> #<DateTime: 211747170121/86400,-1/3,2299161>
@@ -20,17 +20,17 @@
 #  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
-# 
+#
 require 'mail/fields/common/common_date'
 
 module Mail
   class DateField < StructuredField
-    
+
     include Mail::CommonDate
-    
+
     FIELD_NAME = 'date'
     CAPITALIZED_FIELD = "Date"
-    
+
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       if value.blank?
@@ -44,14 +44,14 @@ module Mail
     rescue ArgumentError => e
       raise e unless "invalid date"==e.message
     end
-    
+
     def encoded
       do_encode(CAPITALIZED_FIELD)
     end
-    
+
     def decoded
       do_decode
     end
-    
+
   end
 end

data/lib/mail/fields/from_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending from to a mail message will instantiate a Mail::Field object that
-# has a FromField as it's field type.  This includes all Mail::CommonAddress
+# has a FromField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one From field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.from = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.from    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.from    #=> ['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

data/lib/mail/fields/in_reply_to_field.rb

@@ -6,7 +6,7 @@
 # In-Reply-To: header field in the email.
 # 
 # Sending in_reply_to to a mail message will instantiate a Mail::Field object that
-# has a InReplyToField as it's field type.  This includes all Mail::CommonMessageId
+# has a InReplyToField as its field type.  This includes all Mail::CommonMessageId
 # module instance metods.
 # 
 # Note that, the #message_ids method will return an array of message IDs without the
@@ -38,6 +38,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
+      value = value.join("\r\n\s") if value.is_a?(Array)
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self

data/lib/mail/fields/message_id_field.rb

@@ -6,7 +6,7 @@
 # Message-ID: header field in the email.
 # 
 # Sending message_id to a mail message will instantiate a Mail::Field object that
-# has a MessageIdField as it's field type.  This includes all Mail::CommonMessageId
+# has a MessageIdField as its field type.  This includes all Mail::CommonMessageId
 # module instance metods.
 # 
 # Only one MessageId field can appear in a header, and syntactically it can only have
@@ -75,8 +75,7 @@ module Mail
     private
     
     def generate_message_id
-      fqdn = ::Socket.gethostname
-      "<#{Mail.random_tag}@#{fqdn}.mail>"
+      "<#{Mail.random_tag}@#{::Socket.gethostname}.mail>"
     end
     
   end

data/lib/mail/fields/references_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending references to a mail message will instantiate a Mail::Field object that
-# has a ReferencesField as it's field type.  This includes all Mail::CommonAddress
+# has a ReferencesField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Note that, the #message_ids method will return an array of message IDs without the
@@ -38,6 +38,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
+      value = value.join("\r\n\s") if value.is_a?(Array)
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self

data/lib/mail/fields/reply_to_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending reply_to to a mail message will instantiate a Mail::Field object that
-# has a ReplyToField as it's field type.  This includes all Mail::CommonAddress
+# has a ReplyToField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Reply-To field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.reply_to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.reply_to    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.reply_to    #=> ['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

data/lib/mail/fields/resent_bcc_field.rb

@@ -6,7 +6,7 @@
 # Resent-Bcc: header field in the email.
 # 
 # Sending resent_bcc to a mail message will instantiate a Mail::Field object that
-# has a ResentBccField as it's field type.  This includes all Mail::CommonAddress
+# has a ResentBccField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Resent-Bcc field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.resent_bcc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_bcc    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.resent_bcc    #=> ['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