mail 2.8.1 → 2.9.0

data/lib/mail/parsers/content_location_parser.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 require "mail/utilities"
 require "mail/parser_tools"
@@ -589,7 +588,7 @@ begin
         return content_location if Mail::Utilities.blank?(data)
 
         # Parser state
-        disp_type_s = param_attr_s = param_attr = qstr_s = qstr = param_val_s = nil
+        qstr_s = qstr = param_val_s = nil
 
         # 5.1 Variables Used by Ragel
         p = 0
@@ -631,10 +630,10 @@ begin
               _trans = if (_slen > 0 &&
                            _trans_keys[_keys] <= _wide &&
                            _wide <= _trans_keys[_keys + 1])
-                         _indicies[_inds + _wide - _trans_keys[_keys]]
-                       else
-                         _indicies[_inds + _slen]
-                       end
+                  _indicies[_inds + _wide - _trans_keys[_keys]]
+                else
+                  _indicies[_inds + _slen]
+                end
               cs = _trans_targs[_trans]
               if _trans_actions[_trans] != 0
                 case _trans_actions[_trans]
@@ -809,6 +808,10 @@ begin
           end
         end
 
+        if false
+          testEof
+        end
+
         if p != eof || cs < 32
           raise Mail::Field::IncompleteParseError.new(Mail::ContentLocationElement, data, p)
         end

data/lib/mail/parsers/content_location_parser.rl

@@ -54,7 +54,7 @@ module Mail::Parsers
       return content_location if Mail::Utilities.blank?(data)
 
       # Parser state
-      disp_type_s = param_attr_s = param_attr = qstr_s = qstr = param_val_s = nil
+      qstr_s = qstr = param_val_s = nil
 
       # 5.1 Variables Used by Ragel
       p = 0
@@ -64,6 +64,10 @@ module Mail::Parsers
       %%write init;
       %%write exec;
 
+      if false
+        testEof
+      end
+
       if p != eof || cs < %%{ write first_final; }%%
         raise Mail::Field::IncompleteParseError.new(Mail::ContentLocationElement, data, p)
       end

data/lib/mail/parsers/content_transfer_encoding_parser.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 require "mail/utilities"
 require "mail/parser_tools"
@@ -382,10 +381,10 @@ begin
               _trans = if (_slen > 0 &&
                            _trans_keys[_keys] <= _wide &&
                            _wide <= _trans_keys[_keys + 1])
-                         _indicies[_inds + _wide - _trans_keys[_keys]]
-                       else
-                         _indicies[_inds + _slen]
-                       end
+                  _indicies[_inds + _wide - _trans_keys[_keys]]
+                else
+                  _indicies[_inds + _slen]
+                end
               cs = _trans_targs[_trans]
               if _trans_actions[_trans] != 0
                 case _trans_actions[_trans]
@@ -509,6 +508,10 @@ begin
           end
         end
 
+        if false
+          testEof
+        end
+
         if p != eof || cs < 21
           raise Mail::Field::IncompleteParseError.new(Mail::ContentTransferEncodingElement, data, p)
         end

data/lib/mail/parsers/content_transfer_encoding_parser.rl

@@ -57,6 +57,10 @@ module Mail::Parsers
       %%write init;
       %%write exec;
 
+      if false
+        testEof
+      end
+
       if p != eof || cs < %%{ write first_final; }%%
         raise Mail::Field::IncompleteParseError.new(Mail::ContentTransferEncodingElement, data, p)
       end

data/lib/mail/parsers/content_type_parser.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 require "mail/utilities"
 require "mail/parser_tools"
@@ -736,10 +735,10 @@ begin
               _trans = if (_slen > 0 &&
                            _trans_keys[_keys] <= _wide &&
                            _wide <= _trans_keys[_keys + 1])
-                         _indicies[_inds + _wide - _trans_keys[_keys]]
-                       else
-                         _indicies[_inds + _slen]
-                       end
+                  _indicies[_inds + _wide - _trans_keys[_keys]]
+                else
+                  _indicies[_inds + _slen]
+                end
               cs = _trans_targs[_trans]
               if _trans_actions[_trans] != 0
                 case _trans_actions[_trans]
@@ -788,7 +787,7 @@ begin
                     # Use quoted s value if one exists, otherwise use parameter value
                     value = qstr || chars(data, param_val_s, p - 1)
 
