mail 2.8.1 → 2.9.1

data/lib/mail/utilities.rb

@@ -165,7 +165,11 @@ module Mail
     end
 
     def uri_parser
-      @uri_parser ||= URI.const_defined?(:DEFAULT_PARSER) ? URI::DEFAULT_PARSER : URI
+      @uri_parser ||= if URI.const_defined?(:DEFAULT_PARSER)
+                        defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::DEFAULT_PARSER
+                      else
+                        URI
+                      end
     end
 
     # Matches two objects with their to_s values case insensitively
@@ -363,7 +367,7 @@ module Mail
       if !str.end_with?("=") && str.length % 4 != 0
         str = str.ljust((str.length + 3) & ~3, "=")
       end
-      str.unpack( 'm' ).first
+      str.unpack1( 'm' )
     end
 
     def Utilities.encode_base64(str)
@@ -399,7 +403,7 @@ module Mail
     def Utilities.decode_utf7(utf7)
       utf7.gsub(/&([^-]+)?-/n) do
         if $1
-          ($1.tr(",", "/") + "===").unpack("m")[0].encode(Encoding::UTF_8, Encoding::UTF_16BE)
+          ($1.tr(",", "/") + "===").unpack1("m").encode(Encoding::UTF_8, Encoding::UTF_16BE)
         else
           "&"
         end
@@ -412,16 +416,20 @@ module Mail
     end
 
     def Utilities.b_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Bb]\?(.*)\?\=/m)
-      if match
-        charset = match[1]
-        str = Utilities.decode_base64(match[2])
-        str = charset_encoder.encode(str, charset)
+      b_decoded = str.gsub(/=\?([^?]+)\?[Bb]\?([^?]*)\?=/m) do |match|
+        charset = $1
+
+        string = Utilities.decode_base64($2)
+
+        begin
+          charset_encoder.encode(string, charset)
+        rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError, Encoding::InvalidByteSequenceError
+          warn "WARNING: Encoding conversion failed #{$!}"
+          string.dup.force_encoding(Encoding::UTF_8)
+        end
       end
-      transcode_to_scrubbed_utf8(str)
-    rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError, Encoding::InvalidByteSequenceError
-      warn "Encoding conversion failed #{$!}"
-      str.dup.force_encoding(Encoding::UTF_8)
+
+      transcode_to_scrubbed_utf8(b_decoded)
     end
 
     def Utilities.q_value_encode(str, encoding = nil)
@@ -430,22 +438,28 @@ module Mail
     end
 
     def Utilities.q_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Qq]\?(.*)\?\=/m)
-      if match
-        charset = match[1]
-        string = match[2].gsub(/_/, '=20')
-        # Remove trailing = if it exists in a Q encoding
-        string = string.sub(/\=$/, '')
-        str = Encodings::QuotedPrintable.decode(string)
-        str = charset_encoder.encode(str, charset)
+      q_decoded = str.gsub(/=\?([^?]+)\?[Qq]\?((?:[^?]|\?(?!\=))*)\?=/m) do |_match|
+        charset = $1
+        string  = $2
+          .gsub(/_/, '=20')
+          .sub(/\=$/, '') # Remove trailing = if it exists in a Q encoding
+
+        unquoted_printable = Encodings::QuotedPrintable.decode(string)
+        decoded = begin
+                    charset_encoder.encode(unquoted_printable, charset)
+                  rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
+                    warn "WARNING: Encoding conversion failed #{$!}"
+                    unquoted_printable.dup.force_encoding(Encoding::UTF_8)
+                  end
+
         # We assume that binary strings hold utf-8 directly to work around
         # jruby/jruby#829 which subtly changes String#encode semantics.
-        str.force_encoding(Encoding::UTF_8) if str.encoding == Encoding::ASCII_8BIT
+        decoded.force_encoding(Encoding::UTF_8) if decoded.encoding == Encoding::ASCII_8BIT
+
+        decoded
       end
-      transcode_to_scrubbed_utf8(str)
-    rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
-      warn "Encoding conversion failed #{$!}"
-      str.dup.force_encoding(Encoding::UTF_8)
+
+      transcode_to_scrubbed_utf8(q_decoded)
     end
 
     def Utilities.param_decode(str, encoding)
@@ -453,7 +467,7 @@ module Mail
       str = charset_encoder.encode(str, encoding) if encoding
       transcode_to_scrubbed_utf8(str)
     rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
