Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-10-03 00:55:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make logic in Context#lookup_and_evaluate more understandable

Browse Source
This commit is contained in:
Justin Li
2016-02-02 23:22:46 -05:00
parent 5a50c12953
commit 0cc8b68a97
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/context.rb
+7 -3
View File
@@ -205,10 +205,14 @@ module Liquid
end end
def lookup_and_evaluate(obj, key) def lookup_and_evaluate(obj, key)
if (value = obj[key]).is_a?(Proc) && obj.respond_to?(:[]=) if @strict_variables && obj.respond_to?(:key?) && !obj.key?(key)
obj[key] = (value.arity == 0) ? value.call : value.call(self)
elsif strict_variables && obj.respond_to?(:key?) && !obj.key?(key)
raise Liquid::UndefinedVariable, "undefined variable #{key}" raise Liquid::UndefinedVariable, "undefined variable #{key}"
end
value = obj[key]
if value.is_a?(Proc) && obj.respond_to?(:[]=)
obj[key] = (value.arity == 0) ? value.call : value.call(self)
else else
value value
end end