mail 2.2.5 → 2.2.19

data/lib/mail/configuration.rb

@@ -35,6 +35,8 @@ module Mail
         Mail::Sendmail
       when :file
         Mail::FileDelivery
+      when :smtp_connection
+        Mail::SMTPConnection
       when :test
         Mail::TestMailer
       else
@@ -53,6 +55,10 @@ module Mail
         Mail::POP3
       when :pop3
         Mail::POP3
+      when :imap
+        Mail::IMAP
+      when :test
+        Mail::TestRetriever
       else
         method
       end
@@ -64,4 +70,4 @@ module Mail
 
   end
 
-end
+end

data/lib/mail/core_extensions/shellwords.rb

@@ -0,0 +1,55 @@
+# The following is imported from ruby 1.9.2 shellwords.rb
+#
+module Shellwords
+  # Escapes a string so that it can be safely used in a Bourne shell
+  # command line.
+  #
+  # Note that a resulted string should be used unquoted and is not
+  # intended for use in double quotes nor in single quotes.
+  #
+  #   open("| grep #{Shellwords.escape(pattern)} file") { |pipe|
+  #     # ...
+  #   }
+  #
+  # +String#shellescape+ is a shorthand for this function.
+  #
+  #   open("| grep #{pattern.shellescape} file") { |pipe|
+  #     # ...
+  #   }
+  #
+  def shellescape(str)
+    # An empty argument will be skipped, so return empty quotes.
+    return "''" if str.empty?
+
+    str = str.dup
+
+    # Process as a single byte sequence because not all shell
+    # implementations are multibyte aware.
+    str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
+
+    # A LF cannot be escaped with a backslash because a backslash + LF
+    # combo is regarded as line continuation and simply ignored.
+    str.gsub!(/\n/, "'\n'")
+
+    return str
+  end
+
+  module_function :shellescape
+
+  class << self
+    alias escape shellescape
+  end
+
+end
+
+class String
+  # call-seq:
+  #   str.shellescape => string
+  #
+  # Escapes +str+ so that it can be safely used in a Bourne shell
+  # command line.  See +Shellwords::shellescape+ for details.
+  #
+  def shellescape
+    Shellwords.escape(self)
+  end
+end

data/lib/mail/core_extensions/smtp.rb

@@ -0,0 +1,24 @@
+module Net
+  class SMTP
+    # This is a backport of r30294 from ruby trunk because of a bug in net/smtp.
+    # http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30294
+    #
+    # Fixed in what will be Ruby 1.9.3 - tlsconnect also does not exist in some early versions of ruby
+    remove_method :tlsconnect if defined?(Net::SMTP.new.tlsconnect)
+
+    def tlsconnect(s)
+      verified = false
+      s = OpenSSL::SSL::SSLSocket.new s, @ssl_context
+      logging "TLS connection started"
+      s.sync_close = true
+      s.connect
+      if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
+        s.post_connection_check(@address)
+      end
+      verified = true
+      s
+    ensure
+      s.close unless verified
+    end
+  end
+end

data/lib/mail/elements/address.rb

@@ -104,7 +104,7 @@ module Mail
     #  a.local #=> 'mikel'
     def local
       parse unless @parsed
-      "#{obs_domain_list}#{get_local.strip}"
+      "#{obs_domain_list}#{get_local.strip}" if get_local
     end
 
     # Returns the domain part (the right hand side of the @ sign in the email address) of
@@ -184,11 +184,11 @@ module Mail
     
     
     def get_domain
-      if tree.respond_to?(:angle_addr)
+      if tree.respond_to?(:angle_addr) && tree.angle_addr.respond_to?(:addr_spec) && tree.angle_addr.addr_spec.respond_to?(:domain)
         @domain_text ||= tree.angle_addr.addr_spec.domain.text_value.strip
       elsif tree.respond_to?(:domain)
         @domain_text ||= tree.domain.text_value.strip
