mail 2.5.5 → 2.6.0

data/lib/mail/elements/address_list.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mail
   class AddressList # :nodoc:
-    
+
     # Mail::AddressList is the class that parses To, From and other address fields from
     # emails passed into Mail.
     # 
@@ -18,57 +18,34 @@ module Mail
     #  a.addresses    #=> [#<Mail::Address:14943130 Address: |ada@test.lindsaar.net...
     #  a.group_names  #=> ["My Group"]
     def initialize(string)
-      if string.blank?
-        @address_nodes = []
-        return self
-      end
-      parser = Mail::AddressListsParser.new
-      if tree = parser.parse(string)
-        @address_nodes = tree.addresses
-      else
-        raise Mail::Field::ParseError.new(AddressListsParser, string, parser.failure_reason)
-      end
+      @addresses_grouped_by_group = nil
+      @address_list = Parsers::AddressListsParser.new.parse(string)
     end
     
     # Returns a list of address objects from the parsed line
     def addresses
-      @addresses ||= get_addresses.map do |address_tree|
-        Mail::Address.new(address_tree)
+      @addresses ||= @address_list.addresses.map do |address_data|
+        Mail::Address.new(address_data)
       end
     end
-    
-    # Returns a list of all recipient syntax trees that are not part of a group
-    def individual_recipients # :nodoc:
-      @individual_recipients ||= @address_nodes - group_recipients
-    end
-    
-    # Returns a list of all recipient syntax trees that are part of a group
-    def group_recipients # :nodoc:
-      @group_recipients ||= @address_nodes.select { |an| an.respond_to?(:group_name) }
+
+    def addresses_grouped_by_group
+      return @addresses_grouped_by_group if @addresses_grouped_by_group
+
+      @addresses_grouped_by_group = {}
+
+      @address_list.addresses.each do |address_data|
+        if group = address_data.group
+          @addresses_grouped_by_group[group] ||= []
+          @addresses_grouped_by_group[group] << Mail::Address.new(address_data)
+        end
+      end
+      @addresses_grouped_by_group
     end
     
     # Returns the names as an array of strings of all groups
     def group_names # :nodoc:
-      group_recipients.map { |g| g.group_name.text_value }
-    end
-    
-    # Returns a list of address syntax trees
-    def address_nodes # :nodoc:
-      @address_nodes
-    end
-    
-    private
-    
-    def get_addresses
-      (individual_recipients + group_recipients.map { |g| get_group_addresses(g) }).flatten
-    end
-    
-    def get_group_addresses(g)
-      if g.group_list.respond_to?(:addresses)
-        g.group_list.addresses
-      else
-        []
-      end
+      @address_list.group_names
     end
   end
 end

data/lib/mail/elements/content_disposition_element.rb

@@ -5,13 +5,9 @@ module Mail
     include Mail::Utilities
     
     def initialize( string )
-      parser = Mail::ContentDispositionParser.new
-      if tree = parser.parse(cleaned(string))
-        @disposition_type = tree.disposition_type.text_value.downcase
-        @parameters = tree.parameters
-      else
-        raise Mail::Field::ParseError.new(ContentDispositionElement, string, parser.failure_reason)
-      end
+      content_disposition = Mail::Parsers::ContentDispositionParser.new.parse(cleaned(string))
+      @disposition_type = content_disposition.disposition_type
+      @parameters = content_disposition.parameters
     end
     
     def disposition_type

data/lib/mail/elements/content_location_element.rb

@@ -5,12 +5,8 @@ module Mail
     include Mail::Utilities
     
     def initialize( string )
-      parser = Mail::ContentLocationParser.new
-      if tree = parser.parse(string)
-        @location = tree.location.text_value
-      else
-        raise Mail::Field::ParseError.new(ContentLocationElement, string, parser.failure_reason)
-      end
+      content_location = Mail::Parsers::ContentLocationParser.new.parse(string)
+      @location = content_location.location
     end
     
     def location

data/lib/mail/elements/content_transfer_encoding_element.rb

@@ -4,16 +4,9 @@ module Mail
     
     include Mail::Utilities
     
-    def initialize( string )
-      parser = Mail::ContentTransferEncodingParser.new
-      case
-      when string.blank?
-        @encoding = ''
-      when tree = parser.parse(string.to_s.downcase)
-        @encoding = tree.encoding.text_value
-      else
-        raise Mail::Field::ParseError.new(ContentTransferEncodingElement, string, parser.failure_reason)
-      end
+    def initialize(string)
+      content_transfer_encoding = Mail::Parsers::ContentTransferEncodingParser.new.parse(string)
+      @encoding = content_transfer_encoding.encoding
     end
     
     def encoding

data/lib/mail/elements/content_type_element.rb

@@ -5,14 +5,10 @@ module Mail
     include Mail::Utilities
     
     def initialize( string )
-      parser = Mail::ContentTypeParser.new
-      if tree = parser.parse(cleaned(string))
-        @main_type = tree.main_type.text_value.downcase
-        @sub_type = tree.sub_type.text_value.downcase
-        @parameters = tree.parameters
-      else
-        raise Mail::Field::ParseError.new(ContentTypeElement, string, parser.failure_reason)
-      end
+      content_type = Mail::Parsers::ContentTypeParser.new.parse(cleaned(string))
+      @main_type = content_type.main_type
+      @sub_type = content_type.sub_type
+      @parameters = content_type.parameters
     end
     
     def main_type

