mail 2.6.6 → 2.7.0.rc1

data/lib/mail/elements/content_transfer_encoding_element.rb

@@ -1,18 +1,13 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/content_transfer_encoding_parser'
+
 module Mail
   class ContentTransferEncodingElement
-    
-    include Mail::Utilities
-    
+    attr_reader :encoding
+
     def initialize(string)
-      content_transfer_encoding = Mail::Parsers::ContentTransferEncodingParser.new.parse(string)
-      @encoding = content_transfer_encoding.encoding
+      @encoding = Mail::Parsers::ContentTransferEncodingParser.parse(string).encoding
     end
-    
-    def encoding
-      @encoding
-    end
-    
   end
 end

data/lib/mail/elements/content_type_element.rb

@@ -1,32 +1,21 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/content_type_parser'
+
 module Mail
   class ContentTypeElement # :nodoc:
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      content_type = Mail::Parsers::ContentTypeParser.new.parse(cleaned(string))
+    attr_reader :main_type, :sub_type, :parameters
+
+    def initialize(string)
+      content_type = Mail::Parsers::ContentTypeParser.parse(cleaned(string))
       @main_type = content_type.main_type
       @sub_type = content_type.sub_type
       @parameters = content_type.parameters
     end
-    
-    def main_type
-      @main_type
-    end
-    
-    def sub_type
-      @sub_type
-    end
-    
-    def parameters
-      @parameters
-    end
-    
+
+    private
     def cleaned(string)
       string =~ /(.+);\s*$/ ? $1 : string
     end
-    
   end
 end

data/lib/mail/elements/date_time_element.rb

@@ -1,23 +1,15 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/date_time_parser'
+
 module Mail
   class DateTimeElement # :nodoc:
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      date_time = Mail::Parsers::DateTimeParser.new.parse(string)
+    attr_reader :date_string, :time_string
+
+    def initialize(string)
+      date_time = Mail::Parsers::DateTimeParser.parse(string)
       @date_string = date_time.date_string
       @time_string = date_time.time_string
     end
-    
-    def date_string
-      @date_string
-    end
-    
-    def time_string
-      @time_string
-    end
-    
   end
 end

data/lib/mail/elements/envelope_from_element.rb

@@ -1,40 +1,33 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/envelope_from_parser'
+require 'date'
+
 module Mail
   class EnvelopeFromElement
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      @envelope_from = Mail::Parsers::EnvelopeFromParser.new.parse(string)
-      @address = @envelope_from.address
-      @date_time = ::DateTime.parse(@envelope_from.ctime_date)
-    end
-    
-    def date_time
-      @date_time
-    end
-    
-    def address
-      @address
+    attr_reader :date_time, :address
+
+    def initialize(string)
+      envelope_from = Mail::Parsers::EnvelopeFromParser.parse(string)
+      @address = envelope_from.address
+      @date_time = ::DateTime.parse(envelope_from.ctime_date)
     end
-    
+
     # RFC 4155:
     #   a timestamp indicating the UTC date and time when the message
     #   was originally received, conformant with the syntax of the
     #   traditional UNIX 'ctime' output sans timezone (note that the
     #   use of UTC precludes the need for a timezone indicator);
     def formatted_date_time
-      if @date_time.respond_to?(:ctime)
-        @date_time.ctime
+      if date_time.respond_to?(:ctime)
+        date_time.ctime
       else
-        @date_time.strftime '%a %b %e %T %Y'
+        date_time.strftime '%a %b %e %T %Y'
       end
     end
 
     def to_s
-      "#{@address} #{formatted_date_time}"
+      "#{address} #{formatted_date_time}"
     end
-    
   end
 end

data/lib/mail/elements/message_ids_element.rb

@@ -1,26 +1,22 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/message_ids_parser'
+
 module Mail
   class MessageIdsElement
-
-    include Mail::Utilities
+    attr_reader :message_ids
 
     def initialize(string)
-      raise Mail::Field::ParseError.new(Mail::MessageIdsElement, string, 'nil is invalid') if string.nil?
-      @message_ids = Mail::Parsers::MessageIdsParser.new.parse(string).message_ids.map { |msg_id| clean_msg_id(msg_id) }
-    end
-
-    def message_ids
-      @message_ids
+      @message_ids = Mail::Parsers::MessageIdsParser.parse(string).message_ids.map { |msg_id| clean_msg_id(msg_id) }
     end
 
     def message_id
-      @message_ids.first
+      message_ids.first
     end
 
-    def clean_msg_id( val )
-      val =~ /.*<(.*)>.*/ ; $1
+    private
+    def clean_msg_id(val)
+      val =~ /.*<(.*)>.*/ ? $1 : val
     end
-
   end
 end

data/lib/mail/elements/mime_version_element.rb

