mail 2.4.4 → 2.6.3

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
@@ -26,8 +18,21 @@ module Mail
       @address
     end
     
-    def to_s(*args)
-      "#{@info}; #{@date_time.to_s(*args)}"
+    # 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
+      else
+        @date_time.strftime '%a %b %e %T %Y'
+      end
+    end
+
+    def to_s
+      "#{@address} #{formatted_date_time}"
     end
     
   end

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/elements.rb

@@ -1,14 +1,14 @@
 module Mail
-  autoload :Address, 'mail/elements/address'
-  autoload :AddressList, 'mail/elements/address_list'
-  autoload :ContentDispositionElement, 'mail/elements/content_disposition_element'
-  autoload :ContentLocationElement, 'mail/elements/content_location_element'
-  autoload :ContentTransferEncodingElement, 'mail/elements/content_transfer_encoding_element'
-  autoload :ContentTypeElement, 'mail/elements/content_type_element'
-  autoload :DateTimeElement, 'mail/elements/date_time_element'
-  autoload :EnvelopeFromElement, 'mail/elements/envelope_from_element'
-  autoload :MessageIdsElement, 'mail/elements/message_ids_element'
-  autoload :MimeVersionElement, 'mail/elements/mime_version_element'
-  autoload :PhraseList, 'mail/elements/phrase_list'
-  autoload :ReceivedElement, 'mail/elements/received_element'
+  register_autoload :Address, 'mail/elements/address'
+  register_autoload :AddressList, 'mail/elements/address_list'
+  register_autoload :ContentDispositionElement, 'mail/elements/content_disposition_element'
+  register_autoload :ContentLocationElement, 'mail/elements/content_location_element'
+  register_autoload :ContentTransferEncodingElement, 'mail/elements/content_transfer_encoding_element'
+  register_autoload :ContentTypeElement, 'mail/elements/content_type_element'
+  register_autoload :DateTimeElement, 'mail/elements/date_time_element'
+  register_autoload :EnvelopeFromElement, 'mail/elements/envelope_from_element'
+  register_autoload :MessageIdsElement, 'mail/elements/message_ids_element'
+  register_autoload :MimeVersionElement, 'mail/elements/mime_version_element'
+  register_autoload :PhraseList, 'mail/elements/phrase_list'
+  register_autoload :ReceivedElement, 'mail/elements/received_element'
 end

data/lib/mail/encodings/quoted_printable.rb

@@ -12,13 +12,14 @@ module Mail
         EightBit.can_encode? str
       end
 
-      # Decode the string from Quoted-Printable
+      # Decode the string from Quoted-Printable. Cope with hard line breaks
+      # that were incorrectly encoded as hex instead of literal CRLF.
       def self.decode(str)
-        str.unpack("M*").first
+        str.gsub(/(?:=0D=0A|=0D|=0A)\r\n/, "\r\n").unpack("M*").first.to_lf
       end
 
       def self.encode(str)
-        [str].pack("M").gsub(/\n/, "\r\n")
+        [str.to_lf].pack("M").to_crlf
       end
 
       def self.cost(str)

data/lib/mail/encodings/unix_to_unix.rb

@@ -0,0 +1,17 @@
+module Mail
+  module Encodings
+    module UnixToUnix
+      NAME = "x-uuencode"
+
+      def self.decode(str)
+        str.sub(/\Abegin \d+ [^\n]*\n/, '').unpack('u').first
+      end
+
+      def self.encode(str)
+        [str].pack("u")
+      end
+
+      Encodings.register(NAME, self)
+    end
+  end
+end

data/lib/mail/encodings.rb

@@ -7,7 +7,7 @@ module Mail
 
   module Encodings
 
-    include Mail::Patterns
+    include Mail::Constants
     extend  Mail::Utilities
 
     @transfer_encodings = {}
@@ -47,13 +47,13 @@ module Mail
     end
 
     def Encodings.get_name(enc)
-      enc = enc.to_s.gsub("-", "_").downcase
+      enc = underscoreize(enc).downcase
     end
 
     # Encodes a parameter value using URI Escaping, note the language field 'en' can
     # be set using Mail::Configuration, like so:
     #
-    #  Mail.defaults.do
+    #  Mail.defaults do
     #    param_encode_language 'jp'
     #  end
     #
@@ -114,32 +114,16 @@ module Mail
     # String has to be of the format =?<encoding>?[QB]?<string>?=
     def Encodings.value_decode(str)
       # Optimization: If there's no encoded-words in the string, just return it
-      return str unless str.index("=?")
+      return str unless str =~ ENCODED_VALUE
 
-      str = str.gsub(/\?=(\s*)=\?/, '?==?') # Remove whitespaces between 'encoded-word's
+      lines = collapse_adjacent_encodings(str)
 
       # Split on white-space boundaries with capture, so we capture the white-space as well
