Merge pull request #7 from MountainRoseHerbs/feature/render-html-safe

Render liquid templates as html safe

Author: chamnap

lib/liquid-rails/template_handler.rb

@@ -25,7 +25,7 @@ def render(template, local_assigns={})
 
         liquid = Liquid::Template.parse(template)
         render_method = (::Rails.env.development? || ::Rails.env.test?) ? :render! : :render
-        liquid.send(render_method, assigns, filters: filters, registers: { view: @view, controller: @controller, helper: @helper })
+        liquid.send(render_method, assigns, filters: filters, registers: { view: @view, controller: @controller, helper: @helper }).html_safe
       end
 
       def filters
@@ -41,4 +41,4 @@ def compilable?
       end
     end
   end
-end
+end

spec/dummy/app/controllers/home_controller.rb

@@ -17,9 +17,12 @@ def index_partial_with_full_path
   def index_with_filter
   end
 
+  def erb_with_html_liquid_partial
+  end
+
   private
 
     def set_book
       @book = { 'name' => 'Liquid on Rails' }
     end
-end
+end

spec/dummy/app/views/home/_html_liquid_partial.liquid

@@ -0,0 +1 @@
+<p>Partial Content</p>

spec/dummy/app/views/home/erb_with_html_liquid_partial.erb

@@ -0,0 +1 @@
+<%= render 'html_liquid_partial' %>

spec/dummy/config/routes.rb

@@ -8,5 +8,7 @@
   get  '/index_partial',                to: 'home#index_partial'
   get  '/index_partial_with_full_path', to: 'home#index_partial_with_full_path'
 
+  get '/erb_with_html_liquid_partial',  to: 'home#erb_with_html_liquid_partial'
+
   get '/foospace/bar/index_partial',    to: 'foospace/bar#index_partial'
 end

spec/lib/liquid-rails/template_handler_spec.rb

@@ -5,7 +5,7 @@
     it 'renders with liquid template' do
       visit '/'
 
-      expect(page.body).to eq 'Liquid on Rails'
+      expect(page.body).to eq('Liquid on Rails')
     end
 
     it 'sets content_type as html by default' do
@@ -19,28 +19,28 @@
     it 'renders with layout' do
       visit '/index_with_layout'
 
-      expect(page.body).to eq "Application Layout\nLiquid on Rails"
+      expect(page.body).to eq("Application Layout\nLiquid on Rails")
     end
   end
 
   context 'render with partial' do
     it 'no full path for the current controller' do
       visit '/index_partial'
 
-      expect(page.body).to eq "Application Layout\nLiquid on Rails\n\nHome Partial\nShared Partial"
+      expect(page.body).to eq("Application Layout\nLiquid on Rails\n\nHome Partial\nShared Partial")
     end
 
     it 'full path' do
       visit '/index_partial_with_full_path'
 
-      expect(page.body).to eq "Application Layout\nLiquid on Rails\n\nHome Partial\nShared Partial"
+      expect(page.body).to eq("Application Layout\nLiquid on Rails\n\nHome Partial\nShared Partial")
     end
 
     it 'respects namespace of original template for partials path' do
       visit '/foospace/bar/index_partial'
+
       expect(page.body.strip).to eq("Foospace::BarController\n\nBar Partial")
     end
-
   end
 
   context 'render with filter' do
@@ -56,4 +56,12 @@
       expect(page.body).to eq("Application Layout\nLiquid on Rails\nThis is a long section of text")
     end
   end
+
+  context 'render html within an erb template' do
+    it 'does not escape the html' do
+      visit '/erb_with_html_liquid_partial'
+
+      expect(page.body.strip).to eq("Application Layout\n<p>Partial Content</p>")
+    end
+  end
 end