mail 2.2.7 → 2.2.9

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+== Tue Oct 26 07:14:36 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Version Bump to 2.2.9 and tag
+* Updating Gemfile and gemspec to include i18n and sync dependency versions
+* Added work from Kendall Gifford closing issues #104, #107 and #117
+* Always encode mailbox names with UTF-7 (github: fasta)
+
+== Tue Oct 26 06:43:17 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Added updates from Donald Ball (github: dball) to improve 1.8.6 support
+* Added patch from Ryan Bigg (github: ryanb) for #mark_for_delete
+
 == Thu Oct  7 15:44:31 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
 
 * Version Bump to 2.2.7

data/lib/VERSION

@@ -1,4 +1,4 @@
-patch:7
+patch:9
 major:2
 build:
 minor:2

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

@@ -186,7 +186,7 @@ module Mail
       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
@@ -209,7 +209,7 @@ module Mail
     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
@@ -225,7 +225,7 @@ module Mail
       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

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

@@ -13,10 +13,20 @@ 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)'(.*)/)

data/lib/mail/header.rb

@@ -161,16 +161,18 @@ module Mail
     end
     
     def charset
-      if self[:content_type] && self[:content_type].parameters
-        self[:content_type].parameters[:charset]
+      params = self[:content_type].parameters rescue nil
+      if params
+        params[:charset]
       else
         @charset
       end
     end
     
     def charset=(val)
-      if self[:content_type]
-        self[:content_type].parameters[:charset] = val
+      params = self[:content_type].parameters rescue nil
+      if params
+        params[:charset] = val
       end
       @charset = val
     end

data/lib/mail/message.rb

@@ -1276,11 +1276,13 @@ module Mail
     end
 
     def has_content_type?
-      !!header[:content_type]
+      tmp = header[:content_type].main_type rescue nil
+      !!tmp
     end
 
     def has_charset?
-      !!(has_content_type? && header[:content_type].parameters['charset'])
+      tmp = header[:content_type].parameters rescue nil
+      !!(has_content_type? && tmp && tmp['charset'])
     end
 
     def has_content_transfer_encoding?
@@ -1369,7 +1371,7 @@ module Mail
 
     # Returns the MIME media type of part we are on, this is taken from the content-type header
     def mime_type
-      content_type ? header[:content_type].string : nil
+      content_type ? header[:content_type].string : nil rescue nil
     end
 
     def message_content_type
@@ -1395,12 +1397,12 @@ module Mail
 
     # Returns the main content type
     def main_type
-      has_content_type? ? header[:content_type].main_type : nil
+      has_content_type? ? header[:content_type].main_type : nil rescue nil
     end
 
     # Returns the sub content type
     def sub_type
-      has_content_type? ? header[:content_type].sub_type : nil
+      has_content_type? ? header[:content_type].sub_type : nil rescue nil
     end
 
     # Returns the content type parameters
@@ -1411,7 +1413,7 @@ module Mail
 
     # Returns the content type parameters
     def content_type_parameters
-      has_content_type? ? header[:content_type].parameters : nil
+      has_content_type? ? header[:content_type].parameters : nil rescue nil
     end
 
     # Returns true if the message is multipart
@@ -1904,13 +1906,16 @@ module Mail
 
     # Returns the filename of the attachment (if it exists) or returns nil
     def find_attachment
+      content_type_name = header[:content_type].filename rescue nil
+      content_disp_name = header[:content_disposition].filename rescue nil
+      content_loc_name  = header[:content_location].location rescue nil
       case
-      when content_type && header[:content_type].filename
-        filename = header[:content_type].filename
-      when content_disposition && header[:content_disposition].filename
-        filename = header[:content_disposition].filename
-      when content_location && header[:content_location].location
-        filename = header[:content_location].location
+      when content_type && content_type_name
+        filename = content_type_name
+      when content_disposition && content_disp_name
+        filename = content_disp_name
+      when content_location && content_loc_name
+        filename = content_loc_name
       else
         filename = nil
       end

data/lib/mail/network/delivery_methods/smtp.rb

@@ -68,7 +68,9 @@ module Mail
                         :user_name            => nil,
                         :password             => nil,
                         :authentication       => nil,
-                        :enable_starttls_auto => true  }.merge!(values)
+                        :enable_starttls_auto => true,
+                        :openssl_verify_mode  => nil
+                      }.merge!(values)
     end
     
     attr_accessor :settings
