Use same approach in scope and environment

.rubocop.yml

@@ -2,15 +2,9 @@ inherit_from:
   - .rubocop_todo.yml
   - ./.rubocop_todo.yml
 
-require: rubocop-performance
-
-Performance:
-  Enabled: true
-
 AllCops:
   Exclude:
     - 'performance/shopify/*'
-    - 'vendor/bundle/**/*'
     - 'pkg/**'
 
 Metrics/BlockNesting:
@@ -85,6 +79,9 @@ Style/TrailingCommaInArrayLiteral:
 Style/TrailingCommaInHashLiteral:
   Enabled: false
 
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
 Style/FormatString:
   Enabled: false
 
@@ -109,6 +106,9 @@ Style/RegexpLiteral:
 Style/SymbolLiteral:
   Enabled: false
 
+Performance/Count:
+  Enabled: false
+
 Naming/ConstantName:
   Enabled: false
 

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-29 00:43:36 +1000 using RuboCop version 0.74.0.
+# on 2019-04-22 19:11:24 -0400 using RuboCop version 0.53.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -8,67 +8,16 @@
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
+# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
 # Include: **/*.gemspec
 Gemspec/OrderedDependencies:
   Exclude:
     - 'liquid.gemspec'
 
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: **/*.gemspec, 
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    - 'liquid.gemspec'
-
-# Offense count: 124
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/AlignArguments:
-  Enabled: false
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
-  Exclude:
-    - 'lib/liquid/condition.rb'
-    - 'lib/liquid/expression.rb'
-    - 'test/unit/context_unit_test.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Layout/ClosingHeredocIndentation:
-  Exclude:
-    - 'test/integration/tags/for_tag_test.rb'
-
-# Offense count: 27
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/liquid/block.rb'
-    - 'lib/liquid/block_body.rb'
-    - 'lib/liquid/context.rb'
-    - 'lib/liquid/drop.rb'
-    - 'lib/liquid/lexer.rb'
-    - 'lib/liquid/parser.rb'
-    - 'lib/liquid/standardfilters.rb'
-    - 'lib/liquid/strainer.rb'
-    - 'lib/liquid/tags/for.rb'
-    - 'lib/liquid/tags/if.rb'
-    - 'lib/liquid/tags/include.rb'
-    - 'lib/liquid/utils.rb'
-    - 'lib/liquid/variable.rb'
-    - 'lib/liquid/variable_lookup.rb'
-
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: squiggly, active_support, powerpack, unindent
+# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
 Layout/IndentHeredoc:
   Exclude:
     - 'test/integration/tags/for_tag_test.rb'
@@ -83,13 +32,6 @@ Layout/MultilineMethodCallBraceLayout:
     - 'test/integration/error_handling_test.rb'
     - 'test/unit/strainer_unit_test.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'lib/liquid/condition.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -112,25 +54,27 @@ Metrics/AbcSize:
 Metrics/CyclomaticComplexity:
   Max: 13
 
-# Offense count: 118
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 112
+# Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 38
 
-# Offense count: 9
+# Offense count: 8
 Metrics/PerceivedComplexity:
   Max: 11
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredName.
-Naming/RescuedExceptionsVariableName:
+# Offense count: 52
+# Configuration parameters: Blacklist.
+# Blacklist: END, (?-mix:EO[A-Z]{1})
+Naming/HeredocDelimiterNaming:
   Exclude:
-    - 'lib/liquid/context.rb'
+    - 'test/integration/assign_test.rb'
+    - 'test/integration/capture_test.rb'
+    - 'test/integration/trim_mode_test.rb'
 
-# Offense count: 20
+# Offense count: 23
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
+# AllowedNames: io, id
 Naming/UncommunicativeMethodParamName:
   Exclude:
     - 'example/server/example_servlet.rb'
@@ -138,23 +82,15 @@ Naming/UncommunicativeMethodParamName:
     - 'lib/liquid/context.rb'
     - 'lib/liquid/standardfilters.rb'
     - 'lib/liquid/tags/if.rb'
+    - 'lib/liquid/utils.rb'
     - 'lib/liquid/variable.rb'
     - 'test/integration/filter_test.rb'
     - 'test/integration/standard_filter_test.rb'
+    - 'test/integration/tags/for_tag_test.rb'
     - 'test/integration/template_test.rb'
     - 'test/unit/condition_unit_test.rb'
 
-# Offense count: 5
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: inline, group
-Style/AccessModifierDeclarations:
-  Exclude:
-    - 'lib/liquid/block_body.rb'
-    - 'lib/liquid/tag.rb'
-    - 'lib/liquid/tags/include.rb'
-    - 'test/unit/strainer_unit_test.rb'
-
-# Offense count: 10
+# Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
@@ -181,9 +117,15 @@ Style/ConditionalAssignment:
     - 'lib/liquid/errors.rb'
 
 # Offense count: 1
+Style/DateTime:
+  Exclude:
+    - 'test/unit/context_unit_test.rb'
+
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/EmptyCaseCondition:
   Exclude:
+    - 'lib/liquid/block_body.rb'
     - 'lib/liquid/lexer.rb'
 
 # Offense count: 5
@@ -221,13 +163,6 @@ Style/FormatStringToken:
     - 'test/integration/filter_test.rb'
     - 'test/integration/hash_ordering_test.rb'
 
-# Offense count: 106
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, never
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
 # Offense count: 14
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
@@ -245,13 +180,6 @@ Style/GuardClause:
     - 'lib/liquid/variable.rb'
     - 'test/unit/tokenizer_unit_test.rb'
 
-# Offense count: 53
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
-  Enabled: false
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength.
@@ -260,9 +188,9 @@ Style/Next:
   Exclude:
     - 'lib/liquid/tags/for.rb'
 
-# Offense count: 13
+# Offense count: 4
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
@@ -271,8 +199,6 @@ Style/NumericPredicate:
     - 'lib/liquid/forloop_drop.rb'
     - 'lib/liquid/standardfilters.rb'
     - 'lib/liquid/tablerowloop_drop.rb'
-    - 'test/integration/standard_filter_test.rb'
-    - 'test/integration/template_test.rb'
 
 # Offense count: 14
 # Cop supports --auto-correct.
@@ -290,16 +216,6 @@ Style/RedundantSelf:
   Exclude:
     - 'lib/liquid/strainer.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
-# Whitelist: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Exclude:
-    - 'lib/liquid/drop.rb'
-    - 'lib/liquid/strainer.rb'
-    - 'lib/liquid/tokenizer.rb'
-
 # Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAsExpressionSeparator.
@@ -337,9 +253,8 @@ Style/WhileUntilModifier:
   Exclude:
     - 'lib/liquid/tags/case.rb'
 
-# Offense count: 665
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 648
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 294

.travis.yml

@@ -1,14 +1,20 @@
 language: ruby
 
 rvm:
+  - 2.1
+  - 2.2
+  - 2.3
   - 2.4
   - 2.5
   - &latest_ruby 2.6
-  - 2.7
   - ruby-head
   - jruby-head
-  - truffleruby
+#  - rbx-2
 
+addons:
+  apt:
+    packages:
+    - libgmp3-dev
 
 matrix:
   include:
@@ -18,9 +24,9 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: truffleruby
 
-cache: bundler
+install:
+  - bundle install
 
 script: bundle exec rake
 

Gemfile

@@ -10,16 +10,15 @@ group :benchmark, :test do
   gem 'memory_profiler'
   gem 'terminal-table'
 
-  install_if -> { RUBY_PLATFORM !~ /mingw|mswin|java/ && RUBY_ENGINE != 'truffleruby' } do
+  install_if -> { RUBY_PLATFORM !~ /mingw|mswin|java/ } do
     gem 'stackprof'
   end
 end
 
 group :test do
-  gem 'rubocop', '~> 0.74.0', require: false
-  gem 'rubocop-performance', require: false
+  gem 'rubocop', '~> 0.53.0'
 
-  platform :mri, :truffleruby do
+  platform :mri do
     gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'liquid-tag'
   end
 end

Rakefile

@@ -19,10 +19,8 @@ task :warn_test do
 end
 
 task :rubocop do
-  if RUBY_ENGINE == 'ruby'
-    require 'rubocop/rake_task'
-    RuboCop::RakeTask.new
-  end
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
 end
 
 desc 'runs test suite with both strict and lax parsers'
@@ -34,8 +32,8 @@ task :test do
   Rake::Task['base_test'].reenable
   Rake::Task['base_test'].invoke
 
-  if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'truffleruby'
-    ENV['LIQUID_C'] = '1'
+  if RUBY_ENGINE == 'ruby'
+    ENV['LIQUID-C'] = '1'
 
     ENV['LIQUID_PARSER_MODE'] = 'lax'
     Rake::Task['base_test'].reenable

lib/liquid/context.rb

@@ -20,21 +20,17 @@ module Liquid
       @scopes           = [(outer_scope || {})]
       @registers        = registers
       @errors           = []
+      @interrupts       = []
+      @filters          = []
+      @global_filter    = nil
       @partial          = false
       @strict_variables = false
       @resource_limits  = resource_limits || ResourceLimits.new(Template.default_resource_limits)
-      squash_instance_assigns_with_environments
-
-      @this_stack_used = false
 
       self.exception_renderer = Template.default_exception_renderer
-      if rethrow_errors
-        self.exception_renderer = ->(e) { raise }
-      end
+      self.exception_renderer = ->(e) { raise } if rethrow_errors
 
-      @interrupts = []
-      @filters = []
-      @global_filter = nil
+      squash_instance_assigns_with_environments
     end
 
     def warnings
@@ -87,9 +83,9 @@ module Liquid
     end
 
     # Push new local scope on the stack. use <tt>Context#stack</tt> instead
-    def push(new_scope = {})
-      @scopes.unshift(new_scope)
-      raise StackLevelError, "Nesting too deep".freeze if @scopes.length > Block::MAX_DEPTH
+    def push
+      @scopes.unshift({})
+      raise StackLevelError, "Nesting too deep".freeze if @scopes.length > (Block::MAX_DEPTH + 1)
     end
 
     # Merge a hash of variables in the current local scope
@@ -111,31 +107,15 @@ module Liquid
     #   end
     #
     #   context['var]  #=> nil
-    def stack(new_scope = nil)
-      old_stack_used = @this_stack_used
-      if new_scope
-        push(new_scope)
-        @this_stack_used = true
-      else
-        @this_stack_used = false
-      end
-
+    def stack
+      push
       yield
     ensure
-      pop if @this_stack_used
-      @this_stack_used = old_stack_used
-    end
-
-    def clear_instance_assigns
-      @scopes[0] = {}
+      pop
     end
 
     # Only allow String, Numeric, Hash, Array, Proc, Boolean or <tt>Liquid::Drop</tt>
     def []=(key, value)
-      unless @this_stack_used
-        @this_stack_used = true
-        push({})
-      end
       @scopes[0][key] = value
     end
 
@@ -163,27 +143,12 @@ module Liquid
     def find_variable(key, raise_on_not_found: true)
       # This was changed from find() to find_index() because this is a very hot
       # path and find_index() is optimized in MRI to reduce object allocation
-      index = @scopes.find_index { |s| s.key?(key) }
-      scope = @scopes[index] if index
 
-      variable = nil
+      scope = (index = @scopes.find_index { |s| s.key?(key)  }) && @scopes[index]
+      scope ||= (index = @environments.find_index { |s| s.key?(key) }) && @environments[index]
+      scope ||= {}
 
-      if scope.nil?
-        @environments.each do |e|
-          variable = lookup_and_evaluate(e, key, raise_on_not_found: raise_on_not_found)
-          # When lookup returned a value OR there is no value but the lookup also did not raise
-          # then it is the value we are looking for.
-          if !variable.nil? || @strict_variables && raise_on_not_found
-            scope = e
-            break
-          end
-        end
-      end
-
-      scope ||= @environments.last || @scopes.last
-      variable ||= lookup_and_evaluate(scope, key, raise_on_not_found: raise_on_not_found)
-
-      variable = variable.to_liquid
+      variable = lookup_and_evaluate(scope, key, raise_on_not_found: raise_on_not_found).to_liquid
       variable.context = self if variable.respond_to?(:context=)
 
       variable

lib/liquid/tags/echo.rb

@@ -16,7 +16,7 @@ module Liquid
     end
 
     def render(context)
-      @variable.render_to_output_buffer(context, '')
+      @variable.render(context)
     end
   end
 

liquid.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   # s.description = "A secure, non-evaling end user template engine with aesthetic markup."
 
-  s.required_ruby_version     = ">= 2.4.0"
+  s.required_ruby_version     = ">= 2.1.0"
   s.required_rubygems_version = ">= 1.3.7"
 
   s.test_files  = Dir.glob("{test}/**/*")

