mail 2.7.0 → 2.7.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0f77ef2d4e2ecc02b59f5431cd56e3c0a5569262
-  data.tar.gz: a6e4a0ee6b7d2d1a824578a43a5c73893ae3fa10
+SHA256:
+  metadata.gz: c7a286430676f89847640cf02f8b5a0e1e7c1e4151a629f0d26f8bb660bc48e5
+  data.tar.gz: 5d8aa0bcf4b95a7d01baea338edb3133c3ff47924e627b8d0a424e93a6d7fe7c
 SHA512:
-  metadata.gz: 70f3d73bb71de6e3d6121df0e93cd3909fb35eef6716c0597803a67ee341445385951dc662901dce2e806840c399d1f6ea0015987b2944b9fb24f9973a8e97af
-  data.tar.gz: 0d7283e6e57f4600704b9d9e45ae17e77e8105db42a394174217c7f488e81ac4598fef6492e85e24a8e763ceb302ee3ee6754fa1bf3bf9777bfa37a707157d4b
+  metadata.gz: a816d0c0cb167ece62be9a2749527668c70cd898d0c576d136ad6be89c1bfa3d93f109d1438d1f6e8b54caabfea58aee08aab3f6f5aaf32cbd7a6716b4b8db7d
+  data.tar.gz: 753249413f3a2bd8cf5a9666e1b1e39e3ffe7599b305302ab0e0ad4d323d6854e5c081cb154f2ac96c2b3fa1cb4ba1d413d81dfe49b290a5e059727ccab5f3f4

data/lib/mail/body.rb

@@ -39,9 +39,9 @@ module Mail
       else
         # Do join first incase we have been given an Array in Ruby 1.9
         if string.respond_to?(:join)
-          @raw_source = string.join('')
+          @raw_source = ::Mail::Utilities.to_crlf(string.join(''))
         elsif string.respond_to?(:to_s)
-          @raw_source = string.to_s
+          @raw_source = ::Mail::Utilities.to_crlf(string.to_s)
         else
           raise "You can only assign a string or an object that responds_to? :join or :to_s to a body."
         end

data/lib/mail/constants.rb

@@ -16,7 +16,7 @@ module Mail
       control = control.dup.force_encoding(Encoding::BINARY)
     end
 
