mail 2.2.12 → 2.2.13

data/CHANGELOG.rdoc

@@ -1,3 +1,20 @@
+== Thu 23 Dec 2010 09:15:58 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Added backport fix for net/smtp bug (Aaron Patterson)
+* Changed "Mail#text_part" so that it does not return a plain text attachment (Anton Mironov)
+* Added in rescue blocks for badly formatted dates as well as encoding problems (Karl Baum)
+* Fixed warning errors of duplicated regular expressions (Kouhei Sutou)
+* Removed duplication from Regex's containing [\w\d]+ as \w contains \d (mikel)
+* Add authentication selection for imap retriever (Björn Albers)
+* Removing warning on @name not being initialized (mikel)
+* Version bump to 2.2.13 and gem release
+
+== Fri 10 Dec 2010 09:06:49 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Fixing problems with multibyte filenamed attachment (amatsuda)
+* Providing IMAP uid and imap object as options to IMAP calls (dball)
+* Fixing filename for windows (mikel)
+
 == Sun Dec  5 02:24:55 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
 
 * Updating requirement on i18n to be more relaxed for now until we nuke ActiveSupport dependency (Mikel)

data/lib/VERSION

@@ -1,4 +1,4 @@
-patch:12
+patch:13
 major:2
 build:
 minor:2

data/lib/mail.rb

@@ -4,6 +4,7 @@ module Mail # :doc:
   require 'date'
 
   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'
@@ -32,6 +33,7 @@ module Mail # :doc:
 
   require 'mail/core_extensions/nil'
   require 'mail/core_extensions/string'
+  require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
 
   require 'mail/patterns'
   require 'mail/utilities'
@@ -52,7 +54,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 ]
 

data/lib/mail/attachments_list.rb

@@ -37,9 +37,10 @@ module Mail
     end
 
     def []=(name, value)
-      default_values = { :content_type => "#{set_mime_type(name)}; filename=\"#{name}\"",
+      encoded_name = Mail::Encodings.decode_encode name, :encode
+      default_values = { :content_type => "#{set_mime_type(name)}; filename=\"#{encoded_name}\"",
                          :content_transfer_encoding => "#{guess_encoding}",
-                         :content_disposition => "#{@content_disposition_type}; filename=\"#{name}\"" }
+                         :content_disposition => "#{@content_disposition_type}; filename=\"#{encoded_name}\"" }
 
       if value.is_a?(Hash)
 
@@ -73,7 +74,7 @@ module Mail
           hash[:body].force_encoding("BINARY")
         end
       end
-      
+
       attachment = Part.new(hash)
       attachment.add_content_id(hash[:content_id])
 
@@ -102,4 +103,3 @@ module Mail
 
   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
+    remove_method :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

@@ -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 ? tree.local_part.text_value : nil
+        tree && tree.respond_to?(:local_part) ? tree.local_part.text_value : nil
       end
     end
     

data/lib/mail/encodings.rb

@@ -180,7 +180,7 @@ 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) }

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

@@ -29,7 +29,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 <=> 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_type_field.rb

@@ -153,10 +153,10 @@ module Mail
       end
 
       case
-      when val.chomp =~ /^\s*([\w\d\-_]+)\/([\w\d\-_]+)\s*;;+(.*)$/i
+      when val.chomp =~ /^\s*([\w\-]+)\/([\w\-]+)\s*;;+(.*)$/i
         # Handles 'text/plain;; format="flowed"' (double semi colon)
         "#{$1}/#{$2}; #{$3}"
-      when val.chomp =~ /^\s*([\w\d\-_]+)\/([\w\d\-_]+)\s*;\s?(ISO[\w\d\-_]+)$/i
+      when val.chomp =~ /^\s*([\w\-]+)\/([\w\-]+)\s*;\s?(ISO[\w\-]+)$/i
         # Microsoft helper:
         # Handles 'type/subtype;ISO-8559-1'
         "#{$1}/#{$2}; charset=#{quote_atom($3)}"
