@@ -227,6 +227,11 @@ module Sinatra render :erb, template, options, locals end + def liquid(template, options={}, locals={}) + require 'liquid' + render :liquid, template, options, locals + end + def haml(template, options={}, locals={}) require 'haml' unless defined? ::Haml::Engine render :haml, template, options, locals @@ -304,7 +309,17 @@ module Sinatra @_out_buf, result = original_out_buf, @_out_buf result end - + + def render_liquid(template, data, options, locals, &block) + tem=::Liquid::Template.parse(data) + content='' + if(not block.nil?) + content = yield + end + locals['content']=content + result = tem.render(locals) + result + end def render_haml(template, data, options, locals, &block) ::Haml::Engine.new(data, options).render(self, locals, &block) end lib/sinatra/base.rb @@ -10,7 +10,7 @@ class LiquidTest < Test::Unit::TestCase end it 'renders inline Liquid strings' do - liquid_app { liquid '<%= 1 + 1 %>' } + liquid_app { liquid '{{ 1|plus:1 }}' } assert ok? assert_equal '2', body end @@ -23,7 +23,7 @@ class LiquidTest < Test::Unit::TestCase it 'takes a :locals option' do liquid_app { - locals = {:foo => 'Bar'} + locals = {'foo' => 'Bar'} liquid '{{ foo }}', :locals => locals } assert ok? @@ -32,7 +32,7 @@ class LiquidTest < Test::Unit::TestCase it "renders with inline layouts" do mock_app { - layout { 'THIS. IS. {{ content.upcase }}!' } + layout { 'THIS. IS. {{ content|upcase }}!' } get('/') { liquid 'Sparta' } } get '/' test/liquid_test.rb a5531f1887ee46450426a59e6a46df93a193b91a sjh sarvajanahitam@gmail.com http://github.com/vagmi/sinatra/commit/20d75ec5b8adf98b326c63377f5eaa175a0a935c 20d75ec5b8adf98b326c63377f5eaa175a0a935c 2009-04-22T01:54:41-07:00 2009-04-22T01:54:41-07:00 add liquid engine to sinatra d34632a6a9f3ab310ecf61b7790bd14c69363fd9 sjh sarvajanahitam@gmail.com