@@ -95,7 +97,19 @@ module Mail
       
       smtp = Net::SMTP.new(settings[:address], settings[:port])
       if settings[:enable_starttls_auto]
-        smtp.enable_starttls_auto if smtp.respond_to?(:enable_starttls_auto) 
+        if smtp.respond_to?(:enable_starttls_auto) 
+          unless settings[:openssl_verify_mode]
+            smtp.enable_starttls_auto
+          else
+            openssl_verify_mode = settings[:openssl_verify_mode]
+            if openssl_verify_mode.kind_of?(String)
+              openssl_verify_mode = "OpenSSL::SSL::VERIFY_#{openssl_verify_mode.upcase}".constantize
+            end
+            context = Net::SMTP.default_ssl_context
+            context.verify_mode = openssl_verify_mode
+            smtp.enable_starttls_auto(context)
+          end
+        end
       end
       
       smtp.start(settings[:domain], settings[:user_name], settings[:password], settings[:authentication]) do |smtp|
@@ -107,4 +121,4 @@ module Mail
     
     
   end
-end
+end

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

@@ -118,16 +118,20 @@ module Mail
         if block_given?
           message_ids.each do |message_id|
             fetchdata = imap.uid_fetch(message_id, ['RFC822'])[0]
-
-            yield Mail.new(fetchdata.attr['RFC822'])
+            new_message = Mail.new(fetchdata.attr['RFC822'])
+            new_message.mark_for_delete = true if options[:delete_after_find]
+            yield new_message
+            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]
         else
           emails = []
           message_ids.each do |message_id|
             fetchdata = imap.uid_fetch(message_id, ['RFC822'])[0]
-
             emails << Mail.new(fetchdata.attr['RFC822'])
+            imap.uid_store(message_id, "+FLAGS", [Net::IMAP::DELETED]) if options[:delete_after_find]
           end
+          imap.expunge if options[:delete_after_find]
           emails.size == 1 && options[:count] == 1 ? emails.first : emails
         end
       end
@@ -136,6 +140,7 @@ module Mail
     # Delete all emails from a IMAP mailbox
     def delete_all(mailbox='INBOX')
       mailbox ||= 'INBOX'
+      mailbox = Net::IMAP.encode_utf7(mailbox)
 
       start do |imap|
         imap.select(mailbox)
@@ -165,6 +170,9 @@ module Mail
         options[:order]   ||= :asc
         options[:what]    ||= :first
         options[:keys]    ||= 'ALL'
+        options[:delete_after_find] ||= false
+        options[:mailbox] = Net::IMAP.encode_utf7(options[:mailbox])
+
         options
       end
 

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

@@ -109,7 +109,7 @@ module Mail
         if block_given?
           mails.each do |mail|
             new_message = Mail.new(mail.pop)
-            new_message.marked_for_delete = true if options[:delete_after_find]
+            new_message.mark_for_delete = true if options[:delete_after_find]
             yield new_message
             mail.delete if options[:delete_after_find] && new_message.is_marked_for_delete? # Delete if still marked for delete
           end

data/lib/mail/parsers/content_disposition.rb

@@ -113,6 +113,12 @@ module Mail
       r0
     end
 
+    module DispositionType0
+    end
+
+    module DispositionType1
+    end
+
     def _nt_disposition_type
       start_index = index
       if node_cache[:disposition_type].has_key?(index)
@@ -125,39 +131,181 @@ module Mail
       end
 
       i0 = index
-      if has_terminal?("inline", false, index)
-        r1 = instantiate_node(SyntaxNode,input, index...(index + 6))
-        @index += 6
+      i1, s1 = index, []
+      if has_terminal?('\G[iI]', true, index)
+        r2 = true
+        @index += 1
       else
-        terminal_parse_failure("inline")
+        r2 = nil
+      end
+      s1 << r2
+      if r2
+        if has_terminal?('\G[nN]', true, index)
+          r3 = true
+          @index += 1
+        else
+          r3 = nil
+        end
+        s1 << r3
+        if r3
+          if has_terminal?('\G[lL]', true, index)
+            r4 = true
+            @index += 1
+          else
+            r4 = nil
+          end
+          s1 << r4
+          if r4
+            if has_terminal?('\G[iI]', true, index)
+              r5 = true
+              @index += 1
+            else
+              r5 = nil
+            end
+            s1 << r5
+            if r5
+              if has_terminal?('\G[nN]', true, index)
+                r6 = true
+                @index += 1
+              else
+                r6 = nil
+              end
+              s1 << r6
+              if r6
+                if has_terminal?('\G[eE]', true, index)
+                  r7 = true
+                  @index += 1
+                else
+                  r7 = nil
+                end
+                s1 << r7
+              end
+            end
+          end
+        end
+      end
+      if s1.last
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+        r1.extend(DispositionType0)
+      else
+        @index = i1
         r1 = nil
       end
       if r1
         r0 = r1
       else