-      elsif tree.respond_to?(:addr_spec)
+      elsif tree.respond_to?(:addr_spec) && tree.addr_spec.respond_to?(:domain)
         tree.addr_spec.domain.text_value.strip
       else
         nil
@@ -292,12 +292,12 @@ module Mail
       case
       when tree.respond_to?(:local_dot_atom_text)
         tree.local_dot_atom_text.text_value
-      when tree.respond_to?(:angle_addr)
+      when tree.respond_to?(:angle_addr) && tree.angle_addr.respond_to?(:addr_spec) && tree.angle_addr.addr_spec.respond_to?(:local_part)
         tree.angle_addr.addr_spec.local_part.text_value
-      when tree.respond_to?(:addr_spec)
+      when tree.respond_to?(:addr_spec) && tree.addr_spec.respond_to?(:local_part)
         tree.addr_spec.local_part.text_value
       else
-        tree.local_part.text_value
+        tree && tree.respond_to?(:local_part) ? tree.local_part.text_value : nil
       end
     end
     

data/lib/mail/elements/content_disposition_element.rb

@@ -7,7 +7,7 @@ module Mail
     def initialize( string )
       parser = Mail::ContentDispositionParser.new
       if tree = parser.parse(cleaned(string))
-        @disposition_type = tree.disposition_type.text_value
+        @disposition_type = tree.disposition_type.text_value.downcase
         @parameters = tree.parameters
       else
         raise Mail::Field::ParseError, "ContentDispositionElement can not parse |#{string}|\nReason was: #{parser.failure_reason}\n"

data/lib/mail/elements/content_type_element.rb

@@ -7,8 +7,8 @@ module Mail
     def initialize( string )
       parser = Mail::ContentTypeParser.new
       if tree = parser.parse(cleaned(string))
-        @main_type = tree.main_type.text_value
-        @sub_type = tree.sub_type.text_value
+        @main_type = tree.main_type.text_value.downcase
+        @sub_type = tree.sub_type.text_value.downcase
         @parameters = tree.parameters
       else
         raise Mail::Field::ParseError, "ContentTypeElement can not parse |#{string}|\nReason was: #{parser.failure_reason}\n"

data/lib/mail/encodings.rb

@@ -6,12 +6,12 @@ module Mail
   end
 
   module Encodings
-    
+
     include Mail::Patterns
     extend  Mail::Utilities
 
     @transfer_encodings = {}
-   
+
     # Register transfer encoding
     #
     # Example
@@ -20,23 +20,23 @@ module Mail
     def Encodings.register(name, cls)
         @transfer_encodings[get_name(name)] = cls
     end
- 
+
     # Is the encoding we want defined?
-    # 
+    #
     # Example:
-    # 
+    #
     #  Encodings.defined?(:base64) #=> true
     def Encodings.defined?( str )
       @transfer_encodings.include? get_name(str)
     end
-    
+
     # Gets a defined encoding type, QuotedPrintable or Base64 for now.
-    # 
-    # Each encoding needs to be defined as a Mail::Encodings::ClassName for 
+    #
+    # Each encoding needs to be defined as a Mail::Encodings::ClassName for
     # this to work, allows us to add other encodings in the future.
-    # 
+    #
     # Example:
-    # 
+    #
     #  Encodings.get_encoding(:base64) #=> Mail::Encodings::Base64
     def Encodings.get_encoding( str )
       @transfer_encodings[get_name(str)]
@@ -52,16 +52,16 @@ module Mail
 
     # Encodes a parameter value using URI Escaping, note the language field 'en' can
     # be set using Mail::Configuration, like so:
-    # 
+    #
     #  Mail.defaults.do
     #    param_encode_language 'jp'
     #  end
     #
-    # The character set used for encoding will either be the value of $KCODE for 
+    # The character set used for encoding will either be the value of $KCODE for
     # Ruby < 1.9 or the encoding on the string passed in.
-    # 
+    #
     # Example:
-    # 
+    #
     #  Mail::Encodings.param_encode("This is fun") #=> "us-ascii'en'This%20is%20fun"
     def Encodings.param_encode(str)
       case
@@ -75,9 +75,9 @@ module Mail
     end
 
     # Decodes a parameter value using URI Escaping.
-    # 
+    #
     # Example:
-    # 
+    #
     #  Mail::Encodings.param_decode("This%20is%20fun", 'us-ascii') #=> "This is fun"
     #
     #  str = Mail::Encodings.param_decode("This%20is%20fun", 'iso-8559-1')
@@ -86,14 +86,14 @@ module Mail
     def Encodings.param_decode(str, encoding)
       RubyVer.param_decode(str, encoding)
     end
-    
+
     # Decodes or encodes a string as needed for either Base64 or QP encoding types in
     # the =?<encoding>?[QB]?<string>?=" format.
-    # 
+    #
     # The output type needs to be :decode to decode the input string or :encode to
     # encode the input string.  The character set used for encoding will either be
     # the value of $KCODE for Ruby < 1.9 or the encoding on the string passed in.
-    # 
+    #
     # On encoding, will only send out Base64 encoded strings.
     def Encodings.decode_encode(str, output_type)
       case
@@ -110,39 +110,33 @@ module Mail
 
     # Decodes a given string as Base64 or Quoted Printable, depending on what
     # type it is.
-    # 
+    #
     # 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("=?")
-      
+
       str = str.gsub(/\?=(\s*)=\?/, '?==?') # Remove whitespaces between 'encoded-word's
 
       # Split on white-space boundaries with capture, so we capture the white-space as well
       str.split(/([ \t])/).map do |text|
-        if text.index('=?') != 0
+        if text.index('=?') .nil?
           text
         else
           # Join QP encoded-words that are adjacent to avoid decoding partial chars
           text.gsub!(/\?\=\=\?.+?\?[Qq]\?/m, '') if text =~ /\?==\?/
-        
+
           # Separate encoded-words with a space, so we can treat them one by one
           text.gsub!(/\?\=\=\?/, '?= =?')
-
           text.split(/ /).map do |word|
-            case 
-            when word.to_str =~ /=\?.+\?[Bb]\?/m
-              b_value_decode(word)
-            when text.to_str =~ /=\?.+\?[Qq]\?/m
-              q_value_decode(word)
-            else
-              word.to_str
+            word.to_str.
+              gsub( /=\?.+\?[Bb]\?.+\?=/m ) { |substr| b_value_decode(substr) }.
+              gsub( /=\?.+\?[Qq]\?.+\?=/m ) { |substr| q_value_decode(substr) }
             end
-          end
         end
       end.join("")
     end
-    
+
     # Takes an encoded string of the format =?<encoding>?[QB]?<string>?=
     def Encodings.unquote_and_convert_to(str, to_encoding)
       original_encoding, string = split_encoding_from_string( str )
@@ -153,8 +147,12 @@ module Mail
         output
       elsif original_encoding && to_encoding
         begin
-          require 'iconv'
-          Iconv.iconv(to_encoding, original_encoding, output).first
+          if RUBY_VERSION >= '1.9'
+            output.encode(to_encoding)
+          else
+            require 'iconv'
+            Iconv.iconv(to_encoding, original_encoding, output).first
+          end
         rescue Iconv::IllegalSequence, Iconv::InvalidEncoding, Errno::EINVAL
           # the 'from' parameter specifies a charset other than what the text
           # actually is...not much we can do in this case but just return the
@@ -168,7 +166,7 @@ module Mail
         output
       end
     end
-    
+
     def Encodings.address_encode(address, charset = 'utf-8')
       if address.is_a?(Array)
         # loop back through for each element
@@ -180,13 +178,13 @@ module Mail
     end
 
     def Encodings.encode_non_usascii(address, charset)
