mail 2.6.4.rc2 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4cd6578224b57f03109de0e15e54fc7d0e54079
-  data.tar.gz: 7f7b2116022f18740b56ba559038332d40476dbf
+  metadata.gz: a4283c0737ab7bc528ff6a60317c46e1a2ff0f92
+  data.tar.gz: 8f98051e95f99f1622283e76919404d08027b7ff
 SHA512:
-  metadata.gz: 5a93b7505e4b1dc57444a7779005de12c4cc4db846d9e0ec86981f26c13abdac2cffde6be282b03ef6cc7f24317822434cdb34be99dd213a585b4eb34589ece4
-  data.tar.gz: c5abba187c988de228cd9d808b5e85d26a1d59a48ae8c702a1ebb25a96b98ad1c48e16364ff1970ba5302c08112f78c45e82b475c724574cd9664b7847423f42
+  metadata.gz: 63514c34ddad591e76cb6704122775906f4d603aad4e90024ec88f17d7f19a78129dfe15d561b2f9e3807bdb074e6269dbdcb09d95656da2399b143e58681cd2
+  data.tar.gz: a05cbc7af1c553e062d405b024390c17b03649f280c1c171b278b373401c1843657dc25e316f5041a44fdd3aba19f2a7a44b9d33d0ca9074bab06ed6c86b068d

data/CHANGELOG.rdoc

@@ -1,4 +1,14 @@
-== HEAD
+== Version 2.6.5 - 2017-04-26 Jeremy Daer <jeremydaer@gmail.com>
+
+Features:
+* #1053 - Ruby 2.4.0 compatibility. Fixnum+Bignum unified as Integer. (peterkovacs)
+
+Bugs:
+* #605 - Fix Mail::Address#name for nil addresses (peterkovacs)
+* #1003 - Fix decoding some b encoded headers on specific rubies that don't account for lack of base64 padding (kjg)
+* #1023 - Fix double-quoting in display names. (garethrees)
+
+== Version 2.6.4 - Wed Mar 23 08:16 -0700 2016 Jeremy Daer <jeremydaer@gmail.com>
 
 Features:
 * #772 - Normalize encoding matchers (grosser)
@@ -11,6 +21,10 @@ Features:
 * #901 - Allow mail.text_part = '…' and mail.html_part = '<p>…</p>' (taavo)
 * #924 - Matcher for having attachments (schepedw)
 
+Performance:
+* #956 - Use native String#encode for CR/LF conversion (carsonreinke)
+* #970 - Support Ruby 2.3+ frozen string literals (twalpole)
+
 Bugs:
 * #719 - Fix to not extract header content that looks like its field name (kjg)
 * #789 - Fix encoding collapsing not dealing with multiple encodings in 1 line (grosser)

data/Gemfile

@@ -1,11 +1,14 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
-gem "tlsmail", "~> 0.0.1" if RUBY_VERSION <= "1.8.6"
-gem "jruby-openssl", :platforms => :jruby
+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.8.7"
+  gem 'appraisal', '~> 1.0' unless RUBY_VERSION < '1.9'
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2015 Mikel Lindsaar
+Copyright (c) 2009-2017 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

