mail 2.7.1 → 2.8.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.1
 platform: ruby
 authors:
 - Mikel Lindsaar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-13 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_mime
@@ -24,6 +24,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  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: net-imap
+  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: net-pop
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -109,8 +165,6 @@ files:
 - lib/mail/check_delivery_params.rb
 - lib/mail/configuration.rb
 - lib/mail/constants.rb
-- lib/mail/core_extensions/smtp.rb
-- lib/mail/core_extensions/string.rb
 - lib/mail/elements.rb
 - lib/mail/elements/address.rb
 - lib/mail/elements/address_list.rb
@@ -140,12 +194,10 @@ files:
 - lib/mail/fields/bcc_field.rb
 - lib/mail/fields/cc_field.rb
 - lib/mail/fields/comments_field.rb
-- lib/mail/fields/common/address_container.rb
-- lib/mail/fields/common/common_address.rb
-- lib/mail/fields/common/common_date.rb
-- lib/mail/fields/common/common_field.rb
-- lib/mail/fields/common/common_message_id.rb
-- lib/mail/fields/common/parameter_hash.rb
+- lib/mail/fields/common_address_field.rb
+- lib/mail/fields/common_date_field.rb
+- lib/mail/fields/common_field.rb
+- lib/mail/fields/common_message_id_field.rb
 - lib/mail/fields/content_description_field.rb
 - lib/mail/fields/content_disposition_field.rb
 - lib/mail/fields/content_id_field.rb
@@ -158,7 +210,10 @@ files:
 - lib/mail/fields/keywords_field.rb
 - lib/mail/fields/message_id_field.rb
 - lib/mail/fields/mime_version_field.rb
+- lib/mail/fields/named_structured_field.rb
+- lib/mail/fields/named_unstructured_field.rb
 - lib/mail/fields/optional_field.rb
+- lib/mail/fields/parameter_hash.rb
 - lib/mail/fields/received_field.rb
 - lib/mail/fields/references_field.rb
 - lib/mail/fields/reply_to_field.rb
@@ -233,16 +288,16 @@ files:
 - lib/mail/parsers/rfc5322_lexical_tokens.rl
 - lib/mail/part.rb
 - lib/mail/parts_list.rb
+- lib/mail/smtp_envelope.rb
 - lib/mail/utilities.rb
 - lib/mail/values/unicode_tables.dat
 - lib/mail/version.rb
-- lib/mail/version_specific/ruby_1_8.rb
-- lib/mail/version_specific/ruby_1_9.rb
+- lib/mail/yaml.rb
 homepage: https://github.com/mikel/mail
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--exclude"
 - lib/mail/values/unicode_tables.dat
@@ -252,16 +307,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.
 test_files: []

data/lib/mail/core_extensions/smtp.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-# This is a backport of r30294 from ruby trunk because of a bug in net/smtp.
-# http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30294
-#
-# Fixed in Ruby 1.9.3 - tlsconnect also does not exist in some early versions of ruby
-if RUBY_VERSION < '1.9.3'
-  module Net
-    class SMTP
-      begin
-        alias_method :original_tlsconnect, :tlsconnect
-
-        def tlsconnect(s)
-          verified = false
-          begin
-            original_tlsconnect(s).tap { verified = true }
-          ensure
-            unless verified
-              s.close rescue nil
-            end
-          end
-        end
-      rescue NameError
-      end
-    end
-  end
-end

data/lib/mail/core_extensions/string.rb

@@ -1,17 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-class String #:nodoc:
-
-  unless method_defined?(:ascii_only?)
-    # Backport from Ruby 1.9 checks for non-us-ascii characters.
-    def ascii_only?
-      self !~ MATCH_NON_US_ASCII
-    end
-
-    MATCH_NON_US_ASCII = /[^\x00-\x7f]/
-  end
-
-  unless method_defined?(:bytesize)
-    alias :bytesize :length
-  end
-end

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

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-module Mail
-  
-  class AddressContainer < Array
-    
-    def initialize(field, list = [])
-      @field = field
-      super(list)
-    end
-
-    def <<(address)
-      @field << address
-    end
-
-  end
-  
-end

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