performance/memory_profile.rb

@@ -30,7 +30,6 @@ class Profiler
     @retained  << "#{report.scale_bytes(report.total_retained_memsize)} (#{report.total_retained} objects)"
 
     return if ENV['CI']
-
     require 'fileutils'
     report_file = File.join(REPORTS_DIR, "#{sanitize(phase)}.txt")
     FileUtils.mkdir_p(REPORTS_DIR)

test/integration/tags/liquid_tag_test.rb

@@ -5,72 +5,72 @@ class LiquidTagTest < Minitest::Test
 
   def test_liquid_tag
     assert_template_result('1 2 3', <<~LIQUID, 'array' => [1, 2, 3])
-      {%- liquid
-        echo array | join: " "
-      -%}
+    {%- liquid
+      echo array | join: " "
+    -%}
     LIQUID
 
     assert_template_result('1 2 3', <<~LIQUID, 'array' => [1, 2, 3])
-      {%- liquid
-        for value in array
-          echo value
-          unless forloop.last
-            echo " "
-          endunless
-        endfor
-      -%}
+    {%- liquid
+      for value in array
+        echo value
+        unless forloop.last
+          echo " "
+        endunless
+      endfor
+    -%}
     LIQUID
 
     assert_template_result('4 8 12 6', <<~LIQUID, 'array' => [1, 2, 3])
