mail 2.6.4.rc1 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9294e13f17b710d1817da0765d4f366904f79b0a
-  data.tar.gz: 7c7e6bb27d50e7d0a77aeff4b0024a575950fa6e
+  metadata.gz: f91f133d2e44832ecef1cb4bfe9cc57391aedf84
+  data.tar.gz: 23d0cdbc09cdbaafee76b01d7c3820a6c0dfb6d1
 SHA512:
-  metadata.gz: 21c9ad8d24e777f6eb598f91f26502d9a22e8ee7477d222b58a5d08d33cb395e0fbe7423ef4d55b28b41a0829a081f2f489e9b5ab60b3a5aa6f5a3dcb6d91460
-  data.tar.gz: ee66d0c7ad442f39ecc5a383098d156309faf9ee231197e9a7cac7899f7b286d234d2de83a170c4069699650c75d21f74c0eff4cd369473d2b0dba5ceb426c38
+  metadata.gz: c788407da309561bee6a59ec746efeea7c0cc8633206eb2085f08ad6b161df92475109a988de748e554248d2ca47e6cd31c3fd0394d0eddac5950e7bb28783a8
+  data.tar.gz: 55b70f9d539420d254373c7abfccf6bc85228f34c38696086be363a36fb4f966415238aaa8e9ec9e6eed02207af2a3940b9f85c5f3076e735cd19e095764abc2

data/CHANGELOG.rdoc

@@ -1,5 +1,7 @@
 == HEAD
 
+== Version 2.6.4 - Wed Mar 23 08:16 -0700 2016 Jeremy Daer <jeremydaer@gmail.com>
+
 Features:
 * #772 - Normalize encoding matchers (grosser)
 * #775 - Avoid failed encodings / stop bad charsets early (grosser)
@@ -11,6 +13,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

@@ -8,5 +8,4 @@ gem "jruby-openssl", :platforms => :jruby
 # For gems not required to run tests
 group :local_development, :test do
   gem "appraisal", "~> 1.0" unless RUBY_VERSION <= "1.8.7"
-  gem "ruby-debug", :platforms => :mri_18
 end

data/MIT-LICENSE

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

@@ -697,7 +697,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2015 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/lib/mail/attachments_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   class AttachmentsList < Array
 
@@ -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|
@@ -12,7 +13,7 @@ module Mail
     control      = %Q|\x00-\x1f\x7f-\xff|
 
     if control.respond_to?(:force_encoding)
-      control = control.force_encoding(Encoding::BINARY)
+      control = control.dup.force_encoding(Encoding::BINARY)
     end
 
     CRLF          = /\r\n/

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,26 +1,7 @@
 # encoding: utf-8
+# frozen_string_literal: true
 class String #:nodoc:
 
-  CRLF = "\r\n"
-  LF   = "\n"
-
-  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 to_crlf
-    to_str.gsub(CRLF_REGEX, CRLF)
-  end
-
-  def to_lf
-    to_str.gsub(/\r\n|\r/, LF)
-  end
-
   unless method_defined?(:ascii_only?)
     # Backport from Ruby 1.9 checks for non-us-ascii characters.
     def 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.dup # in case frozen
     end
 
     # Returns the local part (the left hand side of the @ sign in the email address) of
@@ -209,7 +210,6 @@ module Mail
       elsif @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:
 

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
@@ -12,12 +13,12 @@ module Mail
       
       # Decode the string
       def self.decode(str)
-        str.to_lf
+        ::Mail::Utilities.to_lf str
       end
     
       # Encode the string
       def self.encode(str)
-        str.to_crlf
+        ::Mail::Utilities.to_crlf str
       end
      
       # Idenity encodings have a fixed cost, 1 byte out per 1 byte in

data/lib/mail/encodings/base64.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/encodings/7bit'
 
 module Mail
@@ -19,7 +20,7 @@ module Mail
     
       # Encode the string to Base64
       def self.encode(str)
-        RubyVer.encode_base64( str ).to_crlf
+        ::Mail::Utilities.to_crlf(RubyVer.encode_base64( str ))
       end
 
       # Base64 has a fixed cost, 4 bytes out per 3 bytes in

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
@@ -15,11 +16,11 @@ module Mail
       # Decode the string from Quoted-Printable. Cope with hard line breaks
       # that were incorrectly encoded as hex instead of literal CRLF.
       def self.decode(str)
-        str.gsub(/(?:=0D=0A|=0D|=0A)\r\n/, "\r\n").unpack("M*").first.to_lf
+        ::Mail::Utilities.to_lf str.gsub(/(?:=0D=0A|=0D|=0A)\r\n/, "\r\n").unpack("M*").first
       end
 
       def self.encode(str)
-        [str.to_lf].pack("M").to_crlf
+        ::Mail::Utilities.to_crlf([::Mail::Utilities.to_lf(str)].pack("M"))
       end
 
       def self.cost(str)

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

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
 # 

data/lib/mail/fields/resent_cc_field.rb

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

data/lib/mail/fields/resent_date_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # resent-date     =       "Resent-Date:" date-time CRLF
 require 'mail/fields/common/common_date'