@@ -1,23 +1,15 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/mime_version_parser'
+
 module Mail
   class MimeVersionElement
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      mime_version = Mail::Parsers::MimeVersionParser.new.parse(string)
+    attr_reader :major, :minor
+
+    def initialize(string)
+      mime_version = Mail::Parsers::MimeVersionParser.parse(string)
       @major = mime_version.major
       @minor = mime_version.minor
     end
-    
-    def major
-      @major
-    end
-    
-    def minor
-      @minor
-    end
-    
   end
 end

data/lib/mail/elements/phrase_list.rb

@@ -1,17 +1,14 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/phrase_lists_parser'
+require 'mail/utilities'
+
 module Mail
   class PhraseList
-    
-    include Mail::Utilities
-    
+    attr_reader :phrases
+
     def initialize(string)
-      @phrase_lists = Mail::Parsers::PhraseListsParser.new.parse(string)
+      @phrases = Mail::Parsers::PhraseListsParser.parse(string).phrases.map { |p| Mail::Utilities.unquote(p) }
     end
-    
-    def phrases
-      @phrase_lists.phrases.map { |p| unquote(p) }
-    end
-
   end
 end

data/lib/mail/elements/received_element.rb

@@ -1,27 +1,21 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/received_parser'
+require 'date'
+
 module Mail
   class ReceivedElement
-    
     include Mail::Utilities
-    
-    def initialize( string )
-      received = Mail::Parsers::ReceivedParser.new.parse(string)
+    attr_reader :date_time, :info
+
+    def initialize(string)
+      received = Mail::Parsers::ReceivedParser.parse(string)
       @date_time = ::DateTime.parse("#{received.date} #{received.time}")
       @info = received.info
     end
-    
-    def date_time
-      @date_time
-    end
-    
-    def info
-      @info
-    end
-    
+
     def to_s(*args)
-      "#{@info}; #{@date_time.to_s(*args)}"
+      "#{info}; #{date_time.to_s(*args)}"
     end
-    
   end
 end

data/lib/mail/encodings.rb

@@ -178,9 +178,8 @@ module Mail
 
     def Encodings.encode_non_usascii(address, charset)
       return address if address.ascii_only? or charset.nil?
-      us_ascii = %Q{\x00-\x7f}
-      # Encode any non usascii strings embedded inside of quotes
-      address = address.gsub(/(".*?[^#{us_ascii}].*?")/) { |s| Encodings.b_value_encode(unquote(s), charset) }
+      # Encode all strings embedded inside of quotes
+      address = address.gsub(/("[^"]*")/) { |s| Encodings.b_value_encode(unquote(s), charset) }
       # Then loop through all remaining items and encode as needed
       tokens = address.split(/\s/)
       map_with_index(tokens) do |word, i|
@@ -258,24 +257,23 @@ module Mail
       str[ENCODED_VALUE, 1]
     end
 
-    # When the encoded string consists of multiple lines, lines with the same
-    # encoding (Q or B) can be joined together.
+    # Split header line into proper encoded and unencoded parts.
     #
     # String has to be of the format =?<encoding>?[QB]?<string>?=
+    #
+    # Omit unencoded space after an encoded-word.
     def Encodings.collapse_adjacent_encodings(str)
       results = []
-      previous_encoding = nil
+      last_encoded = nil  # Track whether to preserve or drop whitespace
+
       lines = str.split(FULL_ENCODED_VALUE)
       lines.each_slice(2) do |unencoded, encoded|
-        if encoded
-          encoding = value_encoding_from_string(encoded)
-          if encoding == previous_encoding && Utilities.blank?(unencoded)
-            results.last << encoded
-          else
-            results << unencoded unless unencoded == EMPTY
-            results << encoded
+        if last_encoded = encoded
+          if !Utilities.blank?(unencoded) || (!last_encoded && unencoded != EMPTY)
+            results << unencoded
           end
-          previous_encoding = encoding
+
+          results << encoded
         else
           results << unencoded
         end

data/lib/mail/field.rb

@@ -218,10 +218,13 @@ module Mail
     private
 
     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.to_s]
+      match_data = Mail::Multibyte.mb_chars(raw_field).match(FIELD_SPLIT)
+      [
+        Mail::Multibyte.mb_chars(match_data[1].to_s).strip,
+        Mail::Multibyte.mb_chars(match_data[2].to_s).strip.to_s
+      ]
     rescue
-      STDERR.puts "WARNING: Could not parse (and so ignoring) '#{raw_field}'"
+      $stderr.puts "WARNING: Could not parse (and so ignoring) '#{raw_field}'"
     end
 
     # 2.2.3. Long Header Fields
@@ -233,7 +236,7 @@ module Mail
     #  treated in its unfolded form for further syntactic and semantic
     #  evaluation.
     def unfold(string)
