mail 2.1.5.3 → 2.2.0

data/lib/mail/fields/resent_from_field.rb

@@ -36,11 +36,11 @@ module Mail
     FIELD_NAME = 'resent-from'
     CAPITALIZED_FIELD = 'Resent-From'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def encoded

data/lib/mail/fields/resent_message_id_field.rb

@@ -11,11 +11,11 @@ module Mail
     FIELD_NAME = 'resent-message-id'
     CAPITALIZED_FIELD = 'Resent-Message-ID'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def name

data/lib/mail/fields/resent_sender_field.rb

@@ -35,11 +35,11 @@ module Mail
     FIELD_NAME = 'resent-sender'
     CAPITALIZED_FIELD = 'Resent-Sender'
 
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
 
     def addresses

data/lib/mail/fields/resent_to_field.rb

@@ -36,11 +36,11 @@ module Mail
     FIELD_NAME = 'resent-to'
     CAPITALIZED_FIELD = 'Resent-To'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def encoded

data/lib/mail/fields/return_path_field.rb

@@ -37,11 +37,11 @@ module Mail
     FIELD_NAME = 'return-path'
     CAPITALIZED_FIELD = 'Return-Path'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def encoded

data/lib/mail/fields/sender_field.rb

@@ -36,11 +36,11 @@ module Mail
     FIELD_NAME = 'sender'
     CAPITALIZED_FIELD = 'Sender'
 
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
 
     def addresses

data/lib/mail/fields/structured_field.rb

@@ -24,12 +24,21 @@ module Mail
     include Mail::CommonField
     include Mail::Utilities
     
-    def initialize(*args)
-      self.name = args.first
-      self.value = args.last
+    def initialize(name = nil, value = nil, charset = nil)
+      self.name    = name
+      self.value   = value
+      self.charset = charset
       self
     end
     
+    def charset
+      @charset
+    end
+    
+    def charset=(val)
+      @charset = val
+    end
+    
     def default
       decoded
     end

data/lib/mail/fields/subject_field.rb

@@ -7,8 +7,9 @@ module Mail
     FIELD_NAME = 'subject'
     CAPITALIZED_FIELD = "Subject"
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
     end
     
   end

data/lib/mail/fields/to_field.rb

@@ -36,11 +36,11 @@ module Mail
     FIELD_NAME = 'to'
     CAPITALIZED_FIELD = 'To'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def encoded

data/lib/mail/fields/unstructured_field.rb

@@ -19,13 +19,31 @@ module Mail
     include Mail::CommonField
     include Mail::Utilities
     
-    def initialize(*args)
+    def initialize(name, value, charset = nil)
+      self.charset = charset
       @errors = []
-      self.name = args.first
-      self.value = args.last
+      if charset
+        self.charset = charset
+      else
+        if value.to_s.respond_to?(:encoding)
+          self.charset = value.to_s.encoding
+        else
+          self.charset = $KCODE
+        end
+      end
+      self.name = name
+      self.value = value
       self
     end
     
+    def charset
+      @charset
+    end
+    
+    def charset=(val)
+      @charset = val
+    end
+
     def errors
       @errors
     end
@@ -83,41 +101,65 @@ module Mail
     #  preference to other places where the field could be folded, even if
     #  it is allowed elsewhere.
     def wrapped_value # :nodoc:
-      case
-      when decoded.to_s.ascii_only? && field_length <= 78
-        "#{name}: #{value}"
-      when field_length <= 40 # Allow for =?ISO-8859-1?B?=...=
-        "#{name}: #{encode(value)}"
-      else
-        @folded_line = []
-        @unfolded_line = value.clone
-        fold("#{name}: ".length)
-        folded = @folded_line.map { |l| l unless l.blank? }.compact.join("\r\n\t")
-        "#{name}: #{folded}"
+      @folded_line = []
+      @unfolded_line = decoded.to_s.clone
+      fold("#{name}: ".length)
+      wrap_lines(name, @folded_line)
+    end
+
+    def wrap_lines(name, folded_lines)
+      result = []
+      index = 0
+      result[index] = "#{name}: #{folded_lines.shift}"
+      folded_lines.each do |line|
+        if (result[index] + line).length < 77
+          result[index] << " " + line
+        else
+          result[index] << "\r\n\t"
+          index += 1
+          result[index] = line
+        end
       end
+      result.join
     end
 
     def fold(prepend = 0) # :nodoc:
       # Get the last whitespace character, OR we'll just choose 