-                    content_type.parameters << {param_attr => value}
+                    content_type.parameters << { param_attr => value }
                     param_attr = nil
                     qstr = nil
                   end
@@ -859,7 +858,7 @@ begin
                     # Use quoted s value if one exists, otherwise use parameter value
                     value = qstr || chars(data, param_val_s, p - 1)
 
-                    content_type.parameters << {param_attr => value}
+                    content_type.parameters << { param_attr => value }
                     param_attr = nil
                     qstr = nil
                   end
@@ -889,7 +888,7 @@ begin
                     # Use quoted s value if one exists, otherwise use parameter value
                     value = qstr || chars(data, param_val_s, p - 1)
 
-                    content_type.parameters << {param_attr => value}
+                    content_type.parameters << { param_attr => value }
                     param_attr = nil
                     qstr = nil
                   end
@@ -946,7 +945,7 @@ begin
                     # Use quoted s value if one exists, otherwise use parameter value
                     value = qstr || chars(data, param_val_s, p - 1)
 
-                    content_type.parameters << {param_attr => value}
+                    content_type.parameters << { param_attr => value }
                     param_attr = nil
                     qstr = nil
                   end
@@ -970,7 +969,7 @@ begin
                     # Use quoted s value if one exists, otherwise use parameter value
                     value = qstr || chars(data, param_val_s, p - 1)
 
-                    content_type.parameters << {param_attr => value}
+                    content_type.parameters << { param_attr => value }
                     param_attr = nil
                     qstr = nil
                   end
@@ -1004,7 +1003,7 @@ begin
                     # Use quoted s value if one exists, otherwise use parameter value
                     value = qstr || chars(data, param_val_s, p - 1)
 
-                    content_type.parameters << {param_attr => value}
+                    content_type.parameters << { param_attr => value }
                     param_attr = nil
                     qstr = nil
                   end
@@ -1022,7 +1021,7 @@ begin
                     # Use quoted s value if one exists, otherwise use parameter value
                     value = qstr || chars(data, param_val_s, p - 1)
 
-                    content_type.parameters << {param_attr => value}
+                    content_type.parameters << { param_attr => value }
                     param_attr = nil
                     qstr = nil
                   end
@@ -1035,6 +1034,10 @@ begin
           end
         end
 
+        if false
+          testEof
+        end
+
         if p != eof || cs < 47
           raise Mail::Field::IncompleteParseError.new(Mail::ContentTypeElement, data, p)
         end

data/lib/mail/parsers/content_type_parser.rl

@@ -76,6 +76,10 @@ module Mail::Parsers
       %%write init;
       %%write exec;
 
+      if false
+        testEof
+      end
+
       if p != eof || cs < %%{ write first_final; }%%
         raise Mail::Field::IncompleteParseError.new(Mail::ContentTypeElement, data, p)
       end

data/lib/mail/parsers/date_time_parser.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 require "mail/utilities"
 require "mail/parser_tools"
@@ -715,10 +714,10 @@ begin
               _trans = if (_slen > 0 &&
                            _trans_keys[_keys] <= _wide &&
                            _wide <= _trans_keys[_keys + 1])
-                         _indicies[_inds + _wide - _trans_keys[_keys]]
-                       else
-                         _indicies[_inds + _slen]
-                       end
+                  _indicies[_inds + _wide - _trans_keys[_keys]]
+                else
+                  _indicies[_inds + _slen]
+                end
               cs = _trans_targs[_trans]
               if _trans_actions[_trans] != 0
                 case _trans_actions[_trans]
@@ -878,6 +877,10 @@ begin
           end
         end
 
+        if false
+          testEof
+        end
+
         if p != eof || cs < 103
           raise Mail::Field::IncompleteParseError.new(Mail::DateTimeElement, data, p)
         end

data/lib/mail/parsers/date_time_parser.rl

@@ -55,6 +55,10 @@ module Mail::Parsers
       %%write init;
       %%write exec;
 
+      if false
+        testEof
+      end
+
       if p != eof || cs < %%{ write first_final; }%%
         raise Mail::Field::IncompleteParseError.new(Mail::DateTimeElement, data, p)
       end