-      return address if address.ascii_only?
+      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) }
       # Then loop through all remaining items and encode as needed
       tokens = address.split(/\s/)
-      tokens.each_with_index.map do |word, i|
+      map_with_index(tokens) do |word, i|
         if word.ascii_only?
           word
         else
@@ -198,60 +196,60 @@ module Mail
         end
       end.join(' ')
     end
-    
+
     # Encode a string with Base64 Encoding and returns it ready to be inserted
     # as a value for a field, that is, in the =?<charset>?B?<string>?= format
     #
     # Example:
-    # 
-    #  Encodings.b_value_encode('This is あ string', 'UTF-8') 
+    #
+    #  Encodings.b_value_encode('This is あ string', 'UTF-8')
     #  #=> "=?UTF-8?B?VGhpcyBpcyDjgYIgc3RyaW5n?="
     def Encodings.b_value_encode(str, encoding = nil)
       return str if str.to_s.ascii_only?
       string, encoding = RubyVer.b_value_encode(str, encoding)
-      string.each_line.map do |str|
+      map_lines(string) do |str|
         "=?#{encoding}?B?#{str.chomp}?="
       end.join(" ")
     end
-    
+
     # Encode a string with Quoted-Printable Encoding and returns it ready to be inserted
     # as a value for a field, that is, in the =?<charset>?Q?<string>?= format
     #
     # Example:
-    # 
-    #  Encodings.q_value_encode('This is あ string', 'UTF-8') 
+    #
+    #  Encodings.q_value_encode('This is あ string', 'UTF-8')
     #  #=> "=?UTF-8?Q?This_is_=E3=81=82_string?="
     def Encodings.q_value_encode(str, encoding = nil)
       return str if str.to_s.ascii_only?
       string, encoding = RubyVer.q_value_encode(str, encoding)
       string.gsub!("=\r\n", '') # We already have limited the string to the length we want
-      string.each_line.map do |str|
+      map_lines(string) do |str|
         "=?#{encoding}?Q?#{str.chomp.gsub(/ /, '_')}?="
       end.join(" ")
     end
-    
+
     private
-    
+
     # Decodes a Base64 string from the "=?UTF-8?B?VGhpcyBpcyDjgYIgc3RyaW5n?=" format
-    # 
+    #
     # Example:
-    # 
-    #  Encodings.b_value_encode("=?UTF-8?B?VGhpcyBpcyDjgYIgc3RyaW5n?=") 
+    #
+    #  Encodings.b_value_decode("=?UTF-8?B?VGhpcyBpcyDjgYIgc3RyaW5n?=")
     #  #=> 'This is あ string'
     def Encodings.b_value_decode(str)
       RubyVer.b_value_decode(str)
     end
-    
+
     # Decodes a Quoted-Printable string from the "=?UTF-8?Q?This_is_=E3=81=82_string?=" format
-    # 
+    #
     # Example:
-    # 
-    #  Encodings.b_value_encode("=?UTF-8?Q?This_is_=E3=81=82_string?=") 
+    #
+    #  Encodings.q_value_decode("=?UTF-8?Q?This_is_=E3=81=82_string?=")
     #  #=> 'This is あ string'
     def Encodings.q_value_decode(str)
       RubyVer.q_value_decode(str).gsub(/_/, ' ')
     end
-    
+
     def Encodings.split_encoding_from_string( str )
       match = str.match(/\=\?([^?]+)?\?[QB]\?(.+)?\?\=/mi)
       if match
@@ -260,7 +258,7 @@ module Mail
         nil
       end
     end
-    
+
     def Encodings.find_encoding(str)
       RUBY_VERSION >= '1.9' ? str.encoding : $KCODE
     end

data/lib/mail/field.rb

@@ -69,7 +69,8 @@ module Mail
     #  Field.new('content-type', ['text', 'plain', {:charset => 'UTF-8'}])
     def initialize(name, value = nil, charset = 'utf-8')
       case
