mail 2.6.4.rc1 → 2.6.4

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
@@ -143,7 +144,7 @@ module Mail
       while !words.empty?
         limit = 78 - prepend
         limit = limit - 7 - encoding.length if should_encode
-        line = ""
+        line = String.new
         first_word = true
         while !words.empty?
           break unless word = words.first.dup

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   
   # Provides access to a header object.
@@ -49,7 +50,7 @@ module Mail
     # me the example so we can fix it.
     def initialize(header_text = nil, charset = nil)
       @charset = charset
-      self.raw_source = header_text.to_crlf.lstrip
+      self.raw_source = ::Mail::Utilities.to_crlf(header_text).lstrip
       split_header if header_text
     end
 
@@ -204,7 +205,7 @@ module Mail
                            content-id content-disposition content-location]
 
     def encoded
-      buffer = ''
+      buffer = String.new
       buffer.force_encoding('us-ascii') if buffer.respond_to?(:force_encoding)
       fields.each do |field|
         buffer << field.encoded

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
@@ -1994,7 +1995,7 @@ module Mail
 
     def raw_source=(value)
       value = value.dup.force_encoding(Encoding::BINARY) if RUBY_VERSION >= "1.9.1"
-      @raw_source = value.to_crlf
+      @raw_source = ::Mail::Utilities.to_crlf(value)
     end
 
     # see comments to body=. We take data and process it lazily

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/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/network/delivery_methods/exim.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
 
   # A delivery method implementation which sends via exim.
@@ -43,7 +44,7 @@ module Mail
 
     def self.call(path, arguments, destinations, mail)
       popen "#{path} #{arguments}" do |io|
-        io.puts mail.encoded.to_lf
+        io.puts ::Mail::Utilities.to_lf(mail.encoded)
         io.flush
       end
     end

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
@@ -58,7 +59,7 @@ module Mail
 
     def self.call(path, arguments, destinations, encoded_message)
       popen "#{path} #{arguments} #{destinations}" do |io|
-        io.puts encoded_message.to_lf
+        io.puts ::Mail::Utilities.to_lf(encoded_message)
         io.flush
       end
     end

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

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

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

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

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,6 +1,11 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail
   module Utilities
+
+    LF   = "\n"
+    CRLF = "\r\n"
+
     include Constants
 
     # Returns true if the string supplied is free from characters not allowed as an ATOM
@@ -19,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
@@ -221,10 +224,46 @@ module Mail
 
     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
+
+      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 self.to_crlf(input)
+        input.kind_of?(String) ? input.to_str.gsub(CRLF_REGEX, CRLF) : ''
+      end
+
+    end
+
     # 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 = 'rc1'
+    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

data/lib/mail.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Mail # :doc:
 
   require 'date'
@@ -32,7 +33,6 @@ module Mail # :doc:
 
   require 'mail/version'
 
-  require 'mail/core_extensions/nil'
   require 'mail/core_extensions/string'
   require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
   require 'mail/indifferent_hash'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.6.4.rc1
+  version: 2.6.4
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -19,7 +19,7 @@ dependencies:
         version: '1.16'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.16'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,6 @@ files:
 - lib/mail/check_delivery_params.rb
 - lib/mail/configuration.rb
 - lib/mail/constants.rb
-- lib/mail/core_extensions/nil.rb
 - lib/mail/core_extensions/smtp.rb
 - lib/mail/core_extensions/string.rb
 - lib/mail/core_extensions/string/access.rb
@@ -265,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

data/lib/mail/core_extensions/nil.rb

@@ -1,13 +0,0 @@
-# encoding: utf-8
-
-# This is not loaded if ActiveSupport is already loaded
-
-class NilClass #:nodoc:
-  def to_crlf
-    ''
-  end
-
-  def to_lf
-    ''
-  end
-end