-    CRLF          = /\r\n/
+    CRLF          = /\r?\n/
     WSP           = /[#{white_space}]/
     FWS           = /#{CRLF}#{WSP}*/
     TEXT          = /[#{text}]/ # + obs-text

data/lib/mail/encodings/transfer_encoding.rb

@@ -33,7 +33,7 @@ module Mail
       end
 
       def self.negotiate(message_encoding, source_encoding, str, allowed_encodings = nil)
-        message_encoding = Encodings.get_encoding(message_encoding || '8bit')
+        message_encoding = Encodings.get_encoding(message_encoding) || Encodings.get_encoding('8bit')
         source_encoding  = Encodings.get_encoding(source_encoding)
 
         if message_encoding && source_encoding && message_encoding.can_transport?(source_encoding) && source_encoding.compatible_input?(str)

data/lib/mail/field.rb

@@ -147,6 +147,8 @@ module Mail
       end
     end
 
+    attr_reader :unparsed_value
+
     # Create a field by name and optional value:
     #
     #  Mail::Field.new("field-name", "value")
@@ -291,7 +293,7 @@ module Mail
     #  treated in its unfolded form for further syntactic and semantic
     #  evaluation.
     def unfold(string)
-      string.gsub(/#{CRLF}(#{WSP})/m, '\1')
+      string.gsub(/#{Constants::CRLF}(#{Constants::WSP})/m, '\1')
     end
   end
 end

data/lib/mail/fields/content_type_field.rb

@@ -175,7 +175,7 @@ module Mail
         # and: audio/x-midi;\r\n\sname=Part .exe
         params = $2.to_s.split(/\s+/)
         params = params.map { |i| i.to_s.chomp.strip }
-        params = params.map { |i| i.split(/\s*\=\s*/) }
+        params = params.map { |i| i.split(/\s*\=\s*/, 2) }
         params = params.map { |i| "#{i[0]}=#{dquote(i[1].to_s.gsub(/;$/,""))}" }.join('; ')
         "#{type}; #{params}"
       when val =~ /^\s*$/

data/lib/mail/message.rb

@@ -1984,7 +1984,7 @@ module Mail
 
   private
 
-    HEADER_SEPARATOR = /#{CRLF}#{CRLF}/
+    HEADER_SEPARATOR = /#{Constants::CRLF}#{Constants::CRLF}/
 
     #  2.1. General Description
     #   A message consists of header fields (collectively called "the header
@@ -2000,8 +2000,7 @@ module Mail
     end
 
     def raw_source=(value)
-      value = value.dup.force_encoding(Encoding::BINARY) if RUBY_VERSION >= "1.9.1"
-      @raw_source = ::Mail::Utilities.to_crlf(value)
+      @raw_source = value
     end
 
     # see comments to body=. We take data and process it lazily
@@ -2030,7 +2029,7 @@ module Mail
 
     def set_envelope_header
       raw_string = raw_source.to_s
-      if match_data = raw_string.match(/\AFrom\s(#{TEXT}+)#{CRLF}/m)
+      if match_data = raw_string.match(/\AFrom\s(#{TEXT}+)#{Constants::CRLF}/m)
         set_envelope(match_data[1])
         self.raw_source = raw_string.sub(match_data[0], "")
       end

data/lib/mail/part.rb

@@ -104,8 +104,8 @@ module Mail
     
     # A part may not have a header.... so, just init a body if no header
     def parse_message
-      header_part, body_part = raw_source.split(/#{CRLF}#{WSP}*#{CRLF}/m, 2)
-      if header_part =~ HEADER_LINE
+      header_part, body_part = raw_source.split(/#{Constants::CRLF}#{Constants::WSP}*#{Constants::CRLF}/m, 2)
+      if header_part =~ Constants::HEADER_LINE
         self.header = header_part
         self.body   = body_part
       else

data/lib/mail/utilities.rb

@@ -24,9 +24,9 @@ module Mail
     # If the string supplied has PHRASE unsafe characters in it, will return the string quoted
     # in double quotes, otherwise returns the string unmodified
     def quote_phrase( str )
-      if RUBY_VERSION >= '1.9'
+      if str.respond_to?(:force_encoding)
         original_encoding = str.encoding
-        ascii_str = str.dup.force_encoding('ASCII-8BIT')
+        ascii_str = str.to_s.dup.force_encoding('ASCII-8BIT')
         if (PHRASE_UNSAFE === ascii_str)
           dquote(ascii_str).force_encoding(original_encoding)
         else
@@ -45,7 +45,17 @@ module Mail
     # If the string supplied has TOKEN unsafe characters in it, will return the string quoted
     # in double quotes, otherwise returns the string unmodified
     def quote_token( str )
-      token_safe?( str ) ? str : dquote(str)
+      if str.respond_to?(:force_encoding)
+        original_encoding = str.encoding
+        ascii_str = str.to_s.dup.force_encoding('ASCII-8BIT')
+        if token_safe?( ascii_str )
+          str
+        else
+          dquote(ascii_str).force_encoding(original_encoding)
+        end
+      else
+        token_safe?( str ) ? str : dquote(str)
+      end
     end
 
     # Wraps supplied string in double quotes and applies \-escaping as necessary,
@@ -241,45 +251,35 @@ 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.binary_unsafe_to_lf(string) #:nodoc:
+      string.gsub(/\r\n|\r/, LF)
+    end
 
-      def self.binary_unsafe_to_lf(string) #:nodoc:
-        string.encode(string.encoding, :universal_newline => true)
+    TO_CRLF_REGEX =
+      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.
+        Regexp.new("(?<!\r)\n|\r(?!\n)")
+      else
+        /\n|\r\n|\r/
       end
 
-      def self.binary_unsafe_to_crlf(string) #:nodoc:
-        string.encode(string.encoding, :universal_newline => true).encode!(string.encoding, :crlf_newline => true)
-      end
+    def self.binary_unsafe_to_crlf(string) #:nodoc:
+      string.gsub(TO_CRLF_REGEX, CRLF)
+    end
 
+    if RUBY_VERSION < '1.9'
       def self.safe_for_line_ending_conversion?(string) #:nodoc:
         string.ascii_only?
       end
     else
-      def self.binary_unsafe_to_lf(string) #:nodoc:
-        string.gsub(/\r\n|\r/, LF)
-      end
-
-      TO_CRLF_REGEX =
-        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.
-          Regexp.new("(?<!\r)\n|\r(?!\n)")
+      def self.safe_for_line_ending_conversion?(string) #:nodoc:
+        if string.encoding == Encoding::BINARY
+          string.ascii_only?
         else
-          /\n|\r\n|\r/
+          string.valid_encoding?
         end
-
-      def self.binary_unsafe_to_crlf(string) #:nodoc:
-        string.gsub(TO_CRLF_REGEX, CRLF)
-      end
-
-      def self.safe_for_line_ending_conversion?(string) #:nodoc:
-        string.ascii_only?
       end
     end
 

data/lib/mail/version.rb

@@ -4,8 +4,8 @@ module Mail
 
     MAJOR = 2
     MINOR = 7
-    PATCH = 0
-    BUILD = nil
+    PATCH = 1
+    BUILD = 'rc1'
 
     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.7.0
+  version: 2.7.1.rc1
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_mime
@@ -241,12 +241,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.