data/lib/mail/parsers/envelope_from_parser.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 require "mail/utilities"
 require "mail/parser_tools"
@@ -3265,10 +3264,10 @@ begin
               _trans = if (_slen > 0 &&
                            _trans_keys[_keys] <= _wide &&
                            _wide <= _trans_keys[_keys + 1])
-                         _indicies[_inds + _wide - _trans_keys[_keys]]
-                       else
-                         _indicies[_inds + _slen]
-                       end
+                  _indicies[_inds + _wide - _trans_keys[_keys]]
+                else
+                  _indicies[_inds + _slen]
+                end
               cs = _trans_targs[_trans]
               if _trans_actions[_trans] != 0
                 case _trans_actions[_trans]
@@ -3662,6 +3661,10 @@ begin
           end
         end
 
+        if false
+          testEof
+        end
+
         if p != eof || cs < 257
           raise Mail::Field::IncompleteParseError.new(Mail::EnvelopeFromElement, data, p)
         end

data/lib/mail/parsers/envelope_from_parser.rl

@@ -75,6 +75,10 @@ module Mail::Parsers
       %%write init;
       %%write exec;
 
+      if false
+        testEof
+      end
+
       if p != eof || cs < %%{ write first_final; }%%
         raise Mail::Field::IncompleteParseError.new(Mail::EnvelopeFromElement, data, p)
       end

data/lib/mail/parsers/message_ids_parser.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 require "mail/utilities"
 require "mail/parser_tools"
@@ -4872,10 +4871,10 @@ begin
               _trans = if (_slen > 0 &&
                            _trans_keys[_keys] <= _wide &&
                            _wide <= _trans_keys[_keys + 1])
-                         _indicies[_inds + _wide - _trans_keys[_keys]]
-                       else
-                         _indicies[_inds + _slen]
-                       end
+                  _indicies[_inds + _wide - _trans_keys[_keys]]
+                else
+                  _indicies[_inds + _slen]
+                end
               cs = _trans_targs[_trans]
               if _trans_actions[_trans] != 0
                 case _trans_actions[_trans]
@@ -5148,6 +5147,10 @@ begin
           end
         end
 
+        if false
+          testEof
+        end
+
         if p != eof || cs < 318
           raise Mail::Field::IncompleteParseError.new(Mail::MessageIdsElement, data, p)
         end

data/lib/mail/parsers/message_ids_parser.rl

@@ -79,6 +79,10 @@ module Mail::Parsers
       %%write init;
       %%write exec;
 
+      if false
+        testEof
+      end
+
       if p != eof || cs < %%{ write first_final; }%%
         raise Mail::Field::IncompleteParseError.new(Mail::MessageIdsElement, data, p)
       end

data/lib/mail/parsers/mime_version_parser.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 require "mail/utilities"
 require "mail/parser_tools"
@@ -346,10 +345,10 @@ begin
               _trans = if (_slen > 0 &&
                            _trans_keys[_keys] <= _wide &&
                            _wide <= _trans_keys[_keys + 1])
-                         _indicies[_inds + _wide - _trans_keys[_keys]]
-                       else
-                         _indicies[_inds + _slen]
-                       end
+                  _indicies[_inds + _wide - _trans_keys[_keys]]
+                else
+                  _indicies[_inds + _slen]
+                end
               cs = _trans_targs[_trans]
               if _trans_actions[_trans] != 0
                 case _trans_actions[_trans]
@@ -500,6 +499,10 @@ begin
           end
         end
 
+        if false
+          testEof
+        end
+
         if p != eof || cs < 23
           raise Mail::Field::IncompleteParseError.new(Mail::MimeVersionElement, data, p)
         end

data/lib/mail/parsers/mime_version_parser.rl

@@ -54,6 +54,10 @@ module Mail::Parsers
       %%write init;
       %%write exec;
 
+      if false
+        testEof
+      end
+
       if p != eof || cs < %%{ write first_final; }%%
         raise Mail::Field::IncompleteParseError.new(Mail::MimeVersionElement, data, p)
       end

data/lib/mail/parsers/phrase_lists_parser.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 require "mail/utilities"
 require "mail/parser_tools"
@@ -726,10 +725,10 @@ begin
               _trans = if (_slen > 0 &&
                            _trans_keys[_keys] <= _wide &&
                            _wide <= _trans_keys[_keys + 1])
