Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-12 23:40:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Enable rails 2.1.x compaitibility by allowing the render method to accept an ActionView::Template object.

Browse Source 
This seems to complete the earlier 'ugly hack' for rails 2.1.x compatibility
This commit is contained in:
Michael Klett
2008-09-22 09:48:15 -04:00
parent 24bf446b0e
commit 3bfde37a53
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/extras/liquid_view.rb
+11 -2
View File
@@ -11,16 +11,25 @@ class LiquidView
end end
def render(template, local_assigns) def render(template, local_assigns_for_rails_less_than_2_1_0 = nil)
@action_view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8' @action_view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8'
assigns = @action_view.assigns.dup assigns = @action_view.assigns.dup
# template is a Template object in Rails >=2.1.0, a source string previously.
if template.respond_to? :source
source = template.source
local_assigns = template.locals
else
source = template
local_assigns = local_assigns_for_rails_less_than_2_1_0
end
if content_for_layout = @action_view.instance_variable_get("@content_for_layout") if content_for_layout = @action_view.instance_variable_get("@content_for_layout")
assigns['content_for_layout'] = content_for_layout assigns['content_for_layout'] = content_for_layout
end end
assigns.merge!(local_assigns) assigns.merge!(local_assigns)
liquid = Liquid::Template.parse(template) liquid = Liquid::Template.parse(source)
liquid.render(assigns, :filters => [@action_view.controller.master_helper_module], :registers => {:action_view => @action_view, :controller => @action_view.controller}) liquid.render(assigns, :filters => [@action_view.controller.master_helper_module], :registers => {:action_view => @action_view, :controller => @action_view.controller})
end end