kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-06 18:25:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow Hash with default value or default proc to be used

Browse Source
This commit is contained in:
Brian Candler
2009-06-06 16:04:22 +01:00
parent 09c0b3b391
commit cfe3e6f3be
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/liquid/context.rb
View File

@@ -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.