@@ -166,10 +166,10 @@ module Mail
       when val.chomp =~ /^(\w+);\s(.*)$/i
         # Handles 'text; <parameters>'
         "text/plain; #{$2}"
-      when val =~ /([\w\d\-_]+\/[\w\d\-_]+);\scharset="charset="(\w+)""/i
+      when val =~ /([\w\-]+\/[\w\-]+);\scharset="charset="(\w+)""/i
         # Handles text/html; charset="charset="GB2312""
         "#{$1}; charset=#{quote_atom($2)}"
-      when val =~ /([\w\d\-_]+\/[\w\d\-_]+);\s+(.*)/i
+      when val =~ /([\w\-]+\/[\w\-]+);\s+(.*)/i
         type = $1
         # Handles misquoted param values
         # e.g: application/octet-stream; name=archiveshelp1[1].htm
@@ -188,7 +188,7 @@ module Mail
 
     def get_mime_type( val )
       case
-      when val =~ /^([\w\d\-_]+)\/([\w\d\-_]+);.+$/i
+      when val =~ /^([\w\-]+)\/([\w\-]+);.+$/i
         "#{$1}/#{$2}"
       else
         'text/plain'

data/lib/mail/fields/date_field.rb

@@ -41,6 +41,8 @@ module Mail
         value = ::DateTime.parse(value.to_s.squeeze(" ")).strftime('%a, %d %b %Y %H:%M:%S %z')
       end
       super(CAPITALIZED_FIELD, value, charset)
+    rescue ArgumentError => e
+      raise e unless "invalid date"==e.message
     end
     
     def encoded

data/lib/mail/message.rb

@@ -115,7 +115,7 @@ module Mail
       @delivery_method = Mail.delivery_method.dup
 
       @transport_encoding = Mail::Encodings.get_encoding('7bit')
-      
+
       @mark_for_delete = false
 
       if args.flatten.first.respond_to?(:each_pair)
@@ -259,7 +259,9 @@ module Mail
           bracketed_message_id = "<#{message_id}>"
           reply.in_reply_to = bracketed_message_id
           if !references.nil?
-            reply.references = (references.to_a.map { |r| "<#{r}>" } << bracketed_message_id).join(' ')
+            refs = [references].flatten.map { |r| "<#{r}>" }
+            refs << bracketed_message_id
+            reply.references = refs.join(' ')
           elsif !in_reply_to.nil? && !in_reply_to.kind_of?(Array)
             reply.references = "<#{in_reply_to}> #{bracketed_message_id}"
           end
@@ -1758,9 +1760,9 @@ module Mail
     end
 
     def find_first_mime_type(mt)
-      all_parts.detect { |p| p.mime_type == mt }
+      all_parts.detect { |p| p.mime_type == mt && !p.attachment? }
     end
-  
+
     # Skips the deletion of this message. All other messages
     # flagged for delete still will be deleted at session close (i.e. when
     # #find exits). Only has an effect if you're using #find_and_delete
@@ -1768,28 +1770,28 @@ module Mail
     def skip_deletion
       @mark_for_delete = false
     end
-    
-    # Sets whether this message should be deleted at session close (i.e. 
+
+    # Sets whether this message should be deleted at session close (i.e.
     # after #find). Message will only be deleted if messages are retrieved
-    # using the #find_and_delete method, or by calling #find with 
-    # :delete_after_find set to true.    
+    # using the #find_and_delete method, or by calling #find with
+    # :delete_after_find set to true.
     def mark_for_delete=(value = true)
       @mark_for_delete = value
     end
-    
+
     # Returns whether message will be marked for deletion.
-    # If so, the message will be deleted at session close (i.e. after #find 
-    # exits), but only if also using the #find_and_delete method, or by 
+    # If so, the message will be deleted at session close (i.e. after #find
+    # exits), but only if also using the #find_and_delete method, or by
     # calling #find with :delete_after_find set to true.
     #
     # Side-note: Just to be clear, this method will return true even if
