Tidy instance variables

Avoid deep flatten
Enable Instance Assigns to survive many renders
2026-01-06 10:15:40 +03:00 · 2019-09-17 02:33:02 +10:00 · 2019-09-17 02:30:20 +10:00 · 2019-09-17 01:59:55 +10:00 · 2019-09-16 21:42:51 +10:00 · 2019-09-16 12:14:50 +10:00
87 changed files with 2016 additions and 930 deletions
--- a/.rubocop-https---shopify-github-io-ruby-style-guide-rubocop-yml
+++ b/.rubocop-https---shopify-github-io-ruby-style-guide-rubocop-yml
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,6 @@
 inherit_from:
  - https://shopify.github.io/ruby-style-guide/rubocop.yml
  - .rubocop_todo.yml
  - ./.rubocop_todo.yml
 require: rubocop-performance
@@ -9,123 +9,7 @@ Performance:
 AllCops:
  Exclude:
    - 'performance/shopify/*'
    - 'vendor/bundle/**/*'
    - 'pkg/**'
 Metrics/BlockNesting:
  Max: 3
 Metrics/ModuleLength:
  Enabled: false
 Metrics/ClassLength:
  Enabled: false
 Lint/AssignmentInCondition:
  Enabled: false
 Lint/AmbiguousOperator:
  Enabled: false
 Lint/AmbiguousRegexpLiteral:
  Enabled: false
 Lint/ParenthesesAsGroupedExpression:
  Enabled: false
 Lint/UnusedBlockArgument:
  Enabled: false
 Layout/EndAlignment:
  EnforcedStyleAlignWith: variable
 Lint/UnusedMethodArgument:
  Enabled: false
 Style/SingleLineBlockParams:
  Enabled: false
 Style/DoubleNegation:
  Enabled: false
 Style/StringLiteralsInInterpolation:
  Enabled: false
 Style/AndOr:
  Enabled: false
 Style/SignalException:
  Enabled: false
 Style/StringLiterals:
  Enabled: false
 Style/BracesAroundHashParameters:
  Enabled: false
 Style/NumericLiterals:
  Enabled: false
 Layout/SpaceInsideArrayLiteralBrackets:
  Enabled: false
 Layout/SpaceBeforeBlockBraces:
  Enabled: false
 Style/Documentation:
  Enabled: false
 Style/ClassAndModuleChildren:
  Enabled: false
 Style/TrailingCommaInArrayLiteral:
  Enabled: false
 Style/TrailingCommaInHashLiteral:
  Enabled: false
 Style/FormatString:
  Enabled: false
 Layout/AlignParameters:
  EnforcedStyle: with_fixed_indentation
 Layout/MultilineOperationIndentation:
  EnforcedStyle: indented
 Style/IfUnlessModifier:
  Enabled: false
 Style/RaiseArgs:
  Enabled: false
 Style/PreferredHashMethods:
  Enabled: false
 Style/RegexpLiteral:
  Enabled: false
 Style/SymbolLiteral:
  Enabled: false
 Naming/ConstantName:
  Enabled: false
 Layout/CaseIndentation:
  Enabled: false
 Style/ClassVars:
  Enabled: false
 Style/PerlBackrefs:
  Enabled: false
 Style/TrivialAccessors:
  AllowPredicates: true
 Style/WordArray:
  Enabled: false
 Naming/MethodName:
  Exclude:
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,94 +1,30 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-27 22:42:50 +1000 using RuboCop version 0.74.0.
+# on 2019-09-11 06:34:25 +1000 using RuboCop version 0.74.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
 # versions of RuboCop, may require this file to be generated again.
-# Offense count: 1
+# Offense count: 2
-# Cop supports --auto-correct.
+Lint/AmbiguousOperator:
 # Configuration parameters: TreatCommentsAsGroupSeparators, Include.
 # Include: **/*.gemspec
 Gemspec/OrderedDependencies:
  Exclude:
-    - 'liquid.gemspec'
+    - 'test/unit/condition_unit_test.rb'
-# Offense count: 1
+# Offense count: 21
-# Configuration parameters: Include.
+# Configuration parameters: AllowSafeAssignment.
-# Include: **/*.gemspec, 
+Lint/AssignmentInCondition:
 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: 25
 # 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/tags/raw.rb'
    - 'lib/liquid/utils.rb'
    - 'lib/liquid/variable.rb'
-    - 'lib/liquid/variable_lookup.rb'
+    - 'performance/profile.rb'
-
+    - 'test/test_helper.rb'
-# Offense count: 5
+    - 'test/unit/tokenizer_unit_test.rb'
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: squiggly, active_support, powerpack, unindent
 Layout/IndentHeredoc:
  Exclude:
    - 'test/integration/tags/for_tag_test.rb'
    - 'test/integration/trim_mode_test.rb'
 # Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineMethodCallBraceLayout:
  Exclude:
    - '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.
@@ -98,207 +34,63 @@ Lint/InheritException:
  Exclude:
    - 'lib/liquid/interrupts.rb'
 # Offense count: 2
 Lint/UselessAssignment:
  Exclude:
    - 'performance/shopify/database.rb'
 # Offense count: 1
 # Configuration parameters: CheckForMethodsWithNoSideEffects.
 Lint/Void:
  Exclude:
    - 'lib/liquid/parse_context.rb'
-# Offense count: 52
+# Offense count: 98
 Metrics/AbcSize:
  Max: 56
 # Offense count: 12
 Metrics/CyclomaticComplexity:
  Max: 13
 # Offense count: 114
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
  Max: 38
 # Offense count: 9
 Metrics/PerceivedComplexity:
  Max: 11
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: PreferredName.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-Naming/RescuedExceptionsVariableName:
+# URISchemes: http, https
-  Exclude:
+Metrics/LineLength:
-    - 'lib/liquid/context.rb'
+  Max: 294
-# Offense count: 20
+# Offense count: 44
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+Naming/ConstantName:
 # AllowedNames: io, id, to, by, on, in, at, ip, db
 Naming/UncommunicativeMethodParamName:
  Exclude:
-    - 'example/server/example_servlet.rb'
+    - 'lib/liquid.rb'
-    - 'lib/liquid/condition.rb'
+    - 'lib/liquid/block_body.rb'
-    - 'lib/liquid/context.rb'
+    - 'lib/liquid/tags/assign.rb'
-    - 'lib/liquid/standardfilters.rb'
+    - 'lib/liquid/tags/capture.rb'
    - 'lib/liquid/tags/case.rb'
    - 'lib/liquid/tags/cycle.rb'
    - 'lib/liquid/tags/for.rb'
    - 'lib/liquid/tags/if.rb'
    - 'lib/liquid/variable.rb'
    - 'test/integration/filter_test.rb'
    - 'test/integration/standard_filter_test.rb'
    - 'test/integration/template_test.rb'
    - 'test/unit/condition_unit_test.rb'
 # Offense count: 3
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: inline, group
 Style/AccessModifierDeclarations:
  Exclude:
    - 'lib/liquid/tag.rb'
    - 'lib/liquid/tags/include.rb'
    - 'test/unit/strainer_unit_test.rb'
 # Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
 Style/Alias:
  Exclude:
    - 'lib/liquid/drop.rb'
    - 'lib/liquid/i18n.rb'
    - 'lib/liquid/profiler/hooks.rb'
    - 'lib/liquid/standardfilters.rb'
    - 'lib/liquid/tag.rb'
    - 'lib/liquid/tags/include.rb'
    - 'lib/liquid/tags/raw.rb'
    - 'lib/liquid/tags/table_row.rb'
    - 'lib/liquid/variable.rb'
-
+    - 'performance/shopify/comment_form.rb'
-# Offense count: 22
+    - 'performance/shopify/paginate.rb'
-Style/CommentedKeyword:
+    - 'test/integration/tags/include_tag_test.rb'
  Enabled: false
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
  Exclude:
    - 'lib/liquid/errors.rb'
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/EmptyCaseCondition:
  Exclude:
    - 'lib/liquid/lexer.rb'
 # Offense count: 5
-# Cop supports --auto-correct.
+Style/ClassVars:
-# Configuration parameters: EnforcedStyle.
+  Exclude:
-# SupportedStyles: compact, expanded
+    - 'lib/liquid/condition.rb'
-Style/EmptyMethod:
+    - 'lib/liquid/strainer.rb'
    - 'lib/liquid/template.rb'
 # Offense count: 1
 # Configuration parameters: AllowCoercion.
 Style/DateTime:
  Exclude:
    - 'lib/liquid/tag.rb'
    - 'lib/liquid/tags/comment.rb'
    - 'lib/liquid/tags/include.rb'
    - 'test/integration/tags/include_tag_test.rb'
    - 'test/unit/context_unit_test.rb'
-# Offense count: 3
+# Offense count: 119
 # Cop supports --auto-correct.
 Style/Encoding:
  Exclude:
    - 'lib/liquid/version.rb'
    - 'liquid.gemspec'
    - 'test/integration/standard_filter_test.rb'
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/ExpandPathArguments:
  Exclude:
    - 'Rakefile'
    - 'liquid.gemspec'
 # Offense count: 7
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
  Exclude:
    - 'test/integration/filter_test.rb'
    - 'test/integration/hash_ordering_test.rb'
 # Offense count: 103
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, never
 Style/FrozenStringLiteralComment:
  Enabled: false
 # Offense count: 14
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
  Exclude:
    - 'lib/liquid/condition.rb'
    - 'lib/liquid/lexer.rb'
    - 'lib/liquid/strainer.rb'
    - 'lib/liquid/tags/assign.rb'
    - 'lib/liquid/tags/capture.rb'
    - 'lib/liquid/tags/case.rb'
    - 'lib/liquid/tags/for.rb'
    - 'lib/liquid/tags/include.rb'
    - 'lib/liquid/tags/raw.rb'
    - 'lib/liquid/tags/table_row.rb'
    - 'lib/liquid/variable.rb'
    - 'test/unit/tokenizer_unit_test.rb'
 # Offense count: 52
 # 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.
 # SupportedStyles: skip_modifier_ifs, always
 Style/Next:
  Exclude:
    - 'lib/liquid/tags/for.rb'
 # Offense count: 13
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
  Exclude:
    - 'spec/**/*'
    - 'lib/liquid/context.rb'
    - '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.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
  Exclude:
    - 'lib/liquid/tags/if.rb'
    - 'liquid.gemspec'
    - 'test/integration/assign_test.rb'
    - 'test/integration/standard_filter_test.rb'
 # Offense count: 1
 # Cop supports --auto-correct.
 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.
@@ -307,38 +99,3 @@ Style/Semicolon:
    - 'test/integration/error_handling_test.rb'
    - 'test/integration/template_test.rb'
    - 'test/unit/context_unit_test.rb'
 # Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets
 Style/SymbolArray:
  EnforcedStyle: brackets
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowSafeAssignment.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
 Style/TernaryParentheses:
  Exclude:
    - 'lib/liquid/context.rb'
    - 'lib/liquid/utils.rb'
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/UnneededPercentQ:
  Exclude:
    - 'test/integration/error_handling_test.rb'
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/WhileUntilModifier:
  Exclude:
    - 'lib/liquid/tags/case.rb'
 # Offense count: 650
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
  Max: 294
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: ruby
 cache: bundler
 rvm:
  - 2.4
@@ -9,7 +10,6 @@ rvm:
  - jruby-head
  - truffleruby
 matrix:
  include:
    - rvm: *latest_ruby
@@ -20,9 +20,11 @@ matrix:
    - rvm: jruby-head
    - rvm: truffleruby
-cache: bundler
+branches:
-
+  only:
-script: bundle exec rake
+    - master
    - gh-pages
    - /.*-stable/
 notifications:
  disable: true
--- a/2
+++ b/2
@@ -20,6 +20,6 @@ group :test do
  gem 'rubocop-performance', require: false
  platform :mri, :truffleruby do
-    gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'liquid-tag'
+    gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'master'
  end
 end
