mail 2.4.4 → 2.5.2

data/lib/mail/multibyte/chars.rb

@@ -339,7 +339,7 @@ module Mail #:nodoc:
       # Example:
       #   'Laurent, où sont les tests ?'.mb_chars.upcase.to_s # => "LAURENT, OÙ SONT LES TESTS ?"
       def upcase
-        chars(Unicode.apply_mapping(@wrapped_string), :uppercase_mapping)
+        chars(Unicode.apply_mapping(@wrapped_string, :uppercase_mapping))
       end
 
       # Convert characters in the string to lowercase.
@@ -347,7 +347,7 @@ module Mail #:nodoc:
       # Example:
       #   'VĚDA A VÝZKUM'.mb_chars.downcase.to_s # => "věda a výzkum"
       def downcase
-        chars(Unicode.apply_mapping(@wrapped_string), :lowercase_mapping)
+        chars(Unicode.apply_mapping(@wrapped_string, :lowercase_mapping))
       end
 
       # Converts the first character to uppercase and the remainder to lowercase.

data/lib/mail/multibyte/unicode.rb

@@ -390,3 +390,9 @@ module Mail
     end
   end
 end
+
+module ActiveSupport
+  unless const_defined?(:Multibyte)
+    Multibyte = Mail::Multibyte
+  end
+end

data/lib/mail/network.rb

@@ -1,14 +1,14 @@
 require 'mail/network/retriever_methods/base'
 
 module Mail
-  autoload :SMTP, 'mail/network/delivery_methods/smtp'
-  autoload :FileDelivery, 'mail/network/delivery_methods/file_delivery'
-  autoload :Sendmail, 'mail/network/delivery_methods/sendmail'
-  autoload :Exim, 'mail/network/delivery_methods/exim'
-  autoload :SMTPConnection, 'mail/network/delivery_methods/smtp_connection'
-  autoload :TestMailer, 'mail/network/delivery_methods/test_mailer'
+  register_autoload :SMTP, 'mail/network/delivery_methods/smtp'
+  register_autoload :FileDelivery, 'mail/network/delivery_methods/file_delivery'
+  register_autoload :Sendmail, 'mail/network/delivery_methods/sendmail'
+  register_autoload :Exim, 'mail/network/delivery_methods/exim'
+  register_autoload :SMTPConnection, 'mail/network/delivery_methods/smtp_connection'
+  register_autoload :TestMailer, 'mail/network/delivery_methods/test_mailer'
 
-  autoload :POP3, 'mail/network/retriever_methods/pop3'
-  autoload :IMAP, 'mail/network/retriever_methods/imap'
-  autoload :TestRetriever, 'mail/network/retriever_methods/test_retriever'
+  register_autoload :POP3, 'mail/network/retriever_methods/pop3'
+  register_autoload :IMAP, 'mail/network/retriever_methods/imap'
+  register_autoload :TestRetriever, 'mail/network/retriever_methods/test_retriever'
 end

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

@@ -1,3 +1,5 @@
+require 'mail/check_delivery_params'
+
 module Mail
 
   # A delivery method implementation which sends via exim.
@@ -36,13 +38,15 @@ module Mail
   #
   #   mail.deliver!
   class Exim < Sendmail
+    include Mail::CheckDeliveryParams
 
     def initialize(values)
       self.settings = { :location       => '/usr/sbin/exim',
                         :arguments      => '-i -t' }.merge(values)
     end
 
-    def self.call(path, arguments, mail)
+    def self.call(path, arguments, destinations, mail)
+      check_params(mail)
       IO.popen("#{path} #{arguments}", "w+") do |io|
         io.puts mail.encoded.to_lf
         io.flush

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

@@ -1,3 +1,5 @@
+require 'mail/check_delivery_params'
+
 module Mail
   
   # FileDelivery class delivers emails into multiple files based on the destination
@@ -11,6 +13,7 @@ module Mail
   # Make sure the path you specify with :location is writable by the Ruby process
   # running Mail.
   class FileDelivery
+    include Mail::CheckDeliveryParams
 
     if RUBY_VERSION >= '1.9.1'
       require 'fileutils'
@@ -25,6 +28,8 @@ module Mail
     attr_accessor :settings
     
     def deliver!(mail)
