mail 2.4.4 → 2.5.5

data/lib/mail/version_specific/ruby_1_9.rb

@@ -51,9 +51,9 @@ module Mail
     def Ruby19.b_value_decode(str)
       match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
       if match
-        encoding = match[1]
+        charset = match[1]
         str = Ruby19.decode_base64(match[2])
-        str.force_encoding(fix_encoding(encoding))
+        str.force_encoding(pick_encoding(charset))
       end
       decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
       decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
@@ -67,12 +67,20 @@ module Mail
     def Ruby19.q_value_decode(str)
       match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
       if match
-        encoding = match[1]
-        str = Encodings::QuotedPrintable.decode(match[2].gsub(/_/, '=20'))
-        str.force_encoding(fix_encoding(encoding))
+        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.force_encoding(pick_encoding(charset))
+        # We assume that binary strings hold utf-8 directly to work around
+        # jruby/jruby#829 which subtly changes String#encode semantics.
+        str.force_encoding('utf-8') if str.encoding == Encoding::ASCII_8BIT
       end
       decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
       decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
+    rescue Encoding::UndefinedConversionError
+      str.dup.force_encoding("utf-8")
     end
 
     def Ruby19.param_decode(str, encoding)
@@ -91,22 +99,48 @@ module Mail
       @uri_parser ||= URI::Parser.new
     end
 
-     # mails somtimes includes invalid encodings like iso885915 or utf8 so we transform them to iso885915 or utf8
-     # TODO: add this as a test somewhere
-     # Encoding.list.map{|e| [e.to_s.upcase==fix_encoding(e.to_s.downcase.gsub("-", "")), e.to_s] }.select {|a,b| !b}
-     #  Encoding.list.map{|e| [e.to_s==fix_encoding(e.to_s), e.to_s] }.select {|a,b| !b}
-    def Ruby19.fix_encoding(encoding)
-      case encoding
-        # ISO-8859-15, ISO-2022-JP and alike
-        when /iso-?(\d{4})-?(\w{1,2})/i then return "ISO-#{$1}-#{$2}"
-        # "ISO-2022-JP-KDDI"  and alike
-        when /iso-?(\d{4})-?(\w{1,2})-?(\w*)/i then return "ISO-#{$1}-#{$2}-#{$3}"
-        # UTF-8, UTF-32BE and alike
-        when /utf-?(\d{1,2})?(\w{1,2})/i then return "UTF-#{$1}#{$2}".gsub(/\A(UTF-(?:16|32))\z/, '\\1BE')
-        # Windows-1252 and alike
-        when /Windows-?(.*)/i then return "Windows-#{$1}"
-        #more aliases to be added if needed
-        else return encoding
+    # Pick a Ruby encoding corresponding to the message charset. Most
+    # charsets have a Ruby encoding, but some need manual aliasing here.
+    #
+    # TODO: add this as a test somewhere:
+    #   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
+
+      # ISO-8859-15, ISO-2022-JP and alike
+      when /iso-?(\d{4})-?(\w{1,2})/i
+        "ISO-#{$1}-#{$2}"
+
+      # "ISO-2022-JP-KDDI"  and alike
+      when /iso-?(\d{4})-?(\w{1,2})-?(\w*)/i
+        "ISO-#{$1}-#{$2}-#{$3}"
+
+      # UTF-8, UTF-32BE and alike
+      when /utf-?(\d{1,2})?(\w{1,2})/i
+        "UTF-#{$1}#{$2}".gsub(/\A(UTF-(?:16|32))\z/, '\\1BE')
+
+      # Windows-1252 and alike
+      when /Windows-?(.*)/i
+        "Windows-#{$1}"
+
+      when /^8bit$/
+        Encoding::ASCII_8BIT
+
+      # Microsoft-specific alias for CP949 (Korean)
+      when 'ks_c_5601-1987'
+        Encoding::CP949
+
+      # Wrongly written Shift_JIS (Japanese)
+      when 'shift-jis'
+        Encoding::Shift_JIS
+
+      # GB2312 (Chinese charset) is a subset of GB18030 (its replacement)
+      when /gb2312/i
+        Encoding::GB18030
+
+      else
+        charset
       end
     end
   end