@@ -1,161 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-require 'mail/fields/common/address_container'
-
-module Mail
-  module CommonAddress # :nodoc:
-    def parse(val = value)
-      unless Utilities.blank?(val)
-        @address_list = AddressList.new(encode_if_needed(val))
-      else
-        nil
-      end
-    end
-
-    def charset
-      @charset
-    end
-
-    def encode_if_needed(val) #:nodoc:
-      # Need to join arrays of addresses into a single value
-      if val.kind_of?(Array)
-        val.compact.map { |a| encode_if_needed a }.join(', ')
-
-      # Pass through UTF-8; encode non-UTF-8.
-      else
-        utf8_if_needed(val) || Encodings.encode_non_usascii(val, charset)
-      end
-    end
-
-    # Allows you to iterate through each address object in the address_list
-    def each
-      address_list.addresses.each do |address|
-        yield(address)
-      end
-    end
-
-    # Returns the address string of all the addresses in the address list
-    def addresses
-      list = address_list.addresses.map { |a| a.address }
-      Mail::AddressContainer.new(self, list)
-    end
-
-    # Returns the formatted string of all the addresses in the address list
-    def formatted
-      list = address_list.addresses.map { |a| a.format }
-      Mail::AddressContainer.new(self, list)
-    end
-  
-    # Returns the display name of all the addresses in the address list
-    def display_names
-      list = address_list.addresses.map { |a| a.display_name }
-      Mail::AddressContainer.new(self, list)
-    end
-  
-    # Returns the actual address objects in the address list
-    def addrs
-      list = address_list.addresses
-      Mail::AddressContainer.new(self, list)
-    end
-  
-    # Returns a hash of group name => address strings for the address list
-    def groups
-      address_list.addresses_grouped_by_group
-    end
-  
-    # Returns the addresses that are part of groups
-    def group_addresses
-      decoded_group_addresses
-    end
-
-    # Returns a list of decoded group addresses
-    def decoded_group_addresses
-      groups.map { |k,v| v.map { |a| a.decoded } }.flatten
-    end
-
-    # Returns a list of encoded group addresses
-    def encoded_group_addresses
-      groups.map { |k,v| v.map { |a| a.encoded } }.flatten
-    end
-
-    # Returns the name of all the groups in a string
-    def group_names # :nodoc:
-      address_list.group_names
-    end
-  
-    def default
-      addresses
-    end
-
-    def <<(val)
-      case
-      when val.nil?
-        raise ArgumentError, "Need to pass an address to <<"
-      when Utilities.blank?(val)
-        parse(encoded)
-      else
-        self.value = [self.value, val].reject {|a| Utilities.blank?(a) }.join(", ")
-      end
-    end
-
-    def value=(val)
-      super
-      parse(self.value)
-    end
-  
-    private
-
-    if 'string'.respond_to?(:encoding)
-      # Pass through UTF-8 addresses
-      def utf8_if_needed(val)
-        if charset =~ /\AUTF-?8\z/i
-          val
-        elsif val.encoding == Encoding::UTF_8
-          val
-        elsif (utf8 = val.dup.force_encoding(Encoding::UTF_8)).valid_encoding?
-          utf8
-        end
-      end
-    else
-      def utf8_if_needed(val)
-        if charset =~ /\AUTF-?8\z/i
-          val
-        end
-      end
-    end
-
-    def do_encode(field_name)
-      return '' if Utilities.blank?(value)
-      address_array = address_list.addresses.reject { |a| encoded_group_addresses.include?(a.encoded) }.compact.map { |a| a.encoded }
-      address_text  = address_array.join(", \r\n\s")
-      group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.encoded }.join(", \r\n\s")};" }
-      group_text  = group_array.join(" \r\n\s")
-      return_array = [address_text, group_text].reject { |a| Utilities.blank?(a) }
-      "#{field_name}: #{return_array.join(", \r\n\s")}\r\n"
-    end
-
-    def do_decode
-      return nil if Utilities.blank?(value)
-      address_array = address_list.addresses.reject { |a| decoded_group_addresses.include?(a.decoded) }.map { |a| a.decoded }
-      address_text  = address_array.join(", ")
-      group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.decoded }.join(", ")};" }
-      group_text  = group_array.join(" ")
-      return_array = [address_text, group_text].reject { |a| Utilities.blank?(a) }
-      return_array.join(", ")
-    end
-
-    def address_list # :nodoc:
-      @address_list ||= AddressList.new(value)
-    end
-  
-    def get_group_addresses(group_list)
-      if group_list.respond_to?(:addresses)
-        group_list.addresses.map do |address|
-          Mail::Address.new(address)
-        end
-      else
-        []
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-module Mail
-  module CommonDate # :nodoc:
-    # Returns a date time object of the parsed date
-    def date_time
-      ::DateTime.parse("#{element.date_string} #{element.time_string}")
-    end
-
-    def default
-      date_time
-    end
-    
-    def parse(val = value)
-      unless Utilities.blank?(val)
-        @element = Mail::DateTimeElement.new(val)
-      else
-        nil
-      end
-    end
-
-    private
-    
-    def do_encode(field_name)
-      "#{field_name}: #{value}\r\n"
-    end
-    
-    def do_decode
-      "#{value}"
-    end
-
-    def element
-      @element ||= Mail::DateTimeElement.new(value)
-    end
-  end
-end

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