+      check_params(mail)
+
       if ::File.respond_to?(:makedirs)
         ::File.makedirs settings[:location]
       else

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

@@ -1,3 +1,5 @@
+require 'mail/check_delivery_params'
+
 module Mail
   # A delivery method implementation which sends via sendmail.
   #
@@ -35,6 +37,7 @@ module Mail
   #
   #   mail.deliver!
   class Sendmail
+    include Mail::CheckDeliveryParams
 
     def initialize(values)
       self.settings = { :location       => '/usr/sbin/sendmail',
@@ -44,6 +47,8 @@ module Mail
     attr_accessor :settings
 
     def deliver!(mail)
+      check_params(mail)
+
       envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
       return_path = "-f " + '"' + envelope_from.escape_for_shell + '"' if envelope_from
 

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

@@ -1,3 +1,5 @@
+require 'mail/check_delivery_params'
+
 module Mail
   # == Sending Email with SMTP
   # 
@@ -72,6 +74,7 @@ module Mail
   # 
   #   mail.deliver!
   class SMTP
+    include Mail::CheckDeliveryParams
 
     def initialize(values)
       self.settings = { :address              => "localhost",
@@ -92,23 +95,8 @@ module Mail
     # Send the message via SMTP.
     # The from and to attributes are optional. If not set, they are retrieve from the Message.
     def deliver!(mail)
+      envelope_from, destinations, message = check_params(mail)
 
-      # Set the envelope from to be either the return-path, the sender or the first from address
-      envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
-      if envelope_from.blank?
-        raise ArgumentError.new('A sender (Return-Path, Sender or From) required to send a message') 
-      end
-      
-      destinations ||= mail.destinations if mail.respond_to?(:destinations) && mail.destinations
-      if destinations.blank?
-        raise ArgumentError.new('At least one recipient (To, Cc or Bcc) is required to send a message') 
-      end
-      
-      message ||= mail.encoded if mail.respond_to?(:encoded)
-      if message.blank?
-        raise ArgumentError.new('A encoded content is required to send a message')
-      end
-      
       smtp = Net::SMTP.new(settings[:address], settings[:port])
       if settings[:tls] || settings[:ssl]
         if smtp.respond_to?(:enable_tls)
@@ -133,9 +121,13 @@ module Mail
             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)
+            if RUBY_VERSION >= '1.9.0'
+              context = Net::SMTP.default_ssl_context
+              context.verify_mode = openssl_verify_mode
+              smtp.enable_tls(context)
+            else
+              smtp.enable_tls(openssl_verify_mode)
+            end
           end
         end
       end

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

@@ -1,3 +1,5 @@
+require 'mail/check_delivery_params'
+
 module Mail
   # == Sending Email with SMTP
   # 
@@ -35,6 +37,7 @@ module Mail
   # 
   #   mail.deliver!
   class SMTPConnection
+    include Mail::CheckDeliveryParams
 
     def initialize(values)
       raise ArgumentError.new('A Net::SMTP object is required for this delivery method') if values[:connection].nil?
@@ -48,25 +51,9 @@ module Mail
     # Send the message via SMTP.
     # The from and to attributes are optional. If not set, they are retrieve from the Message.
     def deliver!(mail)
-
-      # Set the envelope from to be either the return-path, the sender or the first from address
-      envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
-      if envelope_from.blank?
-        raise ArgumentError.new('A sender (Return-Path, Sender or From) required to send a message') 
-      end
-      
-      destinations ||= mail.destinations if mail.respond_to?(:destinations) && mail.destinations
-      if destinations.blank?
-        raise ArgumentError.new('At least one recipient (To, Cc or Bcc) is required to send a message') 
-      end
-      
-      message ||= mail.encoded if mail.respond_to?(:encoded)
-      if message.blank?
-        raise ArgumentError.new('A encoded content is required to send a message')
-      end
-            
+      envelope_from, destinations, message = check_params(mail)
       response = smtp.sendmail(message, envelope_from, destinations)
-      
+
       settings[:return_response] ? response : self 
     end
         

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

@@ -1,3 +1,5 @@
+require 'mail/check_delivery_params'
+
 module Mail
   # The TestMailer is a bare bones mailer that does nothing.  It is useful
   # when you are testing.
@@ -5,6 +7,7 @@ module Mail
   # It also provides a template of the minimum methods you require to implement
   # if you want to make a custom mailer for Mail
   class TestMailer
+    include Mail::CheckDeliveryParams
 
     # Provides a store of all the emails sent with the TestMailer so you can check them.
     def TestMailer.deliveries
@@ -33,8 +36,9 @@ module Mail
     attr_accessor :settings
 
     def deliver!(mail)
+      check_params(mail)
       Mail::TestMailer.deliveries << mail
     end
     
   end
-end
+end

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

@@ -18,7 +18,7 @@ module Mail
   #
   #   Mail.all    #=> Returns an array of all emails
   #   Mail.first  #=> Returns the first unread email
-  #   Mail.last   #=> Returns the first unread email
+  #   Mail.last   #=> Returns the last unread email
   #
   # You can also pass options into Mail.find to locate an email in your imap mailbox
   # with the following options:
@@ -28,12 +28,15 @@ module Mail
   #   order:   order of emails returned. Possible values are :asc or :desc. Default value is :asc.
   #   count:   number of emails to retrieve. The default value is 10. A value of 1 returns an
   #            instance of Message, not an array of Message instances.
+  #   keys:    are passed as criteria to the SEARCH command.  They can either be a string holding the entire search string, 
+  #            or a single-dimension array of search keywords and arguments.  Refer to  [IMAP] section 6.4.4 for a full list
+  #            The default is 'ALL'
   #
-  #   Mail.find(:what => :first, :count => 10, :order => :asc)
+  #   Mail.find(:what => :first, :count => 10, :order => :asc, :keys=>'ALL')
   #   #=> Returns the first 10 emails in ascending order
   #
   class IMAP < Retriever
-    require 'net/imap'
+    require 'net/imap' unless defined?(Net::IMAP)
     
     def initialize(values)
       self.settings = { :address              => "localhost",
@@ -54,16 +57,21 @@ module Mail
     #   order:   order of emails returned. Possible values are :asc or :desc. Default value is :asc.
     #   count:   number of emails to retrieve. The default value is 10. A value of 1 returns an
     #            instance of Message, not an array of Message instances.
-    #   ready_only: will ensure that no writes are made to the inbox during the session. 
-    #               This is helpful when you don't want your messages to be set to read automatically. Default is false.
+    #   read_only: will ensure that no writes are made to the inbox during the session.  Specifically, if this is
+    #              set to true, the code will use the EXAMINE command to retrieve the mail.  If set to false, which
+    #              is the default, a SELECT command will be used to retrieve the mail
+    #              This is helpful when you don't want your messages to be set to read automatically. Default is false.
     #   delete_after_find: flag for whether to delete each retreived email after find. Default
     #           is false. Use #find_and_delete if you would like this to default to true.
+    #   keys:   are passed as criteria to the SEARCH command.  They can either be a string holding the entire search string, 
+    #           or a single-dimension array of search keywords and arguments.  Refer to  [IMAP] section 6.4.4 for a full list
+    #           The default is 'ALL'
     #
     def find(options={}, &block)
       options = validate_options(options)
 
       start do |imap|
-        options[:read_only] ? imap.select(options[:mailbox]) : imap.examine(options[:mailbox])
+        options[:read_only] ? imap.examine(options[:mailbox]) : imap.select(options[:mailbox])
 
         message_ids = imap.uid_search(options[:keys])
         message_ids.reverse! if options[:what].to_sym == :last

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

@@ -18,7 +18,7 @@ module Mail
   # 
   #   Mail.all    #=> Returns an array of all emails
   #   Mail.first  #=> Returns the first unread email
-  #   Mail.last   #=> Returns the first unread email
+  #   Mail.last   #=> Returns the last unread email
   # 
   # You can also pass options into Mail.find to locate an email in your pop mailbox
   # with the following options:
@@ -32,7 +32,7 @@ module Mail
   #   #=> Returns the first 10 emails in ascending order
   # 
   class POP3 < Retriever
-    require 'net/pop'
+    require 'net/pop' unless defined?(Net::POP)
 
     def initialize(values)
       self.settings = { :address              => "localhost",

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

@@ -20,26 +20,22 @@ module Mail
       options[:count] ||= :all
       options[:order] ||= :asc
       options[:what] ||= :first
-      emails = @@emails.dup
-      emails.reverse! if options[:what] == :last
-      emails = case count = options[:count]
-        when :all then emails
-        when 1 then emails.first
-        when Fixnum then emails[0, count]
+      emails_index = (0...@@emails.size).to_a
+      emails_index.reverse! if options[:what] == :last
+      emails_index = case count = options[:count]
+        when :all then emails_index
+        when Fixnum then emails_index[0, count]
         else
           raise 'Invalid count option value: ' + count.inspect
       end
       if options[:what] == :last && options[:order] == :asc || options[:what] == :first && options[:order] == :desc
-        emails.reverse!
-      end
-      emails.each { |email| email.mark_for_delete = true } if options[:delete_after_find]
-      if block_given?
-        emails.each { |email| yield email }
-      else
-        emails
-      end.tap do |results|
-        emails.each { |email| @@emails.delete(email) if email.is_marked_for_delete? } if options[:delete_after_find]
+        emails_index.reverse!
       end
+      emails_index.each { |idx| @@emails[idx].mark_for_delete = true } if options[:delete_after_find]
+      emails = emails_index.map { |idx| @@emails[idx] }
+      emails.each { |email| yield email } if block_given?
+      @@emails.reject!(&:is_marked_for_delete?) if options[:delete_after_find]
+      emails.size == 1 && options[:count] == 1 ? emails.first : emails
     end
 
   end

data/lib/mail/parsers/rfc2822.rb

@@ -1321,6 +1321,7 @@ module Mail
       def domain_text
         elements[1]
       end
+
     end
 
     def _nt_local_dot_atom_text
@@ -1357,6 +1358,25 @@ module Mail
         if r2
           r4 = _nt_domain_text
           s1 << r4
+          if r4
+            s5, i5 = [], index
+            loop do
+              if has_terminal?(".", false, index)
+                r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure(".")
+                r6 = nil
+              end
+              if r6
+                s5 << r6
+              else
+                break
+              end
+            end
+            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+            s1 << r5
+          end
         end
         if s1.last
           r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
@@ -2714,17 +2734,35 @@ module Mail
         s3, i3 = [], index
         loop do
           i4, s4 = index, []
+          i5 = index
           if has_terminal?(",", false, index)
-            r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             terminal_parse_failure(",")
-            r5 = nil
+            r6 = nil
+          end
+          if r6
+            r5 = r6
+          else
+            if has_terminal?(";", false, index)
+              r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure(";")
+              r7 = nil
+            end
+            if r7
+              r5 = r7
+            else
+              @index = i5
+              r5 = nil
+            end
           end
           s4 << r5
           if r5
-            r6 = _nt_mailbox
-            s4 << r6
+            r8 = _nt_mailbox
+            s4 << r8
           end
           if s4.last
             r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
@@ -2752,9 +2790,9 @@ module Mail
       if r1
         r0 = r1
       else
-        r7 = _nt_obs_mbox_list
-        if r7
-          r0 = r7
+        r9 = _nt_obs_mbox_list
+        if r9
+          r0 = r9
         else
           @index = i0
           r0 = nil
@@ -2915,34 +2953,52 @@ module Mail
           r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
           s4 << r5
           if r5
+            i7 = index
             if has_terminal?(",", false, index)
-              r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure(",")
-              r7 = nil
+              r8 = nil
+            end
+            if r8
+              r7 = r8
+            else
+              if has_terminal?(";", false, index)
+                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure(";")
+                r9 = nil
+              end
+              if r9
+                r7 = r9
+              else
+                @index = i7
+                r7 = nil
+              end
             end
             s4 << r7
             if r7
-              s8, i8 = [], index
+              s10, i10 = [], index
               loop do
-                r9 = _nt_FWS
-                if r9
-                  s8 << r9
+                r11 = _nt_FWS
+                if r11
+                  s10 << r11
                 else
                   break
                 end
               end
-              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-              s4 << r8
-              if r8
-                r11 = _nt_address
-                if r11
-                  r10 = r11
+              r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+              s4 << r10
+              if r10
+                r13 = _nt_address
+                if r13
+                  r12 = r13
                 else
-                  r10 = instantiate_node(SyntaxNode,input, index...index)
+                  r12 = instantiate_node(SyntaxNode,input, index...index)
                 end
-                s4 << r10
+                s4 << r12
               end
             end
           end