data/lib/mail.rb

@@ -29,7 +29,6 @@ module Mail # :doc:
   require 'mail/core_extensions/nil'
   require 'mail/core_extensions/object'
   require 'mail/core_extensions/string'
-  require 'mail/core_extensions/shell_escape'
   require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
   require 'mail/indifferent_hash'
 
@@ -46,6 +45,23 @@ module Mail # :doc:
   require 'mail/utilities'
   require 'mail/configuration'
 
+  @@autoloads = {}
+  def self.register_autoload(name, path)
+    @@autoloads[name] = path
+    autoload(name, path)
+  end
+
+  # This runs through the autoload list and explictly requires them for you.
+  # Useful when running mail in a threaded process.
+  #
+  # Usage:
+  #
+  #   require 'mail'
+  #   Mail.eager_autoload!
+  def self.eager_autoload!
+    @@autoloads.each { |_,path| require(path) }
+  end
+
   # Autoload mail send and receive classes.
   require 'mail/network'
 
@@ -60,23 +76,7 @@ module Mail # :doc:
 
   require 'mail/envelope'
 
-  parsers = %w[ rfc2822_obsolete rfc2822 address_lists phrase_lists
-                date_time received message_ids envelope_from rfc2045
-                mime_version content_type content_disposition
-                content_transfer_encoding content_location ]
-
-  parsers.each do |parser|
-    begin
-      # Try requiring the pre-compiled ruby version first
-      require 'treetop/runtime'
-      require "mail/parsers/#{parser}"
-    rescue LoadError
-      # Otherwise, get treetop to compile and load it
-      require 'treetop/runtime'
-      require 'treetop/compiler'
-      Treetop.load(File.join(File.dirname(__FILE__)) + "/mail/parsers/#{parser}")
-    end
-  end
+  require 'load_parsers'
 
   # Autoload header field elements and transfer encodings.
   require 'mail/elements'

metadata

@@ -1,49 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.4.4
-  prerelease: 
+  version: 2.5.5
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70305676450460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70305676450460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &70305676449980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *70305676449980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.8
 - !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &70305676449520 !ruby/object:Gem::Requirement
-    none: false
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
+        version: 1.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
   prerelease: false
-  version_requirements: *70305676449520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  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'
 description: A really Ruby Mail handler.
 email: raasdnil@gmail.com
 executables: []
@@ -54,24 +104,28 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - TODO.rdoc
 files:
-- README.md
-- CONTRIBUTING.md
 - CHANGELOG.rdoc
+- CONTRIBUTING.md
 - Dependencies.txt
 - Gemfile
-- Gemfile.lock
+- MIT-LICENSE
+- README.md
 - Rakefile
 - TODO.rdoc
+- lib/VERSION
+- lib/load_parsers.rb
+- lib/mail.rb
 - lib/mail/attachments_list.rb
 - lib/mail/body.rb
+- lib/mail/check_delivery_params.rb
 - lib/mail/configuration.rb
 - lib/mail/core_extensions/nil.rb
 - lib/mail/core_extensions/object.rb
-- lib/mail/core_extensions/shell_escape.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/core_extensions/string.rb
+- lib/mail/elements.rb
 - lib/mail/elements/address.rb
 - lib/mail/elements/address_list.rb
 - lib/mail/elements/content_disposition_element.rb
@@ -84,17 +138,17 @@ files:
 - lib/mail/elements/mime_version_element.rb
 - lib/mail/elements/phrase_list.rb
 - lib/mail/elements/received_element.rb
-- lib/mail/elements.rb
+- lib/mail/encodings.rb
 - lib/mail/encodings/7bit.rb
 - lib/mail/encodings/8bit.rb
 - lib/mail/encodings/base64.rb
 - lib/mail/encodings/binary.rb
 - lib/mail/encodings/quoted_printable.rb
 - lib/mail/encodings/transfer_encoding.rb
-- lib/mail/encodings.rb
 - lib/mail/envelope.rb
 - lib/mail/field.rb
 - lib/mail/field_list.rb