data/lib/mail/elements/date_time_element.rb

@@ -5,13 +5,9 @@ module Mail
     include Mail::Utilities
     
     def initialize( string )
-      parser = Mail::DateTimeParser.new
-      if tree = parser.parse(string)
-        @date_string = tree.date.text_value
-        @time_string = tree.time.text_value
-      else
-        raise Mail::Field::ParseError.new(DateTimeElement, string, parser.failure_reason)
-      end
+      date_time = Mail::Parsers::DateTimeParser.new.parse(string)
+      @date_string = date_time.date_string
+      @time_string = date_time.time_string
     end
     
     def date_string

data/lib/mail/elements/envelope_from_element.rb

@@ -5,17 +5,9 @@ module Mail
     include Mail::Utilities
     
     def initialize( string )
-      parser = Mail::EnvelopeFromParser.new
-      if @tree = parser.parse(string)
-        @address = tree.addr_spec.text_value.strip
-        @date_time = ::DateTime.parse("#{tree.ctime_date.text_value}")
-      else
-        raise Mail::Field::ParseError.new(EnvelopeFromElement, string, parser.failure_reason)
-      end
-    end
-    
-    def tree
-      @tree
+      @envelope_from = Mail::Parsers::EnvelopeFromParser.new.parse(string)
+      @address = @envelope_from.address
+      @date_time = ::DateTime.parse(@envelope_from.ctime_date)
     end
     
     def date_time

data/lib/mail/elements/message_ids_element.rb

@@ -5,12 +5,7 @@ module Mail
     include Mail::Utilities
     
     def initialize(string)
-      parser = Mail::MessageIdsParser.new
-      if tree = parser.parse(string)
-        @message_ids = tree.message_ids.map { |msg_id| clean_msg_id(msg_id.text_value) }
-      else
-        raise Mail::Field::ParseError.new(MessageIdsElement, string, parser.failure_reason)
-      end
+      @message_ids = Mail::Parsers::MessageIdsParser.new.parse(string).message_ids.map { |msg_id| clean_msg_id(msg_id) }
     end
     
     def message_ids

data/lib/mail/elements/mime_version_element.rb

@@ -5,13 +5,9 @@ module Mail
     include Mail::Utilities
     
     def initialize( string )
-      parser = Mail::MimeVersionParser.new
-      if tree = parser.parse(string)
-        @major = tree.major.text_value
-        @minor = tree.minor.text_value
-      else
-        raise Mail::Field::ParseError.new(MimeVersionElement, string, parser.failure_reason)
-      end
+      mime_version = Mail::Parsers::MimeVersionParser.new.parse(string)
+      @major = mime_version.major
+      @minor = mime_version.minor
     end
     
     def major

data/lib/mail/elements/phrase_list.rb

@@ -5,16 +5,11 @@ module Mail
     include Mail::Utilities
     
     def initialize(string)
-      parser = Mail::PhraseListsParser.new
-      if tree = parser.parse(string)
-        @phrases = tree.phrases
-      else
-        raise Mail::Field::ParseError.new(PhraseList, string, parser.failure_reason)
-      end
+      @phrase_lists = Mail::Parsers::PhraseListsParser.new.parse(string)
     end
     
     def phrases
-      @phrases.map { |p| unquote(p.text_value) }
+      @phrase_lists.phrases.map { |p| unquote(p) }
     end
 
   end

data/lib/mail/elements/received_element.rb

@@ -5,13 +5,9 @@ module Mail
     include Mail::Utilities
     
     def initialize( string )
-      parser = Mail::ReceivedParser.new
-      if tree = parser.parse(string)
-        @date_time = ::DateTime.parse("#{tree.date_time.date.text_value} #{tree.date_time.time.text_value}")
-        @info = tree.name_val_list.text_value
-      else
-        raise Mail::Field::ParseError.new(ReceivedElement, string, parser.failure_reason)
-      end
+      received = Mail::Parsers::ReceivedParser.new.parse(string)
+      @date_time = ::DateTime.parse("#{received.date} #{received.time}")
+      @info = received.info
     end
     
     def date_time

data/lib/mail/encodings.rb

@@ -292,7 +292,6 @@ module Mail
 
         if encoding == previous_encoding
           line = results.pop + line
-          line.gsub!(/\?\=\=\?.+?\?[QqBb]\?/m, '')
         end
 
         previous_encoding = encoding

data/lib/mail/envelope.rb

@@ -14,11 +14,6 @@ module Mail
       super(FIELD_NAME, strip_field(FIELD_NAME, args.last))
     end
     
-    def tree
-      @element ||= Mail::EnvelopeFromElement.new(value)
-      @tree ||= @element.tree
-    end
-    
     def element
       @element ||= Mail::EnvelopeFromElement.new(value)
     end

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,19 +150,29 @@ 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
@@ -182,18 +204,32 @@ module Mail
 
     def split(raw_field)
       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]
+      [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
 

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