mail 2.6.4.rc1 → 2.6.4.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9294e13f17b710d1817da0765d4f366904f79b0a
-  data.tar.gz: 7c7e6bb27d50e7d0a77aeff4b0024a575950fa6e
+  metadata.gz: a4cd6578224b57f03109de0e15e54fc7d0e54079
+  data.tar.gz: 7f7b2116022f18740b56ba559038332d40476dbf
 SHA512:
-  metadata.gz: 21c9ad8d24e777f6eb598f91f26502d9a22e8ee7477d222b58a5d08d33cb395e0fbe7423ef4d55b28b41a0829a081f2f489e9b5ab60b3a5aa6f5a3dcb6d91460
-  data.tar.gz: ee66d0c7ad442f39ecc5a383098d156309faf9ee231197e9a7cac7899f7b286d234d2de83a170c4069699650c75d21f74c0eff4cd369473d2b0dba5ceb426c38
+  metadata.gz: 5a93b7505e4b1dc57444a7779005de12c4cc4db846d9e0ec86981f26c13abdac2cffde6be282b03ef6cc7f24317822434cdb34be99dd213a585b4eb34589ece4
+  data.tar.gz: c5abba187c988de228cd9d808b5e85d26a1d59a48ae8c702a1ebb25a96b98ad1c48e16364ff1970ba5302c08112f78c45e82b475c724574cd9664b7847423f42

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

@@ -32,7 +32,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'

data/lib/mail/constants.rb

@@ -12,7 +12,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/string.rb

@@ -1,26 +1,6 @@
 # encoding: utf-8
 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/encodings/8bit.rb

@@ -12,12 +12,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

@@ -19,7 +19,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/quoted_printable.rb

@@ -15,11 +15,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/fields/unstructured_field.rb

@@ -143,7 +143,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/header.rb

@@ -49,7 +49,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 +204,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/message.rb

@@ -1994,7 +1994,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/network/delivery_methods/exim.rb

@@ -43,7 +43,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/sendmail.rb

@@ -58,7 +58,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/utilities.rb

@@ -1,6 +1,10 @@
 # encoding: utf-8
 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
@@ -219,6 +223,23 @@ module Mail
         enum.each_with_index.map(&block)
       end
 
+      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.

data/lib/mail/version.rb

@@ -4,7 +4,7 @@ module Mail
     MAJOR = 2
     MINOR = 6
     PATCH = 4
-    BUILD = 'rc1'
+    BUILD = 'rc2'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
 

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.rc2
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-14 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

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