@@ -576,9 +576,19 @@ module Sinatra private def render_erb(content, options = {}) - ::ERB.new(content).result(binding) + locals_opt = options.delete(:locals) || {} + + locals_code = "" + locals_hash = {} + locals_opt.each do |key, value| + locals_code << "#{key} = locals_hash[:#{key}]\n" + locals_hash[:"#{key}"] = value + end + + body = ::ERB.new(content).src + eval("#{locals_code}#{body}", binding) end - + end module Haml lib/sinatra.rb @@ -23,6 +23,26 @@ context "Erb" do body.should == '2' end + + specify "should take an options hash with :locals set with a string" do + get '/locals' do + erb '<%= foo %>', :locals => {:foo => "Bar"} + end + + get_it '/locals' + should.be.ok + body.should == 'Bar' + end + + specify "should take an options hash with :locals set with a complex object" do + get '/locals-complex' do + erb '<%= foo[0] %>', :locals => {:foo => ["foo", "bar", "baz"]} + end + + get_it '/locals-complex' + should.be.ok + body.should == 'foo' + end end context "with layouts" do test/erb_test.rb 07f254733192d114d59143b997ee51a4ca003a48 Chris Schneider chris@christopher-schneider.com http://github.com/cschneid/sinatra/commit/f2733e8785b8b943f4114d4a8ff25b5ef632a1ff f2733e8785b8b943f4114d4a8ff25b5ef632a1ff 2008-05-27T19:16:23-07:00 2008-05-27T19:09:45-07:00 Add :locals option for erb. General approach and some of the code was borrowed from rails (compilable.rb) 1c063b35a5cdc7c30bf0d373d59fa2a05ac078d9 bmizerany blake.mizerany@gmail.com