mail 2.6.3 → 2.7.0

data/lib/mail/fields/content_type_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'mail/fields/common/parameter_hash'
 
 module Mail
@@ -17,16 +18,16 @@ module Mail
         @main_type = nil
         @sub_type = nil
         @parameters = nil
-        value = strip_field(FIELD_NAME, value)
+        value = value.to_s
       end
-      ensure_filename_quoted(value)
+      value = ensure_filename_quoted(value)
       super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
     end
 
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         self.value = val
         @element = nil
         element
@@ -144,9 +145,7 @@ module Mail
       # TODO: check if there are cases where whitespace is not a separator
       val = val.
         gsub(/\s*=\s*/,'='). # remove whitespaces around equal sign
-        tr(' ',';').
-        squeeze(';').
-        gsub(';', '; '). #use '; ' as a separator (or EOL)
+        gsub(/[; ]+/, '; '). #use '; ' as a separator (or EOL)
         gsub(/;\s*$/,'') #remove trailing to keep examples below
 
       if val =~ /(boundary=(\S*))/i
@@ -156,9 +155,6 @@ module Mail
       end
 
       case
-      when val.chomp =~ /^\s*([\w\-]+)\/([\w\-]+)\s*;;+(.*)$/i
-        # Handles 'text/plain;; format="flowed"' (double semi colon)
-        "#{$1}/#{$2}; #{$3}"
       when val.chomp =~ /^\s*([\w\-]+)\/([\w\-]+)\s*;\s?(ISO[\w\-]+)$/i
         # Microsoft helper:
         # Handles 'type/subtype;ISO-8559-1'
@@ -185,7 +181,7 @@ module Mail
       when val =~ /^\s*$/
         'text/plain'
       else
-        ''
+        val
       end
     end
 

data/lib/mail/fields/date_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 #
 # = Date Field
 #
@@ -33,12 +34,11 @@ module Mail
 
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      if value.blank?
+      if Utilities.blank?(value)
         value = ::DateTime.now.strftime('%a, %d %b %Y %H:%M:%S %z')
       else
-        value = strip_field(FIELD_NAME, value)
-        value.to_s.gsub!(/\(.*?\)/, '')
-        value = ::DateTime.parse(value.to_s.squeeze(" ")).strftime('%a, %d %b %Y %H:%M:%S %z')
+        value = value.to_s.gsub(/\(.*?\)/, '').squeeze(' ')
+        value = ::DateTime.parse(value).strftime('%a, %d %b %Y %H:%M:%S %z')
       end
       super(CAPITALIZED_FIELD, value, charset)
     rescue ArgumentError => e

data/lib/mail/fields/from_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = From Field
 # 
@@ -38,8 +39,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
     

data/lib/mail/fields/in_reply_to_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = In-Reply-To Field
 # 
@@ -39,7 +40,7 @@ module Mail
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       value = value.join("\r\n\s") if value.is_a?(Array)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
     end

data/lib/mail/fields/keywords_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # keywords        =       "Keywords:" phrase *("," phrase) CRLF
 module Mail
@@ -9,13 +10,12 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
 
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @phrase_list ||= PhraseList.new(value)
       end
     end

data/lib/mail/fields/message_id_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Message-ID Field
 # 
@@ -41,11 +42,11 @@ module Mail
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       @uniq = 1
-      if value.blank?
+      if Utilities.blank?(value)
         self.name = CAPITALIZED_FIELD
         self.value = generate_message_id
       else
-        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+        super(CAPITALIZED_FIELD, value, charset)
       end
       self.parse
       self

data/lib/mail/fields/mime_version_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # 
 # 
@@ -10,17 +11,17 @@ module Mail
 
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      if value.blank?
+      if Utilities.blank?(value)
         value = '1.0'
       end
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
 
     end
     
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @element = Mail::MimeVersionElement.new(val)
       end
     end

data/lib/mail/fields/optional_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 #    The field names of any optional-field MUST NOT be identical to any
 #    field name specified elsewhere in this standard.
@@ -8,6 +9,9 @@ require 'mail/fields/unstructured_field'
 
 module Mail
   class OptionalField < UnstructuredField
