mail 2.6.6 → 2.7.1

data/lib/mail/fields/common/common_address.rb

@@ -4,7 +4,6 @@ require 'mail/fields/common/address_container'
 
 module Mail
   module CommonAddress # :nodoc:
-      
     def parse(val = value)
       unless Utilities.blank?(val)
         @address_list = AddressList.new(encode_if_needed(val))
@@ -12,15 +11,22 @@ module Mail
         nil
       end
     end
-    
+
     def charset
       @charset
     end
-    
-    def encode_if_needed(val)
-      Encodings.address_encode(val, charset)
+
+    def encode_if_needed(val) #:nodoc:
+      # Need to join arrays of addresses into a single value
+      if val.kind_of?(Array)
+        val.compact.map { |a| encode_if_needed a }.join(', ')
+
+      # Pass through UTF-8; encode non-UTF-8.
+      else
+        utf8_if_needed(val) || Encodings.encode_non_usascii(val, charset)
+      end
     end
-    
+
     # Allows you to iterate through each address object in the address_list
     def each
       address_list.addresses.each do |address|
@@ -98,7 +104,26 @@ module Mail
     end
   
     private
-  
+
+    if 'string'.respond_to?(:encoding)
+      # Pass through UTF-8 addresses
+      def utf8_if_needed(val)
+        if charset =~ /\AUTF-?8\z/i
+          val
+        elsif val.encoding == Encoding::UTF_8
+          val
+        elsif (utf8 = val.dup.force_encoding(Encoding::UTF_8)).valid_encoding?
+          utf8
+        end
+      end
+    else
+      def utf8_if_needed(val)
+        if charset =~ /\AUTF-?8\z/i
+          val
+        end
+      end
+    end
+
     def do_encode(field_name)
       return '' if Utilities.blank?(value)
       address_array = address_list.addresses.reject { |a| encoded_group_addresses.include?(a.encoded) }.compact.map { |a| a.encoded }

data/lib/mail/fields/common/common_field.rb

@@ -14,9 +14,8 @@ module Mail
 
     def value=(value)
       @length = nil
-      @tree = nil
       @element = nil
-      @value = value
+      @value = value.is_a?(Array) ? value : value.to_s
     end
 
     def value
@@ -41,14 +40,6 @@ module Mail
 
     private
 
-    def strip_field(field_name, value)
-      if value.is_a?(Array)
-        value
-      else
-        value.to_s.sub(/\A#{field_name}:\s+/i, EMPTY)
-      end
-    end
-
     FILENAME_RE = /\b(filename|name)=([^;"\r\n]+\s[^;"\r\n]+)/
     def ensure_filename_quoted(value)
       if value.is_a?(String)

data/lib/mail/fields/common/parameter_hash.rb

@@ -30,7 +30,7 @@ module Mail
         super(exact || key_name)
       else # Dealing with a multiple value pair or a single encoded value pair
         string = pairs.sort { |a,b| a.first.to_s <=> b.first.to_s }.map { |v| v.last }.join('')
-        if mt = string.match(/([\w\-]+)'(\w\w)'(.*)/)
+        if mt = string.match(/([\w\-]+)?'(\w\w)?'(.*)/)
           string = mt[3]
           encoding = mt[1]
         else

data/lib/mail/fields/content_description_field.rb

@@ -11,7 +11,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/content_disposition_field.rb

@@ -11,7 +11,7 @@ module Mail
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       value = ensure_filename_quoted(value)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
     end
@@ -38,9 +38,9 @@ module Mail
 
     def filename
       case
-      when !Utilities.blank?(parameters['filename'])
+      when parameters['filename']
         @filename = parameters['filename']
-      when !Utilities.blank?(parameters['name'])
+      when parameters['name']
         @filename = parameters['name']
       else
         @filename = nil

data/lib/mail/fields/content_id_field.rb

@@ -15,9 +15,9 @@ module Mail
       if Utilities.blank?(value)
         value = generate_content_id
       else
-        value = strip_field(FIELD_NAME, value)
+        value = value.to_s
       end
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
     end

data/lib/mail/fields/content_location_field.rb

@@ -11,7 +11,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/content_transfer_encoding_field.rb

@@ -13,7 +13,7 @@ module Mail
       self.charset = charset
       value = '7bit' if value.to_s =~ /7-?bits?/i
       value = '8bit' if value.to_s =~ /8-?bits?/i
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
     end

data/lib/mail/fields/content_type_field.rb

@@ -18,7 +18,7 @@ module Mail
         @main_type = nil
         @sub_type = nil
         @parameters = nil
-        value = strip_field(FIELD_NAME, value)
+        value = value.to_s
       end
       value = ensure_filename_quoted(value)
       super(CAPITALIZED_FIELD, value, charset)
@@ -145,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
@@ -157,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'
@@ -180,13 +175,13 @@ 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*$/
         'text/plain'
       else
-        ''
+        val
       end
     end
 

data/lib/mail/fields/date_field.rb

@@ -37,9 +37,8 @@ module Mail
       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

@@ -39,7 +39,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
     end
     

data/lib/mail/fields/in_reply_to_field.rb

@@ -40,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

@@ -10,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)
       self
     end
 

