0
@@ -576,9 +576,19 @@ module Sinatra
0
     private 
0
     
0
       def render_erb(content, options = {})
0
-        ::ERB.new(content).result(binding)
0
+        locals_opt = options.delete(:locals) || {}
0
+
0
+        locals_code = ""
0
+        locals_hash = {} 
0
+        locals_opt.each do |key, value|
0
+          locals_code << "#{key} = locals_hash[:#{key}]\n"
0
+          locals_hash[:"#{key}"] = value
0
+        end
0
+ 
0
+        body = ::ERB.new(content).src
0
+        eval("#{locals_code}#{body}", binding)
0
       end
0
-      
0
+
0
   end
0
 
0
   module Haml

0
@@ -23,6 +23,26 @@ context "Erb" do
0
       body.should == '2'
0
 
0
     end
0
+
0
+    specify "should take an options hash with :locals set with a string" do
0
+      get '/locals' do
0
+        erb '<%= foo %>', :locals => {:foo => "Bar"}
0
+      end
0
+
0
+      get_it '/locals'
0
+      should.be.ok
0
+      body.should == 'Bar'
0
+    end
0
+
0
+    specify "should take an options hash with :locals set with a complex object" do
0
+      get '/locals-complex' do
0
+        erb '<%= foo[0] %>', :locals => {:foo => ["foo", "bar", "baz"]}
0
+      end
0
+
0
+      get_it '/locals-complex'
0
+      should.be.ok
0
+      body.should == 'foo'
0
+    end
0
   end
0
   
0
   context "with layouts" do