mail 2.7.1 → 2.8.0.rc1

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

@@ -1,9 +1,7 @@
-require 'mail/check_delivery_params'
+require 'mail/smtp_envelope'
 
 module Mail
   class LoggerDelivery
-    include Mail::CheckDeliveryParams
-
     attr_reader :logger, :severity, :settings
 
     def initialize(settings)
@@ -13,8 +11,7 @@ module Mail
     end
 
     def deliver!(mail)
-      Mail::CheckDeliveryParams.check(mail)
-      logger.log(severity) { mail.encoded }
+      logger.log(severity) { Mail::SmtpEnvelope.new(mail).message }
     end
 
     private

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'mail/check_delivery_params'
+require 'mail/smtp_envelope'
 
 module Mail
   # A delivery method implementation which sends via sendmail.
@@ -40,56 +40,48 @@ module Mail
   class Sendmail
     DEFAULTS = {
       :location   => '/usr/sbin/sendmail',
-      :arguments  => '-i'
+      :arguments  => %w[ -i ]
     }
 
     attr_accessor :settings
 
+    class DeliveryError < StandardError
+    end
+
     def initialize(values)
       self.settings = self.class::DEFAULTS.merge(values)
+      raise ArgumentError, ":arguments expected to be an Array of individual string args" if settings[:arguments].is_a?(String)
+    end
+
+    def destinations_for(envelope)
+      envelope.to
     end
 
     def deliver!(mail)
-      smtp_from, smtp_to, message = Mail::CheckDeliveryParams.check(mail)
+      envelope = Mail::SmtpEnvelope.new(mail)
 
-      from = "-f #{self.class.shellquote(smtp_from)}" if smtp_from
-      to = smtp_to.map { |_to| self.class.shellquote(_to) }.join(' ')
+      command = [settings[:location]]
+      command.concat Array(settings[:arguments])
+      command.concat [ '-f', envelope.from ] if envelope.from
 
-      arguments = "#{settings[:arguments]} #{from} --"
-      self.class.call(settings[:location], arguments, to, message)
-    end
+      if destinations = destinations_for(envelope)
+        command.push '--'
+        command.concat destinations
+      end
 
-    def self.call(path, arguments, destinations, encoded_message)
-      popen "#{path} #{arguments} #{destinations}" do |io|
-        io.puts ::Mail::Utilities.binary_unsafe_to_lf(encoded_message)
+      popen(command) do |io|
+        io.puts ::Mail::Utilities.binary_unsafe_to_lf(envelope.message)
         io.flush
       end
     end
 
-    if RUBY_VERSION < '1.9.0'
-      def self.popen(command, &block)
-        IO.popen "#{command} 2>&1", 'w+', &block
-      end
-    else
-      def self.popen(command, &block)
-        IO.popen command, 'w+', :err => :out, &block
+    private
+      def popen(command, &block)
+        IO.popen(command, 'w+', :err => :out, &block).tap do
+          if $?.exitstatus != 0
+            raise DeliveryError, "Delivery failed with exitstatus #{$?.exitstatus}: #{command.inspect}"
+          end
+        end
       end
-    end
-
-    # The following is an adaptation of ruby 1.9.2's shellwords.rb file,
-    # with the following modifications:
-    #
-    # - Wraps in double quotes
-    # - Allows '+' to accept email addresses with them
-    # - Allows '~' as it is not unescaped in double quotes
-    def self.shellquote(address)
-      # Process as a single byte sequence because not all shell
-      # implementations are multibyte aware.
-      #
-      # A LF cannot be escaped with a backslash because a backslash + LF
-      # combo is regarded as line continuation and simply ignored. Strip it.
-      escaped = address.gsub(/([^A-Za-z0-9_\s\+\-.,:\/@~])/n, "\\\\\\1").gsub("\n", '')
-      %("#{escaped}")
-    end
   end
 end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'mail/check_delivery_params'
+require 'mail/smtp_envelope'
 
 module Mail
   # == Sending Email with SMTP
@@ -88,8 +88,8 @@ module Mail
       :openssl_verify_mode  => nil,
       :ssl                  => nil,
       :tls                  => nil,
-      :open_timeout         => nil,
-      :read_timeout         => nil
+      :open_timeout         => 5,
+      :read_timeout         => 5
     }
 
     def initialize(values)

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'mail/check_delivery_params'
+require 'mail/smtp_envelope'
 
 module Mail
   # == Sending Email with SMTP
