diff options
| -rw-r--r-- | lib/erb.rb | 13 | ||||
| -rw-r--r-- | test/erb/test_erb.rb | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/erb.rb b/lib/erb.rb index a950aec84e..c616178507 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -889,7 +889,7 @@ class ERB # Render a template on a new toplevel binding with local variables specified # by a Hash object. def result_with_hash(hash) - b = new_toplevel + b = new_toplevel(hash.keys) hash.each_pair do |key, value| b.local_variable_set(key, value) end @@ -900,8 +900,15 @@ class ERB # Returns a new binding each time *near* TOPLEVEL_BINDING for runs that do # not specify a binding. - def new_toplevel - TOPLEVEL_BINDING.dup + def new_toplevel(vars = nil) + b = TOPLEVEL_BINDING + if vars + vars = vars.select {|v| b.local_variable_defined?(v)} + unless vars.empty? + return b.eval("tap {|;#{vars.join(',')}| break binding}") + end + end + b.dup end private :new_toplevel diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb index 173e71cd7a..46f81c778b 100644 --- a/test/erb/test_erb.rb +++ b/test/erb/test_erb.rb @@ -611,6 +611,10 @@ EOS erb = @erb.new("<%= foo %>") erb.result_with_hash(foo: "1") assert_equal(false, TOPLEVEL_BINDING.local_variable_defined?(:foo)) + TOPLEVEL_BINDING.eval 'template2 = "two"' + erb = @erb.new("<%= template2 %>") + erb.result_with_hash(template2: "TWO") + assert_equal "two", TOPLEVEL_BINDING.local_variable_get("template2") end # This depends on the behavior that #local_variable_set raises TypeError by invalid key. |