-      # 78 if there is no whitespace
-      @unfolded_line.ascii_only? ? (limit = 78 - prepend) : (limit = 40 - prepend)
-      wspp = @unfolded_line.slice(0..limit) =~ /[ \t][^ \T]*$/ || limit
-      wspp = limit if wspp == 0
-      @folded_line << encode(@unfolded_line.slice!(0...wspp))
-      if @unfolded_line.length > limit
+      # 78 if there is no whitespace, or 23 for non ascii:
+      # Each QP byte is 6 chars (=0A)
+      # Plus 18 for the =?encoding?Q?= ... ?=
+      # Plus 2 for the \r\n and 1 for the \t
+      # 80 - 2 - 1 - 18 = 59 / 6 ~= 10
+      @unfolded_line.ascii_only? ? (limit = 78 - prepend) : (limit = 10 - prepend)
+      # find the last white space character within the limit
+      if wspp = @unfolded_line.mb_chars.slice(0..limit) =~ /[ \t][^ \t]*$/
+        wrap = true
+        wspp = limit if wspp == 0
+        @folded_line << encode(@unfolded_line.mb_chars.slice!(0...wspp).strip.to_str)
+        @folded_line.flatten!
+      # if no last whitespace before the limit, find the first
+      elsif wspp = @unfolded_line.mb_chars =~ /[ \t][^ \t]/
+        wrap = true
+        wspp = limit if wspp == 0
+        @folded_line << encode(@unfolded_line.mb_chars.slice!(0...wspp).strip.to_str)
+        @folded_line.flatten!
+      # if no whitespace, don't wrap
+      else
+        wrap = false
+      end
+
+      if wrap && @unfolded_line.length > limit
         fold
       else
         @folded_line << encode(@unfolded_line)
+        @folded_line.flatten!
       end
     end
 
     def encode(value)
-      if value.ascii_only?
-        value
-      else
-        RUBY_VERSION < '1.9' ? encoding = $KCODE : encoding = @value.encoding
-        Encodings.b_value_encode(value, encoding)
-      end
+      value.gsub!("\r", "=0D")
+      value.gsub!("\n", "=0A")
+      Encodings.q_value_encode(value, @charset).split(" ")
     end
 
   end

data/lib/mail/header.rb

@@ -33,8 +33,9 @@ module Mail
     # no automatic processing of that field will happen.  If you find one of
     # these cases, please make a patch and send it in, or at the least, send
     # me the example so we can fix it.
-    def initialize(header_text = nil)
+    def initialize(header_text = nil, charset = nil)
       @errors = []
+      @charset = charset
       self.raw_source = header_text.to_crlf
       split_header if header_text
     end
@@ -74,7 +75,7 @@ module Mail
       @fields = Mail::FieldList.new
       unfolded_fields.each do |field|
 
-        field = Field.new(field)
+        field = Field.new(field, nil, charset)
         field.errors.each { |error| self.errors << error }
         selected = select_field_for(field.name)
 
@@ -155,11 +156,26 @@ module Mail
       # User wants to create the field
       else
         # Need to insert in correct order for trace fields
-        self.fields << Field.new(name.to_s, value)
+        self.fields << Field.new(name.to_s, value, charset)
       end
     end
     