-      {%- liquid
-        for value in array
-          assign double_value = value | times: 2
-          echo double_value | times: 2
-          unless forloop.last
-            echo " "
-          endunless
-        endfor
+    {%- liquid
+      for value in array
+        assign double_value = value | times: 2
+        echo double_value | times: 2
+        unless forloop.last
+          echo " "
+        endunless
+      endfor
 
-        echo " "
-        echo double_value
-      -%}
+      echo " "
+      echo double_value
+    -%}
     LIQUID
 
     assert_template_result('abc', <<~LIQUID)
-      {%- liquid echo "a" -%}
-      b
-      {%- liquid echo "c" -%}
+    {%- liquid echo "a" -%}
+    b
+    {%- liquid echo "c" -%}
     LIQUID
   end
 
   def test_liquid_tag_errors
     assert_match_syntax_error("syntax error (line 1): Unknown tag 'error'", <<~LIQUID)
-      {%- liquid error no such tag -%}
+    {%- liquid error no such tag -%}
     LIQUID
 
     assert_match_syntax_error("syntax error (line 7): Unknown tag 'error'", <<~LIQUID)
-      {{ test }}
+    {{ test }}
 
-      {%-
-      liquid
-        for value in array
+    {%-
+    liquid
+      for value in array
 
-          error no such tag
-        endfor
-      -%}
+        error no such tag
+      endfor
+    -%}
     LIQUID
 
     assert_match_syntax_error("syntax error (line 2): Unknown tag '!!! the guards are vigilant'", <<~LIQUID)
