mail 2.6.6 → 2.7.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fffa789ce57e01eb58d470854eef55242eae6f9c
-  data.tar.gz: fa95a3e43e7c7b80972dd81989688ed00ef5e22c
+  metadata.gz: 93c47855c2c3b7c479ab1b3bfc7814fec87708c4
+  data.tar.gz: 7fd451474a8d296b33732d0db9184945a31d4061
 SHA512:
-  metadata.gz: '06621968e5681c087041b046f1f52cb7316116bedf04e38ab4255118249142488f768fba638c6fc2b99eb69d15a6d84823383f073f33bc8b05a6b3be635417d7'
-  data.tar.gz: f890a870876c79ca6014c8cccc84af35834cfc79576a2032aeef5a6f34ff183661e5fd73796b4693de53c1a288059e7733e359e7f0252548fe8c49e657f5bc7f
+  metadata.gz: 505cbad915ae907563530b378162b0850510f973f4ec7a5d9867ecf582900fb45dfa725c8682f2b9e1848a9cdb3497a1c313178f2fdb81c1909f63adc24bf736
+  data.tar.gz: 0ad2330236098fa81cac6675c17144f6b072b43d8908e57d884f833472817511ec4e7764e9bc5c7aac490e2a76680ff0c6b1bbdf95a6ec478d319b16b76686ba

data/CHANGELOG.rdoc

@@ -1,20 +1,39 @@
-== Version 2.6.6 - 2017-06-09 Jeremy Daer <jeremydaer@gmail.com>
+== HEAD
 
 Security:
 * #1097 – SMTP security: prevent command injection via To/From addresses. (jeremy)
 
-Bugs:
-* #689 - Fix Exim delivery method broken by #477 in 2.5.4. (jethrogb)
-
-== Version 2.6.5 - 2017-04-26 Jeremy Daer <jeremydaer@gmail.com>
-
 Features:
+* #804 - Configurable SMTP open_timeout and read_timeout. (ankane)
+* #853 - `Mail::Message#set_sort_order` overrides the default message part sort order. (rafbm)
+* #650 - UTF-7 charset support. (johngrimes)
+* #1065 - Require STARTTLS using :enable_starttls. (bk2204)
+* #1002 - Transcoding replaces invalid chars with "�" instead of discarding them. (kjg)
 * #1053 - Ruby 2.4.0 compatibility. Fixnum+Bignum unified as Integer. (peterkovacs)
+* #1094 - Core extensions removal: Drop `String#at`, `from`, `last` and `is_utf8?` since they are no longer used by Mail internals. (metcalf)
+* #1095 - Core extensions removal: Drop `String#mb_chars`, `not_ascii_only?`, `constantize`, `first`, `to` to avoid monkey patching the standard library. (metcalf)
+
+Performance:
+* #1059 - Switch from mime-types to mini_mime for a much smaller memory footprint. (SamSaffron)
+
+Compatibility:
+* #464 - Improve attachment filename detection by preferring Content-Disposition filename. (lawrencepit)
+* #655 - Sort attachments to the end of the parts list to work around email clients that may mistake a text attachment for the message body. (npickens)
+* #982 – Faithfully preserve unfolded whitespace rather than collapsing to a single space. (jeremy)
 
 Bugs:
+* #539 - Fix that whitespace-only continued headers would be incorrectly parsed as the break between headers and body. (ConradIrwin)
 * #605 - Fix Mail::Address#name for nil addresses (peterkovacs)
+* #876 - Strip valid RFC-1342 separator characters between non-matching encoded-words (Caleb W. Corliss)
+* #978 - Fix for invalid chars being left in a string for invalid b_value from encoding. (kjg)
+* #996 - Fix that multipart/mixed emails with a delivery-status part could be interpreted as bounces. (kjg)
+* #998 - Fix header parameter parsing (such as attachment names) for values encoded with a blank charset or language code. (kjg)
+* #1000 - Fix header parameter parsing (such as attachment names) to transcode to UTF-8 (kjg)
 * #1003 - Fix decoding some b encoded headers on specific rubies that don't account for lack of base64 padding (kjg)
+* #1020 - Don't set SMTP verify mode to nil when config was not provided. (jhass)
 * #1023 - Fix double-quoting in display names. (garethrees)
