mail 2.6.6 → 2.7.0.rc1

data/lib/mail/version_specific/ruby_1_8.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'net/imap' # for decode_utf7
 
 module Mail
   class Ruby18
@@ -56,7 +57,27 @@ module Mail
     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)
+      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)
@@ -97,7 +118,12 @@ module Mail
     end
 
     def Ruby18.param_decode(str, encoding)
-      URI.unescape(str)
+      str = URI.unescape(str)
+      if encoding
+        transcode_charset(str, encoding)
+      else
+        str
+      end
     end
 
     def Ruby18.param_encode(str)

data/lib/mail/version_specific/ruby_1_9.rb

@@ -5,13 +5,23 @@ module Mail
   class Ruby19
     class StrictCharsetEncoder
       def encode(string, charset)
-        string.force_encoding(Mail::Ruby19.pick_encoding(charset))
+        case charset
+        when /utf-?7/i
+          Mail::Ruby19.decode_utf7(string)
+        else
+          string.force_encoding(Mail::Ruby19.pick_encoding(charset))
+        end
       end
     end
 
     class BestEffortCharsetEncoder
       def encode(string, charset)
-        string.force_encoding(pick_encoding(charset))
+        case charset
+        when /utf-?7/i
+          Mail::Ruby19.decode_utf7(string)
+        else
+          string.force_encoding(pick_encoding(charset))
+        end
       end
 
       private
@@ -78,7 +88,31 @@ module Mail
     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 => '')
+      to_encoding = Encoding.find(to_encoding)
+      replacement_char = to_encoding == Encoding::UTF_8 ? '�' : '?'
+      charset_encoder.encode(str.dup, from_encoding).encode(to_encoding, :undef => :replace, :invalid => :replace, :replace => replacement_char)
+    end
+
+    # From Ruby stdlib Net::IMAP
+    def Ruby19.encode_utf7(string)
+      string.gsub(/(&)|[^\x20-\x7e]+/) do
+        if $1
+          "&-"
+        else
+          base64 = [$&.encode(Encoding::UTF_16BE)].pack("m0")
+          "&" + base64.delete("=").tr("/", ",") + "-"
+        end
+      end.force_encoding(Encoding::ASCII_8BIT)
+    end
+
+    def Ruby19.decode_utf7(utf7)
+      utf7.gsub(/&([^-]+)?-/n) do
+        if $1
+          ($1.tr(",", "/") + "===").unpack("m")[0].encode(Encoding::UTF_8, Encoding::UTF_16BE)
+        else
+          "&"
+        end
+      end
     end
 
     def Ruby19.b_value_encode(str, encoding = nil)
@@ -93,8 +127,7 @@ module Mail
         str = Ruby19.decode_base64(match[2])
         str = charset_encoder.encode(str, charset)
       end
-      decoded = str.encode(Encoding::UTF_8, :invalid => :replace, :replace => "")
-      decoded.valid_encoding? ? decoded : decoded.encode(Encoding::UTF_16LE, :invalid => :replace, :replace => "").encode(Encoding::UTF_8)
+      transcode_to_scrubbed_utf8(str)
     rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
       warn "Encoding conversion failed #{$!}"
       str.dup.force_encoding(Encoding::UTF_8)
@@ -118,8 +151,7 @@ module Mail
         # jruby/jruby#829 which subtly changes String#encode semantics.
         str.force_encoding(Encoding::UTF_8) if str.encoding == Encoding::ASCII_8BIT
       end
-      decoded = str.encode(Encoding::UTF_8, :invalid => :replace, :replace => "")
-      decoded.valid_encoding? ? decoded : decoded.encode(Encoding::UTF_16LE, :invalid => :replace, :replace => "").encode(Encoding::UTF_8)
+      transcode_to_scrubbed_utf8(str)
     rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
       warn "Encoding conversion failed #{$!}"
       str.dup.force_encoding(Encoding::UTF_8)
@@ -128,7 +160,10 @@ module Mail
     def Ruby19.param_decode(str, encoding)
       str = uri_parser.unescape(str)
       str = charset_encoder.encode(str, encoding) if encoding
-      str
+      transcode_to_scrubbed_utf8(str)
+    rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
+      warn "Encoding conversion failed #{$!}"
+      str.dup.force_encoding(Encoding::UTF_8)
     end
 
     def Ruby19.param_encode(str)
@@ -221,6 +256,11 @@ module Mail
           end
         end
       end
+
+      def transcode_to_scrubbed_utf8(str)
+        decoded = str.encode(Encoding::UTF_8, :undef => :replace, :invalid => :replace, :replace => "�")
+        decoded.valid_encoding? ? decoded : decoded.encode(Encoding::UTF_16LE, :invalid => :replace, :replace => "�").encode(Encoding::UTF_8)
+      end
     end
   end
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.7.0.rc1
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: mini_mime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,8 +106,6 @@ files:
 - lib/mail/constants.rb
 - lib/mail/core_extensions/smtp.rb
 - lib/mail/core_extensions/string.rb
