From 29eb18adad5c7ae12c649f4217763f09b01346c6 Mon Sep 17 00:00:00 2001
From: Blake Mizerany <blakemizerany@blake-mizeranys-computer.local>
Date: Wed, 28 Nov 2007 18:32:49 -0800
Subject: [PATCH] simple layouts

---
 lib/sinatra.rb       |  4 ++--
 test/layouts_test.rb | 16 ----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/lib/sinatra.rb b/lib/sinatra.rb
index f2ba627..b9ebc20 100644
--- a/lib/sinatra.rb
+++ b/lib/sinatra.rb
@@ -88,9 +88,9 @@ module Sinatra
       @response.body || returned
     end
     
-    def render(content, options={}, &b)
+    def render(content, options={})
       @content = instance_eval(%Q{"#{content}"})
-      @content = instance_eval(&layout) if layout
+      @content = instance_eval(&layout) if options[:layout] != false && layout
       @content
     end
 
diff --git a/test/layouts_test.rb b/test/layouts_test.rb
index 9f2fe3c..86a48bf 100644
--- a/test/layouts_test.rb
+++ b/test/layouts_test.rb
@@ -22,20 +22,4 @@ context "Layouts (in general)" do
 
   end
   
-  xspecify "are rendered for default return value" do
-    
-    layout do
-      %Q{This is #{@content}!}
-    end
-    
-    get '/lay' do
-      'Blake'
-    end
-    
-    get_it '/lay'
-    should.be.ok
-    body.should.equal 'This is Blake!'
-    
-  end
-  
 end
-- 
2.11.4.GIT