@@ -243,6 +243,9 @@ module Sinatra private def render(engine, template, options={}) #:nodoc: + @renderdepth ||= 0 + options[:layout] = (@renderdepth == 0) if options[:layout].nil? + @renderdepth += 1 data = lookup_template(engine, template, options) output = __send__("render_#{engine}", template, data, options) layout, data = lookup_layout(engine, options) @@ -251,6 +254,8 @@ module Sinatra else output end + ensure + @renderdepth -= 1 end def lookup_template(engine, template, options={}) lib/sinatra/base.rb @@ -78,4 +78,19 @@ describe "ERB Templates" do assert ok? assert_equal '<outer><inner>hi</inner></outer>', body end + + it "defaults to no layout on nested render" do + mock_app { + template(:inner) { "<inner><%= 'hi' %></inner>" } + template(:outer) { "<outer><%= erb :inner %></outer>" } + template(:layout) { "<html><%= yield %></html>" } + get '/' do + erb :outer + end + } + + get '/' + assert ok? + assert_equal '<html><outer><inner>hi</inner></outer></html>', body + end end test/erb_test.rb @@ -65,4 +65,33 @@ describe "HAML Templates" do assert ok? assert_equal "<!DOCTYPE html>\n<h1>Hello World</h1>\n", body end + + it "can be used in a nested fashion for partials and whatnot" do + mock_app { + template(:inner) { "%inner hi" } + template(:outer) { "%outer= haml(:inner)" } + get '/' do + haml :outer + end + } + + get '/' + assert ok? + assert_equal "<outer><inner>hi</inner></outer>\n", body + end + + it "defaults to no layout on nested render" do + mock_app { + template(:inner) { "%inner hi" } + template(:outer) { "%outer= haml(:inner)" } + template(:layout) { "%html= yield" } + get '/' do + haml :outer + end + } + + get '/' + assert ok? + assert_equal "<html><outer><inner>hi</inner></outer></html>\n", body + end end test/haml_test.rb 271a421b983373dc083fb9eefd86c445fc92f27b Ryan Tomayko rtomayko@gmail.com http://github.com/rtomayko/sinatra/commit/a00c2b5a556a81bd5a02650b9f342a0113af8ed3 a00c2b5a556a81bd5a02650b9f342a0113af8ed3

2009-03-11T10:31:57-07:00

Automatic partials [#181] d7131f2aae05aea2625db14f7fa71e70f2a42ca3 Ryan Tomayko rtomayko@gmail.com