@@ -48,9 +48,12 @@ Every Mail commit is tested by Travis on the [following platforms](https://githu
 * ruby-1.9.2 [ x86_64 ]
 * ruby-1.9.3 [ x86_64 ]
 * ruby-2.0.0 [ x86_64 ]
-* ruby-2.1.2 [ x86_64 ]
+* ruby-2.1.10 [ x86_64 ]
+* ruby-2.2.6 [ x86_64 ]
+* ruby-2.3.3 [ x86_64 ]
 * ruby-head [ x86_64 ]
 * jruby [ x86_64 ]
+* jruby-9.1.6.0 [ x86_64 ]
 * jruby-head [ x86_64 ]
 * rbx-2 [ x86_64 ]
 
@@ -697,7 +700,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2015 Mikel Lindsaar
+Copyright (c) 2009-2017 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/mail/attachments_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   class AttachmentsList < Array
 
@@ -29,7 +30,7 @@ module Mail
     # mail.attachments['test.png'].filename #=> 'test.png'
     # mail.attachments[1].filename          #=> 'test.jpg'
     def [](index_value)
-      if index_value.is_a?(Fixnum)
+      if index_value.is_a?(Integer)
         self.fetch(index_value)
       else
         self.select { |a| a.filename == index_value }.first
@@ -71,6 +72,7 @@ module Mail
 
       if hash[:body].respond_to? :force_encoding and hash[:body].respond_to? :valid_encoding?
         if not hash[:body].valid_encoding? and default_values[:content_transfer_encoding].downcase == "binary"
+          hash[:body] = hash[:body].dup if hash[:body].frozen?
           hash[:body].force_encoding("BINARY")
         end
       end

data/lib/mail/body.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   
   # = Body

data/lib/mail/check_delivery_params.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   module CheckDeliveryParams
     def check_delivery_params(mail)

data/lib/mail/configuration.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 #
 # Thanks to Nicolas Fouché for this wrapper
 #

data/lib/mail/constants.rb

@@ -1,4 +1,5 @@
 # encoding: us-ascii
+# frozen_string_literal: true
 module Mail
   module Constants
     white_space = %Q|\x9\x20|

data/lib/mail/core_extensions/smtp.rb

@@ -1,4 +1,5 @@
 # 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.

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 # This is not loaded if ActiveSupport is already loaded
 

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 # This is not loaded if ActiveSupport is already loaded
 

data/lib/mail/core_extensions/string.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 class String #:nodoc:
 
   unless method_defined?(:ascii_only?)

data/lib/mail/elements/address.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class Address
 
@@ -92,7 +93,7 @@ module Mail
     #  a.display_name = 'Mikel Lindsaar'
     #  a.format #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>'
     def display_name=( str )
-      @display_name = str
+      @display_name = str.nil? ? nil : str.dup # in case frozen
     end
 
     # Returns the local part (the left hand side of the @ sign in the email address) of
@@ -122,7 +123,12 @@ module Mail
     #  a.comments #=> ['My email address']
     def comments
       parse unless @parsed
-      get_comments.map { |c| c.squeeze(SPACE) } unless get_comments.empty?
+      comments = get_comments
+      if comments.nil? || comments.none?
+        nil
+      else
+        comments.map { |c| c.squeeze(SPACE) }
+      end
     end
 
     # Sometimes an address will not have a display name, but might have the name
@@ -204,12 +210,11 @@ module Mail
     end
 
     def get_display_name
-      if @data.display_name
+      if @data && @data.display_name
         str = strip_all_comments(@data.display_name.to_s)
-      elsif @data.comments && @data.domain
+      elsif @data && @data.comments && @data.domain
         str = strip_domain_comments(format_comments)
       end
-
       str unless Utilities.blank?(str)
     end
 

data/lib/mail/elements/address_list.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class AddressList # :nodoc:
 
@@ -19,7 +20,7 @@ module Mail
     #  a.group_names  #=> ["My Group"]
     def initialize(string)
       @addresses_grouped_by_group = nil
-      @address_list = Parsers::AddressListsParser.new.parse(string)
+      @address_list = Mail::Parsers::AddressListsParser.new.parse(string)
     end
     
     # Returns a list of address objects from the parsed line

data/lib/mail/elements/content_disposition_element.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class ContentDispositionElement # :nodoc:
     

data/lib/mail/elements/content_location_element.rb

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

data/lib/mail/elements/content_transfer_encoding_element.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class ContentTransferEncodingElement
     

data/lib/mail/elements/content_type_element.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class ContentTypeElement # :nodoc:
     

data/lib/mail/elements/date_time_element.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class DateTimeElement # :nodoc:
     

data/lib/mail/elements/envelope_from_element.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class EnvelopeFromElement
     

data/lib/mail/elements/message_ids_element.rb

@@ -1,21 +1,23 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class MessageIdsElement
-    
+
     include Mail::Utilities
-    
+
     def initialize(string)
+      raise Mail::Field::ParseError.new(Mail::MessageIdsElement, string, 'nil is invalid') if string.nil?
       @message_ids = Mail::Parsers::MessageIdsParser.new.parse(string).message_ids.map { |msg_id| clean_msg_id(msg_id) }
     end
-    
+
     def message_ids
       @message_ids
     end
-    
+
     def message_id
       @message_ids.first
     end
-    
+
     def clean_msg_id( val )
       val =~ /.*<(.*)>.*/ ; $1
     end

data/lib/mail/elements/mime_version_element.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class MimeVersionElement
     

data/lib/mail/elements/phrase_list.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class PhraseList
     

data/lib/mail/elements/received_element.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   class ReceivedElement
     

data/lib/mail/elements.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   register_autoload :Address, 'mail/elements/address'
   register_autoload :AddressList, 'mail/elements/address_list'

data/lib/mail/encodings/7bit.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/encodings/8bit'
 
 module Mail

data/lib/mail/encodings/8bit.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/encodings/binary'
 
 module Mail

data/lib/mail/encodings/base64.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/encodings/7bit'
 
 module Mail

data/lib/mail/encodings/binary.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/encodings/transfer_encoding'
 
 module Mail

data/lib/mail/encodings/quoted_printable.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/encodings/7bit'
 
 module Mail

data/lib/mail/encodings/transfer_encoding.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   module Encodings
     class TransferEncoding

data/lib/mail/encodings/unix_to_unix.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   module Encodings
     module UnixToUnix

data/lib/mail/encodings.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mail
   # Raised when attempting to decode an unknown encoding type

data/lib/mail/envelope.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Mail Envelope
 # 

data/lib/mail/field.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mail/fields'
 
 # encoding: utf-8

data/lib/mail/field_list.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
 
   # Field List class provides an enhanced array that keeps a list of 

data/lib/mail/fields/bcc_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Blind Carbon Copy Field
 # 

data/lib/mail/fields/cc_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Carbon Copy Field
 # 

data/lib/mail/fields/comments_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Comments Field
 # 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   
   class AddressContainer < Array
@@ -7,10 +8,10 @@ module Mail
       super(list)
     end
 
-    def << (address)
+    def <<(address)
       @field << address
     end
 
   end
   
-end
+end

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/fields/common/address_container'
 
 module Mail

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   module CommonDate # :nodoc:
     # Returns a date time object of the parsed date

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   module CommonField # :nodoc:
     include Mail::Constants
@@ -51,7 +52,9 @@ module Mail
     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"'
+        value.sub FILENAME_RE, '\1="\2"'
+      else
+        value
       end
     end
   end

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   module CommonMessageId # :nodoc:
     def element

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
 
   # ParameterHash is an intelligent Hash that allows you to add

data/lib/mail/fields/content_description_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # 
 # 

data/lib/mail/fields/content_disposition_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/fields/common/parameter_hash'
 
 module Mail
@@ -9,7 +10,7 @@ module Mail
 
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      ensure_filename_quoted(value)
+      value = ensure_filename_quoted(value)
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self

data/lib/mail/fields/content_id_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # 
 # 

data/lib/mail/fields/content_location_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # 
 # 

data/lib/mail/fields/content_transfer_encoding_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # 
 # 

data/lib/mail/fields/content_type_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/fields/common/parameter_hash'
 
 module Mail
@@ -19,7 +20,7 @@ module Mail
         @parameters = nil
         value = strip_field(FIELD_NAME, value)
       end
-      ensure_filename_quoted(value)
+      value = ensure_filename_quoted(value)
       super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self

data/lib/mail/fields/date_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 #
 # = Date Field
 #

data/lib/mail/fields/from_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = From Field
 # 

data/lib/mail/fields/in_reply_to_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = In-Reply-To Field
 # 

data/lib/mail/fields/keywords_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # keywords        =       "Keywords:" phrase *("," phrase) CRLF
 module Mail

data/lib/mail/fields/message_id_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Message-ID Field
 # 

data/lib/mail/fields/mime_version_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # 
 # 

data/lib/mail/fields/optional_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 #    The field names of any optional-field MUST NOT be identical to any
 #    field name specified elsewhere in this standard.

data/lib/mail/fields/received_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # trace           =       [return]
 #                         1*received

data/lib/mail/fields/references_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = References Field
 # 

data/lib/mail/fields/reply_to_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Reply-To Field
 # 

data/lib/mail/fields/resent_bcc_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Resent-Bcc Field
 #