-                         _indicies[_inds + _wide - _trans_keys[_keys]]
-                       else
-                         _indicies[_inds + _slen]
-                       end
+                  _indicies[_inds + _wide - _trans_keys[_keys]]
+                else
+                  _indicies[_inds + _slen]
+                end
               cs = _trans_targs[_trans]
               if _trans_actions[_trans] != 0
                 case _trans_actions[_trans]
@@ -871,6 +870,10 @@ begin
           end
         end
 
+        if false
+          testEof
+        end
+
         if p != eof || cs < 42
           raise Mail::Field::IncompleteParseError.new(Mail::PhraseList, data, p)
         end

data/lib/mail/parsers/phrase_lists_parser.rl

@@ -76,6 +76,10 @@ module Mail::Parsers
       %%write init;
       %%write exec;
 
+      if false
+        testEof
+      end
+
       if p != eof || cs < %%{ write first_final; }%%
         raise Mail::Field::IncompleteParseError.new(Mail::PhraseList, data, p)
       end

data/lib/mail/parsers/received_parser.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 require "mail/utilities"
 require "mail/parser_tools"
@@ -7538,10 +7537,10 @@ begin
               _trans = if (_slen > 0 &&
                            _trans_keys[_keys] <= _wide &&
                            _wide <= _trans_keys[_keys + 1])
-                         _indicies[_inds + _wide - _trans_keys[_keys]]
-                       else
-                         _indicies[_inds + _slen]
-                       end
+                  _indicies[_inds + _wide - _trans_keys[_keys]]
+                else
+                  _indicies[_inds + _slen]
+                end
               cs = _trans_targs[_trans]
               if _trans_actions[_trans] != 0
                 case _trans_actions[_trans]
@@ -8769,6 +8768,10 @@ begin
           end
         end
 
+        if false
+          testEof
+        end
+
         if p != eof || cs < 648
           raise Mail::Field::IncompleteParseError.new(Mail::ReceivedElement, data, p)
         end

data/lib/mail/parsers/received_parser.rl

@@ -77,6 +77,10 @@ module Mail::Parsers
       %%write init;
       %%write exec;
 
+      if false
+        testEof
+      end
+
       if p != eof || cs < %%{ write first_final; }%%
         raise Mail::Field::IncompleteParseError.new(Mail::ReceivedElement, data, p)
       end

data/lib/mail/part.rb

@@ -9,31 +9,31 @@ module Mail
     # into the Header.  The ContentIdField object will automatically generate
     # a unique content ID if you try and encode it or output it to_s without
     # specifying a content id.
-    # 
+    #
     # It will preserve the content ID you specify if you do.
     def add_content_id(content_id_val = '')
       header['content-id'] = content_id_val
     end
-    
+
     # Returns true if the part has a content ID field, the field may or may
     # not have a value, but the field exists or not.
     def has_content_id?
       header.has_content_id?
     end
-    
+
     def cid
       add_content_id unless has_content_id?
       Utilities.uri_escape(Utilities.unbracket(content_id))
     end
-    
+
     def url
       "cid:#{cid}"
     end
-    
+
     def inline?
       header[:content_disposition].disposition_type == 'inline' if header[:content_disposition].respond_to?(:disposition_type)
     end
-    
+
     def add_required_fields
       super
       add_content_id if !has_content_id? && inline?
@@ -42,15 +42,15 @@ module Mail
     def add_required_message_fields
       # Override so we don't add Date, MIME-Version, or Message-ID.
     end
-    
+
     def delivery_status_report_part?
       (main_type =~ /message/i && sub_type =~ /delivery-status/i) && body =~ /Status:/
     end
-    
+
     def delivery_status_data
       delivery_status_report_part? ? parse_delivery_status_report : {}
     end
-    
+
     def bounced?
       if action.is_a?(Array)
         !!(action.first =~ /failed/i)
@@ -58,18 +58,18 @@ module Mail
         !!(action =~ /failed/i)
       end
     end
-    
-    
+
+
     # Either returns the action if the message has just a single report, or an
     # array of all the actions, one for each report
     def action
       get_return_values('action')
     end
-    
+
     def final_recipient
       get_return_values('final-recipient')
     end
-    
+
     def error_status
       get_return_values('status')
     end