-        if has_terminal?("attachment", false, index)
-          r2 = instantiate_node(SyntaxNode,input, index...(index + 10))
-          @index += 10
+        i8, s8 = index, []
+        if has_terminal?('\G[aA]', true, index)
+          r9 = true
+          @index += 1
         else
-          terminal_parse_failure("attachment")
-          r2 = nil
+          r9 = nil
         end
-        if r2
-          r0 = r2
+        s8 << r9
+        if r9
+          if has_terminal?('\G[tT]', true, index)
+            r10 = true
+            @index += 1
+          else
+            r10 = nil
+          end
+          s8 << r10
+          if r10
+            if has_terminal?('\G[tT]', true, index)
+              r11 = true
+              @index += 1
+            else
+              r11 = nil
+            end
+            s8 << r11
+            if r11
+              if has_terminal?('\G[aA]', true, index)
+                r12 = true
+                @index += 1
+              else
+                r12 = nil
+              end
+              s8 << r12
+              if r12
+                if has_terminal?('\G[cC]', true, index)
+                  r13 = true
+                  @index += 1
+                else
+                  r13 = nil
+                end
+                s8 << r13
+                if r13
+                  if has_terminal?('\G[hH]', true, index)
+                    r14 = true
+                    @index += 1
+                  else
+                    r14 = nil
+                  end
+                  s8 << r14
+                  if r14
+                    if has_terminal?('\G[mM]', true, index)
+                      r15 = true
+                      @index += 1
+                    else
+                      r15 = nil
+                    end
+                    s8 << r15
+                    if r15
+                      if has_terminal?('\G[eE]', true, index)
+                        r16 = true
+                        @index += 1
+                      else
+                        r16 = nil
+                      end
+                      s8 << r16
+                      if r16
+                        if has_terminal?('\G[nN]', true, index)
+                          r17 = true
+                          @index += 1
+                        else
+                          r17 = nil
+                        end
+                        s8 << r17
+                        if r17
+                          if has_terminal?('\G[tT]', true, index)
+                            r18 = true
+                            @index += 1
+                          else
+                            r18 = nil
+                          end
+                          s8 << r18
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+        if s8.last
+          r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+          r8.extend(DispositionType1)
         else
-          r3 = _nt_extension_token
-          if r3
-            r0 = r3
+          @index = i8
+          r8 = nil
+        end
+        if r8
+          r0 = r8
+        else
+          r19 = _nt_extension_token
+          if r19
+            r0 = r19
           else
             if has_terminal?('', false, index)
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 0))
+              r20 = instantiate_node(SyntaxNode,input, index...(index + 0))
               @index += 0
             else
               terminal_parse_failure('')
-              r4 = nil
+              r20 = nil
             end
-            if r4
-              r0 = r4
+            if r20
+              r0 = r20
             else
               @index = i0
               r0 = nil

data/lib/mail/parsers/content_disposition.treetop

@@ -15,7 +15,7 @@ module Mail
     end
     
     rule disposition_type
-      "inline" / "attachment" / extension_token / ''
+      [iI] [nN] [lL] [iI] [nN] [eE] / [aA] [tT] [tT] [aA] [cC] [hH] [mM] [eE] [nN] [tT] / extension_token / ''
     end
     
     rule extension_token

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 21
   prerelease: false
   segments: 
   - 2
   - 2
-  - 7
-  version: 2.2.7
+  - 9
+  version: 2.2.9
 platform: ruby
 authors: 
 - Mikel Lindsaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +11:00
+date: 2010-10-26 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 47
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 16
+        version: "1.16"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -54,16 +55,32 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 23
         segments: 
         - 1
         - 4
-        - 5
-        version: 1.4.5
+        - 8
+        version: 1.4.8
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 4
+        - 1
+        version: 0.4.1
+  type: :runtime
+  version_requirements: *id004
 description: A really Ruby Mail handler.
 email: raasdnil@gmail.com
 executables: []