Add support for compile-time <%= raw %>

20923516 · Yehuda Katz · 1adfb921 · 20923516 · 20923516
2 changed file
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -15,7 +15,11 @@ def add_text(src, text)
      end

      def add_expr_literal(src, code)
-        src << '@output_buffer << ((' << code << ').to_s);'
+        if code =~ /\s*raw\s+(.*)/
+          src << "@output_buffer.safe_concat((" << $1 << ").to_s);"
+        else
+          src << '@output_buffer << ((' << code << ').to_s);'
+        end
      end

      def add_expr_escaped(src, code)

--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -2,18 +2,19 @@

 module RenderTemplate
  class WithoutLayoutController < ActionController::Base
-    
+
    self.view_paths = [ActionView::FixtureResolver.new(
      "test/basic.html.erb"      => "Hello from basic.html.erb",
      "shared.html.erb"          => "Elastica",
      "locals.html.erb"          => "The secret is <%= secret %>",
-      "xml_template.xml.builder" => "xml.html do\n  xml.p 'Hello'\nend"
+      "xml_template.xml.builder" => "xml.html do\n  xml.p 'Hello'\nend",
+      "with_raw.html.erb"        => "Hello <%=raw '<strong>this is raw</strong>' %>"
    )]
-    
+
    def index
      render :template => "test/basic"
    end
-    
+
    def index_without_key
      render "test/basic"
    end
@@ -25,59 +26,70 @@ def in_top_directory
    def in_top_directory_with_slash
      render :template => '/shared'
    end
-    
+
    def in_top_directory_with_slash_without_key
      render '/shared'
    end
-    
+
    def with_locals
      render :template => "locals", :locals => { :secret => 'area51' }
    end
-    
+
    def builder_template
      render :template => "xml_template"
    end
+
+    def with_raw
+      render :template => "with_raw"
+    end
  end
-  
+
  class TestWithoutLayout < Rack::TestCase
    testing RenderTemplate::WithoutLayoutController
-    
+
    test "rendering a normal template with full path without layout" do
      get :index
      assert_response "Hello from basic.html.erb"
    end
-    
+
    test "rendering a normal template with full path without layout without key" do
      get :index_without_key
      assert_response "Hello from basic.html.erb"
    end
-    
+
    test "rendering a template not in a subdirectory" do
      get :in_top_directory
      assert_response "Elastica"
    end
-    
+
    test "rendering a template not in a subdirectory with a leading slash" do
      get :in_top_directory_with_slash
      assert_response "Elastica"
    end
-    
+
    test "rendering a template not in a subdirectory with a leading slash without key" do
      get :in_top_directory_with_slash_without_key
      assert_response "Elastica"
    end
-    
+
    test "rendering a template with local variables" do
      get :with_locals
      assert_response "The secret is area51"
    end
-    
+
    test "rendering a builder template" do
      get :builder_template, "format" => "xml"
      assert_response "<html>\n  <p>Hello</p>\n</html>\n"
    end
+
+    test "rendering a template with <%=raw stuff %>" do
+      get :with_raw
+
+      assert_body "Hello <strong>this is raw</strong>"
+      assert_status 200
+    end
  end
-    
+
  class WithLayoutController < ::ApplicationController
    self.view_paths = [ActionView::FixtureResolver.new(
      "test/basic.html.erb"          => "Hello from basic.html.erb",
@@ -85,28 +97,28 @@ class WithLayoutController < ::ApplicationController
      "layouts/application.html.erb" => "<%= yield %>, I'm here!",
      "layouts/greetings.html.erb"   => "<%= yield %>, I wish thee well."
    )]
-    
+
    def index
      render :template => "test/basic"
    end
-    
+
    def with_layout
      render :template => "test/basic", :layout => true
    end
-    
+
    def with_layout_false
      render :template => "test/basic", :layout => false
    end
-    
+
    def with_layout_nil
      render :template => "test/basic", :layout => nil
    end
-    
+
    def with_custom_layout
      render :template => "test/basic", :layout => "greetings"
    end
  end
-  
+
  class TestWithLayout < Rack::TestCase
    describe "Rendering with :template using implicit or explicit layout"