mail 2.4.4 → 2.5.2

data/lib/mail/fields.rb

@@ -1,35 +1,35 @@
 module Mail
-  autoload :UnstructuredField, 'mail/fields/unstructured_field'
-  autoload :StructuredField, 'mail/fields/structured_field'
-  autoload :OptionalField, 'mail/fields/optional_field'
+  register_autoload :UnstructuredField, 'mail/fields/unstructured_field'
+  register_autoload :StructuredField, 'mail/fields/structured_field'
+  register_autoload :OptionalField, 'mail/fields/optional_field'
 
-  autoload :BccField, 'mail/fields/bcc_field'
-  autoload :CcField, 'mail/fields/cc_field'
-  autoload :CommentsField, 'mail/fields/comments_field'
-  autoload :ContentDescriptionField, 'mail/fields/content_description_field'
-  autoload :ContentDispositionField, 'mail/fields/content_disposition_field'
-  autoload :ContentIdField, 'mail/fields/content_id_field'
-  autoload :ContentLocationField, 'mail/fields/content_location_field'
-  autoload :ContentTransferEncodingField, 'mail/fields/content_transfer_encoding_field'
-  autoload :ContentTypeField, 'mail/fields/content_type_field'
-  autoload :DateField, 'mail/fields/date_field'
-  autoload :FromField, 'mail/fields/from_field'
-  autoload :InReplyToField, 'mail/fields/in_reply_to_field'
-  autoload :KeywordsField, 'mail/fields/keywords_field'
-  autoload :MessageIdField, 'mail/fields/message_id_field'
-  autoload :MimeVersionField, 'mail/fields/mime_version_field'
-  autoload :ReceivedField, 'mail/fields/received_field'
-  autoload :ReferencesField, 'mail/fields/references_field'
-  autoload :ReplyToField, 'mail/fields/reply_to_field'
-  autoload :ResentBccField, 'mail/fields/resent_bcc_field'
-  autoload :ResentCcField, 'mail/fields/resent_cc_field'
-  autoload :ResentDateField, 'mail/fields/resent_date_field'
-  autoload :ResentFromField, 'mail/fields/resent_from_field'
-  autoload :ResentMessageIdField, 'mail/fields/resent_message_id_field'
-  autoload :ResentSenderField, 'mail/fields/resent_sender_field'
-  autoload :ResentToField, 'mail/fields/resent_to_field'
-  autoload :ReturnPathField, 'mail/fields/return_path_field'
-  autoload :SenderField, 'mail/fields/sender_field'
-  autoload :SubjectField, 'mail/fields/subject_field'
-  autoload :ToField, 'mail/fields/to_field'
+  register_autoload :BccField, 'mail/fields/bcc_field'
+  register_autoload :CcField, 'mail/fields/cc_field'
+  register_autoload :CommentsField, 'mail/fields/comments_field'
+  register_autoload :ContentDescriptionField, 'mail/fields/content_description_field'
+  register_autoload :ContentDispositionField, 'mail/fields/content_disposition_field'
+  register_autoload :ContentIdField, 'mail/fields/content_id_field'
+  register_autoload :ContentLocationField, 'mail/fields/content_location_field'
+  register_autoload :ContentTransferEncodingField, 'mail/fields/content_transfer_encoding_field'
+  register_autoload :ContentTypeField, 'mail/fields/content_type_field'
+  register_autoload :DateField, 'mail/fields/date_field'
+  register_autoload :FromField, 'mail/fields/from_field'
+  register_autoload :InReplyToField, 'mail/fields/in_reply_to_field'
+  register_autoload :KeywordsField, 'mail/fields/keywords_field'
+  register_autoload :MessageIdField, 'mail/fields/message_id_field'
+  register_autoload :MimeVersionField, 'mail/fields/mime_version_field'
+  register_autoload :ReceivedField, 'mail/fields/received_field'
+  register_autoload :ReferencesField, 'mail/fields/references_field'
+  register_autoload :ReplyToField, 'mail/fields/reply_to_field'
+  register_autoload :ResentBccField, 'mail/fields/resent_bcc_field'
+  register_autoload :ResentCcField, 'mail/fields/resent_cc_field'
+  register_autoload :ResentDateField, 'mail/fields/resent_date_field'
+  register_autoload :ResentFromField, 'mail/fields/resent_from_field'
+  register_autoload :ResentMessageIdField, 'mail/fields/resent_message_id_field'
+  register_autoload :ResentSenderField, 'mail/fields/resent_sender_field'
+  register_autoload :ResentToField, 'mail/fields/resent_to_field'
+  register_autoload :ReturnPathField, 'mail/fields/return_path_field'
+  register_autoload :SenderField, 'mail/fields/sender_field'
+  register_autoload :SubjectField, 'mail/fields/subject_field'
+  register_autoload :ToField, 'mail/fields/to_field'
 end

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