+- lib/mail/fields.rb
 - lib/mail/fields/bcc_field.rb
 - lib/mail/fields/cc_field.rb
 - lib/mail/fields/comments_field.rb
@@ -133,17 +187,17 @@ files:
 - lib/mail/fields/subject_field.rb
 - lib/mail/fields/to_field.rb
 - lib/mail/fields/unstructured_field.rb
-- lib/mail/fields.rb
 - lib/mail/header.rb
 - lib/mail/indifferent_hash.rb
 - lib/mail/mail.rb
 - lib/mail/matchers/has_sent_mail.rb
 - lib/mail/message.rb
+- lib/mail/multibyte.rb
 - lib/mail/multibyte/chars.rb
 - lib/mail/multibyte/exceptions.rb
 - lib/mail/multibyte/unicode.rb
 - lib/mail/multibyte/utils.rb
-- lib/mail/multibyte.rb
+- lib/mail/network.rb
 - lib/mail/network/delivery_methods/exim.rb
 - lib/mail/network/delivery_methods/file_delivery.rb
 - lib/mail/network/delivery_methods/sendmail.rb
@@ -154,7 +208,6 @@ files:
 - lib/mail/network/retriever_methods/imap.rb
 - lib/mail/network/retriever_methods/pop3.rb
 - lib/mail/network/retriever_methods/test_retriever.rb
-- lib/mail/network.rb
 - lib/mail/parsers/address_lists.rb
 - lib/mail/parsers/address_lists.treetop
 - lib/mail/parsers/content_disposition.rb
@@ -187,35 +240,34 @@ files:
 - lib/mail/parts_list.rb
 - lib/mail/patterns.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.rb
 - lib/tasks/corpus.rake
 - lib/tasks/treetop.rake
-- lib/VERSION
 homepage: http://github.com/mikel/mail
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.
 test_files: []

data/Gemfile.lock

@@ -1,36 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.6)
-    bouncy-castle-java (1.5.0146.1)
-    diff-lcs (1.1.3)
-    i18n (0.5.0)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
-    mime-types (1.16)
-    polyglot (0.3.3)
-    rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 2.3.6)
-  i18n (>= 0.4.0)
-  jruby-openssl
-  mime-types (~> 1.16)
-  rake (> 0.8.7)
-  rspec (~> 2.8.0)
-  treetop (~> 1.4.10)

data/lib/mail/core_extensions/shell_escape.rb

@@ -1,56 +0,0 @@
-# encoding: utf-8
-
-# The following is an adaptation of ruby 1.9.2's shellwords.rb file,
-# it is modified to include '+' in the allowed list to allow for
-# sendmail to accept email addresses as the sender with a + in them
-#
-module Mail
-  module ShellEscape
-    # Escapes a string so that it can be safely used in a Bourne shell
-    # command line.
-    #
-    # Note that a resulted string should be used unquoted and is not
-    # intended for use in double quotes nor in single quotes.
-    #
-    #   open("| grep #{Shellwords.escape(pattern)} file") { |pipe|
-    #     # ...
-    #   }
-    #
-    # +String#shellescape+ is a shorthand for this function.
-    #
-    #   open("| grep #{pattern.shellescape} file") { |pipe|
-    #     # ...
-    #   }
-    #
-    def escape_for_shell(str)
-      # An empty argument will be skipped, so return empty quotes.
-      return "''" if str.empty?
-
-      str = str.dup
-
-      # Process as a single byte sequence because not all shell
-      # implementations are multibyte aware.
-      str.gsub!(/([^A-Za-z0-9_\s\+\-.,:\/@\n])/n, "\\\\\\1")
-
-      # A LF cannot be escaped with a backslash because a backslash + LF
-      # combo is regarded as line continuation and simply ignored.
-      str.gsub!(/\n/, "'\n'")
-
-      return str
-    end
-
-    module_function :escape_for_shell
-  end
-end
-
-class String
-  # call-seq:
-  #   str.shellescape => string
-  #
-  # Escapes +str+ so that it can be safely used in a Bourne shell
-  # command line.  See +Shellwords::shellescape+ for details.
-  #
-  def escape_for_shell
-    Mail::ShellEscape.escape_for_shell(self)
-  end
-end