mail 2.6.3 → 2.6.4.rc2

data/lib/mail/multibyte/unicode.rb

@@ -1,6 +1,26 @@
 module Mail
   module Multibyte
     module Unicode
+      # Adapted from https://github.com/rails/rails/blob/master/activesupport/lib/active_support/multibyte/unicode.rb
+      # under the MIT license
+      # The Unicode version that is supported by the implementation
+      UNICODE_VERSION = '7.0.0'
+
+      # Holds data about a codepoint in the Unicode database.
+      class Codepoint
+        attr_accessor :code, :combining_class, :decomp_type, :decomp_mapping, :uppercase_mapping, :lowercase_mapping
+
+        # Initializing Codepoint object with default values
+        def initialize
+          @combining_class = 0
+          @uppercase_mapping = 0
+          @lowercase_mapping = 0
+        end
+
+        def swapcase_mapping
+          uppercase_mapping > 0 ? uppercase_mapping : lowercase_mapping
+        end
+      end
 
       extend self
 
@@ -8,9 +28,6 @@ module Mail
       # information about normalization.
       NORMALIZATION_FORMS = [:c, :kc, :d, :kd]
 
-      # The Unicode version that is supported by the implementation
-      UNICODE_VERSION = '5.2.0'
-
       # The default normalization used for operations that require normalization. It can be set to any of the
       # normalizations in NORMALIZATION_FORMS.
       #
@@ -308,11 +325,6 @@ module Mail
         end.pack('U*')
       end
 
-      # Holds data about a codepoint in the Unicode database
-      class Codepoint
-        attr_accessor :code, :combining_class, :decomp_type, :decomp_mapping, :uppercase_mapping, :lowercase_mapping
-      end
-
       # Holds static data from the Unicode database
       class UnicodeDatabase
         ATTRIBUTES = :codepoints, :composition_exclusion, :composition_map, :boundary, :cp1252
@@ -390,11 +402,3 @@ module Mail
     end
   end
 end
-
-unless defined?(ActiveSupport)
-  module ActiveSupport
-    unless const_defined?(:Multibyte)
-      Multibyte = Mail::Multibyte
-    end
-  end
-end

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

@@ -43,7 +43,7 @@ module Mail
 
     def self.call(path, arguments, destinations, mail)
       popen "#{path} #{arguments}" do |io|
-        io.puts mail.encoded.to_lf
+        io.puts ::Mail::Utilities.to_lf(mail.encoded)
         io.flush
       end
     end

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

@@ -58,7 +58,7 @@ module Mail
 
     def self.call(path, arguments, destinations, encoded_message)
       popen "#{path} #{arguments} #{destinations}" do |io|
-        io.puts encoded_message.to_lf
+        io.puts ::Mail::Utilities.to_lf(encoded_message)
         io.flush
       end
     end

data/lib/mail/parsers/address_lists_parser.rb

@@ -5,7 +5,7 @@ module Mail::Parsers
     def parse(s)
       address_list = AddressListStruct.new([],[])
 
-      if s.blank?
+      if Mail::Utilities.blank?(s)
         return address_list
       end
 

data/lib/mail/parsers/content_disposition_parser.rb

@@ -4,7 +4,7 @@ module Mail::Parsers
 
     def parse(s)
       content_disposition = ContentDispositionStruct.new("", nil)
-      if s.blank?
+      if Mail::Utilities.blank?(s)
         return content_disposition
       end
 

data/lib/mail/parsers/content_location_parser.rb

@@ -2,7 +2,7 @@ module Mail::Parsers
   class ContentLocationParser
     def parse(s)
       content_location = ContentLocationStruct.new(nil)
-      if s.blank?
+      if Mail::Utilities.blank?(s)
         return content_location
       end
 

data/lib/mail/parsers/content_transfer_encoding_parser.rb

@@ -3,7 +3,7 @@ module Mail::Parsers
 
     def parse(s)
       content_transfer_encoding = ContentTransferEncodingStruct.new("")
-      if s.blank?
+      if Mail::Utilities.blank?(s)
         return content_transfer_encoding
       end
 

data/lib/mail/parsers/envelope_from_parser.rb

@@ -2,7 +2,7 @@ module Mail::Parsers
   class EnvelopeFromParser
     def parse(s)
       envelope_from = EnvelopeFromStruct.new
