Fixed up being able to pass random headers in with headers, or mail. Also,...

Fixed up being able to pass random headers in with headers, or mail.  Also, undeprecated headers(hash) as this works now too

actionmailer/lib/action_mailer/base.rb

@@ -40,13 +40,17 @@ module ActionMailer #:nodoc:
   # * <tt>headers[]=</tt> - Allows you to specify non standard headers in your email such
   #   as <tt>headers['X-No-Spam'] = 'True'</tt>
   #
+  # * <tt>headers(hash)</tt> - Allows you to specify multiple headers in your email such
+  #   as <tt>headers({'X-No-Spam' => 'True', 'In-Reply-To' => '1234@message.id'})</tt>
+  #
   # * <tt>mail</tt> - Allows you to specify your email to send.
   # 
-  # The hash passed to the mail method allows you to specify the most used headers in an email
-  # message, such as <tt>Subject</tt>, <tt>To</tt>, <tt>From</tt>, <tt>Cc</tt>, <tt>Bcc</tt>,
-  # <tt>Reply-To</tt> and <tt>Date</tt>. See the <tt>ActionMailer#mail</tt> method for more details.
-  # 
-  # If you need other headers not listed above, use the <tt>headers['name'] = value</tt> method.
+  # The hash passed to the mail method allows you to specify any header that a Mail::Message
+  # will accept (any valid Email header including optional fields).  Obviously if you specify
+  # the same header in the headers method and then again in the mail method, the last one
+  # will over write the first, unless you are specifying a header field that can appear more
+  # than once per RFC, in which case, both will be inserted (X-value headers for example can
+  # appear multiple times.)
   #
   # The mail method, if not passed a block, will inspect your views and send all the views with
   # the same name as the method, so the above action would send the +welcome.plain.erb+ view file
@@ -263,13 +267,13 @@ class Base < AbstractController::Base
     }
 
     extlib_inheritable_accessor :default_charset
-    self.default_charset = "utf-8"
+    self.default_charset = self.default_params[:charset]
 
     extlib_inheritable_accessor :default_content_type
-    self.default_content_type = "text/plain"
+    self.default_content_type = self.default_params[:content_type]
 
     extlib_inheritable_accessor :default_mime_version
-    self.default_mime_version = "1.0"
+    self.default_mime_version = self.default_params[:mime_version]
 
     # This specifies the order that the parts of a multipart email will be.  Usually you put
     # text/plain at the top so someone without a MIME capable email reader can read the plain
@@ -278,7 +282,7 @@ class Base < AbstractController::Base
     # Any content type that is not listed here will be inserted in the order you add them to
     # the email after the content types you list here.
     extlib_inheritable_accessor :default_implicit_parts_order
-    self.default_implicit_parts_order = [ "text/plain", "text/enriched", "text/html" ]
+    self.default_implicit_parts_order = self.default_params[:parts_order]
 
     class << self
 
@@ -366,13 +370,18 @@ def initialize(method_name=nil, *args)
     # 
     #   headers['X-Special-Domain-Specific-Header'] = "SecretValue"
     # 
+    # You can also pass a hash into headers of header field names and values, which
+    # will then be set on the Mail::Message object:
+    # 
+    #   headers {'X-Special-Domain-Specific-Header' => "SecretValue",
+    #            'In-Reply-To' => incoming.message_id }
+    # 
     # The resulting Mail::Message will have the following in it's header:
     # 
     #   X-Special-Domain-Specific-Header: SecretValue
     def headers(args=nil)
       if args
-        ActiveSupport::Deprecation.warn "headers(Hash) is deprecated, please do headers[key] = value instead", caller[0,2]
-        @headers = args
+        @_message.headers(args)
       else
         @_message
       end

actionmailer/test/base_test.rb

@@ -5,15 +5,24 @@ class BaseTest < ActiveSupport::TestCase
   class BaseMailer < ActionMailer::Base
     self.mailer_name = "base_mailer"
 
-    self.defaults :to => 'system@test.lindsaar.net',
-                  :from => 'jose@test.plataformatec.com',
-                  :reply_to => 'mikel@test.lindsaar.net'
+    defaults({:to => 'system@test.lindsaar.net',
+              :from => 'jose@test.plataformatec.com',
+              :reply_to => 'mikel@test.lindsaar.net'})
 
     def welcome(hash = {})
       headers['X-SPAM'] = "Not SPAM"
       mail({:subject => "The first email on new API!"}.merge!(hash))
     end
 
+    def simple(hash = {})
+      mail(hash)
+    end
+    
+    def simple_with_headers(hash = {})
+      headers hash
+      mail
+    end
+
     def attachment_with_content(hash = {})
       attachments['invoice.pdf'] = 'This is test File content'
       mail(hash)
@@ -194,9 +203,9 @@ def custom_block(include_html=false)
     end
   end
 
-  test "uses default headers from class" do
+  test "uses random default headers from class" do
     with_default BaseMailer, "X-SPAM" => "Not spam" do
-      email = BaseMailer.welcome.deliver
+      email = BaseMailer.simple
       assert_equal("Not spam", email["X-SPAM"].decoded)
     end
   end
@@ -407,6 +416,22 @@ def custom_block(include_html=false)
     mail = BaseMailer.explicit_multipart
     assert_not_nil(mail.content_type_parameters[:boundary])
   end
+  
+  test "can pass random headers in as a hash" do
+    hash = {'X-Special-Domain-Specific-Header' => "SecretValue",
+            'In-Reply-To' => '1234@mikel.me.com' }
+    mail = BaseMailer.simple_with_headers(hash)
+    assert_equal('SecretValue', mail['X-Special-Domain-Specific-Header'].decoded)
+    assert_equal('1234@mikel.me.com', mail['In-Reply-To'].decoded)
+  end
+  
+  test "can pass random headers in as a hash to mail" do
+    hash = {'X-Special-Domain-Specific-Header' => "SecretValue",
+            'In-Reply-To' => '1234@mikel.me.com' }
+    mail = BaseMailer.simple(hash)
+    assert_equal('SecretValue', mail['X-Special-Domain-Specific-Header'].decoded)
+    assert_equal('1234@mikel.me.com', mail['In-Reply-To'].decoded)
+  end
 
   protected