-- lib/mail/core_extensions/string/access.rb
-- lib/mail/core_extensions/string/multibyte.rb
 - lib/mail/elements.rb
 - lib/mail/elements/address.rb
 - lib/mail/elements/address_list.rb
@@ -201,45 +193,36 @@ files:
 - lib/mail/network/retriever_methods/test_retriever.rb
 - lib/mail/parsers.rb
 - lib/mail/parsers/address_lists_parser.rb
+- lib/mail/parsers/address_lists_parser.rl
 - lib/mail/parsers/content_disposition_parser.rb
+- lib/mail/parsers/content_disposition_parser.rl
 - lib/mail/parsers/content_location_parser.rb
+- lib/mail/parsers/content_location_parser.rl
 - lib/mail/parsers/content_transfer_encoding_parser.rb
+- lib/mail/parsers/content_transfer_encoding_parser.rl
 - lib/mail/parsers/content_type_parser.rb
+- lib/mail/parsers/content_type_parser.rl
 - lib/mail/parsers/date_time_parser.rb
+- lib/mail/parsers/date_time_parser.rl
 - lib/mail/parsers/envelope_from_parser.rb
+- lib/mail/parsers/envelope_from_parser.rl
 - lib/mail/parsers/message_ids_parser.rb
+- lib/mail/parsers/message_ids_parser.rl
 - lib/mail/parsers/mime_version_parser.rb
+- lib/mail/parsers/mime_version_parser.rl
 - lib/mail/parsers/phrase_lists_parser.rb
-- lib/mail/parsers/ragel.rb
-- lib/mail/parsers/ragel/common.rl
-- lib/mail/parsers/ragel/date_time.rl
-- lib/mail/parsers/ragel/parser_info.rb
-- lib/mail/parsers/ragel/ruby.rb
-- lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/machines/rb_actions.rl
-- lib/mail/parsers/ragel/ruby/machines/received_machine.rb
-- lib/mail/parsers/ragel/ruby/machines/received_machine.rb.rl
-- lib/mail/parsers/ragel/ruby/parser.rb.rl.erb
+- lib/mail/parsers/phrase_lists_parser.rl
 - lib/mail/parsers/received_parser.rb
+- lib/mail/parsers/received_parser.rl
+- lib/mail/parsers/rfc2045_content_transfer_encoding.rl
+- lib/mail/parsers/rfc2045_content_type.rl
+- lib/mail/parsers/rfc2045_mime.rl
+- lib/mail/parsers/rfc2183_content_disposition.rl
+- lib/mail/parsers/rfc5234_abnf_core_rules.rl
+- lib/mail/parsers/rfc5322.rl
+- lib/mail/parsers/rfc5322_address.rl
+- lib/mail/parsers/rfc5322_date_time.rl
+- lib/mail/parsers/rfc5322_lexical_tokens.rl
 - lib/mail/part.rb
 - lib/mail/parts_list.rb
 - lib/mail/utilities.rb
@@ -264,12 +247,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.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.

data/lib/mail/core_extensions/string/access.rb