-      if s.blank?
+      if Mail::Utilities.blank?(s)
         return envelope_from
       end
 

data/lib/mail/parsers/message_ids_parser.rb

@@ -1,7 +1,7 @@
 module Mail::Parsers
   class MessageIdsParser
     def parse(s)
-      if s.blank?
+      if Mail::Utilities.blank?(s)
         return MessageIdsStruct.new
       end
 

data/lib/mail/parsers/mime_version_parser.rb

@@ -3,7 +3,7 @@ module Mail::Parsers
     include Mail::Utilities
 
     def parse(s)
-      if s.blank?
+      if Mail::Utilities.blank?(s)
         return MimeVersionStruct.new("", nil)
       end
 

data/lib/mail/part.rb

@@ -34,7 +34,7 @@ module Mail
     end
     
     def inline?
-      header[:content_disposition].disposition_type == 'inline' if header[:content_disposition]
+      header[:content_disposition].disposition_type == 'inline' if header[:content_disposition].respond_to?(:disposition_type)
     end
     
     def add_required_fields
@@ -94,8 +94,10 @@ module Mail
     def get_return_values(key)
       if delivery_status_data[key].is_a?(Array)
         delivery_status_data[key].map { |a| a.value }
-      else
+      elsif !delivery_status_data[key].nil?
         delivery_status_data[key].value
+      else
+        nil
       end
     end
     

data/lib/mail/parts_list.rb

@@ -1,8 +1,27 @@
+require 'delegate'
+
 module Mail
-  class PartsList < Array
+  class PartsList < DelegateClass(Array)
+    attr_reader :parts
+
+    def initialize(*args)
+      @parts = Array.new(*args)
+      super @parts
+    end
+
+    # The #encode_with and #to_yaml methods are just implemented
+    # for the sake of backward compatibility ; the delegator does
+    # not correctly delegate these calls to the delegated object
+    def encode_with(coder) # :nodoc:
+      coder.represent_object(nil, @parts)
+    end
+
+    def to_yaml(options = {}) # :nodoc:
+      @parts.to_yaml(options)
+    end
 
     def attachments
-      Mail::AttachmentsList.new(self)
+      Mail::AttachmentsList.new(@parts)
     end
 
     def collect
@@ -14,8 +33,6 @@ module Mail
         to_a
       end
     end
-
-    undef :map
     alias_method :map, :collect
 
     def map!
@@ -27,20 +44,20 @@ module Mail
     end
 
     def sort
-      self.class.new(super)
+      self.class.new(@parts.sort)
     end
 
     def sort!(order)
       # stable sort should be used to maintain the relative order as the parts are added
       i = 0;
-      sorted = self.sort_by do |a|
+      sorted = @parts.sort_by do |a|
         # OK, 10000 is arbitrary... if anyone actually wants to explicitly sort 10000 parts of a
         # single email message... please show me a use case and I'll put more work into this method,
         # in the meantime, it works :)
         [get_order_value(a, order), i += 1]
       end
-      self.clear
-      sorted.each { |p| self << p }
+      @parts.clear
+      sorted.each { |p| @parts << p }
     end
 
   private

data/lib/mail/utilities.rb

@@ -1,6 +1,10 @@
 # encoding: utf-8
 module Mail
   module Utilities
+
+    LF   = "\n"
+    CRLF = "\r\n"
+
     include Constants
 
     # Returns true if the string supplied is free from characters not allowed as an ATOM
@@ -219,6 +223,38 @@ module Mail
         enum.each_with_index.map(&block)
       end
 
+      def self.to_lf input
+        input.kind_of?(String) ? input.to_str.gsub(/\r\n|\r/, LF) : ''
+      end
+
+      if RUBY_VERSION >= '1.9'
+        # This 1.9 only regex can save a reasonable amount of time (~20%)
+        # by not matching "\r\n" so the string is returned unchanged in
+        # the common case.
+        CRLF_REGEX = Regexp.new("(?<!\r)\n|\r(?!\n)")
+      else
+        CRLF_REGEX = /\n|\r\n|\r/
+      end
+
+      def self.to_crlf input
+        input.kind_of?(String) ? input.to_str.gsub(CRLF_REGEX, CRLF) : ''
+      end
+
+    end
+
+    # Returns true if the object is considered blank.
+    # A blank includes things like '', '   ', nil,
+    # and arrays and hashes that have nothing in them.
+    # 
+    # This logic is mostly shared with ActiveSupport's blank?
+    def self.blank?(value)
+      if value.kind_of?(NilClass)
+        true
+      elsif value.kind_of?(String)
+        value !~ /\S/
+      else
+        value.respond_to?(:empty?) ? value.empty? : !value
+      end
     end
 
   end