-      warn "Encoding conversion failed #{$!}"
+      warn "WARNING: Encoding conversion failed #{$!}"
       str.dup.force_encoding(Encoding::UTF_8)
     end
 
@@ -464,7 +478,7 @@ module Mail
     end
 
     def Utilities.uri_parser
-      URI::DEFAULT_PARSER
+      defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::DEFAULT_PARSER
     end
 
     # Pick a Ruby encoding corresponding to the message charset. Most

data/lib/mail/version.rb

@@ -3,7 +3,7 @@ module Mail
   module VERSION
 
     MAJOR = 2
-    MINOR = 8
+    MINOR = 9
     PATCH = 1
     BUILD = nil
 

data/lib/mail.rb

@@ -48,7 +48,7 @@ module Mail # :doc:
   require 'mail/field'
   require 'mail/field_list'
 
-  require 'mail/envelope'
+  register_autoload :Envelope, 'mail/envelope'
 
   # Autoload header field elements and transfer encodings.
   require 'mail/elements'
@@ -58,10 +58,7 @@ module Mail # :doc:
   require 'mail/encodings/unix_to_unix'
 
   require 'mail/matchers/has_sent_mail'
-  require 'mail/matchers/attachment_matchers.rb'
-
-  # Deprecated will be removed in 3.0 release
-  require 'mail/check_delivery_params'
+  require 'mail/matchers/attachment_matchers'
 
   # Finally... require all the Mail.methods
   require 'mail/mail'

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.9.1
 platform: ruby
 authors:
 - Mikel Lindsaar
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_mime
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +175,6 @@ files:
 - lib/mail.rb
 - lib/mail/attachments_list.rb
 - lib/mail/body.rb
-- lib/mail/check_delivery_params.rb
 - lib/mail/configuration.rb
 - lib/mail/constants.rb
 - lib/mail/elements.rb
@@ -297,7 +309,6 @@ homepage: https://github.com/mikel/mail
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--exclude"
 - lib/mail/values/unicode_tables.dat
@@ -314,8 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.
 test_files: []

data/lib/mail/check_delivery_params.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-#
-# This whole class and associated specs is deprecated and will go away in the version 3 release of mail.
-module Mail
-  module CheckDeliveryParams #:nodoc:
-    class << self
-
-      extend Gem::Deprecate
-
-      def check(mail)
-        envelope = Mail::SmtpEnvelope.new(mail)
-        [ envelope.from,
-          envelope.to,
-          envelope.message ]
-      end
-      deprecate :check, 'Mail::SmtpEnvelope.new created in commit c106bebea066782a72e4f24dd37b532d95773df7', 2023, 6
-
-      def check_from(addr)
-        mail = Mail.new(from: 'deprecated@example.com', to: 'deprecated@example.com')
-        Mail::SmtpEnvelope.new(mail).send(:validate_addr, 'From', addr)
-      end
-      deprecate :check_from, :none, 2023, 6
-
-      def check_to(addrs)
-        mail = Mail.new(from: 'deprecated@example.com', to: 'deprecated@example.com')
-        Array(addrs).map do |addr|
-          Mail::SmtpEnvelope.new(mail).send(:validate_addr, 'To', addr)
-        end
-      end
-      deprecate :check_to, :none, 2023, 6
-
-      def check_addr(addr_name, addr)
-        mail = Mail.new(from: 'deprecated@example.com', to: 'deprecated@example.com')
-        Mail::SmtpEnvelope.new(mail).send(:validate_addr, addr_name, addr)
-      end
-      deprecate :check_addr, :none, 2023, 6
-
-      def validate_smtp_addr(addr)
-        if addr
-          if addr.bytesize > 2048
-            yield 'may not exceed 2kB'
-          end
-
-          if /[\r\n]/ =~ addr
-            yield 'may not contain CR or LF line breaks'
-          end
-        end
-
-        addr
-      end
-      deprecate :validate_smtp_addr, :none, 2023, 6
-
-      def check_message(message)
-        message = message.encoded if message.respond_to?(:encoded)
-
-        if Utilities.blank?(message)
-          raise ArgumentError, 'An encoded message is required to send an email'
-        end
-
-        message
-      end
-      deprecate :check_message, :none, 2023, 6
-    end
-  end
-end