-      {%- liquid
-        !!! the guards are vigilant
-      -%}
+    {%- liquid
+      !!! the guards are vigilant
+    -%}
     LIQUID
 
     assert_match_syntax_error("syntax error (line 4): 'for' tag was never closed", <<~LIQUID)
-      {%- liquid
-        for value in array
-          echo 'forgot to close the for tag'
-      -%}
+    {%- liquid
+      for value in array
+        echo 'forgot to close the for tag'
+    -%}
     LIQUID
   end
 
@@ -81,24 +81,24 @@ class LiquidTagTest < Minitest::Test
 
   def test_cannot_open_blocks_living_past_a_liquid_tag
     assert_match_syntax_error("syntax error (line 3): 'if' tag was never closed", <<~LIQUID)
-      {%- liquid
-        if true
-      -%}
-      {%- endif -%}
+    {%- liquid
+      if true
+    -%}
+    {%- endif -%}
     LIQUID
   end
 
   def test_quirk_can_close_blocks_created_before_a_liquid_tag
     assert_template_result("42", <<~LIQUID)
-      {%- if true -%}
-      42
-      {%- liquid endif -%}
+    {%- if true -%}
+    42
+    {%- liquid endif -%}
     LIQUID
   end
 
   def test_liquid_tag_in_raw
     assert_template_result("{% liquid echo 'test' %}\n", <<~LIQUID)
-      {% raw %}{% liquid echo 'test' %}{% endraw %}
+    {% raw %}{% liquid echo 'test' %}{% endraw %}
     LIQUID
   end
 end

test/integration/variable_test.rb

@@ -80,10 +80,7 @@ class VariableTest < Minitest::Test
     assigns['test'] = 'Tobi'
     assert_equal 'Hello Tobi', template.render!(assigns)
     assigns.delete('test')
-    e = assert_raises(RuntimeError) do
-      template.render!(assigns)
-    end
-    assert_equal "Unknown variable 'test'", e.message
+    assert_equal "Hello ", template.render!(assigns)
   end
 
   def test_multiline_variable

test/test_helper.rb

@@ -14,7 +14,7 @@ if env_mode = ENV['LIQUID_PARSER_MODE']
 end
 Liquid::Template.error_mode = mode
 
-if ENV['LIQUID_C'] == '1'
+if ENV['LIQUID-C'] == '1'
   puts "-- LIQUID C"
   require 'liquid/c'
 end