data/lib/mail/version.rb

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

data/lib/mail/version_specific/ruby_1_8.rb

@@ -54,11 +54,15 @@ module Mail
       klass.const_get( string )
     end
 
+    def Ruby18.transcode_charset(str, from_encoding, to_encoding = 'UTF-8')
+      Iconv.conv("#{normalize_iconv_charset_encoding(to_encoding)}//IGNORE", normalize_iconv_charset_encoding(from_encoding), 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), fix_encoding(encoding)]
+      [Encodings::Base64.encode(str), normalize_iconv_charset_encoding(encoding)]
     end
 
     def Ruby18.b_value_decode(str)
@@ -66,7 +70,7 @@ module Mail
       if match
         encoding = match[1]
         str = Ruby18.decode_base64(match[2])
-        str = Iconv.conv('UTF-8//IGNORE', fix_encoding(encoding), str)
+        str = transcode_charset(str, encoding)
       end
       str
     end
@@ -86,7 +90,7 @@ module Mail
         # Remove trailing = if it exists in a Q encoding
         string = string.sub(/\=$/, '')
         str = Encodings::QuotedPrintable.decode(string)
-        str = Iconv.conv('UTF-8//IGNORE', fix_encoding(encoding), str)
+        str = transcode_charset(str, encoding)
       end
       str
     end
@@ -103,7 +107,7 @@ module Mail
 
     private
 
-    def Ruby18.fix_encoding(encoding)
+    def Ruby18.normalize_iconv_charset_encoding(encoding)
       case encoding.upcase
       when 'UTF8', 'UTF_8'
         'UTF-8'
@@ -111,6 +115,8 @@ module Mail
         'UTF-16BE'
       when 'UTF32', 'UTF-32'
         'UTF-32BE'
+      when 'KS_C_5601-1987'
+        'CP949'
       else
         encoding
       end

data/lib/mail/version_specific/ruby_1_9.rb

@@ -73,6 +73,10 @@ module Mail
       klass.const_get( string )
     end
 
+    def Ruby19.transcode_charset(str, from_encoding, to_encoding = Encoding::UTF_8)
+      charset_encoder.encode(str.dup, from_encoding).encode(to_encoding, :undef => :replace, :invalid => :replace, :replace => '')
+    end
+
     def Ruby19.b_value_encode(str, encoding = nil)
       encoding = str.encoding.to_s
       [Ruby19.encode_base64(str), encoding]
@@ -140,37 +144,38 @@ module Mail
     #   Encoding.list.map { |e| [e.to_s.upcase == pick_encoding(e.to_s.downcase.gsub("-", "")), e.to_s] }.select {|a,b| !b}
     #   Encoding.list.map { |e| [e.to_s == pick_encoding(e.to_s), e.to_s] }.select {|a,b| !b}
     def Ruby19.pick_encoding(charset)
-      case charset
+      charset = charset.to_s
+      encoding = case charset.downcase
 
       # ISO-8859-8-I etc. http://en.wikipedia.org/wiki/ISO-8859-8-I
-      when /^iso-?8859-(\d+)(-i)?$/i
+      when /^iso[-_]?8859-(\d+)(-i)?$/
         "ISO-8859-#{$1}"
 
       # ISO-8859-15, ISO-2022-JP and alike
-      when /iso-?(\d{4})-?(\w{1,2})/i
+      when /^iso[-_]?(\d{4})-?(\w{1,2})$/
         "ISO-#{$1}-#{$2}"
 
       # "ISO-2022-JP-KDDI"  and alike
-      when /iso-?(\d{4})-?(\w{1,2})-?(\w*)/i
+      when /^iso[-_]?(\d{4})-?(\w{1,2})-?(\w*)$/
         "ISO-#{$1}-#{$2}-#{$3}"
 
       # UTF-8, UTF-32BE and alike