--- a/README.md
+++ b/README.md
@@ -106,3 +106,9 @@ template = Liquid::Template.parse("{{x}} {{y}}")
 template.render!({ 'x' => 1}, { strict_variables: true })
 #=> Liquid::UndefinedVariable: Liquid error: undefined variable y
 ```
 ### Usage tracking
 To help track usages of a feature or code path in production, we have released opt-in usage tracking. To enable this, we provide an empty `Liquid:: Usage.increment` method which you can customize to your needs. The feature is well suited to https://github.com/Shopify/statsd-instrument. However, the choice of implementation is up to you.
 Once you have enabled usage tracking, we recommend reporting any events through Github Issues that your system may be logging. It is highly likely this event has been added to consider deprecating or improving code specific to this event, so please raise any concerns.
--- a/14
+++ b/14
@@ -1,18 +1,18 @@
 require 'rake'
 require 'rake/testtask'
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
 require "liquid/version"
-task default: [:test, :rubocop]
+task(default: [:test, :rubocop])
-desc 'run test suite with default parser'
+desc('run test suite with default parser')
 Rake::TestTask.new(:base_test) do |t|
  t.libs << '.' << 'lib' << 'test'
  t.test_files = FileList['test/{integration,unit}/**/*_test.rb']
  t.verbose = false
 end
-desc 'run test suite with warn error mode'
+desc('run test suite with warn error mode')
 task :warn_test do
  ENV['LIQUID_PARSER_MODE'] = 'warn'
  Rake::Task['base_test'].invoke
@@ -25,7 +25,7 @@ task :rubocop do
  end
 end
-desc 'runs test suite with both strict and lax parsers'
+desc('runs test suite with both strict and lax parsers')
 task :test do
  ENV['LIQUID_PARSER_MODE'] = 'lax'
  Rake::Task['base_test'].invoke
@@ -47,7 +47,7 @@ task :test do
  end
 end
-task gem: :build
+task(gem: :build)
 task :build do
  system "gem build liquid.gemspec"
 end
@@ -94,7 +94,7 @@ namespace :memory_profile do
  end
 end
-desc "Run example"
+desc("Run example")
 task :example do
  ruby "-w -d -Ilib example/server/server.rb"
 end
--- a/example/server/example_servlet.rb
+++ b/example/server/example_servlet.rb
@@ -1,6 +1,6 @@
 module ProductsFilter
  def price(integer)
-    sprintf("$%.2d USD", integer / 100.0)
+    format("$%.2d USD", integer / 100.0)
  end
  def prettyprint(text)
--- a/example/server/liquid_servlet.rb
+++ b/example/server/liquid_servlet.rb
@@ -9,12 +9,12 @@ class LiquidServlet < WEBrick::HTTPServlet::AbstractServlet
  private
-  def handle(type, req, res)
+  def handle(_type, req, res)
    @request = req
    @response = res
    @request.path_info =~ /(\w+)\z/
-    @action = $1 || 'index'
+    @action = Regexp.last_match(1) || 'index'
    @assigns = send(@action) if respond_to?(@action)
    @response['Content-Type'] = "text/html"
--- a/lib/liquid.rb
+++ b/lib/liquid.rb
@@ -74,6 +74,8 @@ require 'liquid/condition'
 require 'liquid/utils'
 require 'liquid/tokenizer'
 require 'liquid/parse_context'
 require 'liquid/partial_cache'
 require 'liquid/usage'
 # Load all the tags of the standard library
 #
--- a/lib/liquid/block.rb
+++ b/lib/liquid/block.rb
@@ -28,15 +28,15 @@ module Liquid
    def unknown_tag(tag, _params, _tokens)
      if tag == 'else'.freeze
-        raise SyntaxError.new(parse_context.locale.t("errors.syntax.unexpected_else".freeze,
+        raise SyntaxError, parse_context.locale.t("errors.syntax.unexpected_else".freeze,
-          block_name: block_name))
+          block_name: block_name)
      elsif tag.start_with?('end'.freeze)
-        raise SyntaxError.new(parse_context.locale.t("errors.syntax.invalid_delimiter".freeze,
+        raise SyntaxError, parse_context.locale.t("errors.syntax.invalid_delimiter".freeze,
          tag: tag,
          block_name: block_name,
-          block_delimiter: block_delimiter))
+          block_delimiter: block_delimiter)
      else
-        raise SyntaxError.new(parse_context.locale.t("errors.syntax.unknown_tag".freeze, tag: tag))
+        raise SyntaxError, parse_context.locale.t("errors.syntax.unknown_tag".freeze, tag: tag)
      end
    end
@@ -61,7 +61,7 @@ module Liquid
          return false if end_tag_name == block_delimiter
          unless end_tag_name
-            raise SyntaxError.new(parse_context.locale.t("errors.syntax.tag_never_closed".freeze, block_name: block_name))
+            raise SyntaxError, parse_context.locale.t("errors.syntax.tag_never_closed".freeze, block_name: block_name)
          end
          # this tag is not registered with the system
--- a/lib/liquid/block_body.rb
+++ b/lib/liquid/block_body.rb
@@ -32,8 +32,8 @@ module Liquid
            # caller raise a syntax error
            return yield token, token
          end
-          tag_name = $1
+          tag_name = Regexp.last_match(1)
-          markup = $2
+          markup = Regexp.last_match(2)
          unless tag = registered_tags[tag_name]
            # end parsing if we reach an unknown tag and let the caller decide
            # determine how to proceed
@@ -58,13 +58,13 @@ module Liquid
          unless token =~ FullToken
            raise_missing_tag_terminator(token, parse_context)
          end
-          tag_name = $2
+          tag_name = Regexp.last_match(2)
-          markup = $4
+          markup = Regexp.last_match(4)
          if parse_context.line_number
            # newlines inside the tag should increase the line number,
            # particularly important for multiline {% liquid %} tags
-            parse_context.line_number += $1.count("\n".freeze) + $3.count("\n".freeze)
+            parse_context.line_number += Regexp.last_match(1).count("\n".freeze) + Regexp.last_match(3).count("\n".freeze)
          end
          if tag_name == 'liquid'.freeze
@@ -101,7 +101,7 @@ module Liquid
    def whitespace_handler(token, parse_context)
      if token[2] == WhitespaceControl
        previous_token = @nodelist.last
-        if previous_token.is_a? String
+        if previous_token.is_a?(String)
          previous_token.rstrip!
        end
      end
@@ -163,7 +163,7 @@ module Liquid
    def raise_if_resource_limits_reached(context, length)
      context.resource_limits.render_length += length
      return unless context.resource_limits.reached?
-      raise MemoryError.new("Memory limits exceeded".freeze)
+      raise MemoryError, "Memory limits exceeded".freeze
    end
    def create_variable(token, parse_context)
@@ -175,11 +175,11 @@ module Liquid
    end
    def raise_missing_tag_terminator(token, parse_context)
-      raise SyntaxError.new(parse_context.locale.t("errors.syntax.tag_termination".freeze, token: token, tag_end: TagEnd.inspect))
+      raise SyntaxError, parse_context.locale.t("errors.syntax.tag_termination".freeze, token: token, tag_end: TagEnd.inspect)
    end
    def raise_missing_variable_terminator(token, parse_context)
-      raise SyntaxError.new(parse_context.locale.t("errors.syntax.variable_termination".freeze, token: token, tag_end: VariableEnd.inspect))
+      raise SyntaxError, parse_context.locale.t("errors.syntax.variable_termination".freeze, token: token, tag_end: VariableEnd.inspect)
    end
    def registered_tags
--- a/lib/liquid/condition.rb
+++ b/lib/liquid/condition.rb
@@ -15,14 +15,14 @@ module Liquid
      '>'.freeze => :>,
      '>='.freeze => :>=,
      '<='.freeze => :<=,
-      'contains'.freeze => lambda do |cond, left, right|
+      'contains'.freeze => lambda do |_cond, left, right|
        if left && right && left.respond_to?(:include?)
          right = right.to_s if left.is_a?(String)
          left.include?(right)
        else
          false
        end
-      end
+      end,
    }
    def self.operators
@@ -116,7 +116,7 @@ module Liquid
      left = context.evaluate(left)
      right = context.evaluate(right)
-      operation = self.class.operators[op] || raise(Liquid::ArgumentError.new("Unknown operator #{op}"))
+      operation = self.class.operators[op] || raise(Liquid::ArgumentError, "Unknown operator #{op}")
      if operation.respond_to?(:call)
        operation.call(self, left, right)
@@ -124,7 +124,7 @@ module Liquid
        begin
          left.send(operation, right)
        rescue ::ArgumentError => e
-          raise Liquid::ArgumentError.new(e.message)
+          raise Liquid::ArgumentError, e.message
        end
      end
    end
--- a/lib/liquid/context.rb
+++ b/lib/liquid/context.rb
@@ -12,30 +12,35 @@ module Liquid
  #
  #   context['bob']  #=> nil  class Context
  class Context
-    attr_reader :scopes, :errors, :registers, :environments, :resource_limits
+    attr_reader :scopes, :errors, :registers, :environments, :resource_limits, :static_registers, :static_environments
    attr_accessor :exception_renderer, :template_name, :partial, :global_filter, :strict_variables, :strict_filters
-    def initialize(environments = {}, outer_scope = {}, registers = {}, rethrow_errors = false, resource_limits = nil)
+    # rubocop:disable Metrics/ParameterLists
-      @environments     = [environments].flatten
+    def self.build(environments: {}, outer_scope: {}, registers: {}, rethrow_errors: false, resource_limits: nil, static_registers: {}, static_environments: {})
      new(environments, outer_scope, registers, rethrow_errors, resource_limits, static_registers, static_environments)
    end
    def initialize(environments = {}, outer_scope = {}, registers = {}, rethrow_errors = false, resource_limits = nil, static_registers = {}, static_environments = {})
      @environments        = environments.is_a?(Array) ? environments : [environments]
      @static_environments = [static_environments].flat_map(&:freeze).freeze
      @scopes              = [(outer_scope || {})]
      @registers           = registers
      @static_registers    = static_registers.freeze
      @errors              = []
      @partial             = false
      @strict_variables    = false
      @resource_limits     = resource_limits || ResourceLimits.new(Template.default_resource_limits)
-      squash_instance_assigns_with_environments
+      @base_scope_depth    = 0
      @this_stack_used = false
      self.exception_renderer = Template.default_exception_renderer
      if rethrow_errors
        self.exception_renderer = ->(e) { raise }
      end
      @interrupts          = []
      @filters             = []
      @global_filter       = nil
      self.exception_renderer = Template.default_exception_renderer
      if rethrow_errors
        self.exception_renderer = ->(_e) { raise }
      end
    end
    # rubocop:enable Metrics/ParameterLists
    def warnings
      @warnings ||= []
@@ -89,7 +94,7 @@ module Liquid
    # 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
+      check_overflow
    end
    # Merge a hash of variables in the current local scope
@@ -111,19 +116,30 @@ module Liquid
    #   end
    #
    #   context['var]  #=> nil
-    def stack(new_scope = nil)
+    def stack(new_scope = {})
      old_stack_used = @this_stack_used
      if new_scope
      push(new_scope)
        @this_stack_used = true
      else
        @this_stack_used = false
      end
      yield
    ensure
-      pop if @this_stack_used
+      pop
-      @this_stack_used = old_stack_used
+    end
    # Creates a new context inheriting resource limits, filters, environment etc.,
    # but with an isolated scope.
    def new_isolated_subcontext
      check_overflow
      Context.build(
        resource_limits: resource_limits,
        static_environments: static_environments,
        static_registers: static_registers
      ).tap do |subcontext|
        subcontext.base_scope_depth = base_scope_depth + 1
        subcontext.exception_renderer = exception_renderer
        subcontext.filters = @filters
        subcontext.strainer = nil
        subcontext.errors = errors
        subcontext.warnings = warnings
      end
    end
    def clear_instance_assigns
@@ -132,10 +148,6 @@ module Liquid
    # 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
@@ -164,24 +176,12 @@ module Liquid
      # 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
+      variable = if index
-
+        lookup_and_evaluate(@scopes[index], key, raise_on_not_found: raise_on_not_found)
-      if scope.nil?
+      else
-        @environments.each do |e|
+        try_variable_find_in_environments(key, raise_on_not_found: raise_on_not_found)
          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.context = self if variable.respond_to?(:context=)
@@ -197,30 +197,49 @@ module Liquid
      value = obj[key]
      if value.is_a?(Proc) && obj.respond_to?(:[]=)
-        obj[key] = (value.arity == 0) ? value.call : value.call(self)
+        obj[key] = value.arity == 0 ? value.call : value.call(self)
      else
        value
      end
    end
    protected
    attr_writer :base_scope_depth, :warnings, :errors, :strainer, :filters
    private
    attr_reader :base_scope_depth
    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)
        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)
        if !found_variable.nil? || @strict_variables && raise_on_not_found
          return found_variable
        end
      end
      nil
    end
    def check_overflow
      raise StackLevelError, "Nesting too deep".freeze if overflow?
    end
    def overflow?
      base_scope_depth + @scopes.length > Block::MAX_DEPTH
    end
    def internal_error
      # raise and catch to set backtrace and cause on exception
      raise Liquid::InternalError, 'internal'
    rescue Liquid::InternalError => exc
      exc
    end
    def squash_instance_assigns_with_environments
      @scopes.last.each_key do |k|
        @environments.each do |env|
          if env.key?(k)
            scopes.last[k] = lookup_and_evaluate(env, k)
            break
          end
        end
      end
    end # squash_instance_assigns_with_environments
  end # Context
 end # Liquid
--- a/lib/liquid/document.rb
+++ b/lib/liquid/document.rb
@@ -7,7 +7,7 @@ module Liquid
    end
    def parse(tokens, parse_context)
-      super do |end_tag_name, end_tag_params|
+      super do |end_tag_name, _end_tag_params|
        unknown_tag(end_tag_name, parse_context) if end_tag_name
      end
    rescue SyntaxError => e
@@ -18,9 +18,9 @@ module Liquid
    def unknown_tag(tag, parse_context)
      case tag
      when 'else'.freeze, 'end'.freeze
-        raise SyntaxError.new(parse_context.locale.t("errors.syntax.unexpected_outer_tag".freeze, tag: tag))
+        raise SyntaxError, parse_context.locale.t("errors.syntax.unexpected_outer_tag".freeze, tag: tag)
      else
-        raise SyntaxError.new(parse_context.locale.t("errors.syntax.unknown_tag".freeze, tag: tag))
+        raise SyntaxError, parse_context.locale.t("errors.syntax.unknown_tag".freeze, tag: tag)
      end
    end
  end
--- a/lib/liquid/drop.rb
+++ b/lib/liquid/drop.rb
@@ -25,7 +25,7 @@ module Liquid
    # Catch all for the method
    def liquid_method_missing(method)
-      return nil unless @context && @context.strict_variables
+      return nil unless @context&.strict_variables
      raise Liquid::UndefinedDropMethod, "undefined method #{method}"
    end
--- a/lib/liquid/errors.rb
+++ b/lib/liquid/errors.rb
@@ -21,10 +21,10 @@ module Liquid
    def message_prefix
      str = ""
-      if is_a?(SyntaxError)
+      str << if is_a?(SyntaxError)
-        str << "Liquid syntax error"
+        "Liquid syntax error"
      else
-        str << "Liquid error"
+        "Liquid error"
      end
      if line_number
--- a/lib/liquid/expression.rb
+++ b/lib/liquid/expression.rb
@@ -33,13 +33,13 @@ module Liquid
      else
        case markup
        when SINGLE_QUOTED_STRING, DOUBLE_QUOTED_STRING
-          $1
+          Regexp.last_match(1)
        when INTEGERS_REGEX
-          $1.to_i
+          Regexp.last_match(1).to_i
        when RANGES_REGEX
-          RangeLookup.parse($1, $2)
+          RangeLookup.parse(Regexp.last_match(1), Regexp.last_match(2))
        when FLOATS_REGEX
-          $1.to_f
+          Regexp.last_match(1).to_f
        else
          VariableLookup.parse(markup)
        end
--- a/lib/liquid/file_system.rb
+++ b/lib/liquid/file_system.rb
@@ -57,7 +57,7 @@ module Liquid
    end
    def full_path(template_path)
-      raise FileSystemError, "Illegal template name '#{template_path}'" unless template_path =~ /\A[^.\/][a-zA-Z0-9_\/]+\z/
+      raise FileSystemError, "Illegal template name '#{template_path}'" unless template_path =~ %r{\A[^./][a-zA-Z0-9_/]+\z}
      full_path = if template_path.include?('/'.freeze)
        File.join(root, File.dirname(template_path), @pattern % File.basename(template_path))
--- a/lib/liquid/i18n.rb
+++ b/lib/liquid/i18n.rb
@@ -26,13 +26,13 @@ module Liquid
    def interpolate(name, vars)
      name.gsub(/%\{(\w+)\}/) do
        # raise TranslationError, "Undefined key #{$1} for interpolation in translation #{name}"  unless vars[$1.to_sym]
-        (vars[$1.to_sym]).to_s
+        (vars[Regexp.last_match(1).to_sym]).to_s
      end
    end
    def deep_fetch_translation(name)
      name.split('.'.freeze).reduce(locale) do |level, cur|
-        level[cur] or raise TranslationError, "Translation for #{name} does not exist in locale #{path}"
+        level[cur] || raise(TranslationError, "Translation for #{name} does not exist in locale #{path}")
      end
    end
  end
--- a/lib/liquid/lexer.rb
+++ b/lib/liquid/lexer.rb
@@ -11,7 +11,7 @@ module Liquid
      '('.freeze => :open_round,
      ')'.freeze => :close_round,
      '?'.freeze => :question,
-      '-'.freeze => :dash
+      '-'.freeze => :dash,
    }.freeze
    IDENTIFIER = /[a-zA-Z_][\w-]*\??/
    SINGLE_STRING_LITERAL = /'[^\']*'/
@@ -31,13 +31,12 @@ module Liquid
      until @ss.eos?
        @ss.skip(WHITESPACE_OR_NOTHING)
        break if @ss.eos?
-        tok = case
+        tok = if t = @ss.scan(COMPARISON_OPERATOR) then [:comparison, t]
-        when t = @ss.scan(COMPARISON_OPERATOR) then [:comparison, t]
+        elsif t = @ss.scan(SINGLE_STRING_LITERAL) then [:string, t]
-        when t = @ss.scan(SINGLE_STRING_LITERAL) then [:string, t]
+        elsif t = @ss.scan(DOUBLE_STRING_LITERAL) then [:string, t]
-        when t = @ss.scan(DOUBLE_STRING_LITERAL) then [:string, t]
+        elsif t = @ss.scan(NUMBER_LITERAL) then [:number, t]
-        when t = @ss.scan(NUMBER_LITERAL) then [:number, t]
+        elsif t = @ss.scan(IDENTIFIER) then [:id, t]
-        when t = @ss.scan(IDENTIFIER) then [:id, t]
+        elsif t = @ss.scan(DOTDOT) then [:dotdot, t]
        when t = @ss.scan(DOTDOT) then [:dotdot, t]
        else
          c = @ss.getch
          if s = SPECIALS[c]
--- a/lib/liquid/locales/en.yml
+++ b/lib/liquid/locales/en.yml
@@ -22,5 +22,6 @@
      tag_never_closed: "'%{block_name}' tag was never closed"
      meta_syntax_error: "Liquid syntax error: #{e.message}"
      table_row: "Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3"
      render: "Syntax error in tag 'render' - Template name must be a quoted string"
    argument:
      include: "Argument error in tag 'include' - Illegal template name"
--- a/lib/liquid/parse_context.rb
+++ b/lib/liquid/parse_context.rb
@@ -28,7 +28,7 @@ module Liquid
        if dont_pass == true
          { locale: locale }
        elsif dont_pass.is_a?(Array)
-          @template_options.reject { |k, v| dont_pass.include?(k) }
+          @template_options.reject { |k, _v| dont_pass.include?(k) }
        else
          @template_options
        end
--- a/lib/liquid/parse_tree_visitor.rb
+++ b/lib/liquid/parse_tree_visitor.rb
@@ -28,7 +28,7 @@ module Liquid
        item, new_context = @callbacks[node.class].call(node, context)
        [
          item,
-          ParseTreeVisitor.for(node, @callbacks).visit(new_context || context)
+          ParseTreeVisitor.for(node, @callbacks).visit(new_context || context),
        ]
      end
    end
--- a/lib/liquid/parser.rb
+++ b/lib/liquid/parser.rb
@@ -51,7 +51,7 @@ module Liquid
      token = @tokens[@p]
      if token[0] == :id
        variable_signature
-      elsif SINGLE_TOKEN_EXPRESSION_TYPES.include? token[0]
+      elsif SINGLE_TOKEN_EXPRESSION_TYPES.include?(token[0])
        consume
      elsif token.first == :open_round
        consume
--- a/lib/liquid/partial_cache.rb
+++ b/lib/liquid/partial_cache.rb
@@ -0,0 +1,18 @@
 module Liquid
  class PartialCache
    def self.load(template_name, context:, parse_context:)
      cached_partials = (context.registers[:cached_partials] ||= {})
      cached = cached_partials[template_name]
      return cached if cached
      file_system = (context.registers[:file_system] ||= Liquid::Template.file_system)
      source = file_system.read_template_file(template_name)
      parse_context.partial = true
      partial = Liquid::Template.parse(source, parse_context)
      cached_partials[template_name] = partial
    ensure
      parse_context.partial = false
    end
  end
 end
--- a/lib/liquid/standardfilters.rb
+++ b/lib/liquid/standardfilters.rb
@@ -8,13 +8,13 @@ module Liquid
      '>'.freeze => '&gt;'.freeze,
      '<'.freeze => '&lt;'.freeze,
      '"'.freeze => '&quot;'.freeze,
-      "'".freeze => '&#39;'.freeze
+      "'".freeze => '&#39;'.freeze,
    }.freeze
    HTML_ESCAPE_ONCE_REGEXP = /["><']|&(?!([a-zA-Z]+|(#\d+));)/
    STRIP_HTML_BLOCKS = Regexp.union(
-      /<script.*?<\/script>/m,
+      %r{<script.*?</script>}m,
      /<!--.*?-->/m,
-      /<style.*?<\/style>/m
+      %r{<style.*?</style>}m
    )
    STRIP_HTML_TAGS = /<.*?>/m
@@ -276,7 +276,7 @@ module Liquid
    def concat(input, array)
      unless array.respond_to?(:to_ary)
-        raise ArgumentError.new("concat filter requires an array argument")
+        raise ArgumentError, "concat filter requires an array argument"
      end
      InputIterator.new(input).concat(array)
    end
@@ -421,6 +421,7 @@ module Liquid
    def default(input, default_value = ''.freeze)
      if !input || input.respond_to?(:empty?) && input.empty?
        Usage.increment("default_filter_received_false_value") if input == false # See https://github.com/Shopify/liquid/issues/1127
        default_value
      else
        input
@@ -430,7 +431,7 @@ module Liquid
    private
    def raise_property_error(property)
-      raise Liquid::ArgumentError.new("cannot select the property '#{property}'")
+      raise Liquid::ArgumentError, "cannot select the property '#{property}'"
    end
    def apply_operation(input, operand, operation)
--- a/lib/liquid/strainer.rb
+++ b/lib/liquid/strainer.rb
@@ -27,7 +27,7 @@ module Liquid
    def self.add_filter(filter)
      raise ArgumentError, "Expected module but got: #{filter.class}" unless filter.is_a?(Module)
-      unless self.include?(filter)
+      unless include?(filter)
        invokable_non_public_methods = (filter.private_instance_methods + filter.protected_instance_methods).select { |m| invokable?(m) }
        if invokable_non_public_methods.any?
          raise MethodOverrideError, "Filter overrides registered public methods as non public: #{invokable_non_public_methods.join(', ')}"
@@ -54,7 +54,7 @@ module Liquid
    def invoke(method, *args)
      if self.class.invokable?(method)
        send(method, *args)
-      elsif @context && @context.strict_filters
+      elsif @context&.strict_filters
        raise Liquid::UndefinedFilter, "undefined filter #{method}"
      else
        args.first
--- a/lib/liquid/tags/assign.rb
+++ b/lib/liquid/tags/assign.rb
@@ -19,10 +19,10 @@ module Liquid
    def initialize(tag_name, markup, options)
      super
      if markup =~ Syntax
-        @to = $1
+        @to = Regexp.last_match(1)
-        @from = Variable.new($2, options)
+        @from = Variable.new(Regexp.last_match(2), options)
      else
-        raise SyntaxError.new(options[:locale].t(self.class.syntax_error_translation_key))
+        raise SyntaxError, options[:locale].t(self.class.syntax_error_translation_key)
      end
    end
--- a/lib/liquid/tags/capture.rb
+++ b/lib/liquid/tags/capture.rb
@@ -16,9 +16,9 @@ module Liquid
    def initialize(tag_name, markup, options)
      super
      if markup =~ Syntax
-        @to = $1
+        @to = Regexp.last_match(1)
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.capture"))
+        raise SyntaxError, options[:locale].t("errors.syntax.capture")
      end
    end
--- a/lib/liquid/tags/case.rb
+++ b/lib/liquid/tags/case.rb
@@ -10,17 +10,15 @@ module Liquid
      @blocks = []
      if markup =~ Syntax
-        @left = Expression.parse($1)
+        @left = Expression.parse(Regexp.last_match(1))
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.case".freeze))
+        raise SyntaxError, options[:locale].t("errors.syntax.case".freeze)
      end
    end
    def parse(tokens)
      body = BlockBody.new
-      while parse_body(body, tokens)
+      body = @blocks.last.attachment while parse_body(body, tokens)
        body = @blocks.last.attachment
      end
    end
    def nodelist
@@ -39,7 +37,6 @@ module Liquid
    end
    def render_to_output_buffer(context, output)
      context.stack do
      execute_else_block = true
      @blocks.each do |block|
@@ -50,7 +47,6 @@ module Liquid
          block.attachment.render_to_output_buffer(context, output)
        end
      end
      end
      output
    end
@@ -62,12 +58,12 @@ module Liquid
      while markup
        unless markup =~ WhenSyntax
-          raise SyntaxError.new(options[:locale].t("errors.syntax.case_invalid_when".freeze))
+          raise SyntaxError, options[:locale].t("errors.syntax.case_invalid_when".freeze)
        end
-        markup = $2
+        markup = Regexp.last_match(2)
-        block = Condition.new(@left, '=='.freeze, Expression.parse($1))
+        block = Condition.new(@left, '=='.freeze, Expression.parse(Regexp.last_match(1)))
        block.attach(body)
        @blocks << block
      end
@@ -75,7 +71,7 @@ module Liquid
    def record_else_condition(markup)
      unless markup.strip.empty?
-        raise SyntaxError.new(options[:locale].t("errors.syntax.case_invalid_else".freeze))
+        raise SyntaxError, options[:locale].t("errors.syntax.case_invalid_else".freeze)
      end
      block = ElseCondition.new
--- a/lib/liquid/tags/cycle.rb
+++ b/lib/liquid/tags/cycle.rb
@@ -21,20 +21,19 @@ module Liquid
      super
      case markup
      when NamedSyntax
-        @variables = variables_from_string($2)
+        @variables = variables_from_string(Regexp.last_match(2))
-        @name = Expression.parse($1)
+        @name = Expression.parse(Regexp.last_match(1))
      when SimpleSyntax
        @variables = variables_from_string(markup)
        @name = @variables.to_s
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.cycle".freeze))
+        raise SyntaxError, options[:locale].t("errors.syntax.cycle".freeze)
      end
    end
    def render_to_output_buffer(context, output)
      context.registers[:cycle] ||= {}
      context.stack do
      key = context.evaluate(@name)
      iteration = context.registers[:cycle][key].to_i
@@ -51,7 +50,6 @@ module Liquid
      iteration += 1
      iteration  = 0 if iteration >= @variables.size
      context.registers[:cycle][key] = iteration
      end
      output
    end
@@ -61,7 +59,7 @@ module Liquid
    def variables_from_string(markup)
      markup.split(',').collect do |var|
        var =~ /\s*(#{QuotedFragment})\s*/o
-        $1 ? Expression.parse($1) : nil
+        Regexp.last_match(1) ? Expression.parse(Regexp.last_match(1)) : nil
      end.compact
    end
--- a/lib/liquid/tags/echo.rb
+++ b/lib/liquid/tags/echo.rb
@@ -16,7 +16,7 @@ module Liquid
    end
    def render(context)
-      @variable.render(context)
+      @variable.render_to_output_buffer(context, '')
    end
  end
--- a/lib/liquid/tags/for.rb
+++ b/lib/liquid/tags/for.rb
@@ -86,23 +86,23 @@ module Liquid
    def lax_parse(markup)
      if markup =~ Syntax
-        @variable_name = $1
+        @variable_name = Regexp.last_match(1)
-        collection_name = $2
+        collection_name = Regexp.last_match(2)
-        @reversed = !!$3
+        @reversed = !!Regexp.last_match(3)
        @name = "#{@variable_name}-#{collection_name}"
        @collection_name = Expression.parse(collection_name)
        markup.scan(TagAttributes) do |key, value|
          set_attribute(key, value)
        end
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.for".freeze))
+        raise SyntaxError, options[:locale].t("errors.syntax.for".freeze)
      end
    end
    def strict_parse(markup)
      p = Parser.new(markup)
      @variable_name = p.consume(:id)
-      raise SyntaxError.new(options[:locale].t("errors.syntax.for_invalid_in".freeze)) unless p.id?('in'.freeze)
+      raise SyntaxError, options[:locale].t("errors.syntax.for_invalid_in".freeze) unless p.id?('in'.freeze)
      collection_name = p.expression
      @name = "#{@variable_name}-#{collection_name}"
      @collection_name = Expression.parse(collection_name)
@@ -110,7 +110,7 @@ module Liquid
      while p.look(:id) && p.look(:colon, 1)
        unless attribute = p.id?('limit'.freeze) || p.id?('offset'.freeze)
-          raise SyntaxError.new(options[:locale].t("errors.syntax.for_invalid_attribute".freeze))
+          raise SyntaxError, options[:locale].t("errors.syntax.for_invalid_attribute".freeze)
        end
        p.consume
        set_attribute(attribute, p.expression)
@@ -170,11 +170,10 @@ module Liquid
            loop_vars.send(:increment!)
            # Handle any interrupts if they exist.
-            if context.interrupt?
+            next unless context.interrupt?
            interrupt = context.pop_interrupt
-              break if interrupt.is_a? BreakInterrupt
+            break if interrupt.is_a?(BreakInterrupt)
-              next if interrupt.is_a? ContinueInterrupt
+            next if interrupt.is_a?(ContinueInterrupt)
            end
          end
        ensure
          for_stack.pop
--- a/lib/liquid/tags/if.rb
+++ b/lib/liquid/tags/if.rb
@@ -40,13 +40,11 @@ module Liquid
    end
    def render_to_output_buffer(context, output)
      context.stack do
      @blocks.each do |block|
        if block.evaluate(context)
          return block.attachment.render_to_output_buffer(context, output)
        end
      end
      end
      output
    end
@@ -66,17 +64,17 @@ module Liquid
    def lax_parse(markup)
      expressions = markup.scan(ExpressionsAndOperators)
-      raise(SyntaxError.new(options[:locale].t("errors.syntax.if".freeze))) unless expressions.pop =~ Syntax
+      raise SyntaxError, options[:locale].t("errors.syntax.if".freeze) unless expressions.pop =~ Syntax
-      condition = Condition.new(Expression.parse($1), $2, Expression.parse($3))
+      condition = Condition.new(Expression.parse(Regexp.last_match(1)), Regexp.last_match(2), Expression.parse(Regexp.last_match(3)))
      until expressions.empty?
        operator = expressions.pop.to_s.strip
-        raise(SyntaxError.new(options[:locale].t("errors.syntax.if".freeze))) unless expressions.pop.to_s =~ Syntax
+        raise SyntaxError, options[:locale].t("errors.syntax.if".freeze) unless expressions.pop.to_s =~ Syntax
-        new_condition = Condition.new(Expression.parse($1), $2, Expression.parse($3))
+        new_condition = Condition.new(Expression.parse(Regexp.last_match(1)), Regexp.last_match(2), Expression.parse(Regexp.last_match(3)))
-        raise(SyntaxError.new(options[:locale].t("errors.syntax.if".freeze))) unless BOOLEAN_OPERATORS.include?(operator)
+        raise SyntaxError, options[:locale].t("errors.syntax.if".freeze) unless BOOLEAN_OPERATORS.include?(operator)
        new_condition.send(operator, condition)
        condition = new_condition
      end
--- a/lib/liquid/tags/ifchanged.rb
+++ b/lib/liquid/tags/ifchanged.rb
@@ -1,7 +1,6 @@
 module Liquid
  class Ifchanged < Block
    def render_to_output_buffer(context, output)
      context.stack do
      block_output = ''
      super(context, block_output)
@@ -9,7 +8,6 @@ module Liquid
        context.registers[:ifchanged] = block_output
        output << block_output
      end
      end
      output
    end
--- a/lib/liquid/tags/include.rb
+++ b/lib/liquid/tags/include.rb
@@ -23,8 +23,8 @@ module Liquid
      if markup =~ Syntax
-        template_name = $1
+        template_name = Regexp.last_match(1)
-        variable_name = $3
+        variable_name = Regexp.last_match(3)
        @variable_name_expr = variable_name ? Expression.parse(variable_name) : nil
        @template_name_expr = Expression.parse(template_name)
@@ -35,7 +35,7 @@ module Liquid
        end
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.include".freeze))
+        raise SyntaxError, options[:locale].t("errors.syntax.include".freeze)
      end
    end
@@ -44,9 +44,14 @@ module Liquid
    def render_to_output_buffer(context, output)
      template_name = context.evaluate(@template_name_expr)
-      raise ArgumentError.new(options[:locale].t("errors.argument.include")) unless template_name
+      raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name
      partial = PartialCache.load(
        template_name,
        context: context,
        parse_context: parse_context
      )
      partial = load_cached_partial(template_name, context)
      context_variable_name = template_name.split('/'.freeze).last
      variable = if @variable_name_expr
@@ -83,40 +88,14 @@ module Liquid
      output
    end
    private
    alias_method :parse_context, :options
    private :parse_context
    def load_cached_partial(template_name, context)
      cached_partials = context.registers[:cached_partials] || {}
      if cached = cached_partials[template_name]
        return cached
      end
      source = read_template_from_file_system(context)
      begin
        parse_context.partial = true
        partial = Liquid::Template.parse(source, parse_context)
      ensure
        parse_context.partial = false
      end
      cached_partials[template_name] = partial
      context.registers[:cached_partials] = cached_partials
      partial
    end
    def read_template_from_file_system(context)
      file_system = context.registers[:file_system] || Liquid::Template.file_system
      file_system.read_template_file(context.evaluate(@template_name_expr))
    end
    class ParseTreeVisitor < Liquid::ParseTreeVisitor
      def children
        [
          @node.template_name_expr,
-          @node.variable_name_expr
+          @node.variable_name_expr,
        ] + @node.attributes.values
      end
    end
--- a/lib/liquid/tags/increment.rb
+++ b/lib/liquid/tags/increment.rb
@@ -23,6 +23,7 @@ module Liquid
    def render_to_output_buffer(context, output)
      value = context.environments.first[@variable] ||= 0
      context.environments.first[@variable] = value + 1
      output << value.to_s
      output
    end
--- a/lib/liquid/tags/raw.rb
+++ b/lib/liquid/tags/raw.rb
@@ -13,13 +13,13 @@ module Liquid
      @body = ''
      while token = tokens.shift
        if token =~ FullTokenPossiblyInvalid
-          @body << $1 if $1 != "".freeze
+          @body << Regexp.last_match(1) if Regexp.last_match(1) != "".freeze
-          return if block_delimiter == $2
+          return if block_delimiter == Regexp.last_match(2)
        end
        @body << token unless token.empty?
      end
-      raise SyntaxError.new(parse_context.locale.t("errors.syntax.tag_never_closed".freeze, block_name: block_name))
+      raise SyntaxError, parse_context.locale.t("errors.syntax.tag_never_closed".freeze, block_name: block_name)
    end
    def render_to_output_buffer(_context, output)
@@ -39,7 +39,7 @@ module Liquid
    def ensure_valid_markup(tag_name, markup, parse_context)
      unless markup =~ Syntax
-        raise SyntaxError.new(parse_context.locale.t("errors.syntax.tag_unexpected_args".freeze, tag: tag_name))
+        raise SyntaxError, parse_context.locale.t("errors.syntax.tag_unexpected_args".freeze, tag: tag_name)
      end
    end
  end
--- a/lib/liquid/tags/render.rb
+++ b/lib/liquid/tags/render.rb
@@ -0,0 +1,54 @@
 module Liquid
  class Render < Tag
    SYNTAX = /(#{QuotedString})#{QuotedFragment}*/o
    attr_reader :template_name_expr, :attributes
    def initialize(tag_name, markup, options)
      super
      raise SyntaxError, options[:locale].t("errors.syntax.render".freeze) unless markup =~ SYNTAX
      template_name = Regexp.last_match(1)
      @template_name_expr = Expression.parse(template_name)
      @attributes = {}
      markup.scan(TagAttributes) do |key, value|
        @attributes[key] = Expression.parse(value)
      end
    end
    def render_to_output_buffer(context, output)
      # Though we evaluate this here we will only ever parse it as a string literal.
      template_name = context.evaluate(@template_name_expr)
      raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name
      partial = PartialCache.load(
        template_name,
        context: context,
        parse_context: parse_context
      )
      inner_context = context.new_isolated_subcontext
      inner_context.template_name = template_name
      inner_context.partial = true
      @attributes.each do |key, value|
        inner_context[key] = context.evaluate(value)
      end
      partial.render_to_output_buffer(inner_context, output)
      output
    end
    class ParseTreeVisitor < Liquid::ParseTreeVisitor
      def children
        [
          @node.template_name_expr,
        ] + @node.attributes.values
      end
    end
  end
  Template.register_tag('render'.freeze, Render)
 end
--- a/lib/liquid/tags/table_row.rb
+++ b/lib/liquid/tags/table_row.rb
@@ -7,19 +7,19 @@ module Liquid
    def initialize(tag_name, markup, options)
      super
      if markup =~ Syntax
-        @variable_name = $1
+        @variable_name = Regexp.last_match(1)
-        @collection_name = Expression.parse($2)
+        @collection_name = Expression.parse(Regexp.last_match(2))
        @attributes = {}
        markup.scan(TagAttributes) do |key, value|
          @attributes[key] = Expression.parse(value)
        end
      else
-        raise SyntaxError.new(options[:locale].t("errors.syntax.table_row".freeze))
+        raise SyntaxError, options[:locale].t("errors.syntax.table_row".freeze)
      end
    end
    def render_to_output_buffer(context, output)
-      collection = context.evaluate(@collection_name) or return ''.freeze
+      (collection = context.evaluate(@collection_name)) || (return ''.freeze)
      from = @attributes.key?('offset'.freeze) ? context.evaluate(@attributes['offset'.freeze]).to_i : 0
      to = @attributes.key?('limit'.freeze) ? from + context.evaluate(@attributes['limit'.freeze]).to_i : nil
--- a/lib/liquid/tags/unless.rb
+++ b/lib/liquid/tags/unless.rb
@@ -7,7 +7,6 @@ module Liquid
  #
  class Unless < If
    def render_to_output_buffer(context, output)
      context.stack do
      # First condition is interpreted backwards ( if not )
      first_block = @blocks.first
      unless first_block.evaluate(context)
@@ -20,7 +19,6 @@ module Liquid
          return block.attachment.render_to_output_buffer(context, output)
        end
      end
      end
      output
    end
--- a/lib/liquid/template.rb
+++ b/lib/liquid/template.rb
@@ -143,7 +143,12 @@ module Liquid
    end
    def instance_assigns
-      @instance_assigns ||= {}
+      @instance_assigns ||= []
    end
    def new_outer_scope
      @instance_assigns.unshift(last = {})
      last
    end
    def errors
@@ -172,17 +177,17 @@ module Liquid
        c = args.shift
        if @rethrow_errors
-          c.exception_renderer = ->(e) { raise }
+          c.exception_renderer = ->(_e) { raise }
        end
        c
      when Liquid::Drop
        drop = args.shift
-        drop.context = Context.new([drop, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits)
+        drop.context = Context.new([drop, assigns].concat(instance_assigns), new_outer_scope, registers, @rethrow_errors, @resource_limits)
      when Hash
-        Context.new([args.shift, assigns], instance_assigns, registers, @rethrow_errors, @resource_limits)
+        Context.new([args.shift, assigns].concat(instance_assigns), new_outer_scope, registers, @rethrow_errors, @resource_limits)
      when nil
-        Context.new(assigns, instance_assigns, registers, @rethrow_errors, @resource_limits)
+        Context.new([assigns].concat(instance_assigns), new_outer_scope, registers, @rethrow_errors, @resource_limits)
      else
        raise ArgumentError, "Expected Hash or Liquid::Context as parameter"
      end
--- a/lib/liquid/tokenizer.rb
+++ b/lib/liquid/tokenizer.rb
@@ -10,7 +10,7 @@ module Liquid
    end
    def shift
-      token = @tokens.shift or return
+      (token = @tokens.shift) || return
      if @line_number
        @line_number += @for_liquid_tag ? 1 : token.count("\n")
@@ -29,7 +29,7 @@ module Liquid
      tokens = @source.split(TemplateParser)
      # removes the rogue empty element at the beginning of the array
-      tokens.shift if tokens[0] && tokens[0].empty?
+      tokens.shift if tokens[0]&.empty?
      tokens
    end
--- a/lib/liquid/usage.rb
+++ b/lib/liquid/usage.rb
@@ -0,0 +1,6 @@
 module Liquid
  module Usage
    def self.increment(name)
    end
  end
 end
--- a/lib/liquid/utils.rb
+++ b/lib/liquid/utils.rb
@@ -50,7 +50,7 @@ module Liquid
      when Numeric
        obj
      when String
-        (obj.strip =~ /\A-?\d+\.\d+\z/) ? BigDecimal(obj) : obj.to_i
+        obj.strip =~ /\A-?\d+\.\d+\z/ ? BigDecimal(obj) : obj.to_i
      else
        if obj.respond_to?(:to_number)
          obj.to_number
--- a/lib/liquid/variable.rb
+++ b/lib/liquid/variable.rb
@@ -43,11 +43,11 @@ module Liquid
      @filters = []
      return unless markup =~ MarkupWithQuotedFragment
-      name_markup = $1
+      name_markup = Regexp.last_match(1)
-      filter_markup = $2
+      filter_markup = Regexp.last_match(2)
      @name = Expression.parse(name_markup)
      if filter_markup =~ FilterMarkupRegex
-        filters = $1.scan(FilterParser)
+        filters = Regexp.last_match(1).scan(FilterParser)
        filters.each do |f|
          next unless f =~ /\w+/
          filtername = Regexp.last_match(0)
--- a/lib/liquid/variable_lookup.rb
+++ b/lib/liquid/variable_lookup.rb
@@ -14,7 +14,7 @@ module Liquid
      name = lookups.shift
      if name =~ SQUARE_BRACKETED
-        name = Expression.parse($1)
+        name = Expression.parse(Regexp.last_match(1))
      end
      @name = name
@@ -24,7 +24,7 @@ module Liquid
      @lookups.each_index do |i|
        lookup = lookups[i]
        if lookup =~ SQUARE_BRACKETED
-          lookups[i] = Expression.parse($1)
+          lookups[i] = Expression.parse(Regexp.last_match(1))
        elsif COMMAND_METHODS.include?(lookup)
          @command_flags |= 1 << i
        end
--- a/liquid.gemspec
+++ b/liquid.gemspec
@@ -1,7 +1,7 @@
 # encoding: utf-8
 lib = File.expand_path('../lib/', __FILE__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "liquid/version"
@@ -26,6 +26,6 @@ Gem::Specification.new do |s|
  s.require_path = "lib"
-  s.add_development_dependency 'rake', '~> 11.3'
+  s.add_development_dependency('rake', '~> 11.3')
-  s.add_development_dependency 'minitest'
+  s.add_development_dependency('minitest')
 end
--- a/performance/memory_profile.rb
+++ b/performance/memory_profile.rb
@@ -30,6 +30,7 @@ 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)
--- a/performance/shopify/comment_form.rb
+++ b/performance/shopify/comment_form.rb
@@ -5,10 +5,10 @@ class CommentForm < Liquid::Block
    super
    if markup =~ Syntax
-      @variable_name = $1
+      @variable_name = Regexp.last_match(1)
      @attributes = {}
    else
-      raise SyntaxError.new("Syntax Error in 'comment_form' - Valid syntax: comment_form [article]")
+      raise SyntaxError, "Syntax Error in 'comment_form' - Valid syntax: comment_form [article]"
    end
  end
@@ -21,7 +21,7 @@ class CommentForm < Liquid::Block
        'errors' => context['comment.errors'],
        'author' => context['comment.author'],
        'email' => context['comment.email'],
-        'body'   => context['comment.body']
+        'body' => context['comment.body'],
      }
      output << wrap_in_form(article, render_all(@nodelist, context, output))
--- a/performance/shopify/database.rb
+++ b/performance/shopify/database.rb
@@ -16,9 +16,10 @@ module Database
      end
      # key the tables by handles, as this is how liquid expects it.
-      db = db.inject({}) do |assigns, (key, values)|
+      db = db.each_with_object({}) do |(key, values), assigns|
-        assigns[key] = values.inject({}) { |h, v| h[v['handle']] = v; h; }
+        assigns[key] = values.each_with_object({}) do |v, h|
-        assigns
+          h[v['handle']] = v
        end
      end
      # Some standard direct accessors so that the specialized templates
@@ -31,7 +32,7 @@ module Database
      db['cart']       = {
        'total_price' => db['line_items'].values.inject(0) { |sum, item| sum += item['line_price'] * item['quantity'] },
        'item_count' => db['line_items'].values.inject(0) { |sum, item| sum += item['quantity'] },
-        'items'       => db['line_items'].values
+        'items' => db['line_items'].values,
      }
      db
@@ -40,6 +41,6 @@ module Database
 end
 if __FILE__ == $PROGRAM_NAME
-  p Database.tables['collections']['frontpage'].keys
+  p(Database.tables['collections']['frontpage'].keys)
  # p Database.tables['blog']['articles']
 end
--- a/performance/shopify/json_filter.rb
+++ b/performance/shopify/json_filter.rb
@@ -2,6 +2,6 @@ require 'json'
 module JsonFilter
  def json(object)
-    JSON.dump(object.reject { |k, v| k == "collections" })
+    JSON.dump(object.reject { |k, _v| k == "collections" })
  end
 end
--- a/performance/shopify/liquid.rb
+++ b/performance/shopify/liquid.rb
@@ -1,4 +1,4 @@
-$:.unshift __dir__ + '/../../lib'
+$LOAD_PATH.unshift(__dir__ + '/../../lib')
 require_relative '../../lib/liquid'
 require_relative 'comment_form'
@@ -9,11 +9,11 @@ require_relative 'shop_filter'
 require_relative 'tag_filter'
 require_relative 'weight_filter'
-Liquid::Template.register_tag 'paginate', Paginate
+Liquid::Template.register_tag('paginate', Paginate)
-Liquid::Template.register_tag 'form', CommentForm
+Liquid::Template.register_tag('form', CommentForm)
-Liquid::Template.register_filter JsonFilter
+Liquid::Template.register_filter(JsonFilter)
-Liquid::Template.register_filter MoneyFilter
+Liquid::Template.register_filter(MoneyFilter)
-Liquid::Template.register_filter WeightFilter
+Liquid::Template.register_filter(WeightFilter)
-Liquid::Template.register_filter ShopFilter
+Liquid::Template.register_filter(ShopFilter)
-Liquid::Template.register_filter TagFilter
+Liquid::Template.register_filter(TagFilter)
--- a/performance/shopify/money_filter.rb
+++ b/performance/shopify/money_filter.rb
@@ -1,12 +1,12 @@
 module MoneyFilter
  def money_with_currency(money)
    return '' if money.nil?
-    sprintf("$ %.2f USD", money / 100.0)
+    format("$ %.2f USD", money / 100.0)
  end
  def money(money)
    return '' if money.nil?
-    sprintf("$ %.2f", money / 100.0)
+    format("$ %.2f", money / 100.0)
  end
  private
--- a/performance/shopify/paginate.rb
+++ b/performance/shopify/paginate.rb
@@ -5,9 +5,9 @@ class Paginate < Liquid::Block
    super
    if markup =~ Syntax
-      @collection_name = $1
+      @collection_name = Regexp.last_match(1)
-      @page_size = if $2
+      @page_size = if Regexp.last_match(2)
-        $3.to_i
+        Regexp.last_match(3).to_i
      else
        20
      end
@@ -17,7 +17,7 @@ class Paginate < Liquid::Block
        @attributes[key] = value
      end
    else
-      raise SyntaxError.new("Syntax Error in tag 'paginate' - Valid syntax: paginate [collection] by number")
+      raise SyntaxError, "Syntax Error in tag 'paginate' - Valid syntax: paginate [collection] by number"
    end
  end
@@ -30,14 +30,14 @@ class Paginate < Liquid::Block
      pagination = {
        'page_size' => @page_size,
        'current_page' => 5,
-        'current_offset' => @page_size * 5
+        'current_offset' => @page_size * 5,
      }
      context['paginate'] = pagination
      collection_size = context[@collection_name].size
-      raise ArgumentError.new("Cannot paginate array '#{@collection_name}'. Not found.") if collection_size.nil?
+      raise ArgumentError, "Cannot paginate array '#{@collection_name}'. Not found." if collection_size.nil?
      page_count = (collection_size.to_f / @page_size.to_f).to_f.ceil + 1
--- a/performance/shopify/shop_filter.rb
+++ b/performance/shopify/shop_filter.rb
@@ -52,7 +52,7 @@ module ShopFilter
  end
  def product_img_url(url, style = 'small')
-    unless url =~ /\Aproducts\/([\w\-\_]+)\.(\w{2,4})/
+    unless url =~ %r{\Aproducts/([\w\-\_]+)\.(\w{2,4})}
      raise ArgumentError, 'filter "size" can only be called on product images'
    end
@@ -60,7 +60,7 @@ module ShopFilter
    when 'original'
      return '/files/shops/random_number/' + url
    when 'grande', 'large', 'medium', 'compact', 'small', 'thumb', 'icon'
-      "/files/shops/random_number/products/#{$1}_#{style}.#{$2}"
+      "/files/shops/random_number/products/#{Regexp.last_match(1)}_#{style}.#{Regexp.last_match(2)}"
    else
      raise ArgumentError, 'valid parameters for filter "size" are: original, grande, large, medium, compact, small, thumb and icon '
    end
@@ -70,16 +70,14 @@ module ShopFilter
    html = []
    html << %(<span class="prev">#{link_to(paginate['previous']['title'], paginate['previous']['url'])}</span>) if paginate['previous']
-    for part in paginate['parts']
+    paginate['parts'].each do |part|
-
+      html << if part['is_link']
-      if part['is_link']
+        %(<span class="page">#{link_to(part['title'], part['url'])}</span>)
        html << %(<span class="page">#{link_to(part['title'], part['url'])}</span>)
      elsif part['title'].to_i == paginate['current_page'].to_i
-        html << %(<span class="page current">#{part['title']}</span>)
+        %(<span class="page current">#{part['title']}</span>)
      else
-        html << %(<span class="deco">#{part['title']}</span>)
+        %(<span class="deco">#{part['title']}</span>)
      end
    end
    html << %(<span class="next">#{link_to(paginate['next']['title'], paginate['next']['url'])}</span>) if paginate['next']
--- a/performance/shopify/tag_filter.rb
+++ b/performance/shopify/tag_filter.rb
@@ -13,11 +13,11 @@ module TagFilter
  def link_to_add_tag(label, tag)
    tags = (@context['current_tags'] + [tag]).uniq
-    "<a title=\"Show tag #{tag}\" href=\"/collections/#{@context['handle']}/#{tags.join("+")}\">#{label}</a>"
+    "<a title=\"Show tag #{tag}\" href=\"/collections/#{@context['handle']}/#{tags.join('+')}\">#{label}</a>"
  end
  def link_to_remove_tag(label, tag)
    tags = (@context['current_tags'] - [tag]).uniq
-    "<a title=\"Show tag #{tag}\" href=\"/collections/#{@context['handle']}/#{tags.join("+")}\">#{label}</a>"
+    "<a title=\"Show tag #{tag}\" href=\"/collections/#{@context['handle']}/#{tags.join('+')}\">#{label}</a>"
  end
 end
--- a/performance/shopify/weight_filter.rb
+++ b/performance/shopify/weight_filter.rb
@@ -1,6 +1,6 @@
 module WeightFilter
  def weight(grams)
-    sprintf("%.2f", grams / 1000)
+    format("%.2f", grams / 1000)
  end
  def weight_with_unit(grams)
--- a/performance/theme_runner.rb
+++ b/performance/theme_runner.rb
@@ -31,7 +31,7 @@ class ThemeRunner
      {
        liquid: File.read(test),
        layout: (File.file?(theme_path) ? File.read(theme_path) : nil),
-        template_name: test
+        template_name: test,
      }
    end.compact
--- a/test/integration/blank_test.rb
+++ b/test/integration/blank_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 class FoobarTag < Liquid::Tag
-  def render_to_output_buffer(context, output)
+  def render_to_output_buffer(_context, output)
    output << ' '
    output
  end
--- a/test/integration/error_handling_test.rb
+++ b/test/integration/error_handling_test.rb
@@ -83,15 +83,14 @@ class ErrorHandlingTest < Minitest::Test
  def test_with_line_numbers_adds_numbers_to_parser_errors
    err = assert_raises(SyntaxError) do
-      Liquid::Template.parse(%q(
+      Liquid::Template.parse('
          foobar
          {% "cat" | foobar %}
          bla
-        ),
+        ',
-        line_numbers: true
+        line_numbers: true)
      )
    end
    assert_match(/Liquid syntax error \(line 4\)/, err.message)
@@ -99,15 +98,14 @@ class ErrorHandlingTest < Minitest::Test
  def test_with_line_numbers_adds_numbers_to_parser_errors_with_whitespace_trim
    err = assert_raises(SyntaxError) do
-      Liquid::Template.parse(%q(
+      Liquid::Template.parse('
          foobar
          {%- "cat" | foobar -%}
          bla
-        ),
+        ',
-        line_numbers: true
+        line_numbers: true)
      )
    end
    assert_match(/Liquid syntax error \(line 4\)/, err.message)
@@ -122,8 +120,7 @@ class ErrorHandlingTest < Minitest::Test
        bla
            ',
      error_mode: :warn,
-      line_numbers: true
+      line_numbers: true)
    )
    assert_equal ['Liquid syntax error (line 4): Unexpected character = in "1 =! 2"'],
      template.warnings.map(&:message)
@@ -139,8 +136,7 @@ class ErrorHandlingTest < Minitest::Test
          bla
                ',
        error_mode: :strict,
-        line_numbers: true
+        line_numbers: true)
      )
    end
    assert_equal 'Liquid syntax error (line 4): Unexpected character = in "1 =! 2"', err.message
@@ -157,8 +153,7 @@ class ErrorHandlingTest < Minitest::Test
          bla
                ',
-        line_numbers: true
+        line_numbers: true)
      )
    end
    assert_equal "Liquid syntax error (line 5): Unknown tag 'foo'", err.message
@@ -205,7 +200,7 @@ class ErrorHandlingTest < Minitest::Test
  def test_default_exception_renderer_with_internal_error
    template = Liquid::Template.parse('This is a runtime error: {{ errors.runtime_error }}', line_numbers: true)
-    output = template.render({ 'errors' => ErrorDrop.new })
+    output = template.render('errors' => ErrorDrop.new)
    assert_equal 'This is a runtime error: Liquid error (line 1): internal', output
    assert_equal [Liquid::InternalError], template.errors.map(&:class)
@@ -217,7 +212,7 @@ class ErrorHandlingTest < Minitest::Test
    Liquid::Template.default_exception_renderer = ->(e) { exceptions << e; '' }
    template = Liquid::Template.parse('This is a runtime error: {{ errors.argument_error }}')
-    output = template.render({ 'errors' => ErrorDrop.new })
+    output = template.render('errors' => ErrorDrop.new)
    assert_equal 'This is a runtime error: ', output
    assert_equal [Liquid::ArgumentError], template.errors.map(&:class)
@@ -239,7 +234,7 @@ class ErrorHandlingTest < Minitest::Test
  end
  class TestFileSystem
-    def read_template_file(template_path)
+    def read_template_file(_template_path)
      "{{ errors.argument_error }}"
    end
  end
--- a/test/integration/filter_test.rb
+++ b/test/integration/filter_test.rb
@@ -2,23 +2,23 @@ require 'test_helper'
 module MoneyFilter
  def money(input)
-    sprintf(' %d$ ', input)
+    format(' %d$ ', input)
  end
  def money_with_underscore(input)
-    sprintf(' %d$ ', input)
+    format(' %d$ ', input)
  end
 end
 module CanadianMoneyFilter
  def money(input)
-    sprintf(' %d$ CAD ', input)
+    format(' %d$ CAD ', input)
  end
 end
 module SubstituteFilter
  def substitute(input, params = {})
-    input.gsub(/%\{(\w+)\}/) { |match| params[$1] }
+    input.gsub(/%\{(\w+)\}/) { |_match| params[Regexp.last_match(1)] }
  end
 end
@@ -26,7 +26,7 @@ class FiltersTest < Minitest::Test
  include Liquid
  module OverrideObjectMethodFilter
-    def tap(input)
+    def tap(_input)
      "tap overridden"
    end
  end
@@ -149,7 +149,7 @@ class FiltersTest < Minitest::Test
    assert_equal "tap overridden", Template.parse("{{var | tap}}").render!({ 'var' => 1000 }, filters: [OverrideObjectMethodFilter])
    # tap still treated as a non-existent filter
-    assert_equal "1000", Template.parse("{{var | tap}}").render!({ 'var' => 1000 })
+    assert_equal "1000", Template.parse("{{var | tap}}").render!('var' => 1000)
  end
 end
--- a/test/integration/hash_ordering_test.rb
+++ b/test/integration/hash_ordering_test.rb
@@ -3,13 +3,13 @@ require 'test_helper'
 class HashOrderingTest < Minitest::Test
  module MoneyFilter
    def money(input)
-      sprintf(' %d$ ', input)
+      format(' %d$ ', input)
    end
  end
  module CanadianMoneyFilter
    def money(input)
-      sprintf(' %d$ CAD ', input)
+      format(' %d$ CAD ', input)
    end
  end
--- a/test/integration/output_test.rb
+++ b/test/integration/output_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 module FunnyFilter
-  def make_funny(input)
+  def make_funny(_input)
    'LOL'
  end
@@ -32,7 +32,7 @@ class OutputTest < Minitest::Test
  def setup
    @assigns = {
      'best_cars' => 'bmw',
-      'car' => { 'bmw' => 'good', 'gm' => 'bad' }
+      'car' => { 'bmw' => 'good', 'gm' => 'bad' },
    }
  end
--- a/test/integration/parse_tree_visitor_test.rb
+++ b/test/integration/parse_tree_visitor_test.rb
@@ -227,7 +227,7 @@ class ParseTreeVisitorTest < Minitest::Test
      [[nil, [
        [nil, [[nil, [["other", []]]]]],
        ["test", []],
-        ["xs", []]
+        ["xs", []],
      ]]],
      traversal(%({% for x in xs offset: test %}{{ other }}{% endfor %})).visit
    )
--- a/test/integration/render_profiling_test.rb
+++ b/test/integration/render_profiling_test.rb
@@ -128,7 +128,7 @@ class RenderProfilingTest < Minitest::Test
    t.render!
    timing_count = 0
-    t.profiler.each do |timing|
+    t.profiler.each do |_timing|
      timing_count += 1
    end
@@ -145,7 +145,7 @@ class RenderProfilingTest < Minitest::Test
  def test_profiling_marks_children_of_for_blocks
    t = Template.parse("{% for item in collection %} {{ item }} {% endfor %}", profile: true)
-    t.render!({ "collection" => ["one", "two"] })
+    t.render!("collection" => ["one", "two"])
    assert_equal 1, t.profiler.length
    # Will profile each invocation of the for block
--- a/test/integration/standard_filter_test.rb
+++ b/test/integration/standard_filter_test.rb
@@ -17,7 +17,7 @@ class TestThing
    "woot: #{@foo}"
  end
-  def [](whatever)
+  def [](_whatever)
    to_s
  end
@@ -208,14 +208,14 @@ class StandardFiltersTest < Minitest::Test
      { "handle" => "beta" },
      { "price" => 1, "handle" => "gamma" },
      { "handle" => "delta" },
-      { "price" => 2, "handle" => "epsilon" }
+      { "price" => 2, "handle" => "epsilon" },
    ]
    expectation = [
      { "price" => 1, "handle" => "gamma" },
      { "price" => 2, "handle" => "epsilon" },
      { "price" => 4, "handle" => "alpha" },
      { "handle" => "delta" },
-      { "handle" => "beta" }
+      { "handle" => "beta" },
    ]
    assert_equal expectation, @filters.sort(input, "price")
  end
@@ -236,14 +236,14 @@ class StandardFiltersTest < Minitest::Test
      { "handle" => "beta" },
      { "price" => "1", "handle" => "gamma" },
      { "handle" => "delta" },
-      { "price" => 2, "handle" => "epsilon" }
+      { "price" => 2, "handle" => "epsilon" },
    ]
    expectation = [
      { "price" => "1", "handle" => "gamma" },
      { "price" => 2, "handle" => "epsilon" },
      { "price" => "4", "handle" => "alpha" },
      { "handle" => "delta" },
-      { "handle" => "beta" }
+      { "handle" => "beta" },
    ]
    assert_equal expectation, @filters.sort_natural(input, "price")
  end
@@ -256,7 +256,7 @@ class StandardFiltersTest < Minitest::Test
      { "fake" => "t" },
      { "key" => "a" },
      { "key" => "b" },
-      { "key" => "c" }
+      { "key" => "c" },
    ]
    expectation = [
      { "key" => "a" },
@@ -265,7 +265,7 @@ class StandardFiltersTest < Minitest::Test
      { "key" => "X" },
      { "key" => "Y" },
      { "key" => "Z" },
-      { "fake" => "t" }
+      { "fake" => "t" },
    ]
    assert_equal expectation, @filters.sort_natural(input, "key")
    assert_equal ["a", "b", "c", "X", "Y", "Z"], @filters.sort_natural(["X", "Y", "Z", "a", "b", "c"])
@@ -279,7 +279,7 @@ class StandardFiltersTest < Minitest::Test
    foo = [
      [1],
      [2],
-      [3]
+      [3],
    ]
    assert_raises Liquid::ArgumentError do
@@ -295,7 +295,7 @@ class StandardFiltersTest < Minitest::Test
    foo = [
      [1],
      [2],
-      [3]
+      [3],
    ]
    assert_raises Liquid::ArgumentError do
@@ -304,7 +304,7 @@ class StandardFiltersTest < Minitest::Test
  end
  def test_legacy_sort_hash
-    assert_equal [{ a: 1, b: 2 }], @filters.sort({ a: 1, b: 2 })
+    assert_equal [{ a: 1, b: 2 }], @filters.sort(a: 1, b: 2)
  end
  def test_numerical_vs_lexicographical_sort
@@ -330,7 +330,7 @@ class StandardFiltersTest < Minitest::Test
    foo = [
      [1],
      [2],
-      [3]
+      [3],
    ]
    assert_raises Liquid::ArgumentError do
@@ -346,7 +346,7 @@ class StandardFiltersTest < Minitest::Test
    foo = [
      [1],
      [2],
-      [3]
+      [3],
    ]
    assert_raises Liquid::ArgumentError do
@@ -423,7 +423,7 @@ class StandardFiltersTest < Minitest::Test
    foo = [
      [1],
      [2],
-      [3]
+      [3],
    ]
    assert_raises Liquid::ArgumentError do
@@ -435,7 +435,7 @@ class StandardFiltersTest < Minitest::Test
    foo = [
      [1],
      [2],
-      [3]
+      [3],
    ]
    assert_raises Liquid::ArgumentError do
      @filters.map(foo, nil)
@@ -697,12 +697,12 @@ class StandardFiltersTest < Minitest::Test
      { "handle" => "alpha", "ok" => true },
      { "handle" => "beta", "ok" => false },
      { "handle" => "gamma", "ok" => false },
-      { "handle" => "delta", "ok" => true }
+      { "handle" => "delta", "ok" => true },
    ]
    expectation = [
      { "handle" => "alpha", "ok" => true },
-      { "handle" => "delta", "ok" => true }
+      { "handle" => "delta", "ok" => true },
    ]
    assert_equal expectation, @filters.where(input, "ok", true)
@@ -714,12 +714,12 @@ class StandardFiltersTest < Minitest::Test
      { "handle" => "alpha", "ok" => true },
      { "handle" => "beta" },
      { "handle" => "gamma" },
-      { "handle" => "delta", "ok" => true }
+      { "handle" => "delta", "ok" => true },
    ]
    expectation = [
      { "handle" => "alpha", "ok" => true },
-      { "handle" => "delta", "ok" => true }
+      { "handle" => "delta", "ok" => true },
    ]
    assert_equal expectation, @filters.where(input, "ok", true)
@@ -740,7 +740,7 @@ class StandardFiltersTest < Minitest::Test
    input = [
      { "message" => "Bonjour!", "language" => "French" },
      { "message" => "Hello!", "language" => "English" },
-      { "message" => "Hallo!", "language" => "German" }
+      { "message" => "Hallo!", "language" => "German" },
    ]
    assert_equal [{ "message" => "Bonjour!", "language" => "French" }], @filters.where(input, "language", "French")
@@ -758,7 +758,7 @@ class StandardFiltersTest < Minitest::Test
      { "foo" => false },
      { "foo" => true },
      { "foo" => "for sure" },
-      { "bar" => true }
+      { "bar" => true },
    ]
    assert_equal [{ "foo" => true }, { "foo" => "for sure" }], @filters.where(input, "foo")
--- a/test/integration/tags/echo_test.rb
+++ b/test/integration/tags/echo_test.rb
@@ -4,7 +4,7 @@ class EchoTest < Minitest::Test
  include Liquid
  def test_echo_outputs_its_input
-    assert_template_result('BAR', <<~LIQUID, { 'variable-name' => 'bar' })
+    assert_template_result('BAR', <<~LIQUID, 'variable-name' => 'bar')
      {%- echo variable-name | upcase -%}
    LIQUID
  end
--- a/test/integration/tags/for_tag_test.rb
+++ b/test/integration/tags/for_tag_test.rb
@@ -23,7 +23,7 @@ class ForTagTest < Minitest::Test
  yo
 HERE
-    template = <<HERE
+    template = <<~HERE
      {%for item in array%}
        yo
      {%endfor%}
--- a/test/integration/tags/include_tag_test.rb
+++ b/test/integration/tags/include_tag_test.rb
@@ -40,14 +40,14 @@ class TestFileSystem
 end
 class OtherFileSystem
-  def read_template_file(template_path)
+  def read_template_file(_template_path)
    'from OtherFileSystem'
  end
 end
 class CountingFileSystem
  attr_reader :count
-  def read_template_file(template_path)
+  def read_template_file(_template_path)
    @count ||= 0
    @count += 1
    'from CountingFileSystem'
@@ -59,14 +59,14 @@ class CustomInclude < Liquid::Tag
  def initialize(tag_name, markup, tokens)
    markup =~ Syntax
-    @template_name = $1
+    @template_name = Regexp.last_match(1)
    super
  end
  def parse(tokens)
  end
-  def render_to_output_buffer(context, output)
+  def render_to_output_buffer(_context, output)
    output << @template_name[1..-2]
    output
  end
@@ -134,7 +134,7 @@ class IncludeTagTest < Minitest::Test
  def test_recursively_included_template_does_not_produce_endless_loop
    infinite_file_system = Class.new do
-      def read_template_file(template_path)
+      def read_template_file(_template_path)
        "-{% include 'loop' %}"
      end
    end
--- a/test/integration/tags/increment_tag_test.rb
+++ b/test/integration/tags/increment_tag_test.rb
@@ -13,11 +13,11 @@ class IncrementTagTest < Minitest::Test
  end
  def test_dec
-    assert_template_result('9', '{%decrement port %}', { 'port' => 10 })
+    assert_template_result('9', '{%decrement port %}', 'port' => 10)
    assert_template_result('-1 -2', '{%decrement port %} {%decrement port%}', {})
    assert_template_result('1 5 2 2 5',
      '{%increment port %} {%increment starboard%} ' \
      '{%increment port %} {%decrement port%} ' \
-      '{%decrement starboard %}', { 'port' => 1, 'starboard' => 5 })
+      '{%decrement starboard %}', 'port' => 1, 'starboard' => 5)
  end
 end
--- a/test/integration/tags/render_tag_test.rb
+++ b/test/integration/tags/render_tag_test.rb
@@ -0,0 +1,149 @@
 require 'test_helper'
 class RenderTagTest < Minitest::Test
  include Liquid
  def test_render_with_no_arguments
    Liquid::Template.file_system = StubFileSystem.new('source' => 'rendered content')
    assert_template_result 'rendered content', '{% render "source" %}'
  end
  def test_render_tag_looks_for_file_system_in_registers_first
    file_system = StubFileSystem.new('pick_a_source' => 'from register file system')
    assert_equal 'from register file system',
      Template.parse('{% render "pick_a_source" %}').render!({}, registers: { file_system: file_system })
  end
  def test_render_passes_named_arguments_into_inner_scope
    Liquid::Template.file_system = StubFileSystem.new('product' => '{{ inner_product.title }}')
    assert_template_result 'My Product', '{% render "product", inner_product: outer_product %}',
      'outer_product' => { 'title' => 'My Product' }
  end
  def test_render_accepts_literals_as_arguments
    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ price }}')
    assert_template_result '123', '{% render "snippet", price: 123 %}'
  end
  def test_render_accepts_multiple_named_arguments
    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ one }} {{ two }}')
    assert_template_result '1 2', '{% render "snippet", one: 1, two: 2 %}'
  end
  def test_render_does_not_inherit_parent_scope_variables
    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ outer_variable }}')
    assert_template_result '', '{% assign outer_variable = "should not be visible" %}{% render "snippet" %}'
  end
  def test_render_does_not_inherit_variable_with_same_name_as_snippet
    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ snippet }}')
    assert_template_result '', "{% assign snippet = 'should not be visible' %}{% render 'snippet' %}"
  end
  def test_render_sets_the_correct_template_name_for_errors
    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ unsafe }}')
    with_taint_mode :error do
      template = Liquid::Template.parse('{% render "snippet", unsafe: unsafe %}')
      context = Context.new('unsafe' => (+'unsafe').tap(&:taint))
      template.render(context)
      assert_equal [Liquid::TaintedError], template.errors.map(&:class)
      assert_equal 'snippet', template.errors.first.template_name
    end
  end
  def test_render_sets_the_correct_template_name_for_warnings
    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{{ unsafe }}')
    with_taint_mode :warn do
      template = Liquid::Template.parse('{% render "snippet", unsafe: unsafe %}')
      context = Context.new('unsafe' => (+'unsafe').tap(&:taint))
      template.render(context)
      assert_equal [Liquid::TaintedError], context.warnings.map(&:class)
      assert_equal 'snippet', context.warnings.first.template_name
    end
  end
  def test_render_does_not_mutate_parent_scope
    Liquid::Template.file_system = StubFileSystem.new('snippet' => '{% assign inner = 1 %}')
    assert_template_result '', "{% render 'snippet' %}{{ inner }}"
  end
  def test_nested_render_tag
    Liquid::Template.file_system = StubFileSystem.new(
      'one' => "one {% render 'two' %}",
      'two' => 'two'
    )
    assert_template_result 'one two', "{% render 'one' %}"
  end
  def test_recursively_rendered_template_does_not_produce_endless_loop
    Liquid::Template.file_system = StubFileSystem.new('loop' => '{% render "loop" %}')
    assert_raises Liquid::StackLevelError do
      Template.parse('{% render "loop" %}').render!
    end
  end
  def test_includes_and_renders_count_towards_the_same_recursion_limit
    Liquid::Template.file_system = StubFileSystem.new(
      'loop_render' => '{% render "loop_include" %}',
      'loop_include' => '{% include "loop_render" %}'
    )
    assert_raises Liquid::StackLevelError  do
      Template.parse('{% render "loop_include" %}').render!
    end
  end
  def test_dynamically_choosen_templates_are_not_allowed
    Liquid::Template.file_system = StubFileSystem.new('snippet' => 'should not be rendered')
    assert_raises Liquid::SyntaxError do
      Liquid::Template.parse("{% assign name = 'snippet' %}{% render name %}")
    end
  end
  def test_include_tag_caches_second_read_of_same_partial
    file_system = StubFileSystem.new('snippet' => 'echo')
    assert_equal 'echoecho',
      Template.parse('{% render "snippet" %}{% render "snippet" %}')
      .render!({}, registers: { file_system: file_system })
    assert_equal 1, file_system.file_read_count
  end
  def test_render_tag_doesnt_cache_partials_across_renders
    file_system = StubFileSystem.new('snippet' => 'my message')
    assert_equal 'my message',
      Template.parse('{% include "snippet" %}').render!({}, registers: { file_system: file_system })
    assert_equal 1, file_system.file_read_count
    assert_equal 'my message',
      Template.parse('{% include "snippet" %}').render!({}, registers: { file_system: file_system })
    assert_equal 2, file_system.file_read_count
  end
  def test_render_tag_within_if_statement
    Liquid::Template.file_system = StubFileSystem.new('snippet' => 'my message')
    assert_template_result 'my message', '{% if true %}{% render "snippet" %}{% endif %}'
  end
  def test_break_through_render
    Liquid::Template.file_system = StubFileSystem.new('break' => '{% break %}')
    assert_template_result '1', '{% for i in (1..3) %}{{ i }}{% break %}{{ i }}{% endfor %}'
    assert_template_result '112233', '{% for i in (1..3) %}{{ i }}{% render "break" %}{{ i }}{% endfor %}'
  end
  def test_increment_is_isolated_between_renders
    Liquid::Template.file_system = StubFileSystem.new('incr' => '{% increment %}')
    assert_template_result '010', '{% increment %}{% increment %}{% render "incr" %}'
  end
  def test_decrement_is_isolated_between_renders
    Liquid::Template.file_system = StubFileSystem.new('decr' => '{% decrement %}')
    assert_template_result '-1-2-1', '{% decrement %}{% decrement %}{% render "decr" %}'
  end
 end
--- a/test/integration/tags/standard_tag_test.rb
+++ b/test/integration/tags/standard_tag_test.rb
@@ -69,7 +69,7 @@ class StandardTagTest < Minitest::Test
    assert_raises(SyntaxError) do
      assert_template_result('content foo content foo ',
        '{{ var2 }}{% capture %}{{ var }} foo {% endcapture %}{{ var2 }}{{ var2 }}',
-        { 'var' => 'content' })
+        'var' => 'content')
    end
  end
@@ -183,32 +183,32 @@ class StandardTagTest < Minitest::Test
  def test_case_when_or
    code = '{% case condition %}{% when 1 or 2 or 3 %} its 1 or 2 or 3 {% when 4 %} its 4 {% endcase %}'
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => 1 })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => 1)
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => 2 })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => 2)
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => 3 })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => 3)
-    assert_template_result(' its 4 ', code, { 'condition' => 4 })
+    assert_template_result(' its 4 ', code, 'condition' => 4)
-    assert_template_result('', code, { 'condition' => 5 })
+    assert_template_result('', code, 'condition' => 5)
    code = '{% case condition %}{% when 1 or "string" or null %} its 1 or 2 or 3 {% when 4 %} its 4 {% endcase %}'
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => 1 })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => 1)
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => 'string' })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => 'string')
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => nil })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => nil)
-    assert_template_result('', code, { 'condition' => 'something else' })
+    assert_template_result('', code, 'condition' => 'something else')
  end
  def test_case_when_comma
    code = '{% case condition %}{% when 1, 2, 3 %} its 1 or 2 or 3 {% when 4 %} its 4 {% endcase %}'
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => 1 })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => 1)
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => 2 })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => 2)
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => 3 })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => 3)
-    assert_template_result(' its 4 ', code, { 'condition' => 4 })
+    assert_template_result(' its 4 ', code, 'condition' => 4)
-    assert_template_result('', code, { 'condition' => 5 })
+    assert_template_result('', code, 'condition' => 5)
    code = '{% case condition %}{% when 1, "string", null %} its 1 or 2 or 3 {% when 4 %} its 4 {% endcase %}'
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => 1 })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => 1)
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => 'string' })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => 'string')
-    assert_template_result(' its 1 or 2 or 3 ', code, { 'condition' => nil })
+    assert_template_result(' its 1 or 2 or 3 ', code, 'condition' => nil)
-    assert_template_result('', code, { 'condition' => 'something else' })
+    assert_template_result('', code, 'condition' => 'something else')
  end
  def test_assign
--- a/test/integration/template_test.rb
+++ b/test/integration/template_test.rb
@@ -42,6 +42,18 @@ class TemplateTest < Minitest::Test
    assert_equal 'from instance assigns', t.parse("{{ foo }}").render!
  end
  def test_instance_assigns_persist_on_same_template_object_between_many_parses
    t = Template.new
    assert_equal 'from instance assigns', t.parse("{% assign foo = 'from instance assigns' %}{{ foo }}").render!
    assert_equal 'from instance assigns', t.parse("{{ foo }}").render!
    assert_equal 'from instance assigns', t.parse("{{ foo }}").render!
    assert_equal 'from instance assigns', t.parse("{{ foo }}").render!
    assert_equal 'from instance assigns second', t.parse("{% assign foo = 'from instance assigns second' %}{{ foo }}").render!
    assert_equal 'from instance assigns second', t.parse("{{ foo }}").render!
    assert_equal 'from instance assigns second', t.parse("{{ foo }}").render!
    assert_equal 'from instance assigns second', t.parse("{{ foo }}").render!
  end
  def test_warnings_is_not_exponential_time
    str = "false"
    100.times do
@@ -58,6 +70,14 @@ class TemplateTest < Minitest::Test
    assert_equal 'foofoo', t.render!
  end
  def test_instance_assigns_persist_on_same_template_parsing_between_many_renders
    t = Template.new.parse("{{ foo }}{% assign foo = 'foo' %}{{ foo }}")
    assert_equal 'foo', t.render!
    assert_equal 'foofoo', t.render!
    assert_equal 'foofoo', t.render!
    assert_equal 'foofoo', t.render!
  end
  def test_custom_assigns_do_not_persist_on_same_template
    t = Template.new
    assert_equal 'from custom assigns', t.parse("{{ foo }}").render!('foo' => 'from custom assigns')
@@ -224,7 +244,7 @@ class TemplateTest < Minitest::Test
  end
  def test_render_bang_force_rethrow_errors_on_passed_context
-    context = Context.new({ 'drop' => ErroneousDrop.new })
+    context = Context.new('drop' => ErroneousDrop.new)
    t = Template.new.parse('{{ drop.bad_method }}')
    e = assert_raises RuntimeError do
@@ -267,7 +287,7 @@ class TemplateTest < Minitest::Test
  def test_undefined_variables
    t = Template.parse("{{x}} {{y}} {{z.a}} {{z.b}} {{z.c.d}}")
-    result = t.render({ 'x' => 33, 'z' => { 'a' => 32, 'c' => { 'e' => 31 } } }, { strict_variables: true })
+    result = t.render({ 'x' => 33, 'z' => { 'a' => 32, 'c' => { 'e' => 31 } } }, strict_variables: true)
    assert_equal '33  32  ', result
    assert_equal 3, t.errors.count
@@ -292,14 +312,14 @@ class TemplateTest < Minitest::Test
    t = Template.parse("{{x}} {{y}} {{z.a}} {{z.b}} {{z.c.d}}")
    assert_raises UndefinedVariable do
-      t.render!({ 'x' => 33, 'z' => { 'a' => 32, 'c' => { 'e' => 31 } } }, { strict_variables: true })
+      t.render!({ 'x' => 33, 'z' => { 'a' => 32, 'c' => { 'e' => 31 } } }, strict_variables: true)
    end
  end
  def test_undefined_drop_methods
    d = DropWithUndefinedMethod.new
    t = Template.new.parse('{{ foo }} {{ woot }}')
-    result = t.render(d, { strict_variables: true })
+    result = t.render(d, strict_variables: true)
    assert_equal 'foo ', result
    assert_equal 1, t.errors.count
@@ -311,7 +331,7 @@ class TemplateTest < Minitest::Test
    t = Template.new.parse('{{ foo }} {{ woot }}')
    assert_raises UndefinedDropMethod do
-      t.render!(d, { strict_variables: true })
+      t.render!(d, strict_variables: true)
    end
  end
@@ -322,7 +342,7 @@ class TemplateTest < Minitest::Test
        "-#{v}-"
      end
    end
-    result = t.render({ 'a' => 123, 'x' => 'foo' }, { filters: [filters], strict_filters: true })
+    result = t.render({ 'a' => 123, 'x' => 'foo' }, filters: [filters], strict_filters: true)
    assert_equal '123 ', result
    assert_equal 1, t.errors.count
@@ -334,17 +354,17 @@ class TemplateTest < Minitest::Test
    t = Template.parse("{{x | somefilter1 | upcase | somefilter2}}")
    assert_raises UndefinedFilter do
-      t.render!({ 'x' => 'foo' }, { strict_filters: true })
+      t.render!({ 'x' => 'foo' }, strict_filters: true)
    end
  end
  def test_using_range_literal_works_as_expected
    t = Template.parse("{% assign foo = (x..y) %}{{ foo }}")
-    result = t.render({ 'x' => 1, 'y' => 5 })
+    result = t.render('x' => 1, 'y' => 5)
    assert_equal '1..5', result
    t = Template.parse("{% assign nums = (x..y) %}{% for num in nums %}{{ num }}{% endfor %}")
-    result = t.render({ 'x' => 1, 'y' => 5 })
+    result = t.render('x' => 1, 'y' => 5)
    assert_equal '12345', result
  end
 end
--- a/test/integration/trim_mode_test.rb
+++ b/test/integration/trim_mode_test.rb
@@ -76,7 +76,7 @@ class TrimModeTest < Minitest::Test
        </p>
      </div>
    END_TEMPLATE
-    expected = <<-END_EXPECTED
+    expected = <<~END_EXPECTED
            <div>
              <p>
      #{whitespace}
@@ -96,7 +96,7 @@ class TrimModeTest < Minitest::Test
        </p>
      </div>
    END_TEMPLATE
-    expected = <<-END_EXPECTED
+    expected = <<~END_EXPECTED
            <div>
              <p>
      #{whitespace}
@@ -337,7 +337,7 @@ class TrimModeTest < Minitest::Test
        </p>
      </div>
    END_TEMPLATE
-    expected = <<-END_EXPECTED
+    expected = <<~END_EXPECTED
            <div>
              <p>
      #{whitespace}
@@ -513,7 +513,7 @@ class TrimModeTest < Minitest::Test
        {% endraw %}
      </div>
    END_TEMPLATE
-    expected = <<-END_EXPECTED
+    expected = <<~END_EXPECTED
            <div>
      #{whitespace}
                {%- if true -%}
--- a/test/integration/variable_test.rb
+++ b/test/integration/variable_test.rb
@@ -76,7 +76,7 @@ class VariableTest < Minitest::Test
  def test_hash_with_default_proc
    template = Template.parse(%(Hello {{ test }}))
-    assigns = Hash.new { |h, k| raise "Unknown variable '#{k}'" }
+    assigns = Hash.new { |_h, k| raise "Unknown variable '#{k}'" }
    assigns['test'] = 'Tobi'
    assert_equal 'Hello Tobi', template.render!(assigns)
    assigns.delete('test')
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -41,7 +41,7 @@ module Minitest
    end
    def assert_template_result_matches(expected, template, assigns = {}, message = nil)
-      return assert_template_result(expected, template, assigns, message) unless expected.is_a? Regexp
+      return assert_template_result(expected, template, assigns, message) unless expected.is_a?(Regexp)
      assert_match expected, Template.parse(template, line_numbers: true).render!(assigns), message
    end
@@ -121,3 +121,17 @@ class ErrorDrop < Liquid::Drop
    raise Exception, 'exception'
  end
 end
 class StubFileSystem
  attr_reader :file_read_count
  def initialize(values)
    @file_read_count = 0
    @values = values
  end
  def read_template_file(template_path)
    @file_read_count += 1
    @values.fetch(template_path)
  end
 end
--- a/test/unit/condition_unit_test.rb
+++ b/test/unit/condition_unit_test.rb
@@ -68,7 +68,7 @@ class ConditionUnitTest < Minitest::Test
    assert_nil Condition.new({}, '>', 2).evaluate
    assert_nil Condition.new(2, '>', {}).evaluate
    assert_equal false, Condition.new({}, '==', 2).evaluate
-    assert_equal true, Condition.new({ 'a' => 1 }, '==', { 'a' => 1 }).evaluate
+    assert_equal true, Condition.new({ 'a' => 1 }, '==', 'a' => 1).evaluate
    assert_equal true, Condition.new({ 'a' => 2 }, 'contains', 'a').evaluate
  end
@@ -107,11 +107,11 @@ class ConditionUnitTest < Minitest::Test
    assert_equal false, condition.evaluate
-    condition.or Condition.new(2, '==', 1)
+    condition.or(Condition.new(2, '==', 1))
    assert_equal false, condition.evaluate
-    condition.or Condition.new(1, '==', 1)
+    condition.or(Condition.new(1, '==', 1))
    assert_equal true, condition.evaluate
  end
@@ -121,22 +121,22 @@ class ConditionUnitTest < Minitest::Test
    assert_equal true, condition.evaluate
-    condition.and Condition.new(2, '==', 2)
+    condition.and(Condition.new(2, '==', 2))
    assert_equal true, condition.evaluate
-    condition.and Condition.new(2, '==', 1)
+    condition.and(Condition.new(2, '==', 1))
    assert_equal false, condition.evaluate
  end
  def test_should_allow_custom_proc_operator
-    Condition.operators['starts_with'] = proc { |cond, left, right| left =~ %r{^#{right}} }
+    Condition.operators['starts_with'] = proc { |_cond, left, right| left =~ /^#{right}/ }
    assert_evaluates_true 'bob', 'starts_with', 'b'
    assert_evaluates_false 'bob', 'starts_with', 'o'
  ensure
-    Condition.operators.delete 'starts_with'
+    Condition.operators.delete('starts_with')
  end
  def test_left_or_right_may_contain_operators
--- a/test/unit/context_unit_test.rb
+++ b/test/unit/context_unit_test.rb
@@ -206,9 +206,9 @@ class ContextUnitTest < Minitest::Test
  end
  def test_merge
-    @context.merge({ "test" => "test" })
+    @context.merge("test" => "test")
    assert_equal 'test', @context['test']
-    @context.merge({ "test" => "newvalue", "foo" => "bar" })
+    @context.merge("test" => "newvalue", "foo" => "bar")
    assert_equal 'newvalue', @context['test']
    assert_equal 'bar', @context['foo']
  end
@@ -238,7 +238,7 @@ class ContextUnitTest < Minitest::Test
      'Blue' => ['003366', '336699', '6699CC', '99CCFF'],
      'Green' => ['003300', '336633', '669966', '99CC99'],
      'Yellow' => ['CC9900', 'FFCC00', 'FFFF99', 'FFFFCC'],
-      'Red'     => ['660000', '993333', 'CC6666', 'FF9999']
+      'Red' => ['660000', '993333', 'CC6666', 'FF9999'],
    }
    assert_equal '003366', @context['colors.Blue[0]']
@@ -453,7 +453,7 @@ class ContextUnitTest < Minitest::Test
  end
  def test_context_initialization_with_a_proc_in_environment
-    contx = Context.new([test: ->(c) { c['poutine'] }], { test: :foo })
+    contx = Context.new([test: ->(c) { c['poutine'] }], test: :foo)
    assert contx
    assert_nil contx['poutine']
@@ -468,11 +468,79 @@ class ContextUnitTest < Minitest::Test
    assert_equal 'hi filtered', context.apply_global_filter('hi')
  end
  def test_static_environments_are_read_with_lower_priority_than_environments
    context = Context.build(
      static_environments: { 'shadowed' => 'static', 'unshadowed' => 'static' },
      environments: { 'shadowed' => 'dynamic' }
    )
    assert_equal 'dynamic', context['shadowed']
    assert_equal 'static', context['unshadowed']
  end
  def test_apply_global_filter_when_no_global_filter_exist
    context = Context.new
    assert_equal 'hi', context.apply_global_filter('hi')
  end
  def test_new_isolated_subcontext_does_not_inherit_variables
    super_context = Context.new
    super_context['my_variable'] = 'some value'
    subcontext = super_context.new_isolated_subcontext
    assert_nil subcontext['my_variable']
  end
  def test_new_isolated_subcontext_inherits_static_environment
    super_context = Context.build(static_environments: { 'my_environment_value' => 'my value' })
    subcontext = super_context.new_isolated_subcontext
    assert_equal 'my value', subcontext['my_environment_value']
  end
  def test_new_isolated_subcontext_inherits_resource_limits
    resource_limits = ResourceLimits.new({})
    super_context = Context.new({}, {}, {}, false, resource_limits)
    subcontext = super_context.new_isolated_subcontext
    assert_equal resource_limits, subcontext.resource_limits
  end
  def test_new_isolated_subcontext_inherits_exception_renderer
    super_context = Context.new
    super_context.exception_renderer = ->(_e) { 'my exception message' }
    subcontext = super_context.new_isolated_subcontext
    assert_equal 'my exception message', subcontext.handle_error(Liquid::Error.new)
  end
  def test_new_isolated_subcontext_does_not_inherit_non_static_registers
    registers = {
      my_register: :my_value,
    }
    super_context = Context.new({}, {}, registers)
    subcontext = super_context.new_isolated_subcontext
    assert_nil subcontext.registers[:my_register]
  end
  def test_new_isolated_subcontext_inherits_static_registers
    super_context = Context.build(static_registers: { my_register: :my_value })
    subcontext = super_context.new_isolated_subcontext
    assert_equal :my_value, subcontext.static_registers[:my_register]
  end
  def test_new_isolated_subcontext_inherits_filters
    my_filter = Module.new do
      def my_filter(*)
        'my filter result'
      end
    end
    super_context = Context.new
    super_context.add_filters([my_filter])
    subcontext = super_context.new_isolated_subcontext
    template = Template.parse('{{ 123 | my_filter }}')
    assert_equal 'my filter result', template.render(subcontext)
  end
  private
  def assert_no_object_allocations
--- a/test/unit/partial_cache_unit_test.rb
+++ b/test/unit/partial_cache_unit_test.rb
@@ -0,0 +1,91 @@
 require 'test_helper'
 class PartialCacheUnitTest < Minitest::Test
  def test_uses_the_file_system_register_if_present
    context = Liquid::Context.build(
      registers: {
        file_system: StubFileSystem.new('my_partial' => 'my partial body'),
      }
    )
    partial = Liquid::PartialCache.load(
      'my_partial',
      context: context,
      parse_context: Liquid::ParseContext.new
    )
    assert_equal 'my partial body', partial.render
  end
  def test_reads_from_the_file_system_only_once_per_file
    file_system = StubFileSystem.new('my_partial' => 'some partial body')
    context = Liquid::Context.build(
      registers: { file_system: file_system }
    )
    2.times do
      Liquid::PartialCache.load(
        'my_partial',
        context: context,
        parse_context: Liquid::ParseContext.new
      )
    end
    assert_equal 1, file_system.file_read_count
  end
  def test_cache_state_is_stored_per_context
    parse_context = Liquid::ParseContext.new
    shared_file_system = StubFileSystem.new(
      'my_partial' => 'my shared value'
    )
    context_one = Liquid::Context.build(
      registers: {
        file_system: shared_file_system,
      }
    )
    context_two = Liquid::Context.build(
      registers: {
        file_system: shared_file_system,
      }
    )
    2.times do
      Liquid::PartialCache.load(
        'my_partial',
        context: context_one,
        parse_context: parse_context
      )
    end
    Liquid::PartialCache.load(
      'my_partial',
      context: context_two,
      parse_context: parse_context
    )
    assert_equal 2, shared_file_system.file_read_count
  end
  def test_cache_is_not_broken_when_a_different_parse_context_is_used
    file_system = StubFileSystem.new('my_partial' => 'some partial body')
    context = Liquid::Context.build(
      registers: { file_system: file_system }
    )
    Liquid::PartialCache.load(
      'my_partial',
      context: context,
      parse_context: Liquid::ParseContext.new(my_key: 'value one')
    )
    Liquid::PartialCache.load(
      'my_partial',
      context: context,
      parse_context: Liquid::ParseContext.new(my_key: 'value two')
    )
    # Technically what we care about is that the file was parsed twice,
    # but measuring file reads is an OK proxy for this.
    assert_equal 1, file_system.file_read_count
  end
 end
--- a/test/unit/strainer_unit_test.rb
+++ b/test/unit/strainer_unit_test.rb
@@ -36,7 +36,8 @@ class StrainerUnitTest < Minitest::Test
    rescue Liquid::ArgumentError => e
      assert_match(
        /\ALiquid error: wrong number of arguments \((1 for 0|given 1, expected 0)\)\z/,
-        e.message)
+        e.message
      )
      assert_equal e.backtrace[0].split(':')[0], __FILE__
    end
  end
@@ -135,7 +136,7 @@ class StrainerUnitTest < Minitest::Test
  end
  module LateAddedFilter
-    def late_added_filter(input)
+    def late_added_filter(_input)
      "filtered"
    end
  end
@@ -150,7 +151,7 @@ class StrainerUnitTest < Minitest::Test
    mod = Module.new do
      class << self
        attr_accessor :include_count
-        def included(mod)
+        def included(_mod)
          self.include_count += 1
        end
      end
--- a/test/unit/tags/if_tag_unit_test.rb
+++ b/test/unit/tags/if_tag_unit_test.rb
@@ -3,6 +3,6 @@ require 'test_helper'
 class IfTagUnitTest < Minitest::Test
  def test_if_nodelist
    template = Liquid::Template.parse('{% if true %}IF{% else %}ELSE{% endif %}')
-    assert_equal ['IF', 'ELSE'], template.root.nodelist[0].nodelist.map(&:nodelist).flatten
+    assert_equal(['IF', 'ELSE'], template.root.nodelist[0].nodelist.map(&:nodelist).flatten)
  end
 end
Author	SHA1	Message	Date
Mike Angell	10f7ed4b9c	Tidy instance variables	2019-09-17 02:33:02 +10:00
Mike Angell	3bf8470a49	Avoid deep flatten	2019-09-17 02:30:20 +10:00
Mike Angell	740241a997	Enable Instance Assigns to survive many renders	2019-09-17 01:59:55 +10:00
Mike Angell	29dfe2aea4	Prevent needing to squash instance assigns Instead of needing to squash instance assigns, we instead just put them at the bottom of the enviornment stack. This simplifies the code base and gains extra performance by not needing to loop over scopes and environments.	2019-09-16 21:42:51 +10:00
Mike Angell	9a42c8c8b2	Merge pull request #1149 from Shopify/liquid-usage Add usage tracking	2019-09-16 12:14:50 +10:00
Mike Angell	1fcef2133f	Merge pull request #1143 from Shopify/styling-fixes-1 Apply simple rubocop fixes	2019-09-16 12:14:32 +10:00
Mike Angell	d7514b1305	Merge pull request #1137 from Shopify/remove-lazy-stacks Remove lazy load stacks	2019-09-16 12:14:14 +10:00
Mike Angell	724d02e9b3	Disable interrupt fix in this round	2019-09-11 06:35:08 +10:00
Mike Angell	a5b387cdd4	Remove reserved word Interrupt to avoid confusion Also resolves rubocop conflicts	2019-09-11 06:32:31 +10:00
Mike Angell	8318be2edc	Update readme	2019-09-11 05:20:05 +10:00
Mike Angell	b6547f322e	Simplify usage	2019-09-11 04:56:25 +10:00
Mike Angell	b316ff8413	Add usage tracking	2019-09-11 04:20:34 +10:00
Justin Li	806b2622da	Switch back to Liquid-C master, since https://github.com/Shopify/liquid-c/pull/50 is merged	2019-09-04 15:12:51 -04:00
Mike Angell	1f90a37b63	Merge branch 'master' into styling-fixes-1	2019-09-04 14:26:27 +10:00
Mike Angell	c34f7c9b2c	Merge pull request #1145 from Shopify/master-fixes Render tag styling fixes	2019-09-04 14:25:38 +10:00
Mike Angell	604d899496	Render tag styling fixes	2019-08-31 22:48:25 +10:00
Mike Angell	799da202df	Apply simple rubocop fixes	2019-08-31 21:58:33 +10:00
Mike Angell	ddb45cd658	Merge pull request #1139 from Shopify/shopify_ruby_style Follow Shopify ruby style guide	2019-08-31 21:43:45 +10:00
Mike Angell	dafbb4ae90	Remove hasnling false scopes	2019-08-31 20:03:54 +10:00
Justin Li	9876096cf4	Merge pull request #1141 from ashmaroli/reduce-context-constructor-allocations Reduce allocations from `Liquid::Context.new`	2019-08-30 12:53:50 -04:00
Ashwin Maroli	8750b4b006	Reduce allocations from `Liquid::Context.new`	2019-08-30 09:01:47 +05:30
Samuel Doiron	34083c96d5	Merge pull request #1122 from Shopify/render-tag Add new `{% render %}` tag	2019-08-29 16:49:56 -04:00
Samuel	9672ed5285	Add a new `{% render %}` tag Example: ``` // the_count.liquid {{ number }}! Ah ah ah. // my_template.liquid {% for number in range (1..3) %} {% render "the_count", number: number %} {% endfor %} Output: 1! Ah ah ah. 2! Ah ah ah. 3! Ah ah ah. ``` The `render` tag is a more strict version of the `include` tag. It is designed to isolate itself from the parent rendering context both by creating a new scope (which does not inherit the parent scope) and by only inheriting "static" registers. Static registers are those that do not hold mutable state which could affect rendering. This again helps `render`ed templates remain entirely separate from their calling context. Unlike `include`, `render` does not permit specifying the target template using a variable, only a string literal. For example, this means that `{% render my_dynamic_template %}` is invalid syntax. This will make it possible to statically analyze the dependencies between templates without making Turing angry. Note that the `static_environment` of a rendered template is inherited, unlike the scope and regular environment. This environment is immutable from within the template. An alternate syntax, which mimics the `{% include ... for %}` tag is currently in design discussion.	2019-08-29 16:32:05 -04:00
Justin Li	f3112fc038	Merge pull request #1136 from ashmaroli/travis-selected-branches Build only pushes to certain branches on Travis CI	2019-08-29 13:47:59 -04:00
Samuel	d338ccb9a6	Add isolated subcontexts An isolated subcontext inherits the environment, filters, and static registers of its supercontext, but with a fresh (isolated) scope. This will pave the way for adding the `render` tag, which renders templates in such a subcontext.	2019-08-29 10:27:15 -04:00
Mike Angell	d67de1c9b2	Follow Shopify ruby style This is the first step in bringing Liquid style inline with Shopify ruby style	2019-08-29 13:39:57 +10:00
Mike Angell	2324564743	Remove lazy load stacks Remove lazy load stacks and instead only create a new scope when a tag is known to need one	2019-08-29 09:09:32 +10:00
Ashwin Maroli	b3097f143c	Build only pushes to certain branches on Travis CI	2019-08-28 21:28:49 +05:30
Mike Angell	7b309dc75d	Merge pull request #1135 from Shopify/fix-failing-rubocop Resolve failing rubocop issues	2019-08-29 01:11:25 +10:00
Mike Angell	8f68cffdf1	Resolve failing rubocop issues	2019-08-29 00:45:38 +10:00
Mike Angell	dd27d0fd1d	Merge pull request #1133 from Shopify/liquid-tag-fixes Bugfix for new Liquid tag	2019-08-29 00:36:13 +10:00
Mike Angell	7a26e6b3d8	Merge pull request #1131 from Shopify/bump-ruby-2-4 Rubocop upgrade, Ruby 2.4 minimum and TruffleRuby	2019-08-29 00:33:42 +10:00
Mike Angell	7bae55dd39	Bugfix for new Liquid tag	2019-08-28 23:39:19 +10:00