mail 2.6.4.rc2 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4cd6578224b57f03109de0e15e54fc7d0e54079
-  data.tar.gz: 7f7b2116022f18740b56ba559038332d40476dbf
+  metadata.gz: f91f133d2e44832ecef1cb4bfe9cc57391aedf84
+  data.tar.gz: 23d0cdbc09cdbaafee76b01d7c3820a6c0dfb6d1
 SHA512:
-  metadata.gz: 5a93b7505e4b1dc57444a7779005de12c4cc4db846d9e0ec86981f26c13abdac2cffde6be282b03ef6cc7f24317822434cdb34be99dd213a585b4eb34589ece4
-  data.tar.gz: c5abba187c988de228cd9d808b5e85d26a1d59a48ae8c702a1ebb25a96b98ad1c48e16364ff1970ba5302c08112f78c45e82b475c724574cd9664b7847423f42
+  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/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.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail # :doc:
 
   require 'date'

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|

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.rb

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

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/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/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/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/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/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.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   register_autoload :UnstructuredField, 'mail/fields/unstructured_field'
   register_autoload :StructuredField, 'mail/fields/structured_field'

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'

data/lib/mail/fields/resent_from_field.rb

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

data/lib/mail/fields/resent_message_id_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # resent-msg-id   =       "Resent-Message-ID:" msg-id CRLF
 require 'mail/fields/common/common_message_id'

data/lib/mail/fields/resent_sender_field.rb

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

data/lib/mail/fields/resent_to_field.rb

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

data/lib/mail/fields/return_path_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # 4.4.3.  REPLY-TO / RESENT-REPLY-TO
 # 

data/lib/mail/fields/sender_field.rb

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

data/lib/mail/fields/structured_field.rb

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

data/lib/mail/fields/subject_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # subject         =       "Subject:" unstructured CRLF
 module Mail

data/lib/mail/fields/to_field.rb

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

data/lib/mail/fields/unstructured_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/fields/common/common_field'
 
 module Mail
@@ -127,7 +128,7 @@ module Mail
           if first
             first = !first
           else
-            word = " " << word
+            word = " #{word}"
           end
           if word.not_ascii_only?
             word

data/lib/mail/header.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   
   # Provides access to a header object.

data/lib/mail/indifferent_hash.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 # 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

data/lib/mail/mail.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
 
   # Allows you to create a new Mail::Message object.

data/lib/mail/matchers/attachment_matchers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   module Matchers
     def any_attachment

data/lib/mail/matchers/has_sent_mail.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   module Matchers
     def have_sent_email

data/lib/mail/message.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require "yaml"
 
 module Mail

data/lib/mail/multibyte.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail #:nodoc:
   module Multibyte
     require 'mail/multibyte/exceptions'

data/lib/mail/multibyte/chars.rb

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

data/lib/mail/multibyte/exceptions.rb

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

data/lib/mail/multibyte/unicode.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   module Multibyte
     module Unicode

data/lib/mail/multibyte/utils.rb

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

data/lib/mail/network.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mail/network/retriever_methods/base'
 
 module Mail

data/lib/mail/network/delivery_methods/exim.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
 
   # A delivery method implementation which sends via exim.

data/lib/mail/network/delivery_methods/file_delivery.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mail/check_delivery_params'
 
 module Mail

data/lib/mail/network/delivery_methods/sendmail.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mail/check_delivery_params'
 
 module Mail

data/lib/mail/network/delivery_methods/smtp.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mail/check_delivery_params'
 
 module Mail

data/lib/mail/network/delivery_methods/smtp_connection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mail/check_delivery_params'
 
 module Mail

data/lib/mail/network/delivery_methods/test_mailer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mail/check_delivery_params'
 
 module Mail

data/lib/mail/network/retriever_methods/base.rb

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

data/lib/mail/network/retriever_methods/imap.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mail
   # The IMAP retriever allows to get the last, first or all emails from a IMAP server.

data/lib/mail/network/retriever_methods/pop3.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mail
   # The Pop3 retriever allows to get the last, first or all emails from a POP3 server.

data/lib/mail/network/retriever_methods/test_retriever.rb

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

data/lib/mail/parsers.rb

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

data/lib/mail/parsers/address_lists_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class AddressListsParser
     include Mail::Utilities

data/lib/mail/parsers/content_disposition_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class ContentDispositionParser
     include Mail::Utilities

data/lib/mail/parsers/content_location_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class ContentLocationParser
     def parse(s)

data/lib/mail/parsers/content_transfer_encoding_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class ContentTransferEncodingParser
 

