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

Merge pull request #574 from zzak/fallback_to_engine_layout

Browse source 
Templates: render should fall back to engine layout sinatra/sinatra#563
This commit is contained in:
Konstantin Haase 2012-09-13 15:17:35 -07:00
commit 2847673c45
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/sinatra/base.rb
View file

@ -688,7 +688,8 @@ module Sinatra
views = options.delete(:views) || settings.views || "./views"
layout = options.delete(:layout)
eat_errors = layout.nil?
layout = @default_layout if layout.nil? or layout == true
engine_layout = settings.send(engine)[:layout] if settings.respond_to?(engine)
layout = engine_layout || @default_layout if layout.nil? or layout == true
content_type = options.delete(:content_type) || options.delete(:default_content_type)
layout_engine = options.delete(:layout_engine) || engine
scope = options.delete(:scope) || self

15
test/templates_test.rb
View file

@ -34,6 +34,21 @@ class TemplatesTest < Test::Unit::TestCase
File.unlink(layout) rescue nil
end
it 'falls back to engine layout' do
mock_app do
template(:layout3) { 'Layout 3!<%= yield %>' }
set :erb, :layout => :layout3
get('/') do
erb('Hello World!', { :layout => true })
end
end
get '/'
assert ok?
assert_equal "Layout 3!Hello World!", body
end
it 'renders String templates directly' do
render_app { render(:test, 'Hello World') }
assert ok?