@@ -81,9 +81,14 @@ module Mail
       when val.blank?
         parse(encoded)
       else
-        parse((formatted + [val]).join(", "))
+        self.value = [self.value, val].reject {|a| a.blank? }.join(", ")
       end
     end
+
+    def value=(val)
+      super
+      parse(self.value)
+    end
   
     private
   

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

@@ -34,7 +34,7 @@ module Mail
     end
 
     def responsible_for?( val )
-      name.to_s.downcase == val.to_s.downcase
+      name.to_s.casecmp(val.to_s) == 0
     end
 
     private
@@ -47,5 +47,11 @@ module Mail
       end
     end
 
+    def ensure_filename_quoted(value)
+      if !value.is_a?(Array) and /(.)*\s(filename|name)=[^"](.+\s)+[^"]/.match value
+        value.gsub!(/[^=]+$/, '"\\0"')
+      end
+    end
+
   end
 end

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

@@ -31,14 +31,18 @@ module Mail
     end
 
     private
-    
+
     def do_encode(field_name)
-      %Q{#{field_name}: #{do_decode}\r\n}
+      %Q{#{field_name}: #{formated_message_ids("\r\n ")}\r\n}
     end
-    
+
     def do_decode
-      "#{message_ids.map { |m| "<#{m}>" }.join(' ')}" if message_ids
+      formated_message_ids(' ')
     end
-    
+
+    def formated_message_ids(join)
+      message_ids.map{ |m| "<#{m}>" }.join(join) if message_ids
+    end
+
   end
 end

data/lib/mail/fields/content_disposition_field.rb

@@ -9,6 +9,7 @@ module Mail
     
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
+      ensure_filename_quoted(value)
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self

data/lib/mail/fields/content_type_field.rb

@@ -19,6 +19,7 @@ module Mail
         @parameters = nil
         value = strip_field(FIELD_NAME, value)
       end
+      ensure_filename_quoted(value)
       super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
@@ -141,7 +142,9 @@ module Mail
     def sanatize( val )
 
       # TODO: check if there are cases where whitespace is not a separator
-      val = val.tr(' ',';').
+      val = val.
+        gsub(/\s*=\s*/,'='). # remove whitespaces around equal sign
+        tr(' ',';').
         squeeze(';').
         gsub(';', '; '). #use '; ' as a separator (or EOL)
         gsub(/;\s*$/,'') #remove trailing to keep examples below

data/lib/mail/fields/keywords_field.rb

@@ -29,7 +29,7 @@ module Mail
     end
     
     def encoded
-      "#{CAPITALIZED_FIELD}: #{keywords.join(', ')}\r\n"
+      "#{CAPITALIZED_FIELD}: #{keywords.join(",\r\n ")}\r\n"
     end
     
     def decoded

data/lib/mail/fields/unstructured_field.rb

@@ -6,7 +6,7 @@ module Mail
   #
   # ===Per RFC 2822:
   #  2.2.1. Unstructured Header Field Bodies
-  #  
+  #
   #     Some field bodies in this standard are defined simply as
   #     "unstructured" (which is specified below as any US-ASCII characters,
   #     except for CR and LF) with no further restrictions.  These are
@@ -15,20 +15,29 @@ module Mail
   #     with no further processing (except for header "folding" and
   #     "unfolding" as described in section 2.2.3).
   class UnstructuredField
-    
+
     include Mail::CommonField
     include Mail::Utilities
-   
+
     attr_accessor :charset
     attr_reader :errors
- 
+
     def initialize(name, value, charset = nil)
       @errors = []
+
+      if value.is_a?(Array)
+        # Probably has arrived here from a failed parse of an AddressList Field
+        value = value.join(', ')
+      else
+        # Ensure we are dealing with a string
+        value = value.to_s
+      end
+
       if charset
         self.charset = charset
       else
-        if value.to_s.respond_to?(:encoding)
-          self.charset = value.to_s.encoding
+        if value.respond_to?(:encoding)
+          self.charset = value.encoding
         else
           self.charset = $KCODE
         end
@@ -37,11 +46,11 @@ module Mail
       self.value = value
       self
     end
-   
+
     def encoded
       do_encode
     end
-    
+
     def decoded
       do_decode
     end
@@ -49,25 +58,23 @@ module Mail
     def default
       decoded
     end
-    
+
     def parse # An unstructured field does not parse
       self
     end
 
     private
-    
+
     def do_encode
       value.nil? ? '' : "#{wrapped_value}\r\n"
     end
-    
+
     def do_decode
-      result = value.blank? ? nil : Encodings.decode_encode(value, :decode)
-      result.encode!(value.encoding || "UTF-8") if RUBY_VERSION >= '1.9' && !result.blank?
-      result
+      value.blank? ? nil : Encodings.decode_encode(value, :decode)
     end
-    
+
     # 2.2.3. Long Header Fields
-    # 
+    #
     #  Each header field is logically a single line of characters comprising
     #  the field name, the colon, and the field body.  For convenience
     #  however, and to deal with the 998/78 character limitations per line,
@@ -76,14 +83,14 @@ module Mail
     #  that wherever this standard allows for folding white space (not
     #  simply WSP characters), a CRLF may be inserted before any WSP.  For
     #  example, the header field:
-    #  
+    #
     #          Subject: This is a test
-    #  
+    #
     #  can be represented as:
-    #  
+    #
     #          Subject: This
     #           is a test
-    #  
+    #
     #  Note: Though structured field bodies are defined in such a way that
     #  folding can take place between many of the lexical tokens (and even
     #  within some of the lexical tokens), folding SHOULD be limited to
@@ -95,9 +102,9 @@ module Mail
     def wrapped_value # :nodoc:
       wrap_lines(name, fold("#{name}: ".length))
     end
-   
+
     # 6.2. Display of 'encoded-word's
-    # 
+    #
     #  When displaying a particular header field that contains multiple
     #  'encoded-word's, any 'linear-white-space' that separates a pair of
     #  adjacent 'encoded-word's is ignored.  (This is to allow the use of
@@ -131,7 +138,7 @@ module Mail
       else
         words = decoded_string.split(/[ \t]/)
       end
-      
+
       folded_lines   = []
       while !words.empty?
         limit = 78 - prepend
@@ -145,7 +152,7 @@ module Mail
           # Skip to next line if we're going to go past the limit
           # Unless this is the first word, in which case we're going to add it anyway
           # Note: This means that a word that's longer than 998 characters is going to break the spec. Please fix if this is a problem for you.
-          # (The fix, it seems, would be to use encoded-word encoding on it, because that way you can break it across multiple lines and 
+          # (The fix, it seems, would be to use encoded-word encoding on it, because that way you can break it across multiple lines and
           # the linebreak will be ignored)
           break if !line.empty? && (line.length + word.length + 1 > limit)
           # Remove the word from the queue ...
@@ -153,7 +160,7 @@ module Mail
           # Add word separator
           line << " " unless (line.empty? || should_encode)
           # ... add it in encoded form to the current line
-          line << word          
+          line << word
         end
         # Encode the line if necessary
         line = "=?#{encoding}?Q?#{line}?=" if should_encode
@@ -163,7 +170,7 @@ module Mail
       end
       folded_lines
     end
- 
+
     def encode(value)
       value = [value].pack("M").gsub("=\n", '')
       value.gsub!(/"/,  '=22')

data/lib/mail/header.rb

@@ -21,6 +21,20 @@ module Mail
     include Utilities
     include Enumerable
     
+    @@maximum_amount = 1000
+
+    # Large amount of headers in Email might create extra high CPU load
+    # Use this parameter to limit number of headers that will be parsed by 
+    # mail library.
+    # Default: 1000
+    def self.maximum_amount
+      @@maximum_amount
+    end
+
+    def self.maximum_amount=(value)
+      @@maximum_amount = value
+    end
+
     # Creates a new header object.
     # 
     # Accepts raw text or nothing.  If given raw text will attempt to parse
@@ -73,14 +87,12 @@ module Mail
     #  h.fields = ['From: mikel@me.com', 'To: bob@you.com']
     def fields=(unfolded_fields)
       @fields = Mail::FieldList.new
-      warn "Warning: more than 1000 header fields only using the first 1000" if unfolded_fields.length > 1000
-      unfolded_fields[0..1000].each do |field|
+      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
+      unfolded_fields[0..(self.class.maximum_amount-1)].each do |field|
 
         field = Field.new(field, nil, charset)
         field.errors.each { |error| self.errors << error }
-        selected = select_field_for(field.name)
-
-        if selected.any? && limited_field?(field.name)
+        if limited_field?(field.name) && (selected = select_field_for(field.name)) && selected.any? 
           selected.first.update(field.name, field.value)
         else
           @fields << field
@@ -159,15 +171,15 @@ module Mail
         # Need to insert in correct order for trace fields
         self.fields << Field.new(name.to_s, value, charset)
       end
+      if dasherize(fn) == "content-type"
+        # Update charset if specified in Content-Type
+        params = self[:content_type].parameters rescue nil
+        @charset = params && params[:charset]
+      end
     end
     
     def charset
-      params = self[:content_type].parameters rescue nil
-      if params
-        params[:charset]
-      else
-        @charset
-      end
+      @charset
     end
     
     def charset=(val)
@@ -254,12 +266,19 @@ module Mail
     end
     
     def select_field_for(name)
-      fields.select { |f| f.responsible_for?(name.to_s) }
+      fields.select { |f| f.responsible_for?(name) }
     end
     
     def limited_field?(name)
       LIMITED_FIELDS.include?(name.to_s.downcase)
     end
-    
+
+    # Enumerable support; yield each field in order to the block if there is one,
+    # or return an Enumerator for them if there isn't.
+    def each( &block )
+      return self.fields.each( &block ) if block
+      self.fields.each
+    end
+
   end
 end

data/lib/mail/message.rb

@@ -1411,7 +1411,7 @@ module Mail
 
     # Returns the MIME media type of part we are on, this is taken from the content-type header
     def mime_type
-      content_type ? header[:content_type].string : nil rescue nil
+      has_content_type? ? header[:content_type].string : nil rescue nil
     end
 
     def message_content_type
@@ -1422,7 +1422,7 @@ module Mail
     # Returns the character set defined in the content type field
     def charset
       if @header
-        content_type ? content_type_parameters['charset'] : @charset
+        has_content_type? ? content_type_parameters['charset'] : @charset
       else
         @charset
       end
@@ -1875,15 +1875,13 @@ module Mail
     # Additionally, I allow for the case where someone might have put whitespace
     # on the "gap line"
     def parse_message
-      header_part, body_part = raw_source.split(/#{CRLF}#{WSP}*#{CRLF}/m, 2)
-#      index = raw_source.index(/#{CRLF}#{WSP}*#{CRLF}/m, 2)
-#      self.header = (index) ? header_part[0,index] : nil
-#      lazy_body ( [raw_source, index+1])
+      header_part, body_part = raw_source.split(/#{CRLF}#{WSP}*#{CRLF}(?!#{WSP})/m, 2)
       self.header = header_part
       self.body   = body_part
     end
 
     def raw_source=(value)
+      value.force_encoding("binary") if RUBY_VERSION >= "1.9.1"
       @raw_source = value.to_crlf
     end
 
@@ -1914,9 +1912,10 @@ module Mail
     end
 
     def set_envelope_header
-      if match_data = raw_source.to_s.match(/\AFrom\s(#{TEXT}+)#{CRLF}(.*)/m)
+      raw_string = raw_source.to_s
+      if match_data = raw_source.to_s.match(/\AFrom\s(#{TEXT}+)#{CRLF}/m)
         set_envelope(match_data[1])
-        self.raw_source = match_data[2]
+        self.raw_source = raw_string.sub(match_data[0], "") 
       end
     end
 
@@ -2047,7 +2046,7 @@ module Mail
         else
           if encoding = Encoding.find(charset) rescue nil
             body_text.force_encoding(encoding)
-            return body_text.encode(Encoding::UTF_8)
+            return body_text.encode(Encoding::UTF_8, :undef => :replace, :invalid => :replace, :replace => '')
           end
         end
       end