-      when name =~ /:/ && value.blank?   # Field.new("field-name: field data")
+      when name =~ /:/                  # Field.new("field-name: field data")
+        charset = value unless value.blank?
         name, value = split(name)
         create_field(name, value, charset)
       when name !~ /:/ && value.blank?  # Field.new("field-name")

data/lib/mail/field_list.rb

@@ -9,7 +9,7 @@ module Mail
     include Enumerable
 
     def <<( new_field )
-      current_entry = self.rindex(new_field.name)
+      current_entry = self.rindex(new_field)
       if current_entry
         self.insert((current_entry + 1), new_field)
       else

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

@@ -1,41 +1,42 @@
 # encoding: utf-8
 module Mail
   module CommonField # :nodoc:
+
     def name=(value)
       @name = value
     end
-    
+
     def name
-      @name
+      @name ||= nil
     end
-    
+
     def value=(value)
       @length = nil
       @tree = nil
       @element = nil
       @value = value
     end
-    
+
     def value
       @value
     end
-    
+
     def to_s
       decoded
     end
-    
+
     def default
       decoded
     end
-    
+
     def field_length
       @length ||= "#{name}: #{encode(decoded)}".length
     end
-    
+
     def responsible_for?( val )
       name.to_s.downcase == val.to_s.downcase
     end
-    
+
     private
 
     def strip_field(field_name, value)

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

@@ -2,7 +2,7 @@
 module Mail
   module CommonMessageId # :nodoc:
     def element
-      @element ||= Mail::MessageIdsElement.new(value)
+      @element ||= Mail::MessageIdsElement.new(value) unless value.blank?
     end
 
     def parse(val = value)
@@ -14,14 +14,15 @@ module Mail
     end
     
     def message_id
-      element.message_id
+      element.message_id if element
     end
     
     def message_ids
-      element.message_ids
+      element.message_ids if element
     end
     
     def default
+      return nil unless message_ids
       if message_ids.length == 1
         message_ids[0]
       else
@@ -32,11 +33,11 @@ module Mail
     private
     
     def do_encode(field_name)
-      %Q{#{field_name}: #{message_ids.map { |m| "<#{m}>" }.join(', ')}\r\n}
+      %Q{#{field_name}: #{do_decode}\r\n}
     end
     
     def do_decode
-      "#{message_ids.map { |m| "<#{m}>" }.join(', ')}"
+      "#{message_ids.map { |m| "<#{m}>" }.join(' ')}" if message_ids
     end
     
   end

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

@@ -13,13 +13,23 @@ module Mail
     include Mail::Utilities
 
     def [](key_name)
-      pairs = select { |k,v| k =~ /^#{key_name}\*/ }
-      pairs = pairs.to_a if RUBY_VERSION >= '1.9'
+      key_pattern = Regexp.escape(key_name.to_s)
+      pairs = []
+      exact = nil
+      each do |k,v|
+        if k =~ /^#{key_pattern}(\*|$)/i
+          if $1 == '*'
+            pairs << [k, v]
+          else
+            exact = k
+          end
+        end
+      end
       if pairs.empty? # Just dealing with a single value pair
-        super(key_name)
+        super(exact || key_name)
       else # Dealing with a multiple value pair or a single encoded value pair
         string = pairs.sort { |a,b| a.first <=> b.first }.map { |v| v.last }.join('')
-        if mt = string.match(/([\w\d\-]+)'(\w\w)'(.*)/)
+        if mt = string.match(/([\w\-]+)'(\w\w)'(.*)/)
           string = mt[3]
           encoding = mt[1]
         else

data/lib/mail/fields/content_disposition_field.rb

@@ -51,7 +51,7 @@ module Mail
       if parameters.length > 0
         p = ";\r\n\s#{parameters.encoded}\r\n"
       else
-        p = ""
+        p = "\r\n"
       end
       "#{CAPITALIZED_FIELD}: #{disposition_type}" + p
     end