@@ -77,17 +77,17 @@ module Mail
     def diagnostic_code
       get_return_values('diagnostic-code')
     end
-    
+
     def remote_mta
       get_return_values('remote-mta')
     end
-    
+
     def retryable?
       !(error_status =~ /^5/)
     end
 
     private
-    
+
     def get_return_values(key)
       if delivery_status_data[key].is_a?(Array)
         delivery_status_data[key].map { |a| a.value }
@@ -97,7 +97,7 @@ module Mail
         nil
       end
     end
-    
+
     # 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(/#{Constants::LAX_CRLF}#{Constants::WSP}*#{Constants::LAX_CRLF}/m, 2)
@@ -109,11 +109,11 @@ module Mail
         self.body   = raw_source
       end
     end
-    
+
     def parse_delivery_status_report
       @delivery_status_data ||= Header.new(body.to_s.gsub("\r\n\r\n", "\r\n"))
     end
 
   end
-  
+
 end

data/lib/mail/smtp_envelope.rb

@@ -47,7 +47,7 @@ module Mail
           raise ArgumentError, "SMTP #{addr_name} address may not exceed #{MAX_ADDRESS_BYTESIZE} bytes: #{addr.inspect}"
         end
 
-        if /[\r\n]/ =~ addr
+        if /[\r\n]/.match?(addr)
           raise ArgumentError, "SMTP #{addr_name} address may not contain CR or LF line breaks: #{addr.inspect}"
         end
 

data/lib/mail/utilities.rb

@@ -165,7 +165,11 @@ module Mail
     end
 
     def uri_parser
-      @uri_parser ||= URI.const_defined?(:DEFAULT_PARSER) ? URI::DEFAULT_PARSER : URI
+      @uri_parser ||= if URI.const_defined?(:DEFAULT_PARSER)
+                        defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::DEFAULT_PARSER
+                      else
+                        URI
+                      end
     end
 
     # Matches two objects with their to_s values case insensitively
@@ -363,7 +367,7 @@ module Mail
       if !str.end_with?("=") && str.length % 4 != 0
         str = str.ljust((str.length + 3) & ~3, "=")
       end
-      str.unpack( 'm' ).first
+      str.unpack1( 'm' )
     end
 
     def Utilities.encode_base64(str)
@@ -399,7 +403,7 @@ module Mail
     def Utilities.decode_utf7(utf7)
       utf7.gsub(/&([^-]+)?-/n) do
         if $1
-          ($1.tr(",", "/") + "===").unpack("m")[0].encode(Encoding::UTF_8, Encoding::UTF_16BE)
+          ($1.tr(",", "/") + "===").unpack1("m").encode(Encoding::UTF_8, Encoding::UTF_16BE)
         else
           "&"
         end
@@ -420,7 +424,7 @@ module Mail
       end
       transcode_to_scrubbed_utf8(str)
     rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError, Encoding::InvalidByteSequenceError
-      warn "Encoding conversion failed #{$!}"
+      warn "WARNING: Encoding conversion failed #{$!}"
       str.dup.force_encoding(Encoding::UTF_8)
     end
 
@@ -444,7 +448,7 @@ module Mail
       end
       transcode_to_scrubbed_utf8(str)
     rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
-      warn "Encoding conversion failed #{$!}"
+      warn "WARNING: Encoding conversion failed #{$!}"
       str.dup.force_encoding(Encoding::UTF_8)
     end
 
@@ -453,7 +457,7 @@ module Mail
       str = charset_encoder.encode(str, encoding) if encoding
       transcode_to_scrubbed_utf8(str)
     rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
-      warn "Encoding conversion failed #{$!}"
+      warn "WARNING: Encoding conversion failed #{$!}"
       str.dup.force_encoding(Encoding::UTF_8)
     end
 
@@ -464,7 +468,7 @@ module Mail
     end
 
     def Utilities.uri_parser
-      URI::DEFAULT_PARSER
+      defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::DEFAULT_PARSER
     end
 
     # Pick a Ruby encoding corresponding to the message charset. Most

data/lib/mail/version.rb

@@ -3,8 +3,8 @@ module Mail
   module VERSION
 
     MAJOR = 2
-    MINOR = 8
-    PATCH = 1
+    MINOR = 9
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')