@@ -49,18 +49,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)
-      smtp_from, smtp_to, message = Mail::CheckDeliveryParams.check(mail)
-
-      response = smtp.sendmail(dot_stuff(message), smtp_from, smtp_to)
-
+      envelope = Mail::SmtpEnvelope.new(mail)
+      response = smtp.sendmail(envelope.message, envelope.from, envelope.to)
       settings[:return_response] ? response : self
     end
-
-    private
-      # This is Net::SMTP's job, but before Ruby 2.x it does not dot-stuff
-      # an unterminated last line: https://bugs.ruby-lang.org/issues/9627
-      def dot_stuff(message)
-        message.gsub(/(\r\n\.)(\r\n|$)/, '\1.\2')
-      end
   end
 end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'mail/check_delivery_params'
+require 'mail/smtp_envelope'
 
 module Mail
   # The TestMailer is a bare bones mailer that does nothing.  It is useful
@@ -35,7 +35,9 @@ module Mail
     end
 
     def deliver!(mail)
-      Mail::CheckDeliveryParams.check(mail)
+      # Create the envelope to validate it
+      Mail::SmtpEnvelope.new(mail)
+
       Mail::TestMailer.deliveries << mail
     end
   end

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

@@ -11,8 +11,8 @@ module Mail
     #   count: number of emails to retrieve. The default value is 1.
     #   order: order of emails returned. Possible values are :asc or :desc. Default value is :asc.
     #
-    def first(options = {}, &block)
-      options ||= {}
+    def first(options = nil, &block)
+      options = options ? Hash[options] : {}
       options[:what] = :first
       options[:count] ||= 1
       find(options, &block)
@@ -24,8 +24,8 @@ module Mail
     #   count: number of emails to retrieve. The default value is 1.
     #   order: order of emails returned. Possible values are :asc or :desc. Default value is :asc.
     #
-    def last(options = {}, &block)
-      options ||= {}
+    def last(options = nil, &block)
+      options = options ? Hash[options] : {}
       options[:what] = :last
       options[:count] ||= 1
       find(options, &block)
@@ -36,8 +36,8 @@ module Mail
     # Possible options:
     #   order: order of emails returned. Possible values are :asc or :desc. Default value is :asc.
     #
-    def all(options = {}, &block)
-      options ||= {}
+    def all(options = nil, &block)
+      options = options ? Hash[options] : {}
       options[:count] = :all
       find(options, &block)
     end
@@ -53,8 +53,8 @@ module Mail
     #   delete_after_find: flag for whether to delete each retreived email after find. Default
     #           is true. Call #find if you would like this to default to false.
     #
-    def find_and_delete(options = {}, &block)
-      options ||= {}
+    def find_and_delete(options = nil, &block)
+      options = options ? Hash[options] : {}
       options[:delete_after_find] ||= true
       find(options, &block)      
     end 

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

@@ -70,7 +70,7 @@ module Mail
     #           The default is 'ALL'
     #   search_charset: charset to pass to IMAP server search. Omitted by default. Example: 'UTF-8' or 'ASCII'.
     #
-    def find(options={}, &block)
+    def find(options=nil, &block)
       options = validate_options(options)
 
       start do |imap|
@@ -142,7 +142,7 @@ module Mail
 
       # Set default options
       def validate_options(options)
-        options ||= {}
+        options = options ? Hash[options] : {}
         options[:mailbox] ||= 'INBOX'
         options[:count]   ||= 10
         options[:order]   ||= :asc

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

@@ -57,7 +57,7 @@ module Mail
     #   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.
     #
-    def find(options = {}, &block)
+    def find(options = nil, &block)
       options = validate_options(options)
       
       start do |pop3|
@@ -113,7 +113,7 @@ module Mail
   
     # Set default options
     def validate_options(options)
-      options ||= {}
+      options = options ? Hash[options] : {}
       options[:count] ||= 10
       options[:order] ||= :asc
       options[:what]  ||= :first

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

@@ -17,7 +17,8 @@ module Mail
       @@emails = []
     end
 
-    def find(options = {}, &block)
+    def find(options = nil, &block)
+      options = options ? Hash[options] : {}
       options[:count] ||= :all
       options[:order] ||= :asc
       options[:what] ||= :first