kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

Make neste layout usage independed of the outer template's :layout value. Allows using partials in layouts.

Browse source
This commit is contained in:
Konstantin Haase 2010-11-11 17:33:30 -06:00
parent 796d62a487
commit 5d15ddf3a1
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/sinatra/base.rb
View file

@ -471,7 +471,7 @@ module Sinatra
# compile and render template
layout_was = @default_layout
@default_layout = false if layout
@default_layout = false
template = compile_template(engine, data, options, views)
output = template.render(self, locals, &block)
@default_layout = layout_was

9
test/templates_test.rb
View file

@ -101,6 +101,15 @@ class TemplatesTest < Test::Unit::TestCase
assert_equal "<h1>String Layout!</h1>\n<content><h1>Hello From String</h1></content>", body
end
it 'is possible to use partials in layouts' do
render_app do
settings.layout { "<%= erb 'foo' %><%= yield %>" }
erb 'bar'
end
assert ok?
assert_equal "foobar", body
end
it 'loads templates from source file' do
mock_app { enable :inline_templates }
assert_equal "this is foo\n\n", @app.templates[:foo][0]