Add a SafeTemplate module that makes TiltTemplates render safe strings

padrino-core/lib/padrino-core/application/rendering.rb

@@ -7,6 +7,16 @@ module Padrino
   # locale enabled rendering, among other features.
   #
   module Rendering
+    ##
+    # A SafeTemplate assumes that its output is safe.
+    #
+    # @api private
+    module SafeTemplate
+      def render(*)
+        super.html_safe
+      end
+    end
+
     ##
     # Exception responsible for when an expected template did not exist.
     #

padrino-core/lib/padrino-core/application/rendering/extensions/haml.rb

@@ -125,6 +125,10 @@ def self.rails_xss_safe?
   if defined? Padrino::Rendering
     Padrino::Rendering.engine_configurations[:haml] =
       {:escape_html => true}
+
+    class Tilt::HamlTemplate
+      include Padrino::Rendering::SafeTemplate
+    end
   end
 rescue LoadError
 end

padrino-core/test/test_rendering.rb

@@ -505,7 +505,7 @@ def is; "IS."; end
 
       get 'with_layout'
       assert ok?
-      assert_equal '<p><div>foo</div></p>', body.strip
+      assert_equal '<p><div>foo</div></p>', body.gsub(/\s+/, "")
     end
 
     should 'render slim to a SafeBuffer' do