-      string.gsub(/[\r\n \t]+/m, ' ')
+      string.gsub(/#{CRLF}(#{WSP})/m, '\1')
     end
 
     def create_field(name, value, charset)

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

@@ -30,7 +30,7 @@ module Mail
         super(exact || key_name)
       else # Dealing with a multiple value pair or a single encoded value pair
         string = pairs.sort { |a,b| a.first.to_s <=> b.first.to_s }.map { |v| v.last }.join('')
-        if mt = string.match(/([\w\-]+)'(\w\w)'(.*)/)
+        if mt = string.match(/([\w\-]+)?'(\w\w)?'(.*)/)
           string = mt[3]
           encoding = mt[1]
         else

data/lib/mail/fields/content_type_field.rb

@@ -145,9 +145,7 @@ module Mail
       # TODO: check if there are cases where whitespace is not a separator
       val = val.
         gsub(/\s*=\s*/,'='). # remove whitespaces around equal sign
-        tr(' ',';').
-        squeeze(';').
-        gsub(';', '; '). #use '; ' as a separator (or EOL)
+        gsub(/[; ]+/, '; '). #use '; ' as a separator (or EOL)
         gsub(/;\s*$/,'') #remove trailing to keep examples below
 
       if val =~ /(boundary=(\S*))/i
@@ -157,9 +155,6 @@ module Mail
       end
 
       case
-      when val.chomp =~ /^\s*([\w\-]+)\/([\w\-]+)\s*;;+(.*)$/i
-        # Handles 'text/plain;; format="flowed"' (double semi colon)
-        "#{$1}/#{$2}; #{$3}"
       when val.chomp =~ /^\s*([\w\-]+)\/([\w\-]+)\s*;\s?(ISO[\w\-]+)$/i
         # Microsoft helper:
         # Handles 'type/subtype;ISO-8559-1'
@@ -186,7 +181,7 @@ module Mail
       when val =~ /^\s*$/
         'text/plain'
       else
-        ''
+        val
       end
     end
 

data/lib/mail/fields/unstructured_field.rb

@@ -121,7 +121,7 @@ module Mail
     def fold(prepend = 0) # :nodoc:
       encoding       = normalized_encoding
       decoded_string = decoded.to_s
-      should_encode  = decoded_string.not_ascii_only?
+      should_encode  = !decoded_string.ascii_only?
       if should_encode
         first = true
         words = decoded_string.split(/[ \t]/).map do |word|
@@ -130,7 +130,7 @@ module Mail
           else
             word = " #{word}"
           end
-          if word.not_ascii_only?
+          if !word.ascii_only?
             word
           else
             word.scan(/.{7}|.+$/)

data/lib/mail/header.rb

@@ -57,6 +57,7 @@ module Mail
     def initialize_copy(original)
       super
       @fields = @fields.dup
+      @fields.map!(&:dup)
     end
     
     # The preserved raw source of the header as you passed it in, untouched

data/lib/mail/message.rb

@@ -213,7 +213,7 @@ module Mail
     self.default_charset = 'UTF-8'
 
     def register_for_delivery_notification(observer)
-      STDERR.puts("Message#register_for_delivery_notification is deprecated, please call Mail.register_observer instead")
+      $stderr.puts("Message#register_for_delivery_notification is deprecated, please call Mail.register_observer instead")
       Mail.register_observer(observer)
     end
 
@@ -360,13 +360,8 @@ module Mail
       if self.message_id && other.message_id
         self.encoded == other.encoded
       else
-        self_message_id, other_message_id = self.message_id, other.message_id
-        begin
-          self.message_id, other.message_id = '<temp@test>', '<temp@test>'
-          self.encoded == other.encoded
-        ensure
-          self.message_id, other.message_id = self_message_id, other_message_id
-        end
+        dup.tap { |m| m.message_id = '<temp@test>' }.encoded ==
+          other.dup.tap { |m| m.message_id = '<temp@test>' }.encoded
       end
     end
 
@@ -1420,7 +1415,7 @@ module Mail
     end
 
     def has_transfer_encoding? # :nodoc:
-      STDERR.puts(":has_transfer_encoding? is deprecated in Mail 1.4.3.  Please use has_content_transfer_encoding?\n#{caller}")
+      $stderr.puts(":has_transfer_encoding? is deprecated in Mail 1.4.3.  Please use has_content_transfer_encoding?\n#{caller}")
       has_content_transfer_encoding?
     end
 
@@ -1468,9 +1463,9 @@ module Mail
       if !body.empty?
         # Only give a warning if this isn't an attachment, has non US-ASCII and the user
         # has not specified an encoding explicitly.
-        if @defaulted_charset && body.raw_source.not_ascii_only? && !self.attachment?
+        if @defaulted_charset && !body.raw_source.ascii_only? && !self.attachment?
           warning = "Non US-ASCII detected and no charset defined.\nDefaulting to UTF-8, set your own if this is incorrect.\n"
-          STDERR.puts(warning)
+          $stderr.puts(warning)
         end
         header[:content_type].parameters['charset'] = @charset
       end
@@ -1484,18 +1479,18 @@ module Mail
         header[:content_transfer_encoding] = '7bit'
       else
         warning = "Non US-ASCII detected and no content-transfer-encoding defined.\nDefaulting to 8bit, set your own if this is incorrect.\n"
-        STDERR.puts(warning)
+        $stderr.puts(warning)
         header[:content_transfer_encoding] = '8bit'
       end
     end
 
     def add_transfer_encoding # :nodoc:
-      STDERR.puts(":add_transfer_encoding is deprecated in Mail 1.4.3.  Please use add_content_transfer_encoding\n#{caller}")
+      $stderr.puts(":add_transfer_encoding is deprecated in Mail 1.4.3.  Please use add_content_transfer_encoding\n#{caller}")
       add_content_transfer_encoding
     end
 
     def transfer_encoding # :nodoc:
-      STDERR.puts(":transfer_encoding is deprecated in Mail 1.4.3.  Please use content_transfer_encoding\n#{caller}")
+      $stderr.puts(":transfer_encoding is deprecated in Mail 1.4.3.  Please use content_transfer_encoding\n#{caller}")
       content_transfer_encoding
     end
 
@@ -1505,7 +1500,7 @@ module Mail
     end
 
     def message_content_type
-      STDERR.puts(":message_content_type is deprecated in Mail 1.4.3.  Please use mime_type\n#{caller}")
+      $stderr.puts(":message_content_type is deprecated in Mail 1.4.3.  Please use mime_type\n#{caller}")
       mime_type
     end
 
@@ -1537,7 +1532,7 @@ module Mail
 
     # Returns the content type parameters
     def mime_parameters
-      STDERR.puts(':mime_parameters is deprecated in Mail 1.4.3, please use :content_type_parameters instead')
+      $stderr.puts(':mime_parameters is deprecated in Mail 1.4.3, please use :content_type_parameters instead')
       content_type_parameters
     end
 
@@ -1563,7 +1558,14 @@ module Mail
 
     # returns the part in a multipart/report email that has the content-type delivery-status
     def delivery_status_part
-      @delivery_stats_part ||= parts.select { |p| p.delivery_status_report_part? }.first
+      unless defined? @delivery_status_part
+        @delivery_status_part =
+          if delivery_status_report?
+            parts.detect(&:delivery_status_report_part?)
+          end
+      end
+
+      @delivery_status_part
     end
 
     def bounced?
@@ -1798,7 +1800,6 @@ module Mail
     # ready to send
     def ready_to_send!
       identify_and_set_transfer_encoding
-      parts.sort!([ "text/plain", "text/enriched", "text/html", "multipart/alternative" ])
       parts.each do |part|
         part.transport_encoding = transport_encoding
         part.ready_to_send!
@@ -1807,7 +1808,7 @@ module Mail
     end
 
     def encode!
-      STDERR.puts("Deprecated in 1.1.0 in favour of :ready_to_send! as it is less confusing with encoding and decoding.")
+      $stderr.puts("Deprecated in 1.1.0 in favour of :ready_to_send! as it is less confusing with encoding and decoding.")
       ready_to_send!
     end
 
@@ -1975,7 +1976,7 @@ module Mail
 
   private
 
-    HEADER_SEPARATOR = /#{CRLF}#{CRLF}|#{CRLF}#{WSP}*#{CRLF}(?!#{WSP})/m
+    HEADER_SEPARATOR = /#{CRLF}#{CRLF}/
 
     #  2.1. General Description
     #   A message consists of header fields (collectively called "the header
@@ -1984,9 +1985,6 @@ module Mail
     #   this standard. The body is simply a sequence of characters that
     #   follows the header and is separated from the header by an empty line
     #   (i.e., a line with nothing preceding the CRLF).
-    #
-    # Additionally, I allow for the case where someone might have put whitespace
-    # on the "gap line"
     def parse_message
       header_part, body_part = raw_source.lstrip.split(HEADER_SEPARATOR, 2)
       self.header = header_part
@@ -2130,10 +2128,10 @@ module Mail
       content_disp_name = header[:content_disposition].filename rescue nil
       content_loc_name  = header[:content_location].location rescue nil
       case
-      when content_type && content_type_name
-        filename = content_type_name
       when content_disposition && content_disp_name
         filename = content_disp_name
+      when content_type && content_type_name
+        filename = content_type_name
       when content_location && content_loc_name
         filename = content_loc_name
       else