+* #1032 - Fix that comparing messages changed their raw Message-ID to their parsed message_id. (bobjflong)
+* #1074 - Fix that the first address in a list is dropped when a subsequent address has non-US-ASCII characters. (domininik)
 
 == Version 2.6.4 - Wed Mar 23 08:16 -0700 2016 Jeremy Daer <jeremydaer@gmail.com>
 

data/Dependencies.txt

@@ -1,2 +1 @@
 tlsmail: if ruby < 1.8.6... we could make it optional, or embed it in Mail
-mime/types: I think we embed a simplified version, or help maintain it, it is old (2006)

data/Gemfile

@@ -4,11 +4,8 @@ gemspec
 
 gem 'tlsmail', '~> 0.0.1' if RUBY_VERSION <= '1.8.6'
 gem 'jruby-openssl', :platforms => :jruby
-gem 'rake', '< 11.0', :platforms => :ruby_18
-gem 'rdoc', '< 4.3', :platforms => [ :ruby_18, :ruby_19 ]
-gem 'mime-types', '< 2.0', :platforms => [ :ruby_18, :ruby_19 ]
-
-# For gems not required to run tests
-group :local_development, :test do
-  gem 'appraisal', '~> 1.0' unless RUBY_VERSION < '1.9'
-end
+
+gem 'rake', '< 11.0' if RUBY_VERSION < '1.9.3'
+gem 'rdoc', '< 4.3' if RUBY_VERSION < '2.0'
+
+gem 'mini_mime', :github => 'discourse/mini_mime'

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2017 Mikel Lindsaar
+Copyright (c) 2009-2016 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -42,14 +42,26 @@ me a nice email :)
 Compatibility
 -------------
 