-    
+    private
+      def do_encode
+        "#{wrapped_value}\r\n"
+      end
   end
 end

data/lib/mail/fields/received_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # trace           =       [return]
 #                         1*received
@@ -27,14 +28,14 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
 
     end
     
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @element = Mail::ReceivedElement.new(val)
       end
     end
@@ -56,7 +57,7 @@ module Mail
     end
  
     def encoded
-      if value.blank?
+      if Utilities.blank?(value)
         "#{CAPITALIZED_FIELD}: \r\n"
       else
         "#{CAPITALIZED_FIELD}: #{info}; #{formatted_date}\r\n"
@@ -64,7 +65,7 @@ module Mail
     end
     
     def decoded
-      if value.blank?
+      if Utilities.blank?(value)
         ""
       else
         "#{info}; #{formatted_date}" 

data/lib/mail/fields/references_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = References Field
 # 
@@ -39,7 +40,7 @@ module Mail
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       value = value.join("\r\n\s") if value.is_a?(Array)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
     end

data/lib/mail/fields/reply_to_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Reply-To Field
 # 
@@ -38,8 +39,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
     

data/lib/mail/fields/resent_bcc_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Resent-Bcc Field
 # 
@@ -38,8 +39,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
     

data/lib/mail/fields/resent_cc_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Resent-Cc Field
 # 
@@ -38,8 +39,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
     

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'
@@ -13,10 +14,9 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      if value.blank?
+      if Utilities.blank?(value)
         value = ::DateTime.now.strftime('%a, %d %b %Y %H:%M:%S %z')
       else
-        value = strip_field(FIELD_NAME, value)
         value = ::DateTime.parse(value.to_s).strftime('%a, %d %b %Y %H:%M:%S %z')
       end
       super(CAPITALIZED_FIELD, value, charset)

data/lib/mail/fields/resent_from_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Resent-From Field
 # 
@@ -38,8 +39,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
     

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'
@@ -13,7 +14,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
     end

data/lib/mail/fields/resent_sender_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Resent-Sender Field
 # 
@@ -37,8 +38,7 @@ module Mail
 
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
 

data/lib/mail/fields/resent_to_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Resent-To Field
 # 
@@ -38,8 +39,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
     

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
 # 
@@ -40,8 +41,7 @@ module Mail
     def initialize(value = nil, charset = 'utf-8')
       value = nil if value == '<>'
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
     

data/lib/mail/fields/sender_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = Sender Field
 # 
@@ -38,8 +39,7 @@ module Mail
 
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
 

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
@@ -9,7 +10,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      super(CAPITALIZED_FIELD, value, charset)
     end
     
   end

data/lib/mail/fields/to_field.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 # 
 # = To Field
 # 
@@ -38,8 +39,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
     

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
@@ -31,6 +32,12 @@ module Mail
       else
         # Ensure we are dealing with a string
         value = value.to_s
+
+        # Mark UTF-8 strings parsed from ASCII-8BIT
+        if value.respond_to?(:force_encoding) && value.encoding == Encoding::ASCII_8BIT
+          utf8 = value.dup.force_encoding(Encoding::UTF_8)
+          value = utf8 if utf8.valid_encoding?
+        end
       end
 
       if charset
@@ -66,11 +73,15 @@ module Mail
     private
 
     def do_encode
-      value.nil? ? '' : "#{wrapped_value}\r\n"
+      if value && !value.empty?
+        "#{wrapped_value}\r\n"
+      else
+        ''
+      end
     end
 
     def do_decode
-      value.blank? ? nil : Encodings.decode_encode(value, :decode)
+      Utilities.blank?(value) ? nil : Encodings.decode_encode(value, :decode)
     end
 
     # 2.2.3. Long Header Fields
@@ -120,16 +131,16 @@ module Mail
     def fold(prepend = 0) # :nodoc:
       encoding       = normalized_encoding
       decoded_string = decoded.to_s
-      should_encode  = decoded_string.not_ascii_only?
+      should_encode  = !decoded_string.ascii_only?
       if should_encode
         first = true
         words = decoded_string.split(/[ \t]/).map do |word|
           if first
             first = !first
           else
