@@ -159,16 +159,12 @@ module Liquid # fetches an object starting at the local scope and then moving up # the hierachy def find_variable(key) - @scopes.each do |scope| - if scope.has_key?(key) - variable = scope[key] - variable = scope[key] = variable.call(self) if variable.is_a?(Proc) - variable = variable.to_liquid - variable.context = self if variable.respond_to?(:context=) - return variable - end - end - nil + scope = @scopes[0..-2].find { |s| s.has_key?(key) } || @scopes.last + variable = scope[key] + variable = scope[key] = variable.call(self) if variable.is_a?(Proc) + variable = variable.to_liquid + variable.context = self if variable.respond_to?(:context=) + return variable end # resolves namespaced queries gracefully. lib/liquid/context.rb @@ -157,4 +157,16 @@ class VariableResolutionTest < Test::Unit::TestCase assert_equal 'bazbar', template.render end + def test_hash_with_default_proc + template = Template.parse(%|Hello {{ test }}|) + assigns = Hash.new { |h,k| raise "Unknown variable '#{k}'" } + assigns['test'] = 'Tobi' + assert_equal 'Hello Tobi', template.render!(assigns) + assigns.delete('test') + e = assert_raises(RuntimeError) { + template.render!(assigns) + } + assert_equal "Unknown variable 'test'", e.message + end + end \ No newline at end of file test/variable_test.rb 09c0b3b3916d44e3a31062161019247d9ef451b4 Brian Candler b.candler@pobox.com http://github.com/tobi/liquid/commit/cfe3e6f3be197da14a1976fccb83cc1a33bb3add cfe3e6f3be197da14a1976fccb83cc1a33bb3add 2009-06-06T08:16:06-07:00 2009-06-06T08:04:22-07:00 Allow Hash with default value or default proc to be used 6f3ce3e52364954473c86f8cfb47530967e2abdf Brian Candler b.candler@pobox.com