[Haml] Default to :html5 under Rails 3.

doc-src/HAML_CHANGELOG.md

@@ -17,6 +17,12 @@ Rather than defaulting to `"utf-8"`,
 it defaults to the encoding of the source document,
 and only falls back to `"utf-8"` if this encoding is `"us-ascii"`.
 
+### Other Changes
+
+* Default to the {file:HAML_REFERENCE.md#format-option `:html5` format}
+  when running under Rails 3,
+  since it defaults to HTML5 as well.
+
 ## 3.0.6
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.6).

lib/haml/template.rb

@@ -46,6 +46,10 @@ unless Haml::Util.rails_env == "development"
   Haml::Template.options[:ugly] ||= true
 end
 
+if ActionPack::VERSION::MAJOR >= 3
+  Haml::Template.options[:format] ||= :html5
+end
+
 # Decide how we want to load Haml into Rails.
 # Patching was necessary for versions <= 2.0.1,
 # but we can make it a normal handler for higher versions.

test/test_helper.rb

@@ -9,6 +9,7 @@ require 'sass'
 
 require 'haml/template'
 Haml::Template.options[:ugly] = false
+Haml::Template.options[:format] = :xhtml
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)