-            word = " " << word
+            word = " #{word}"
           end
-          if word.not_ascii_only?
+          if !word.ascii_only?
             word
           else
             word.scan(/.{7}|.+$/)
@@ -143,11 +154,18 @@ 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
-          word.encode!(charset) if charset && word.respond_to?(:encode!)
+
+          # Convert on 1.9+ only since we aren't sure of the current
+          # charset encoding on 1.8. We'd need to track internal/external
+          # charset on each field.
+          if charset && word.respond_to?(:encoding)
+            word = Encodings.transcode_charset(word, word.encoding, charset)
+          end
+
           word = encode(word) if should_encode
           word = encode_crlf(word)
           # Skip to next line if we're going to go past the limit

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,13 +50,14 @@ 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 = header_text
       split_header if header_text
     end
 
     def initialize_copy(original)
       super
       @fields = @fields.dup
+      @fields.map!(&:dup)
     end
     
     # The preserved raw source of the header as you passed it in, untouched
@@ -91,14 +93,15 @@ module Mail
     #  h.fields = ['From: mikel@me.com', 'To: bob@you.com']
     def fields=(unfolded_fields)
       @fields = Mail::FieldList.new
-      warn "Warning: more than #{self.class.maximum_amount} header fields only using the first #{self.class.maximum_amount}" if unfolded_fields.length > self.class.maximum_amount
+      Kernel.warn "WARNING: More than #{self.class.maximum_amount} header fields; only using the first #{self.class.maximum_amount} and ignoring the rest" if unfolded_fields.length > self.class.maximum_amount
       unfolded_fields[0..(self.class.maximum_amount-1)].each do |field|
 
-        field = Field.new(field, nil, charset)
-        if limited_field?(field.name) && (selected = select_field_for(field.name)) && selected.any? 
-          selected.first.update(field.name, field.value)
-        else
-          @fields << field
+        if field = Field.parse(field, charset)
+          if limited_field?(field.name) && (selected = select_field_for(field.name)) && selected.any?
+            selected.first.update(field.name, field.value)
+          else
+            @fields << field
+          end
         end
       end
 
@@ -136,7 +139,7 @@ module Mail
       case
       when selected.length > 1
         selected.map { |f| f }
-      when !selected.blank?
+      when !Utilities.blank?(selected)
         selected.first
       else
         nil
@@ -166,11 +169,11 @@ module Mail
       
       case
       # User wants to delete the field
-      when !selected.blank? && value == nil
+      when !Utilities.blank?(selected) && value == nil
         fields.delete_if { |f| selected.include?(f) }
         
       # User wants to change the field
-      when !selected.blank? && limited_field?(fn)
+      when !Utilities.blank?(selected) && limited_field?(fn)
         selected.first.update(fn, value)
         
       # User wants to create the field
@@ -204,7 +207,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
@@ -247,7 +250,7 @@ module Mail
     private
     
     def raw_source=(val)
-      @raw_source = val
+      @raw_source = ::Mail::Utilities.to_crlf(val).lstrip
     end
     
     # Splits an unfolded and line break cleaned header into individual field

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.
@@ -89,19 +90,11 @@ module Mail
   # Each mail object inherits the default set in Mail.delivery_method, however, on
   # a per email basis, you can override the method:
   #
-  #   mail.delivery_method :sendmail
+  #   mail.delivery_method :smtp
   # 
   # Or you can override the method and pass in settings:
   # 
-  #   mail.delivery_method :sendmail, { :address => 'some.host' }
-  # 
-  # You can also just modify the settings:
-  # 
-  #   mail.delivery_settings = { :address => 'some.host' }
-  # 
-  # The passed in hash is just merged against the defaults with +merge!+ and the result
-  # assigned the mail object.  So the above example will change only the :address value
-  # of the global smtp_settings to be 'some.host', keeping all other values
+  #   mail.delivery_method :smtp, :address => 'some.host'
   def self.defaults(&block)
     Configuration.instance.instance_eval(&block)
   end