mail 2.6.4.rc2 → 2.6.5

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

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Mail #:nodoc:
   module Multibyte #:nodoc:
@@ -268,12 +269,12 @@ module Mail #:nodoc:
           @wrapped_string[*args] = replace_by
         else
           result = Unicode.u_unpack(@wrapped_string)
-          if args[0].is_a?(Fixnum)
+          if args[0].is_a?(Integer)
             raise IndexError, "index #{args[0]} out of string" if args[0] >= result.length
             min = args[0]
             max = args[1].nil? ? min : (min + args[1] - 1)
             range = Range.new(min, max)
-            replace_by = [replace_by].pack('U') if replace_by.is_a?(Fixnum)
+            replace_by = [replace_by].pack('U') if replace_by.is_a?(Integer)
           elsif args.first.is_a?(Range)
             raise RangeError, "#{args[0]} out of range" if args[0].min >= result.length
             range = args[0]

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.

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
 
@@ -24,7 +25,7 @@ module Mail
       emails_index.reverse! if options[:what] == :last
       emails_index = case count = options[:count]
         when :all then emails_index
-        when Fixnum then emails_index[0, count]
+        when Integer then emails_index[0, count]
         else
           raise 'Invalid count option value: ' + count.inspect
       end

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
@@ -91,7 +92,7 @@ module Mail::Parsers
         # version.
         when :angle_addr_s
           if qstr
-            address.display_name = qstr
+            address.display_name = Mail::Utilities.unescape(qstr)
             qstr = nil
           elsif phrase_e
             address.display_name = s[phrase_s..phrase_e].strip

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,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
@@ -73,12 +72,26 @@ module Mail
     #  unqoute(string) #=> 'This is "a string"'
     def unquote( str )
       if str =~ /^"(.*?)"$/
-        $1.gsub(/\\(.)/, '\1')
+        unescape($1)
       else
         str
       end
     end
 
+    # Removes any \-escaping.
+    #
+    # Example:
+    #
+    #  string = 'This is \"a string\"'
+    #  unescape(string) #=> 'This is "a string"'
+    #
+    #  string = '"This is \"a string\""'
+    #  unescape(string) #=> '"This is "a string""'
+    def unescape( str )
+      str.gsub(/\\(.)/, '\1')
+    end
+    module_function :unescape
+
     # Wraps a string in parenthesis and escapes any that are in the string itself.
     #
     # Example:
@@ -223,7 +236,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 +268,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 +277,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'
+    PATCH = 5
+    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
@@ -58,6 +59,9 @@ module Mail
     end
 
     def Ruby19.decode_base64(str)
+      if !str.end_with?("=") && str.length % 4 != 0
+        str = str.ljust((str.length + 3) & ~3, "=")
+      end
       str.unpack( 'm' ).first
     end
 

data/lib/mail.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.6.4.rc2
+  version: 2.6.5
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -264,12 +264,12 @@ 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
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.