-      str.split(/([ \t])/).map do |text|
-        if text.index('=?') .nil?
-          text
-        else
-          # Join QP encoded-words that are adjacent to avoid decoding partial chars
-          text.gsub!(/\?\=\=\?.+?\?[Qq]\?/m, '') if text =~ /\?==\?/
-
-          # Search for occurences of quoted strings or plain strings
-          text.scan(/(                                  # Group around entire regex to include it in matches
-                       \=\?[^?]+\?([QB])\?[^?]+?\?\=  # Quoted String with subgroup for encoding method
-                       |                                # or
-                       .+?(?=\=\?|$)                    # Plain String
-                     )/xmi).map do |matches|
-            string, method = *matches
-            if    method == 'b' || method == 'B'
-              b_value_decode(string)
-            elsif method == 'q' || method == 'Q'
-              q_value_decode(string)
-            else
-              string
-            end
+      lines.each do |line|
+        line.gsub!(ENCODED_VALUE) do |string|
+          case $1
+          when *B_VALUES then b_value_decode(string)
+          when *Q_VALUES then q_value_decode(string)
           end
         end
       end.join("")
@@ -147,19 +131,17 @@ module Mail
 
     # Takes an encoded string of the format =?<encoding>?[QB]?<string>?=
     def Encodings.unquote_and_convert_to(str, to_encoding)
-      original_encoding = split_encoding_from_string( str )
-
-      output = value_decode( str ).to_s
+      output = value_decode( str ).to_s # output is already converted to UTF-8
 
-      if original_encoding.to_s.downcase.gsub("-", "") == to_encoding.to_s.downcase.gsub("-", "")
+      if 'utf8' == to_encoding.to_s.downcase.gsub("-", "")
         output
-      elsif original_encoding && to_encoding
+      elsif to_encoding
         begin
           if RUBY_VERSION >= '1.9'
             output.encode(to_encoding)
           else
             require 'iconv'
-            Iconv.iconv(to_encoding, original_encoding, output).first
+            Iconv.iconv(to_encoding, 'UTF-8', output).first
           end
         rescue Iconv::IllegalSequence, Iconv::InvalidEncoding, Errno::EINVAL
           # the 'from' parameter specifies a charset other than what the text
@@ -178,10 +160,10 @@ module Mail
     def Encodings.address_encode(address, charset = 'utf-8')
       if address.is_a?(Array)
         # loop back through for each element
-        address.map { |a| Encodings.address_encode(a, charset) }.join(", ")
+        address.compact.map { |a| Encodings.address_encode(a, charset) }.join(", ")
       else
         # find any word boundary that is not ascii and encode it
-        encode_non_usascii(address, charset)
+        encode_non_usascii(address, charset) if address
       end
     end
 
@@ -189,15 +171,15 @@ module Mail
       return address if address.ascii_only? or charset.nil?
       us_ascii = %Q{\x00-\x7f}
       # Encode any non usascii strings embedded inside of quotes
-      address.gsub!(/(".*?[^#{us_ascii}].*?")/) { |s| Encodings.b_value_encode(unquote(s), charset) }
+      address = address.gsub(/(".*?[^#{us_ascii}].*?")/) { |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|
         if word.ascii_only?
           word
         else
-          previous_non_ascii = tokens[i-1] && !tokens[i-1].ascii_only?
-          if previous_non_ascii
+          previous_non_ascii = i>0 && tokens[i-1] && !tokens[i-1].ascii_only?
+          if previous_non_ascii #why are we adding an extra space here?
             word = " #{word}"
           end
           Encodings.b_value_encode(word, charset)
@@ -259,7 +241,7 @@ module Mail
     end
 
     def Encodings.split_encoding_from_string( str )
-      match = str.match(/\=\?([^?]+)?\?[QB]\?(.+)?\?\=/mi)
+      match = str.match(/\=\?([^?]+)?\?[QB]\?(.*)\?\=/mi)
       if match
         match[1]
       else
@@ -270,5 +252,38 @@ module Mail
     def Encodings.find_encoding(str)
       RUBY_VERSION >= '1.9' ? str.encoding : $KCODE
     end
+
+    # Gets the encoding type (Q or B) from the string.
+    def Encodings.split_value_encoding_from_string(str)
+      match = str.match(/\=\?[^?]+?\?([QB])\?(.*)\?\=/mi)
+      if match
+        match[1]
+      else
+        nil
+      end
+    end
+
+    # When the encoded string consists of multiple lines, lines with the same
+    # encoding (Q or B) can be joined together.
+    #
+    # String has to be of the format =?<encoding>?[QB]?<string>?=
+    def Encodings.collapse_adjacent_encodings(str)
+      lines = str.split(/(\?=)\s*(=\?)/).each_slice(2).map(&:join)
+      results = []
+      previous_encoding = nil
+
+      lines.each do |line|
+        encoding = split_value_encoding_from_string(line)
+
+        if encoding == previous_encoding
+          line = results.pop + line
+        end
+
+        previous_encoding = encoding
+        results << line
+      end
+
+      results
+    end
   end
 end

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