-      when /utf[\-_]?(\d{1,2})?(\w{1,2})/i
+      when /^utf[\-_]?(\d{1,2})?(\w{1,2})$/
         "UTF-#{$1}#{$2}".gsub(/\A(UTF-(?:16|32))\z/, '\\1BE')
 
       # Windows-1252 and alike
-      when /Windows-?(.*)/i
+      when /^windows-?(.*)$/
         "Windows-#{$1}"
 
-      when /^8bit$/
+      when '8bit'
         Encoding::ASCII_8BIT
 
       # alternatives/misspellings of us-ascii seen in the wild
-      when /^iso-?646(-us)?$/i, /us=ascii/i
+      when /^iso[-_]?646(-us)?$/, 'us=ascii'
         Encoding::ASCII
 
       # Microsoft-specific alias for MACROMAN
-      when /^macintosh$/i
+      when 'macintosh'
         Encoding::MACROMAN
 
       # Microsoft-specific alias for CP949 (Korean)
@@ -182,12 +187,36 @@ module Mail
         Encoding::Shift_JIS
 
       # GB2312 (Chinese charset) is a subset of GB18030 (its replacement)
-      when /gb2312/i
+      when 'gb2312'
         Encoding::GB18030
 
+      when 'cp-850'
+        Encoding::CP850
+
+      when 'latin2'
+        Encoding::ISO_8859_2
+
       else
         charset
       end
+
+      convert_to_encoding(encoding)
+    end
+
+    class << self
+      private
+
+      def convert_to_encoding(encoding)
+        if encoding.is_a?(Encoding)
+          encoding
+        else
+          begin
+            Encoding.find(encoding)
+          rescue ArgumentError
+            Encoding::BINARY
+          end
+        end
+      end
     end
   end
 end

data/lib/mail.rb

@@ -6,7 +6,13 @@ module Mail # :doc:
 
   require 'uri'
   require 'net/smtp'
-  require 'mime/types'
+
+  begin
+    # Use mime/types/columnar if available, for reduced memory usage
+    require 'mime/types/columnar'
+  rescue LoadError
+    require 'mime/types'
+  end
 
   if RUBY_VERSION <= '1.8.6'
     begin
@@ -26,8 +32,6 @@ module Mail # :doc:
 
   require 'mail/version'
 
-  require 'mail/core_extensions/nil'
-  require 'mail/core_extensions/object'
   require 'mail/core_extensions/string'
   require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
   require 'mail/indifferent_hash'
@@ -86,6 +90,7 @@ module Mail # :doc:
   require 'mail/encodings/unix_to_unix'
 
   require 'mail/matchers/has_sent_mail'
+  require 'mail/matchers/attachment_matchers.rb'
 
   # Finally... require all the Mail.methods
   require 'mail/mail'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4.rc2
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -19,7 +19,7 @@ dependencies:
         version: '1.16'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.16'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -110,8 +110,6 @@ files:
 - lib/mail/check_delivery_params.rb
 - lib/mail/configuration.rb
 - lib/mail/constants.rb
-- lib/mail/core_extensions/nil.rb
-- lib/mail/core_extensions/object.rb
 - lib/mail/core_extensions/smtp.rb
 - lib/mail/core_extensions/string.rb
 - lib/mail/core_extensions/string/access.rb
@@ -182,6 +180,7 @@ files:
 - lib/mail/header.rb
 - lib/mail/indifferent_hash.rb
 - lib/mail/mail.rb
+- lib/mail/matchers/attachment_matchers.rb
 - lib/mail/matchers/has_sent_mail.rb
 - lib/mail/message.rb
 - lib/mail/multibyte.rb
@@ -265,12 +264,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.

data/lib/mail/core_extensions/nil.rb

@@ -1,19 +0,0 @@
-# encoding: utf-8
-
-# This is not loaded if ActiveSupport is already loaded
-
-class NilClass #:nodoc:
-  unless nil.respond_to? :blank?
-    def blank?
-      true
-    end
-  end
-
-  def to_crlf
-    ''
-  end
-
-  def to_lf
-    ''
-  end
-end

data/lib/mail/core_extensions/object.rb

@@ -1,13 +0,0 @@
-# encoding: utf-8
-
-unless Object.method_defined? :blank?
-  class Object
-    def blank?
-      if respond_to?(:empty?)
-        empty?
-      else
-        !self
-      end
-    end
-  end
-end