mail 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa5b2d445e65e58dc7c1716cd6f2eebd4f2397548eb1aa1d9230222df09f6aa3
-  data.tar.gz: cae304c28819a9903baf718616f8bb94e2ea860b0b2db43bfb3a3e0f9f12eaac
+  metadata.gz: ea4015fe2858f6c1b123e04d4d407169567b1aeea1155b7b145fe75d9d3781b5
+  data.tar.gz: 20cdb386c2f878560b9f61ab63b4f0c264c9f9115af5c835b8c66f49486cb274
 SHA512:
-  metadata.gz: b72cc59bc03570e9f5347d796e38b6d4365143a7122e7353559314e82b2523479fb5adf90fce65d1d8a5c7e95a97964b2118c082de5b6bb535f663bf4056fa8f
-  data.tar.gz: 64157d336e45117c5e32db4a599ccf97e3b8b6aa2c761b4d5923f18b6b506ee8a20795ce5e9e8494c4d39c7c4784e2317da7674d89ffc75cb5fd6d19f5473073
+  metadata.gz: b2eb55bc6f51b2d93e6d6abed5bb74876b3f96fd1eea00105047b3a211007b2b906ac89bcd1bed52603c211c595d439b6642bd897943decbcc9ac541f88e2049
+  data.tar.gz: 063dd68ef655b93d96412bdcf66ab6f191eaf0bfbafa10730ecfa99a447eb3d2a4469d6d1de67ae144bbaada65eaec4c7d8dbb5fe04509146dc1434a5c557fff

data/README.md

@@ -47,7 +47,21 @@ our documentation, add new features—up to you! Thank you for pitching in.
 
 ## Compatibility
 
-Mail supports Ruby 2.5+, including JRuby and TruffleRuby.
+Mail is tested against:
+
+* Ruby: 2.5
+* Ruby: 2.6
+* Ruby: 2.7
+* Ruby: 3.0
+* Ruby: 3.1
+* Ruby: 3.2
+* JRuby: 9.2
+* JRuby: 9.3
+* JRuby: 9.4
+* JRuby: stable
+* JRuby: head
+* Truffleruby: stable
+* Truffleruby: head
 
 As new versions of Ruby are released, Mail will be compatible with support for the "preview" and all "normal maintenance", "security maintenance" and the two most recent "end of life" versions listed at the [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/) page.  Pull requests to assist in adding support for new preview releases are more than welcome.
 

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

@@ -49,8 +49,12 @@ module Mail
     end
 
     def initialize(values)
+      if values[:arguments].is_a?(String)
+        deprecation_warn.call \
+          'Initializing Mail::Sendmail with :arguments of type String is deprecated.' \
+          ' Instead ensure :arguments is an array of strings, e.g. ["-i", "-t"]'
+      end
       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)
@@ -60,8 +64,13 @@ module Mail
     def deliver!(mail)
       envelope = Mail::SmtpEnvelope.new(mail)
 
+      arguments = settings[:arguments]
+      if arguments.is_a? String
+        return old_deliver(envelope)
+      end
+
       command = [settings[:location]]
-      command.concat Array(settings[:arguments])
+      command.concat Array(arguments)
       command.concat [ '-f', envelope.from ] if envelope.from
 
       if destinations = destinations_for(envelope)
@@ -83,5 +92,42 @@ module Mail
           end
         end
       end
+
+    #+ support for delivery using string arguments (deprecated)
+    def old_deliver(envelope)
+      smtp_from = envelope.from
+      smtp_to = destinations_for(envelope)
+
+      from = "-f #{shellquote(smtp_from)}" if smtp_from
+      destination = smtp_to.map { |to| shellquote(to) }.join(' ')
+
+      arguments = "#{settings[:arguments]} #{from} --"
+      command = "#{settings[:location]} #{arguments} #{destination}"
+      popen command do |io|
+        io.puts ::Mail::Utilities.binary_unsafe_to_lf(envelope.message)
+        io.flush
+      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 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
+    #- support for delivery using string arguments
+
+    def deprecation_warn
+      defined?(ActiveSupport::Deprecation.warn) ? ActiveSupport::Deprecation.method(:warn) : Kernel.method(:warn)
+    end
   end
 end

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

@@ -135,7 +135,7 @@ module Mail
             when true
               smtp.enable_starttls_auto(ssl_context)
             when false
-              smtp.disable_starttls_auto
+              smtp.disable_starttls
             else
               raise ArgumentError, "Unrecognized :enable_starttls_auto value #{settings[:enable_starttls_auto].inspect}; expected true, false, or nil"
             end

data/lib/mail/version.rb

@@ -4,7 +4,7 @@ module Mail
 
     MAJOR = 2
     MINOR = 8
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-03 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_mime