@@ -1,146 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-# This is not loaded if ActiveSupport is already loaded
-
-# This is an almost cut and paste from ActiveSupport v3.0.6, copied in here so that Mail
-# itself does not depend on ActiveSupport to avoid versioning conflicts
-
-class String
-  unless '1.9'.respond_to?(:force_encoding)
-    # Returns the character at the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".at(0)  # => "h"
-    #   "hello".at(4)  # => "o"
-    #   "hello".at(10) # => ERROR if < 1.9, nil in 1.9
-    def at(position)
-      mb_chars[position, 1].to_s
-    end
-
-    # Returns the remaining of the string from the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".from(0)  # => "hello"
-    #   "hello".from(2)  # => "llo"
-    #   "hello".from(10) # => "" if < 1.9, nil in 1.9
-    def from(position)
-      mb_chars[position..-1].to_s
-    end
-
-    # Returns the beginning of the string up to the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".to(0)  # => "h"
-    #   "hello".to(2)  # => "hel"
-    #   "hello".to(10) # => "hello"
-    def to(position)
-      mb_chars[0..position].to_s
-    end
-
-    # Returns the first character of the string or the first +limit+ characters.
-    #
-    # Examples:
-    #   "hello".first     # => "h"
-    #   "hello".first(2)  # => "he"
-    #   "hello".first(10) # => "hello"
-    def first(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        mb_chars[0...limit].to_s
-      end
-    end
-
-    # Returns the last character of the string or the last +limit+ characters.
-    #
-    # Examples:
-    #   "hello".last     # => "o"
-    #   "hello".last(2)  # => "lo"
-    #   "hello".last(10) # => "hello"
-    def last(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        mb_chars[(-limit)..-1].to_s
-      end
-    end
-  else
-    def at(position)
-      self[position]
-    end
-
-    def from(position)
-      self[position..-1]
-    end
-
-    def to(position)
-      self[0..position]
-    end
-
-    def first(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        to(limit - 1)
-      end
-    end
-
-    def last(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        from(-limit)
-      end
-    end
-  end
-
-  if Module.method(:const_get).arity == 1
-    # Tries to find a constant with the name specified in the argument string:
-    #
-    #   "Module".constantize     # => Module
-    #   "Test::Unit".constantize # => Test::Unit
-    #
-    # The name is assumed to be the one of a top-level constant, no matter whether
-    # it starts with "::" or not. No lexical context is taken into account:
-    #
-    #   C = 'outside'
-    #   module M
-    #     C = 'inside'
-    #     C               # => 'inside'
-    #     "C".constantize # => 'outside', same as ::C
-    #   end
-    #
-    # NameError is raised when the name is not in CamelCase or the constant is
-    # unknown.
-    def constantize
-      names = self.split('::')
-      names.shift if names.empty? || names.first.empty?
-
-      constant = Object
-      names.each do |name|
-        constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-      end
-      constant
-    end
-  else
-    def constantize #:nodoc:
-      names = self.split('::')
-      names.shift if names.empty? || names.first.empty?
-
-      constant = Object
-      names.each do |name|
-        constant = constant.const_defined?(name, false) ? constant.const_get(name) : constant.const_missing(name)
-      end
-      constant
-    end
-  end
-end

data/lib/mail/core_extensions/string/multibyte.rb

@@ -1,79 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-# This is not loaded if ActiveSupport is already loaded
-
-# This is an almost cut and paste from ActiveSupport v3.0.6, copied in here so that Mail
-# itself does not depend on ActiveSupport to avoid versioning conflicts
-
-require 'mail/multibyte'
-
-class String
-  if RUBY_VERSION >= "1.9"
-    # == Multibyte proxy
-    #
-    # +mb_chars+ is a multibyte safe proxy for string methods.
-    #
-    # In Ruby 1.8 and older it creates and returns an instance of the Mail::Multibyte::Chars class which
-    # encapsulates the original string. A Unicode safe version of all the String methods are defined on this proxy
-    # class. If the proxy class doesn't respond to a certain method, it's forwarded to the encapsuled string.
-    #
-    #   name = 'Claus Müller'
-    #   name.reverse # => "rell??M sualC"
-    #   name.length  # => 13
-    #
-    #   name.mb_chars.reverse.to_s # => "rellüM sualC"
-    #   name.mb_chars.length       # => 12
-    #
-    # In Ruby 1.9 and newer +mb_chars+ returns +self+ because String is (mostly) encoding aware. This means that
-    # it becomes easy to run one version of your code on multiple Ruby versions.
-    #
-    # == Method chaining
-    #
-    # All the methods on the Chars proxy which normally return a string will return a Chars object. This allows
-    # method chaining on the result of any of these methods.
-    #
-    #   name.mb_chars.reverse.length # => 12
-    #
-    # == Interoperability and configuration
-    #
-    # The Chars object tries to be as interchangeable with String objects as possible: sorting and comparing between
-    # String and Char work like expected. The bang! methods change the internal string representation in the Chars
-    # object. Interoperability problems can be resolved easily with a +to_s+ call.
-    #
-    # For more information about the methods defined on the Chars proxy see Mail::Multibyte::Chars. For
-    # information about how to change the default Multibyte behaviour see Mail::Multibyte.
-    def mb_chars
-      if Mail::Multibyte.proxy_class.consumes?(self)
-        Mail::Multibyte.proxy_class.new(self)
-      else
-        self
-      end
-    end
-
-    def is_utf8? #:nodoc
-      case encoding
-      when Encoding::UTF_8
-        valid_encoding?
-      when Encoding::ASCII_8BIT, Encoding::US_ASCII
-        dup.force_encoding(Encoding::UTF_8).valid_encoding?
-      else
-        false
-      end
-    end
-  else
-    def mb_chars
-      if Mail::Multibyte.proxy_class.wants?(self)
-        Mail::Multibyte.proxy_class.new(self)
-      else
-        self
-      end
-    end
-
-    # Returns true if the string has UTF-8 semantics (a String used for purely byte resources is unlikely to have
-    # them), returns false otherwise.
-    def is_utf8?
-      Mail::Multibyte::Chars.consumes?(self)
-    end
-  end
-end