Added support for Erubis <%== tag

<%== x %> is syntactic sugar for <%= raw(x) %>

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#5918 status:committed]

2 files changed, 15 insertions, 1 deletions

diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index b827610456..4c1f3d70ca 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -40,7 +40,11 @@ module ActionView
         end
 
         def add_expr_escaped(src, code)
-          src << '@output_buffer.append= ' << escaped_expr(code) << ';'
+          if code =~ BLOCK_EXPR
+            src << "@output_buffer.safe_append= " << code
+          else
+            src << "@output_buffer.safe_concat((" << code << ").to_s);"
+          end
         end
 
         def add_postamble(src)
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index d31193a063..9899036fe8 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -9,6 +9,7 @@ module RenderTemplate
       "locals.html.erb"          => "The secret is <%= secret %>",
       "xml_template.xml.builder" => "xml.html do\n  xml.p 'Hello'\nend",
       "with_raw.html.erb"        => "Hello <%=raw '<strong>this is raw</strong>' %>",
+      "with_implicit_raw.html.erb"=> "Hello <%== '<strong>this is also raw</strong>' %>",
       "test/with_json.html.erb"  => "<%= render :template => 'test/with_json.json' %>",
       "test/with_json.json.erb"  => "<%= render :template => 'test/final' %>",
       "test/final.json.erb"      => "{ final: json }",
@@ -51,6 +52,10 @@ module RenderTemplate
       render :template => "with_raw"
     end
 
+    def with_implicit_raw
+      render :template => "with_implicit_raw"
+    end
+
     def with_error
       render :template => "test/with_error"
     end
@@ -99,6 +104,11 @@ module RenderTemplate
 
       assert_body "Hello <strong>this is raw</strong>"
       assert_status 200
+
+      get :with_implicit_raw
+
+      assert_body "Hello <strong>this is also raw</strong>"
+      assert_status 200
     end
 
     test "rendering a template with renders another template with other format that renders other template in the same format" do