@@ -1,52 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-module Mail
-  module CommonField # :nodoc:
-    include Mail::Constants
-
-    def name=(value)
-      @name = value
-    end
-
-    def name
-      @name ||= nil
-    end
-
-    def value=(value)
-      @length = nil
-      @element = nil
-      @value = value.is_a?(Array) ? value : value.to_s
-    end
-
-    def value
-      @value
-    end
-
-    def to_s
-      decoded.to_s
-    end
-
-    def default
-      decoded
-    end
-
-    def field_length
-      @length ||= "#{name}: #{encode(decoded)}".length
-    end
-
-    def responsible_for?( val )
-      name.to_s.casecmp(val.to_s) == 0
-    end
-
-    private
-
-    FILENAME_RE = /\b(filename|name)=([^;"\r\n]+\s[^;"\r\n]+)/
-    def ensure_filename_quoted(value)
-      if value.is_a?(String)
-        value.sub FILENAME_RE, '\1="\2"'
-      else
-        value
-      end
-    end
-  end
-end

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

@@ -1,49 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-module Mail
-  module CommonMessageId # :nodoc:
-    def element
-      @element ||= Mail::MessageIdsElement.new(value) unless Utilities.blank?(value)
-    end
-
-    def parse(val = value)
-      unless Utilities.blank?(val)
-        @element = Mail::MessageIdsElement.new(val)
-      else
-        nil
-      end
-    end
-    
-    def message_id
-      element.message_id if element
-    end
-    
-    def message_ids
-      element.message_ids if element
-    end
-    
-    def default
-      return nil unless message_ids
-      if message_ids.length == 1
-        message_ids[0]
-      else
-        message_ids
-      end
-    end
-
-    private
-
-    def do_encode(field_name)
-      %Q{#{field_name}: #{formated_message_ids("\r\n ")}\r\n}
-    end
-
-    def do_decode
-      formated_message_ids(' ')
-    end
-
-    def formated_message_ids(join)
-      message_ids.map{ |m| "<#{m}>" }.join(join) if message_ids
-    end
-
-  end
-end

data/lib/mail/version_specific/ruby_1_8.rb

@@ -1,163 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-require 'net/imap' # for decode_utf7
-
-module Mail
-  class Ruby18
-    require 'base64'
-    require 'iconv'
-
-    # Escapes any parenthesis in a string that are unescaped. This can't
-    # use the Ruby 1.9.1 regexp feature of negative look behind so we have
-    # to do two replacement, first unescape everything, then re-escape it
-    def Ruby18.escape_paren( str )
-      re = /\\\)/
-      str = str.gsub(re) { |s| ')'}
-      re = /\\\(/
-      str = str.gsub(re) { |s| '('}
-      re = /([\(\)])/          # Only match unescaped parens
-      str.gsub(re) { |s| '\\' + s }
-    end
-
-    def Ruby18.paren( str )
-      str = $1 if str =~ /^\((.*)?\)$/
-      str = escape_paren( str )
-      '(' + str + ')'
-    end
-
-    def Ruby18.escape_bracket( str )
-      re = /\\\>/
-      str = str.gsub(re) { |s| '>'}
-      re = /\\\</
-      str = str.gsub(re) { |s| '<'}
-      re = /([\<\>])/          # Only match unescaped parens
-      str.gsub(re) { |s| '\\' + s }
-    end
-
-    def Ruby18.bracket( str )
-      str = $1 if str =~ /^\<(.*)?\>$/
-      str = escape_bracket( str )
-      '<' + str + '>'
-    end
-
-    def Ruby18.decode_base64(str)
-      Base64.decode64(str) if str
-    end
-
-    def Ruby18.encode_base64(str)
-      Base64.encode64(str)
-    end
-
-    def Ruby18.has_constant?(klass, string)
-      klass.constants.include?( string )
-    end
-
-    def Ruby18.get_constant(klass, string)
-      klass.const_get( string )
-    end
-
-    def Ruby18.transcode_charset(str, from_encoding, to_encoding = 'UTF-8')
-      case from_encoding
-      when /utf-?7/i
-        decode_utf7(str)
-      else
-        retried = false
-        begin
-          Iconv.conv("#{normalize_iconv_charset_encoding(to_encoding)}//IGNORE", normalize_iconv_charset_encoding(from_encoding), str)
-        rescue Iconv::InvalidEncoding
-          if retried
-            raise
-          else
-            from_encoding = 'ASCII'
-            retried = true
-            retry
-          end
-        end
-      end
-    end
-
-    def Ruby18.decode_utf7(str)
-      Net::IMAP.decode_utf7(str)
-    end
-
-    def Ruby18.b_value_encode(str, encoding)
-      # Ruby 1.8 requires an encoding to work
-      raise ArgumentError, "Must supply an encoding" if encoding.nil?
-      encoding = encoding.to_s.upcase.gsub('_', '-')
-      [Encodings::Base64.encode(str), normalize_iconv_charset_encoding(encoding)]
-    end
-
-    def Ruby18.b_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Bb]\?(.*)\?\=/m)
-      if match
-        encoding = match[1]
-        str = Ruby18.decode_base64(match[2])
-        str = transcode_charset(str, encoding)
-      end
-      str
-    end
-
-    def Ruby18.q_value_encode(str, encoding)
-      # Ruby 1.8 requires an encoding to work
-      raise ArgumentError, "Must supply an encoding" if encoding.nil?
-      encoding = encoding.to_s.upcase.gsub('_', '-')
-      [Encodings::QuotedPrintable.encode(str), encoding]
-    end
-
-    def Ruby18.q_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Qq]\?(.*)\?\=/m)
-      if match
-        encoding = 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 = transcode_charset(str, encoding)
-      end
-      str
-    end
-
-    def Ruby18.param_decode(str, encoding)
-      str = URI.unescape(str)
-      if encoding
-        transcode_charset(str, encoding)
-      else
-        str
-      end
-    end
-
-    def Ruby18.param_encode(str)
-      encoding = $KCODE.to_s.downcase
-      language = Configuration.instance.param_encode_language
-      "#{encoding}'#{language}'#{URI.escape(str)}"
-    end
-
-    def Ruby18.string_byteslice(str, *args)
-      str.slice(*args)
-    end
-
-    private
-
-    def Ruby18.normalize_iconv_charset_encoding(encoding)
-      case encoding.upcase
-      when 'UTF8', 'UTF_8'
-        'UTF-8'
-      when 'UTF16', 'UTF-16'
-        'UTF-16BE'
-      when 'UTF32', 'UTF-32'
-        'UTF-32BE'
-      when 'KS_C_5601-1987'
-        'CP949'
-      else
-        # Fall back to ASCII for charsets that Iconv doesn't recognize
-        begin
-          Iconv.new('UTF-8', encoding)
-        rescue Iconv::InvalidEncoding => e
-          'ASCII'
-        else
-          encoding
-        end
-      end
-    end
-  end
-end