-    LIMITED_FIELDS   = %w[ orig-date from sender reply-to to cc bcc 
+    def charset
+      if self[:content_type] && self[:content_type].parameters
+        self[:content_type].parameters[:charset]
+      else
+        @charset
+      end
+    end
+    
+    def charset=(val)
+      if self[:content_type]
+        self[:content_type].parameters[:charset] = val
+      end
+      @charset = val
+    end
+    
+    LIMITED_FIELDS   = %w[ date from sender reply-to to cc bcc 
                            message-id in-reply-to references subject
                            return-path content-type mime-version
                            content-transfer-encoding content-description 

data/lib/mail/message.rb

@@ -100,7 +100,10 @@ module Mail
       @text_part = nil
       @html_part = nil
       @errors = nil
-
+      @header = nil
+      @charset = 'UTF-8'
+      @defaulted_charset = true
+      
       @perform_deliveries = true
       @raise_delivery_errors = true
 
@@ -109,13 +112,13 @@ module Mail
       @delivery_method = Mail.delivery_method.dup
      
       @transport_encoding = Mail::Encodings.get_encoding('7bit')
- 
+
       if args.flatten.first.respond_to?(:each_pair)
         init_with_hash(args.flatten.first)
       else
         init_with_string(args.flatten[0].to_s.strip)
       end
-
+ 
       if block_given?
         instance_eval(&block)
       end
@@ -307,7 +310,8 @@ module Mail
         self_message_id, other_message_id = self.message_id, other.message_id
         self.message_id, other.message_id = '<temp@test>', '<temp@test>'
         result = self.encoded == other.encoded
-        self.message_id, other.message_id = "<#{self_message_id}>", "<#{other_message_id}>"
+        self.message_id = "<#{self_message_id}>" if self_message_id
+        other.message_id = "<#{other_message_id}>" if other_message_id
         result
       end
     end
@@ -352,7 +356,7 @@ module Mail
     #  mail.header = 'To: mikel@test.lindsaar.net\r\nFrom: Bob@bob.com'
     #  mail.header #=> <#Mail::Header
     def header=(value)
-      @header = Mail::Header.new(value)
+      @header = Mail::Header.new(value, charset)
     end
 
     # Returns the header object of the message object. Or, if passed
@@ -804,7 +808,7 @@ module Mail
     #  mail.resent_cc = 'Mikel <mikel@test.lindsaar.net>'
     #  mail.resent_cc #=> ['mikel@test.lindsaar.net']
     #  mail.resent_cc = 'Mikel <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-    #  mail.resent_cc #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']    
+    #  mail.resent_cc #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
     def resent_cc=( val )
       header[:resent_cc] = val
     end
@@ -1270,18 +1274,17 @@ module Mail
     def has_mime_version?
       header.has_mime_version?
     end
-
+    
     def has_content_type?
       !!header[:content_type]
     end
     
     def has_charset?
-      !!charset
+      !!(header[:content_type] && header[:content_type].parameters['charset'])
     end
     
     def has_content_transfer_encoding?
-      header[:content_transfer_encoding] && 
-      header[:content_transfer_encoding].errors.blank?
+      header[:content_transfer_encoding] && header[:content_transfer_encoding].errors.blank?
     end
     
     def has_transfer_encoding? # :nodoc:
@@ -1325,17 +1328,19 @@ module Mail
     def add_content_type
       header[:content_type] = 'text/plain'
     end
-    
+
     # Adds a content type and charset if the body is US-ASCII
     # 
     # Otherwise raises a warning
     def add_charset
-      if body.only_us_ascii? and !body.empty?
-        header[:content_type].parameters['charset'] = 'US-ASCII'
-      elsif !body.empty?
-        warning = "Non US-ASCII detected and no charset defined.\nDefaulting to UTF-8, set your own if this is incorrect.\n"
-        STDERR.puts(warning)
-        header[:content_type].parameters['charset'] = 'UTF-8'
+      if !body.empty?
+        # Only give a warning if this isn't an attachment, has non US-ASCII and the user
+        # has not specified an encoding explicitly.
+        if @defaulted_charset && body.raw_source.not_ascii_only? && !self.attachment?
+          warning = "Non US-ASCII detected and no charset defined.\nDefaulting to UTF-8, set your own if this is incorrect.\n"
+          STDERR.puts(warning)
+        end
+        header[:content_type].parameters['charset'] = @charset
       end
     end
     
@@ -1374,17 +1379,18 @@ module Mail
     
     # Returns the character set defined in the content type field
     def charset
-      content_type ? content_type_parameters['charset'] : nil
+      if @header
+        content_type ? content_type_parameters['charset'] : @charset
+      else
+        @charset
+      end
     end
 
-    # Sets the charset to the supplied value.  Will set the content type to text/plain if
-    # it does not already exist
+    # Sets the charset to the supplied value.
     def charset=(value)
-      if content_type
-        content_type_parameters['charset'] = value
-      else
-        self.content_type ['text', 'plain', {'charset' => value}]
-      end
+      @defaulted_charset = false
+      @charset = value
+      @header.charset = value
     end
     
     # Returns the main content type
@@ -1755,7 +1761,7 @@ module Mail
     end
 
     def identify_and_set_transfer_encoding
-        if body.multipart?
+        if body && body.multipart?
             self.content_transfer_encoding = @transport_encoding
         else
             self.content_transfer_encoding = body.get_best_encoding(@transport_encoding)
@@ -1775,6 +1781,7 @@ module Mail
     
     def add_multipart_alternate_header
       header['content-type'] = ContentTypeField.with_boundary('multipart/alternative').value
+      header['content_type'].parameters[:charset] = @charset
       body.boundary = boundary
     end
     
@@ -1782,6 +1789,7 @@ module Mail
       unless body.boundary && boundary
         header['content-type'] = 'multipart/mixed' unless header['content-type']
         header['content-type'].parameters[:boundary] = ContentTypeField.generate_boundary
+        header['content_type'].parameters[:charset] = @charset
         body.boundary = boundary
       end
     end
@@ -1789,6 +1797,7 @@ module Mail
     def add_multipart_mixed_header
       unless header['content-type']
         header['content-type'] = ContentTypeField.with_boundary('multipart/mixed').value
+        header['content_type'].parameters[:charset] = @charset
         body.boundary = boundary
       end
     end
@@ -1796,6 +1805,7 @@ module Mail
     def init_with_hash(hash)
       passed_in_options = hash.with_indifferent_access
       self.raw_source = ''
+
       @header = Mail::Header.new
       @body = Mail::Body.new