mail 2.2.5 → 2.2.19

data/lib/mail/parsers/rfc2822.rb

@@ -2866,7 +2866,7 @@ module Mail
 
     module AddressList0
       def addr_value
-        elements[2]
+        elements[3]
       end
     end
 
@@ -2892,52 +2892,75 @@ module Mail
       end
 
       i0, s0 = index, []
-      r1 = _nt_address
+      r2 = _nt_address
+      if r2
+        r1 = r2
+      else
+        r1 = instantiate_node(SyntaxNode,input, index...index)
+      end
       s0 << r1
       if r1
-        s2, i2 = [], index
+        s3, i3 = [], index
         loop do
-          i3, s3 = index, []
-          if has_terminal?(",", false, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
-          else
-            terminal_parse_failure(",")
-            r4 = nil
+          i4, s4 = index, []
+          s5, i5 = [], index
+          loop do
+            r6 = _nt_FWS
+            if r6
+              s5 << r6
+            else
+              break
+            end
           end
-          s3 << r4
-          if r4
-            s5, i5 = [], index
-            loop do
-              r6 = _nt_FWS
-              if r6
-                s5 << r6
-              else
-                break
-              end
+          r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+          s4 << r5
+          if r5
+            if has_terminal?(",", false, index)
+              r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure(",")
+              r7 = nil
             end
-            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-            s3 << r5
-            if r5
-              r7 = _nt_address
-              s3 << r7
+            s4 << r7
+            if r7
+              s8, i8 = [], index
+              loop do
+                r9 = _nt_FWS
+                if r9
+                  s8 << r9
+                else
+                  break
+                end
+              end
+              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+              s4 << r8
+              if r8
+                r11 = _nt_address
+                if r11
+                  r10 = r11
+                else
+                  r10 = instantiate_node(SyntaxNode,input, index...index)
+                end
+                s4 << r10
+              end
             end
           end
-          if s3.last
-            r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-            r3.extend(AddressList0)
+          if s4.last
+            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+            r4.extend(AddressList0)
           else
-            @index = i3
-            r3 = nil
+            @index = i4
+            r4 = nil
           end
-          if r3
-            s2 << r3
+          if r4
+            s3 << r4
           else
             break
           end
         end
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-        s0 << r2
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        s0 << r3
       end
       if s0.last
         r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
@@ -5315,4 +5338,4 @@ module Mail
     include RFC2822
   end
 
-end
+end

data/lib/mail/parsers/rfc2822.treetop

@@ -265,7 +265,7 @@ module Mail
     end
   
     rule address_list
-      first_addr:address other_addr:("," FWS* addr_value:address)*
+      first_addr:address? other_addr:(FWS* "," FWS* addr_value:address?)*
     end
     
     rule date_time
@@ -407,4 +407,4 @@ module Mail
     
     
   end
-end
+end

data/lib/mail/part.rb

@@ -43,7 +43,7 @@ module Mail
     end
     
     def delivery_status_report_part?
-      main_type =~ /message/i && sub_type =~ /delivery-status/i
+      (main_type =~ /message/i && sub_type =~ /delivery-status/i) && body =~ /Status:/
     end
     
     def delivery_status_data
@@ -103,7 +103,7 @@ module Mail
         self.body   = body_part
       else
         self.header = "Content-Type: text/plain\r\n"
-        self.body   = header_part
+        self.body   = raw_source
       end
     end
     

data/lib/mail/parts_list.rb

@@ -1,6 +1,6 @@
 module Mail
   class PartsList < Array
-    
+
     def attachments
       Mail::AttachmentsList.new(self)
     end
@@ -14,30 +14,38 @@ module Mail
         to_a
       end
     end
-    
+
     undef :map
     alias_method :map, :collect
 
     def map!
       raise NoMethodError, "#map! is not defined, please call #collect and create a new PartsList"
     end
-    
+
     def collect!
       raise NoMethodError, "#collect! is not defined, please call #collect and create a new PartsList"
     end
-    
+
     def sort!(order)
       sorted = self.sort do |a, b|
         # OK, 10000 is arbitrary... if anyone actually wants to explicitly sort 10000 parts of a
         # single email message... please show me a use case and I'll put more work into this method,
         # in the meantime, it works :)
-        a_order = order.index(a[:content_type].string.downcase) || 10000
-        b_order = order.index(b[:content_type].string.downcase) || 10000
-        a_order <=> b_order
+        get_order_value(a, order) <=> get_order_value(b, order)
       end
       self.clear
       sorted.each { |p| self << p }
     end
-    
+
+  private
+
+    def get_order_value(part, order)
+      if part.respond_to?(:content_type)
+        order.index(part[:content_type].string.downcase) || 10000
+      else
+        10000
+      end
+    end
+
   end
 end

data/lib/mail/patterns.rb

@@ -9,8 +9,13 @@ module Mail
     aspecial     = %Q|()<>[]:;@\\,."| # RFC5322
     tspecial     = %Q|()<>@,;:\\"/[]?=| # RFC2045
     lwsp         = %Q| \t\r\n|
+    sp           = %Q| |
     control      = %Q|\x00-\x1f\x7f-\xff|
     
+    if control.respond_to?(:force_encoding)
+      control = control.force_encoding(Encoding::BINARY)
+    end
+    
     CRLF          = /\r\n/
     WSP           = /[#{white_space}]/
     FWS           = /#{CRLF}#{WSP}*/
@@ -23,8 +28,8 @@ module Mail
     QP_UNSAFE     = /[^#{qp_safe}]/
     QP_SAFE       = /[#{qp_safe}]/
     CONTROL_CHAR  = /[#{control}]/n
-    ATOM_UNSAFE   = /[#{Regexp.quote aspecial}#{control}#{lwsp}]/n
+    ATOM_UNSAFE   = /[#{Regexp.quote aspecial}#{control}#{sp}]/n
     PHRASE_UNSAFE = /[#{Regexp.quote aspecial}#{control}]/n
-    TOKEN_UNSAFE  = /[#{Regexp.quote tspecial}#{control}#{lwsp}]/n
+    TOKEN_UNSAFE  = /[#{Regexp.quote tspecial}#{control}#{sp}]/n
   end
 end

data/lib/mail/utilities.rb

@@ -176,6 +176,36 @@ module Mail
     def underscoreize( str )
       str.to_s.downcase.gsub('-', '_')
     end
-    
+
+    if RUBY_VERSION <= '1.8.6'
+
+      def map_lines( str, &block )
+        results = []
+        str.each_line do |line|
+          results << yield(line)
+        end
+        results
+      end
+  
+      def map_with_index( enum, &block )
+        results = []
+        enum.each_with_index do |token, i|
+          results[i] = yield(token, i)
+        end
+        results
+      end
+      
+    else
+
+      def map_lines( str, &block )
+        str.each_line.map(&block)
+      end
+
+      def map_with_index( enum, &block )
+        enum.each_with_index.map(&block)
+      end
+
+    end
+
   end
 end

data/lib/mail/version.rb

@@ -2,14 +2,11 @@
 module Mail
   module VERSION
     
-    def self.version
-      version_hash = {}
-      File.read(File.join(File.dirname(__FILE__), '../', 'VERSION')).each_line do |line|
-        type, value = line.chomp.split(":")
-        next if type =~ /^\s+$/  || value =~ /^\s+$/
-        version_hash[type] = value
-      end
-      version_hash
+    version = {}
+    File.read(File.join(File.dirname(__FILE__), '../', 'VERSION')).each_line do |line|
+      type, value = line.chomp.split(":")
+      next if type =~ /^\s+$/  || value =~ /^\s+$/
+      version[type] = value
     end
     
     MAJOR = version['major']
@@ -18,5 +15,10 @@ module Mail
     BUILD = version['build']
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+    
+    def self.version
+      STRING
+    end
+    
   end
 end

data/lib/mail/version_specific/ruby_1_8.rb

@@ -37,7 +37,7 @@ module Mail
     end
     
     def Ruby18.decode_base64(str)
-      Base64.decode64(str)
+      Base64.decode64(str) if str
     end
     
     def Ruby18.encode_base64(str)
@@ -90,7 +90,7 @@ module Mail
     
     def Ruby18.param_encode(str)
       encoding = $KCODE.to_s.downcase
-      language = Mail::Configuration.instance.param_encode_language
+      language = Configuration.instance.param_encode_language
       "#{encoding}'#{language}'#{URI.escape(str)}"
     end
   end

data/lib/mail/version_specific/ruby_1_9.rb

@@ -27,7 +27,7 @@ module Mail
     end
 
     def Ruby19.decode_base64(str)
-      str.unpack( 'm' ).first.force_encoding(Encoding::BINARY)
+      str.unpack( 'm' ).first
     end
     
     def Ruby19.encode_base64(str)
@@ -35,11 +35,11 @@ module Mail
     end
     
     def Ruby19.has_constant?(klass, string)
-      klass.constants.include?( string.to_sym )
+      klass.const_defined?( string, false )
     end
     
     def Ruby19.get_constant(klass, string)
-      klass.const_get( string.to_sym )
+      klass.const_get( string )
     end
     
     def Ruby19.b_value_encode(str, encoding = nil)
@@ -52,9 +52,10 @@ module Mail
       if match
         encoding = match[1]
         str = Ruby19.decode_base64(match[2])
-        str.force_encoding(encoding)
+        str.force_encoding(fix_encoding(encoding))
       end
-      str
+      decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
+      decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
     end
     
     def Ruby19.q_value_encode(str, encoding = nil)
@@ -67,9 +68,10 @@ module Mail
       if match
         encoding = match[1]
         str = Encodings::QuotedPrintable.decode(match[2])
-        str.force_encoding(encoding)
+        str.force_encoding(fix_encoding(encoding))
       end
-      str
+      decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
+      decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
     end
 
     def Ruby19.param_decode(str, encoding)
@@ -80,8 +82,27 @@ module Mail
 
     def Ruby19.param_encode(str)
       encoding = str.encoding.to_s.downcase
-      language = Mail::Configuration.instance.param_encode_language
+      language = Configuration.instance.param_encode_language
       "#{encoding}'#{language}'#{URI.escape(str)}"
     end
+
+     # mails somtimes includes invalid encodings like iso885915 or utf8 so we transform them to iso885915 or utf8 
+     # TODO: add this as a test somewhere 
+     # Encoding.list.map{|e| [e.to_s.upcase==fix_encoding(e.to_s.downcase.gsub("-", "")), e.to_s] }.select {|a,b| !b}
+     #  Encoding.list.map{|e| [e.to_s==fix_encoding(e.to_s), e.to_s] }.select {|a,b| !b}
+    def Ruby19.fix_encoding(encoding)
+      case encoding
+        # ISO-8859-15, ISO-2022-JP and alike
+        when /iso-?(\d{4})-?(\w{1,2})/i then return "ISO-#{$1}-#{$2}"
+        # "ISO-2022-JP-KDDI"  and alike
+        when /iso-?(\d{4})-?(\w{1,2})-?(\w*)/i then return "ISO-#{$1}-#{$2}-#{$3}"
+        # UTF-8, UTF-32BE and alike
+        when /utf-?(\d{1,2})?(\w{1,2})/i then return "UTF-#{$1}#{$2}"
+        # Windows-1252 and alike
+        when /Windows-?(.*)/i then return "Windows-#{$1}"
+        #more aliases to be added if needed
+        else return encoding
+      end
+    end
   end
 end

data/lib/mail.rb

@@ -2,11 +2,13 @@
 module Mail # :doc:
 
   require 'date'
+  require 'shellwords'
 
   require 'active_support'
+  require 'active_support/core_ext/class/attribute_accessors'
   require 'active_support/core_ext/hash/indifferent_access'
   require 'active_support/core_ext/object/blank'
-  require 'active_support/core_ext/string'
+  require 'active_support/inflector'
 
   require 'uri'
   require 'net/smtp'
@@ -22,16 +24,18 @@ module Mail # :doc:
 
   if RUBY_VERSION >= "1.9.1"
     require 'mail/version_specific/ruby_1_9'
-    RubyVer = Mail::Ruby19
+    RubyVer = Ruby19
   else
     require 'mail/version_specific/ruby_1_8'
-    RubyVer = Mail::Ruby18
+    RubyVer = Ruby18
   end
 
   require 'mail/version'
 
   require 'mail/core_extensions/nil'
   require 'mail/core_extensions/string'
+  require 'mail/core_extensions/shellwords' unless String.new.respond_to?(:shellescape)
+  require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
 
   require 'mail/patterns'
   require 'mail/utilities'
@@ -52,7 +56,7 @@ module Mail # :doc:
   require 'mail/envelope'
 
   parsers = %w[ rfc2822_obsolete rfc2822 address_lists phrase_lists
-                date_time received message_ids envelope_from rfc2045 
+                date_time received message_ids envelope_from rfc2045
                 mime_version content_type content_disposition
                 content_transfer_encoding content_location ]