Added lambda merging to OptionMerger (especially useful with named_scope and with_options) [#740 state:commited] (Paweł Kondzior)

actionmailer/CHANGELOG

@@ -1,3 +1,8 @@
+*2.3.0/3.0*
+
+* Fixed that no body charset would be set when there are attachments present #740 [Paweł Kondzior]
+
+
 *2.2.1 [RC2] (November 14th, 2008)*
 
 * Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it (This is required for Gmail's SMTP server) #1336 [Grant Hollingworth]

actionmailer/lib/action_mailer/part_container.rb

@@ -41,7 +41,11 @@ module ActionMailer
     private
     
       def parse_content_type(defaults=nil)
-        return [defaults && defaults.content_type, {}] if content_type.blank?
+        if content_type.blank? 
+          return defaults                                                ? 
+            [ defaults.content_type, { 'charset' => defaults.charset } ] : 
+            [ nil, {} ] 
+        end 
         ctype, *attrs = content_type.split(/;\s*/)
         attrs = attrs.inject({}) { |h,s| k,v = s.split(/=/, 2); h[k] = v; h }
         [ctype, {"charset" => charset || defaults && defaults.charset}.merge(attrs)]

actionmailer/test/mail_service_test.rb

@@ -915,6 +915,8 @@ EOF
   def test_multipart_with_template_path_with_dots
     mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
     assert_equal 2, mail.parts.length
+    assert_equal 'text/plain', mail.parts[0].content_type
+    assert_equal 'utf-8', mail.parts[0].charset
   end
 
   def test_custom_content_type_attributes

activesupport/CHANGELOG

@@ -1,3 +1,8 @@
+*2.3.0/3.0*
+
+* Added lambda merging to OptionMerger (especially useful with named_scope and with_options) #740 [Paweł Kondzior]
+
+
 *2.2.1 [RC2] (November 14th, 2008)*
 
 * Increment the version of our altered memcache-client to prevent confusion caused when the 1.5.0 gem is installed.