-    # the message hasn't yet been marked for delete on the mail server. 
+    # the message hasn't yet been marked for delete on the mail server.
     # However, if this method returns true, it *will be* marked on the
-    # server after each block yields back to #find or #find_and_delete. 
+    # server after each block yields back to #find or #find_and_delete.
     def is_marked_for_delete?
       return @mark_for_delete
     end
-    
+
   private
 
     #  2.1. General Description

data/lib/mail/network/retriever_methods/imap.rb

@@ -74,7 +74,11 @@ module Mail
             fetchdata = imap.uid_fetch(message_id, ['RFC822'])[0]
             new_message = Mail.new(fetchdata.attr['RFC822'])
             new_message.mark_for_delete = true if options[:delete_after_find]
-            yield new_message
+            if block.arity == 3
+              yield new_message, imap, message_id
+            else
+              yield new_message
+            end
             imap.uid_store(message_id, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find] && new_message.is_marked_for_delete?
           end
           imap.expunge if options[:delete_after_find]
@@ -135,7 +139,13 @@ module Mail
         raise ArgumentError.new("Mail::Retrievable#imap_start takes a block") unless block_given?
 
         imap = Net::IMAP.new(settings[:address], settings[:port], settings[:enable_ssl], nil, false)
-        imap.login(settings[:user_name], settings[:password])
+        if settings[:authentication].nil?
+          imap.login(settings[:user_name], settings[:password])
+        else
+          # Note that Net::IMAP#authenticate('LOGIN', ...) is not equal with Net::IMAP#login(...)!
+          # (see also http://www.ensta.fr/~diam/ruby/online/ruby-doc-stdlib/libdoc/net/imap/rdoc/classes/Net/IMAP.html#M000718)
+          imap.authenticate(settings[:authentication], settings[:user_name], settings[:password])
+        end
 
         yield imap
       ensure

data/lib/mail/patterns.rb

@@ -9,6 +9,7 @@ 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)
@@ -27,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/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)

data/lib/mail/version_specific/ruby_1_9.rb

@@ -14,7 +14,7 @@ module Mail
       str = escape_paren( str )
       '(' + str + ')'
     end
-    
+
     def Ruby19.escape_bracket( str )
       re = /(?<!\\)([\<\>])/          # Only match unescaped brackets
       str.gsub(re) { |s| '\\' + s }
@@ -29,34 +29,34 @@ module Mail
     def Ruby19.decode_base64(str)
       str.unpack( 'm' ).first.force_encoding(Encoding::BINARY)
     end
-    
+
     def Ruby19.encode_base64(str)
       [str].pack( 'm' )
     end
-    
+
     def Ruby19.has_constant?(klass, string)
       klass.constants.include?( string.to_sym )
     end
-    
+
     def Ruby19.get_constant(klass, string)
       klass.const_get( string.to_sym )
     end
-    
+
     def Ruby19.b_value_encode(str, encoding = nil)
       encoding = str.encoding.to_s
       [Ruby19.encode_base64(str), encoding]
     end
-    
+
     def Ruby19.b_value_decode(str)
       match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
       if match
         encoding = match[1]
-        str = Ruby19.decode_base64(match[2])
+        str = Ruby19.decode_base64(match[2].to_s)
         str.force_encoding(encoding)
       end
       str
     end
-    
+
     def Ruby19.q_value_encode(str, encoding = nil)
       encoding = str.encoding.to_s
       [Encodings::QuotedPrintable.encode(str), encoding]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 2
   - 2
-  - 12
-  version: 2.2.12
+  - 13
+  version: 2.2.13
 platform: ruby
 authors: 
 - Mikel Lindsaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 +11:00
+date: 2010-12-23 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,7 @@ files:
 - lib/mail/body.rb
 - lib/mail/configuration.rb
 - lib/mail/core_extensions/nil.rb
+- lib/mail/core_extensions/smtp.rb
 - lib/mail/core_extensions/string.rb
 - lib/mail/elements/address.rb
 - lib/mail/elements/address_list.rb