data/lib/mail/fields/message_id_field.rb

@@ -46,7 +46,7 @@ module Mail
         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

@@ -14,7 +14,7 @@ module Mail
       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
 

data/lib/mail/fields/optional_field.rb

@@ -9,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

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

data/lib/mail/fields/references_field.rb

@@ -40,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

@@ -39,7 +39,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
     end
     

data/lib/mail/fields/resent_bcc_field.rb

@@ -39,7 +39,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
     end
     

data/lib/mail/fields/resent_cc_field.rb

@@ -39,7 +39,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
     end
     

data/lib/mail/fields/resent_date_field.rb

@@ -17,7 +17,6 @@ module Mail
       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

@@ -39,7 +39,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
     end
     

data/lib/mail/fields/resent_message_id_field.rb

@@ -14,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

@@ -38,7 +38,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
     end
 

data/lib/mail/fields/resent_to_field.rb

@@ -39,7 +39,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
     end
     

data/lib/mail/fields/return_path_field.rb

@@ -41,7 +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)
+      super(CAPITALIZED_FIELD, value, charset)
       self
     end
     

data/lib/mail/fields/sender_field.rb

@@ -39,7 +39,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
     end
 

data/lib/mail/fields/subject_field.rb

@@ -10,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

@@ -39,7 +39,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
     end
     

data/lib/mail/fields/unstructured_field.rb

@@ -32,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
@@ -67,7 +73,11 @@ 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
@@ -121,7 +131,7 @@ 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|
@@ -130,7 +140,7 @@ module Mail
           else
             word = " #{word}"
           end
-          if word.not_ascii_only?
+          if !word.ascii_only?
             word
           else
             word.scan(/.{7}|.+$/)
@@ -148,7 +158,14 @@ module Mail
         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/header.rb

@@ -50,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 = ::Mail::Utilities.to_crlf(header_text).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
@@ -92,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
 
@@ -248,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/mail.rb

@@ -90,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

data/lib/mail/matchers/has_sent_mail.rb

@@ -83,6 +83,16 @@ module Mail
         self
       end
 
+      def with_html(body)
+        @html_part_body = body
+        self
+      end
+
+      def with_text(body)
+        @text_part_body = body
+        self
+      end
+
       def description
         result = "send a matching email"
         result
@@ -108,7 +118,7 @@ module Mail
         candidate_deliveries = deliveries
         modifiers =
           %w(sender recipients copy_recipients blind_copy_recipients subject
-          subject_matcher body body_matcher having_attachments attachments)
+          subject_matcher body body_matcher html_part_body text_part_body  having_attachments attachments)
         modifiers.each do |modifier_name|
           next unless instance_variable_defined?("@#{modifier_name}")
           candidate_deliveries = candidate_deliveries.select{|matching_delivery| self.send("matches_on_#{modifier_name}?", matching_delivery)}
@@ -160,6 +170,14 @@ module Mail
         @body_matcher.match delivery.body.raw_source
       end
 
+      def matches_on_html_part_body?(delivery)
+        delivery.html_part.body == @html_part_body
+      end
+
+      def matches_on_text_part_body?(delivery)
+        delivery.text_part.body == @text_part_body
+      end
+
       def explain_expectations
         result = ''
         result += "from #{@sender} " if instance_variable_defined?('@sender')
@@ -170,6 +188,8 @@ module Mail
         result += "with subject matching \"#{@subject_matcher}\" " if instance_variable_defined?('@subject_matcher')
         result += "with body \"#{@body}\" " if instance_variable_defined?('@body')
         result += "with body matching \"#{@body_matcher}\" " if instance_variable_defined?('@body_matcher')
+        result += "with a text part matching \"#{@text_part_body}\" " if instance_variable_defined?('@text_part_body')
+        result += "with an HTML part matching \"#{@html_part_body}\" " if instance_variable_defined?('@html_part_body')
         result
       end