-Mail supports Ruby 1.8.7+, including JRuby and Rubinius.
-
-Every Mail commit is tested by Travis on [all supported Ruby versions](https://github.com/mikel/mail/blob/master/.travis.yml).
-
-Testing a specific version of mime-types (needed for Ruby 1.8.7, for example) can be done manually with:
+Every Mail commit is tested by Travis on the [following platforms](https://github.com/mikel/mail/blob/master/.travis.yml)
+
+* ruby-1.8.7 [ i686 ]
+* ruby-1.9.2 [ x86_64 ]
+* ruby-1.9.3 [ x86_64 ]
+* ruby-2.0.0 [ x86_64 ]
+* ruby-2.1.10 [ x86_64 ]
+* ruby-2.2.6 [ x86_64 ]
+* ruby-2.3.3 [ x86_64 ]
+* ruby-2.4.0 [ x86_64 ]
+* ruby-head [ x86_64 ]
+* jruby [ x86_64 ]
+* jruby-9.1.6.0 [ x86_64 ]
+* jruby-head [ x86_64 ]
+* rbx-2 [ x86_64 ]
+
+Testing a specific mime type (needed for 1.8.7 for example) can be done manually with:
 
 ```sh
-BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile bundle && rake
+BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile (bundle check || bundle) && rake
 ```
 
 Discussion
@@ -226,7 +238,7 @@ what you are doing.
 ### Sending an email:
 
 Mail defaults to sending via SMTP to local host port 25.  If you have a
-sendmail or postfix daemon running on on this port, sending email is as
+sendmail or postfix daemon running on this port, sending email is as
 easy as:
 
 ```ruby
@@ -339,7 +351,7 @@ mail.cc              #=> 'sam@test.lindsaar.net'
 mail.subject         #=> "This is the subject"
 mail.date.to_s       #=> '21 Nov 1997 09:55:06 -0600'
 mail.message_id      #=> '<4D6AA7EB.6490534@xxx.xxx>'
-mail.body.decoded    #=> 'This is the body of the email...
+mail.decoded         #=> 'This is the body of the email...
 ```
 
 Many more methods available.
@@ -374,7 +386,7 @@ mail.attachments.each do | attachment |
     # extracting images for example...
     filename = attachment.filename
     begin
-      File.open(images_dir + filename, "w+b", 0644) {|f| f.write attachment.body.decoded}
+      File.open(images_dir + filename, "w+b", 0644) {|f| f.write attachment.decoded}
     rescue => e
       puts "Unable to save data for #{filename} because #{e.message}"
     end
@@ -519,7 +531,6 @@ than mail (this should be rarely needed)
 
 ```ruby
 @mail = Mail.new
-file_data = File.read('path/to/myfile.pdf')
 @mail.attachments['myfile.pdf'] = { :mime_type => 'application/x-pdf',
                                     :content => File.read('path/to/myfile.pdf') }
 @mail.parts.first.mime_type #=> 'application/x-pdf'
@@ -689,7 +700,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2017 Mikel Lindsaar
+Copyright (c) 2009-2016 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -19,11 +19,5 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w(--backtrace --color)
 end
 
-begin
-  require "appraisal"
-rescue LoadError, SyntaxError
-  warn "Appraisal is only available in test/development on Ruby 1.9+"
-end
-
 # load custom rake tasks
 Dir["#{File.dirname(__FILE__)}/tasks/**/*.rake"].sort.each { |ext| load ext }

data/lib/mail.rb

@@ -7,13 +7,7 @@ module Mail # :doc:
 
   require 'uri'
   require 'net/smtp'
-
-  begin
-    # Use mime/types/columnar if available, for reduced memory usage
-    require 'mime/types/columnar'
-  rescue LoadError
-    require 'mime/types'
-  end
+  require 'mini_mime'
 
   if RUBY_VERSION <= '1.8.6'
     begin
@@ -34,15 +28,13 @@ module Mail # :doc:
   require 'mail/version'
 
   require 'mail/core_extensions/string'
-  require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
+  require 'mail/core_extensions/smtp'
   require 'mail/indifferent_hash'
 
   # Only load our multibyte extensions if AS is not already loaded
   if defined?(ActiveSupport)
     require 'active_support/inflector'
   else
-    require 'mail/core_extensions/string/access'
-    require 'mail/core_extensions/string/multibyte'
     require 'mail/multibyte'
   end
 

data/lib/mail/attachments_list.rb

@@ -60,7 +60,7 @@ module Mail
 
         if value[:mime_type]
           default_values[:content_type] = value.delete(:mime_type)
-          @mime_type = MIME::Types[default_values[:content_type]].first
+          @mime_type = MiniMime.lookup_by_content_type(default_values[:content_type])
           default_values[:content_transfer_encoding] ||= guess_encoding
         end
 
@@ -99,7 +99,8 @@ module Mail
         filename = filename.encode(Encoding::UTF_8) if filename.respond_to?(:encode)
       end
 
-      @mime_type = MIME::Types.type_for(filename).first
+      @mime_type = MiniMime.lookup_by_filename(filename)
+      @mime_type && @mime_type.content_type
     end
 
   end

data/lib/mail/body.rb

@@ -32,7 +32,7 @@ module Mail
       @preamble = nil
       @epilogue = nil
       @charset  = nil
-      @part_sort_order = [ "text/plain", "text/enriched", "text/html" ]
+      @part_sort_order = [ "text/plain", "text/enriched", "text/html", "multipart/alternative" ]
       @parts = Mail::PartsList.new
       if Utilities.blank?(string)
         @raw_source = ''
@@ -115,8 +115,8 @@ module Mail
     end
 
     # Allows you to set the sort order of the parts, overriding the default sort order.
-    # Defaults to 'text/plain', then 'text/enriched', then 'text/html' with any other content
-    # type coming after.
+    # Defaults to 'text/plain', then 'text/enriched', then 'text/html', then 'multipart/alternative'
+    # with any other content type coming after.
     def set_sort_order(order)
       @part_sort_order = order
     end

data/lib/mail/core_extensions/smtp.rb

@@ -1,25 +1,28 @@
 # encoding: utf-8
 # frozen_string_literal: true
-module Net
-  class SMTP
-    # 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 what will be Ruby 1.9.3 - tlsconnect also does not exist in some early versions of ruby
-    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
+# 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
-    rescue NameError
     end
   end
 end

data/lib/mail/core_extensions/string.rb

@@ -11,10 +11,6 @@ class String #:nodoc:
     MATCH_NON_US_ASCII = /[^\x00-\x7f]/
   end
 
-  def not_ascii_only?
-    !ascii_only?
-  end
-
   unless method_defined?(:bytesize)
     alias :bytesize :length
   end

data/lib/mail/elements/address.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/address_lists_parser'
+
 module Mail
   class Address
-
     include Mail::Utilities
 
     # Mail::Address handles all email addresses in Mail.  It takes an email address string
@@ -116,11 +117,15 @@ module Mail
       Encodings.decode_encode(strip_all_comments(get_domain), @output_type) if get_domain
     end
 
-    # Returns an array of comments that are in the email, or an empty array if there
+    # Returns an array of comments that are in the email, or nil if there
     # are no comments
     #
     #  a = Address.new('Mikel Lindsaar (My email address) <mikel@test.lindsaar.net>')
     #  a.comments #=> ['My email address']
+    #
+    #  b = Address.new('Mikel Lindsaar <mikel@test.lindsaar.net>')
+    #  b.comments #=> nil
+
     def comments
       parse unless @parsed
       comments = get_comments
@@ -179,11 +184,11 @@ module Mail
       @data = nil
 
       case value
-      when Mail::Parsers::AddressStruct
+      when Mail::Parsers::AddressListsParser::AddressStruct
         @data = value
       when String
         unless Utilities.blank?(value)
-          address_list = Mail::Parsers::AddressListsParser.new.parse(value)
+          address_list = Mail::Parsers::AddressListsParser.parse(value)
           @data = address_list.addresses.first
         end
       end

data/lib/mail/elements/address_list.rb

@@ -1,42 +1,34 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/address_lists_parser'
+
 module Mail
   class AddressList # :nodoc:
+    attr_reader :addresses, :group_names
 
     # Mail::AddressList is the class that parses To, From and other address fields from
     # emails passed into Mail.
-    # 
+    #
     # AddressList provides a way to query the groups and mailbox lists of the passed in
     # string.
-    # 
+    #
     # It can supply all addresses in an array, or return each address as an address object.
-    # 
+    #
     # Mail::AddressList requires a correctly formatted group or mailbox list per RFC2822 or
     # RFC822.  It also handles all obsolete versions in those RFCs.
-    # 
+    #
     #  list = 'ada@test.lindsaar.net, My Group: mikel@test.lindsaar.net, Bob <bob@test.lindsaar.net>;'
     #  a = AddressList.new(list)
     #  a.addresses    #=> [#<Mail::Address:14943130 Address: |ada@test.lindsaar.net...
     #  a.group_names  #=> ["My Group"]
     def initialize(string)
-      @addresses_grouped_by_group = nil
-      @address_list = Mail::Parsers::AddressListsParser.new.parse(string)
-    end
-    
-    # Returns a list of address objects from the parsed line
-    def addresses
-      @addresses ||= @address_list.addresses.map do |address_data|
-        Mail::Address.new(address_data)
-      end
+      address_list = Parsers::AddressListsParser.parse(string)
+      @addresses = address_list.addresses.map { |a| Address.new(a) }
+      @group_names = address_list.group_names
     end
 
     def addresses_grouped_by_group
       addresses.select(&:group).group_by(&:group)
     end
-    
-    # Returns the names as an array of strings of all groups
-    def group_names # :nodoc:
-      @address_list.group_names
-    end
   end
 end

data/lib/mail/elements/content_disposition_element.rb

@@ -1,27 +1,20 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/content_disposition_parser'
+
 module Mail
   class ContentDispositionElement # :nodoc:
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      content_disposition = Mail::Parsers::ContentDispositionParser.new.parse(cleaned(string))
+    attr_reader :disposition_type, :parameters
+
+    def initialize(string)
+      content_disposition = Mail::Parsers::ContentDispositionParser.parse(cleaned(string))
       @disposition_type = content_disposition.disposition_type
       @parameters = content_disposition.parameters
     end
-    
-    def disposition_type
-      @disposition_type
-    end
-    
-    def parameters
-      @parameters
-    end
-    
+
+    private
     def cleaned(string)
       string =~ /(.+);\s*$/ ? $1 : string
     end
-    
   end
 end

data/lib/mail/elements/content_location_element.rb

@@ -1,22 +1,17 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/content_location_parser'
+
 module Mail
   class ContentLocationElement # :nodoc:
+    attr_reader :location
 
-    include Mail::Utilities
-
-    def initialize( string )
-      content_location = Mail::Parsers::ContentLocationParser.new.parse(string)
-      @location = content_location.location
-    end
-
-    def location
-      @location
+    def initialize(string)
+      @location = Mail::Parsers::ContentLocationParser.parse(string).location
     end
 
     def to_s(*args)
       location.to_s
     end
-
   end
 end