From cd347008ee77d29a4f08e4566475a782e7be044a Mon Sep 17 00:00:00 2001 From: Mike Angell Date: Tue, 24 Sep 2019 05:22:14 +1000 Subject: [PATCH] Expand usage tracking --- lib/liquid/context.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/liquid/context.rb b/lib/liquid/context.rb index d8d880b..9b3e143 100644 --- a/lib/liquid/context.rb +++ b/lib/liquid/context.rb @@ -219,16 +219,16 @@ module Liquid def try_variable_find_in_environments(key, raise_on_not_found:) @environments.each do |environment| found_variable = lookup_and_evaluate(environment, key, raise_on_not_found: raise_on_not_found) - Usage.increment("environment_has_a_default_proc") if environment.default_proc - Usage.increment("environment_has_key_but_is_nil") if environment.key?(key) && found_variable == nil + Usage.increment("environment_has_a_default_proc") if environment.respond_to?(:default_proc) && environment.default_proc + Usage.increment("environment_has_key_but_is_nil") if environment.respond_to?(:key?) && environment.key?(key) && found_variable.nil? if !found_variable.nil? || @strict_variables && raise_on_not_found return found_variable end end @static_environments.each do |environment| found_variable = lookup_and_evaluate(environment, key, raise_on_not_found: raise_on_not_found) - Usage.increment("static_environment_has_a_default_proc") if environment.default_proc - Usage.increment("static_environment_has_key_but_is_nil") if environment.key?(key) && found_variable == nil + Usage.increment("static_environment_has_a_default_proc") if environment.respond_to?(:default_proc) && environment.default_proc + Usage.increment("static_environment_has_key_but_is_nil") if environment.respond_to?(:key?) && environment.key?(key) && found_variable.nil? if !found_variable.nil? || @strict_variables && raise_on_not_found return found_variable end