data/lib/mail/parsers/content_type_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class ContentTypeParser
     include Mail::Utilities

data/lib/mail/parsers/date_time_parser.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class DateTimeParser
     include Mail::Utilities
 
     def parse(s)
+      raise Mail::Field::ParseError.new(Mail::DateTimeElement, s, "nil is an invalid DateTime") if s.nil?
+
       date_time = DateTimeStruct.new([])
 
       actions, error = Ragel.parse(:date_time, s)

data/lib/mail/parsers/envelope_from_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class EnvelopeFromParser
     def parse(s)

data/lib/mail/parsers/message_ids_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class MessageIdsParser
     def parse(s)

data/lib/mail/parsers/mime_version_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class MimeVersionParser
     include Mail::Utilities

data/lib/mail/parsers/phrase_lists_parser.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class PhraseListsParser
 
     def parse(s)
+      raise Mail::Field::ParseError.new(Mail::PhraseList, s, 'nil is invalid') if s.nil?
+
       actions, error = Ragel.parse(:phrase_lists, s)
       if error
         raise Mail::Field::ParseError.new(Mail::PhraseList, s, error)

data/lib/mail/parsers/ragel.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   module Parsers
     module Ragel

data/lib/mail/parsers/received_parser.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
 module Mail::Parsers
   class ReceivedParser
 
     def parse(s)
+      raise Mail::Field::ParseError.new(Mail::ReceivedElement, s, 'nil is invalid') if s.nil?
       actions, error = Ragel.parse(:received, s)
       if error
         raise Mail::Field::ParseError.new(Mail::ReceivedElement, s, error)

data/lib/mail/part.rb

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

data/lib/mail/parts_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'delegate'
 
 module Mail

data/lib/mail/utilities.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   module Utilities
 
@@ -23,13 +24,11 @@ module Mail
     def quote_phrase( str )
       if RUBY_VERSION >= '1.9'
         original_encoding = str.encoding
-        str.force_encoding('ASCII-8BIT')
-        if (PHRASE_UNSAFE === str)
-          quoted_str = dquote(str).force_encoding(original_encoding)
-          str.force_encoding(original_encoding)
-          quoted_str
+        ascii_str = str.dup.force_encoding('ASCII-8BIT')
+        if (PHRASE_UNSAFE === ascii_str)
+          dquote(ascii_str).force_encoding(original_encoding)
         else
-          str.force_encoding(original_encoding)
+          str
         end
       else
         (PHRASE_UNSAFE === str) ? dquote(str) : str
@@ -223,7 +222,26 @@ module Mail
         enum.each_with_index.map(&block)
       end
 
-      def self.to_lf input
+    end
+
+    # Test String#encode works correctly with line endings.
+    # Some versions of Ruby (e.g. MRI <1.9, JRuby, Rubinius) line ending
+    # normalization does not work correctly or did not have #encode.
+    if ("\r".encode(:universal_newline => true) rescue nil) == LF &&
+      (LF.encode(:crlf_newline => true) rescue nil) == CRLF
+      # Using String#encode is better performing than Regexp
+
+      def self.to_lf(input)
+        input.kind_of?(String) ? input.to_str.encode(input.encoding, :universal_newline => true) : ''
+      end
+
+      def self.to_crlf(input)
+        input.kind_of?(String) ? input.to_str.encode(input.encoding, :universal_newline => true).encode!(input.encoding, :crlf_newline => true) : ''
+      end
+
+    else
+
+      def self.to_lf(input)
         input.kind_of?(String) ? input.to_str.gsub(/\r\n|\r/, LF) : ''
       end
 
@@ -236,7 +254,7 @@ module Mail
         CRLF_REGEX = /\n|\r\n|\r/
       end
 
-      def self.to_crlf input
+      def self.to_crlf(input)
         input.kind_of?(String) ? input.to_str.gsub(CRLF_REGEX, CRLF) : ''
       end
 
@@ -245,7 +263,7 @@ module Mail
     # Returns true if the object is considered blank.
     # A blank includes things like '', '   ', nil,
     # and arrays and hashes that have nothing in them.
-    # 
+    #
     # This logic is mostly shared with ActiveSupport's blank?
     def self.blank?(value)
       if value.kind_of?(NilClass)

data/lib/mail/version.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module Mail
   module VERSION
 
     MAJOR = 2
     MINOR = 6
     PATCH = 4
-    BUILD = 'rc2'
+    BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
 

data/lib/mail/version_specific/ruby_1_8.rb

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

data/lib/mail/version_specific/ruby_1_9.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.6.4.rc2
+  version: 2.6.4
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -264,9 +264,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1