jekyll_pre 1.1.5 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3eced8ae5430c67a303f08c90a38caf16c46efbad4e11232aa95ed9580c2f98
-  data.tar.gz: 9370b4fab76dc5ba5487c0d0876907ed9366d0f1e777e63ca8250121a9a32533
+  metadata.gz: 97df025cc0565235360a3c42053ed994e5f33968145eef4008ae5b27a8df61fa
+  data.tar.gz: d8c1eba16949515b28e7696865307da8ba8e150d807f466f45e32322f1786576
 SHA512:
-  metadata.gz: 7fc327f37d0c5dc7f54ba78837984a05603ae24bbdee5e888eebdb01bc8d377ecd08bbc4b18a68c97a9bd3f1272f359cb8da53ee7a2143938793d5dca298fb31
-  data.tar.gz: 656acb136598d957e9b129a2ebd71cfb905f63191c6c0c09eb0565c9070c71d5790b1319289b6ac70d71f15b8710a1af5e693240102f10f5c4ecce0068784252
+  metadata.gz: 03bb017f63fe8cf7b780065f10e248727f4047c031c0c5d74f4a96721b95c3a4e30ba9288dc9ac176b5eeff4efb2a454e412da28a58a7489c246529fb2335ea4
+  data.tar.gz: 4fb5fd78dde215a9639438095fddae46c053f396edcd77cbd42662d9f3250c32928349effecc17688d377f2f09bab140f56c6af16cf061801d15667849ed2ebc

data/.rubocop.yml

@@ -1,13 +1,63 @@
-# require: rubocop-jekyll
-# inherit_gem:
-#   rubocop-jekyll: .rubocop.yml
+require:
+ - rubocop-rspec
+ - rubocop-rake
 
 AllCops:
   Exclude:
-      - vendor/**/*
-      - Gemfile*
+    - exe/**/*
+    - vendor/**/*
+    - Gemfile*
   NewCops: enable
   TargetRubyVersion: 2.6
 
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: false
+
+Gemspec/RequireMFA:
+  Enabled: false
+
+Layout/HashAlignment:
+  Enabled: false
+
 Layout/LineLength:
   Max: 150
+
+Metrics/AbcSize:
+  Max: 25
+
+Metrics/BlockLength:
+  Exclude:
+    - jekyll_pre.gemspec
+  Max: 30
+
+Metrics/CyclomaticComplexity:
+  Max: 15
+
+Metrics/MethodLength:
+  Max: 30
+
+Metrics/PerceivedComplexity:
+  Max: 15
+
+Naming/FileName:
+  Exclude:
+    - Rakefile
+
+Style/Documentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+RSpec/FilePath:
+  IgnoreMethods: true
+  SpecSuffixOnly: true
+
+RSpec/ExampleLength:
+  Max: 30
+
+RSpec/MultipleExpectations:
+  Max: 15

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.7
+  * Fixed `noselect` tag content handling.
+
+## 1.1.6
+  * Added `jekyll_plugin_support` as a dependency.
+
 ## 1.1.5
   * Added `class` and `style` options to allow for specifying additional CSS classes and inline CSS
   * Added `clear` option to ensure no images overlap the pre output

data/README.md

@@ -6,10 +6,20 @@ This Jekyll plugin provides 2 new Liquid tags that work together:
 
   * A `pre` block tag that can optionally display a copy button.
     ```
-    {% pre [copyButton] [shell] [headline words] %}
+    {% pre [Options] [headline words] %}
     Contents of pre tag
     {% endpre %}
     ```
+    `Options` are:
+     - `clear` – Line break after floating HTML elements
+     - `class="class names"` – Apply CSS styles
+     - `copyButton` – Generate a copy button
+     - `dark` – Dark mode
+     - `label='This is a label'` – Apply text above pre tag
+     - `number` – Number the lines
+     - `shell` – Equivalent to `label='Shell'`
+     - `style` – Apply CSS styles
+
     The generated <pre></pre> tag has an `data-lt-active="false"` attribute, so [LanguageTool](https://forum.languagetool.org/t/avoid-spell-check-on-certain-html-inputs-manually/3944) does not check the spelling or grammar of the contents.
   * A `noselect` tag that can renders HTML content passed to it unselectable.
     ```
@@ -39,8 +49,9 @@ Below are the CSS declarations that I defined pertaining to the pre and noselect
 }
 ```
 
+
 ## Additional Information
-More information is available on [my web site](https://www.mslinn.com/blog/2020/10/03/jekyll-plugins.html#jekyll_pre).
+More information is available on [my website](https://www.mslinn.com/blog/2020/10/03/jekyll-plugins.html#jekyll_pre).
 
 
 ## Installation
@@ -57,10 +68,6 @@ And then execute:
 
     $ bundle install
 
-Or install it yourself as:
-
-    $ gem install jekyll_pre
-
 
 ## Usage
 
@@ -175,6 +182,20 @@ After checking out the repo, run `bin/setup` to install dependencies.
 You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 
+## Test
+A test website is provided in the `demo` directory.
+ 1. Set breakpoints.
+
+ 2. Initiate a debug session from the command line:
+    ```shell
+    $ bin/attach demo
+    ```
+
+  3. Once the `Fast Debugger` signon appears, launch the Visual Studio Code launch configuration called `Attach rdebug-ide`.
+
+  4. View the generated website at [`http://localhost:4444`](http://localhost:4444)
+
+
 ### Build and Install Locally
 To build and install this gem onto your local machine, run:
 ```shell

data/Rakefile

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+task default: :spec

data/jekyll_pre.gemspec

@@ -1,48 +1,36 @@
-# frozen_string_literal: true
+require_relative 'lib/jekyll_pre/version'
 
-require_relative "lib/jekyll_pre/version"
-
-# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
-  github = "https://github.com/mslinn/jekyll_pre"
+  github = 'https://github.com/mslinn/jekyll_pre'
 
-  spec.authors = ["Mike Slinn"]
-  spec.bindir = "exe"
+  spec.authors = ['Mike Slinn']
+  spec.bindir = 'exe'
   spec.description = <<~END_OF_DESC
     Jekyll tags pre and noselect, for HTML <pre/> tag, prompts and unselectable text. Can number lines.
   END_OF_DESC
-  spec.email = ["mslinn@mslinn.com"]
-  spec.files = Dir[".rubocop.yml", "LICENSE.*", "Rakefile", "{lib,spec}/**/*", "*.gemspec", "*.md"]
-  spec.homepage = "https://www.mslinn.com/blog/2020/10/03/jekyll-plugins.html#pre"
-  spec.license = "MIT"
+  spec.email = ['mslinn@mslinn.com']
+  spec.files = Dir['.rubocop.yml', 'LICENSE.*', 'Rakefile', '{lib,spec}/**/*', '*.gemspec', '*.md']
+  spec.homepage = 'https://www.mslinn.com/blog/2020/10/03/jekyll-plugins.html#pre'
+  spec.license = 'MIT'
   spec.metadata = {
-    "allowed_push_host" => "https://rubygems.org",
-    "bug_tracker_uri"   => "#{github}/issues",
-    "changelog_uri"     => "#{github}/CHANGELOG.md",
-    "homepage_uri"      => spec.homepage,
-    "source_code_uri"   => github,
+    'allowed_push_host' => 'https://rubygems.org',
+    'bug_tracker_uri'   => "#{github}/issues",
+    'changelog_uri'     => "#{github}/CHANGELOG.md",
+    'homepage_uri'      => spec.homepage,
+    'source_code_uri'   => github,
   }
-  spec.name = "jekyll_pre"
+  spec.name = 'jekyll_pre'
   spec.post_install_message = <<~END_MESSAGE
 
     Thanks for installing #{spec.name}!
 
   END_MESSAGE
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.6.0"
-  spec.summary = "Jekyll tags pre and noselect, for HTML <pre/> tag, prompts and unselectable text. Can number lines."
-  spec.test_files = spec.files.grep(%r!^(test|spec|features)/!)
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.6.0'
+  spec.summary = 'Jekyll tags pre and noselect, for HTML <pre/> tag, prompts and unselectable text. Can number lines.'
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.version = JekyllPreVersion::VERSION
 
-  spec.add_dependency "jekyll", ">= 3.5.0"
-  spec.add_dependency "jekyll_plugin_logger"
-  spec.add_dependency "key-value-parser"
-  spec.add_dependency "shellwords"
-
-  # spec.add_development_dependency "debase"
-  # spec.add_development_dependency "rubocop-jekyll"
-  # spec.add_development_dependency "rubocop-rake"
-  # spec.add_development_dependency "rubocop-rspec"
-  # spec.add_development_dependency "ruby-debug-ide"
+  spec.add_dependency 'jekyll', '>= 3.5.0'
+  spec.add_dependency 'jekyll_plugin_support', '~> 0.4.0'
 end
-# rubocop:enable Metrics/BlockLength

data/lib/jekyll_pre/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module JekyllPreVersion
-  VERSION = "1.1.5"
+  VERSION = '1.1.7'.freeze
 end

data/lib/jekyll_pre.rb

@@ -1,37 +1,13 @@
-# frozen_string_literal: true
-
 require 'liquid'
 require 'jekyll_plugin_logger'
-require 'key_value_parser'
-require 'shellwords'
+require 'jekyll_plugin_support'
 require_relative 'jekyll_pre/version'
-require_relative 'jekyll_tag_helper'
 
 module JekyllPluginPreName
-  PLUGIN_NAME = 'jekyll_pre'
+  PLUGIN_NAME = 'jekyll_pre'.freeze
 end
 
-# """
-#   \\{% pre %}
-#   Content here
-#   \\{% endpre %}
-#
-#   \\{% pre copyButton %}
-#   Content here
-#   \\{% endpre %}"""
-#
-#   \\{% pre shell %}
-#   Content here
-#   \\{% endpre %}
-#
-#   \\{% pre copyButton shell %}
-#   Content here
-#   \\{% endpre %}
-#
-#   \\{% pre copyButton label %}
-#   Content here
-#   \\{% endpre %}"""
-class PreTagBlock < Liquid::Block
+class PreTagBlock < JekyllSupport::JekyllBlock
   @@prefix = "<button class='copyBtn' data-clipboard-target="
   @@suffix = " title='Copy to clipboard'><img src='/assets/images/clippy.svg' " \
              "alt='Copy to clipboard' style='width: 13px'></button>"
@@ -44,7 +20,7 @@ class PreTagBlock < Liquid::Block
     "#{@@prefix}'##{pre_id}'#{@@suffix}"
   end
 
-  def self.make_pre(make_copy_button, number_lines, label, dark, highlight_pattern, css_class, style, clear, content) # rubocop:disable Metrics/ParameterLists, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
+  def self.make_pre(make_copy_button, number_lines, label, dark, highlight_pattern, css_class, style, clear, content) # rubocop:disable Metrics/ParameterLists
     pre_clear = label_clear = ''
     if clear
       if label.to_s.empty?
@@ -67,10 +43,13 @@ class PreTagBlock < Liquid::Block
     copy_button = make_copy_button ? PreTagBlock.make_copy_button(pre_id) : ''
     content = PreTagBlock.highlight(content, highlight_pattern) if highlight_pattern
     content = PreTagBlock.number_content(content) if number_lines
-    "#{label}<pre data-lt-active='false' class='maxOneScreenHigh copyContainer#{dark}#{pre_clear}#{css_class}'#{style} id='#{pre_id}'>#{copy_button}#{content.strip}</pre>"
+
+    classes = "maxOneScreenHigh copyContainer#{dark}#{pre_clear}#{css_class}"
+    pre_content = "#{copy_button}#{content.strip}"
+    "#{label}<pre data-lt-active='false' class='#{classes}'#{style} id='#{pre_id}'>#{pre_content}</pre>"
   end
 
-  def self.number_content(content) # rubocop:disable Metrics/MethodLength
+  def self.number_content(content)
     lines = content.split("\n")
     digits = lines.length.to_s.length
     i = 0
@@ -84,65 +63,33 @@ class PreTagBlock < Liquid::Block
     result
   end
 
-  # @param _tag_name [String] is the name of the tag, which we already know.
-  # @param markup [String] the arguments from the web page.
-  # @param _tokens [Liquid::ParseContext] tokenized command line
-  #        By default it has two keys: :locale and :line_numbers, the first is a Liquid::I18n object, and the second,
-  #        a boolean parameter that determines if error messages should display the line number the error occurred.
-  #        This argument is used mostly to display localized error messages on Liquid built-in Tags and Filters.
-  #        See https://github.com/Shopify/liquid/wiki/Liquid-for-Programmers#create-your-own-tags
-  # @return [void]
-  def initialize(_tag_name, markup, _tokens)
-    super
-    markup = '' if markup.nil?
-    markup.strip!
-
-    @logger = PluginMetaLogger.instance.new_logger(self, PluginMetaLogger.instance.config)
-    @helper = JekyllTagHelper.new(tag_name, markup, @logger)
-  end
-
-  # Method prescribed by the Jekyll plugin lifecycle.
-  # @param liquid_context [Liquid::Context]
-  # @return [String]
-  def render(liquid_context) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-    content = super
-    @helper.liquid_context = liquid_context
+  def render_impl(text)
+    text.strip!
 
-    @clear = @helper.parameter_specified?('clear')
-    @class = @helper.parameter_specified?('class')
+    @clear = @helper.parameter_specified? 'clear'
+    @class = @helper.parameter_specified? 'class'
     @highlight = @helper.parameter_specified? 'highlight'
     @make_copy_button = @helper.parameter_specified? 'copyButton'
     @number_lines = @helper.parameter_specified? 'number'
     @dark = ' dark' if @helper.parameter_specified? 'dark'
+    @style = @helper.parameter_specified? 'style'
     @label = @helper.parameter_specified? 'label'
-    @style = @helper.parameter_specified?('style')
 
     # If a label was specified, use it, otherwise concatenate any dangling parameters and use that as the label
-    @label ||= @helper.params.join(' ')
+    @label ||= @helper.argv.join(' ')
 
     @logger.debug { "@make_copy_button = '#{@make_copy_button}'; @label = '#{@label}'" }
-    PreTagBlock.make_pre(@make_copy_button, @number_lines, @label, @dark, @highlight, @class, @style, @clear, content)
+    self.class.make_pre(@make_copy_button, @number_lines, @label, @dark, @highlight, @class, @style, @clear, text)
   end
 end
 
 # """\\{% noselect %} or \\{% noselect this all gets copied.
 # Also, space before the closing percent is signficant %}"""
-class UnselectableTag < Liquid::Tag
-  # @param _tag_name [String] is the name of the tag, which we already know.
-  # @param markup [String] the arguments from the web page.
-  # @param _tokens [Liquid::ParseContext] tokenized command line
-  # @return [void]
-  def initialize(_tag_name, markup, _tokens)
-    super
-    @logger = PluginMetaLogger.instance.new_logger(self)
-
-    @markup = markup
-    @markup = '$ ' if @markup.nil? || @markup.empty?
-    @logger.debug { "UnselectableTag: markup= '#{@markup}'" }
-  end
-
-  def render(_)
-    "<span class='unselectable'>#{@markup}</span>"
+class UnselectableTag < JekyllSupport::JekyllTag
+  def render_impl
+    text = @argument_string
+    text = '$ ' if text.nil? || text.empty?
+    "<span class='unselectable'>#{text}</span>"
   end
 end
 

data/spec/pre_spec.rb

@@ -1,14 +1,12 @@
-# frozen_string_literal: true
-
-require "fileutils"
-require "jekyll"
-require "key_value_parser"
-require "shellwords"
-require_relative "../lib/jekyll_pre"
+require 'fileutils'
+require 'jekyll'
+require 'key_value_parser'
+require 'shellwords'
+require_relative '../lib/jekyll_pre'
 
 RSpec.describe(PreTagBlock) do
-  it "parses arguments" do
-    argv = Shellwords.split "number copyButton shell"
+  it 'parses arguments' do
+    argv = Shellwords.split 'number copyButton shell'
     options = KeyValueParser.new.parse(argv)
     # puts options.map { |k, v| "#{k} = #{v}" }.join("\n")
 
@@ -17,7 +15,7 @@ RSpec.describe(PreTagBlock) do
     expect(options[:shell]).to be true
   end
 
-  it "numbers content lines" do
+  it 'numbers content lines' do
     content = <<~END_CONTENT
       Line 1
         Line 2
@@ -30,7 +28,7 @@ RSpec.describe(PreTagBlock) do
         Line 9
       Line 10
     END_CONTENT
-    numbered_content = PreTagBlock.number_content(content)
+    numbered_content = described_class.number_content(content)
     expected_content = <<~END_CONTENT
       <span class='unselectable numbered_line'>  1: </span>Line 1
       <span class='unselectable numbered_line'>  2: </span>  Line 2
@@ -46,7 +44,7 @@ RSpec.describe(PreTagBlock) do
     expect(numbered_content).to eq(expected_content)
   end
 
-  it "highlights regex patterns" do
+  it 'highlights regex patterns' do
     content = <<~END_CONTENT
       Line 1
         Line 2
@@ -59,7 +57,7 @@ RSpec.describe(PreTagBlock) do
         Line 9
       Line 10
     END_CONTENT
-    highlighted = PreTagBlock.highlight(content, ".*2").split("\n")[1]
+    highlighted = described_class.highlight(content, '.*2').split("\n")[1]
     expect(highlighted).to eq("<span class='bg_yellow'>  Line 2</span>")
   end
 end

data/spec/spec_helper.rb

@@ -1,19 +1,17 @@
-# frozen_string_literal: true
+require 'jekyll'
+require 'fileutils'
+require 'key_value_parser'
+require 'shellwords'
 
-require "jekyll"
-require "fileutils"
-require "key_value_parser"
-require "shellwords"
-
-require_relative "../lib/jekyll_pre"
+require_relative '../lib/jekyll_pre'
 
 Jekyll.logger.log_level = :info
 
 RSpec.configure do |config|
   config.filter_run :focus
-  config.order = "random"
+  # config.order = 'random'
   config.run_all_when_everything_filtered = true
 
   # See https://relishapp.com/rspec/rspec-core/docs/command-line/only-failures
-  config.example_status_persistence_file_path = "spec/status_persistence.txt"
+  config.example_status_persistence_file_path = 'spec/status_persistence.txt'
 end

data/spec/status_persistence.txt

@@ -1,5 +1,5 @@
 example_id              | status | run_time        |
 ----------------------- | ------ | --------------- |
-./spec/pre_spec.rb[1:1] | passed | 0.00187 seconds |
-./spec/pre_spec.rb[1:2] | passed | 0.00285 seconds |
-./spec/pre_spec.rb[1:3] | passed | 0.00056 seconds |
+./spec/pre_spec.rb[1:1] | passed | 0.00075 seconds |
+./spec/pre_spec.rb[1:2] | passed | 0.00044 seconds |
+./spec/pre_spec.rb[1:3] | passed | 0.00018 seconds |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_pre
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.7
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -25,47 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: jekyll_plugin_logger
+  name: jekyll_plugin_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: key-value-parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shellwords
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 description: 'Jekyll tags pre and noselect, for HTML <pre/> tag, prompts and unselectable
   text. Can number lines.
 
@@ -84,7 +56,6 @@ files:
 - jekyll_pre.gemspec
 - lib/jekyll_pre.rb
 - lib/jekyll_pre/version.rb
-- lib/jekyll_tag_helper.rb
 - spec/pre_spec.rb
 - spec/spec_helper.rb
 - spec/status_persistence.txt

data/lib/jekyll_tag_helper.rb

@@ -1,92 +0,0 @@
-# frozen_string_literal: true
-
-require 'shellwords'
-require 'key_value_parser'
-
-# Parses arguments and options
-class JekyllTagHelper
-  attr_reader :argv, :liquid_context, :logger, :params, :tag_name
-
-  def self.escape_html(string)
-    string.gsub('&', '&')
-          .gsub('{', '{')
-          .gsub('}', '}')
-          .gsub('<', '&lt;')
-  end
-
-  # Expand a environment variable reference
-  def self.expand_env(str, die_if_undefined: false)
-    str.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}|%\g<1>%/) do
-      envar = Regexp.last_match(1)
-      raise FlexibleError, "flexible_include error: #{envar} is undefined".red, [] if !ENV.key?(envar) && die_if_undefined # Suppress stack trace
-
-      ENV[envar]
-    end
-  end
-
-  # strip leading and trailing quotes if present
-  def self.remove_quotes(string)
-    string.strip.gsub(/\A'|\A"|'\Z|"\Z/, '').strip if string
-  end
-
-  def initialize(tag_name, markup, logger)
-    @tag_name = tag_name
-    @argv = Shellwords.split(markup)
-    @keys_values = KeyValueParser.new.parse(@argv) # Hash[Symbol, String|Boolean]
-    @logger = logger
-    @logger.debug { "@keys_values='#{@keys_values}'" }
-  end
-
-  def delete_parameter(name)
-    @params.delete(name)
-    @argv.delete_if { |x| x.start_with? name }
-    @keys_values.delete(name.to_sym)
-  end
-
-  # @return if parameter was specified, returns value and removes it from the available tokens
-  def parameter_specified?(name)
-    value = @keys_values[name.to_sym]
-    delete_parameter(name)
-    value
-  end
-
-  PREDEFINED_SCOPE_KEYS = [:include, :page].freeze
-
-  # Finds variables defined in an invoking include, or maybe somewhere else
-  # @return variable value or nil
-  def dereference_include_variable(name)
-    @liquid_context.scopes.each do |scope|
-      next if PREDEFINED_SCOPE_KEYS.include? scope.keys.first
-
-      value = scope[name]
-      return value if value
-    end
-    nil
-  end
-
-  # @return value of variable, or the empty string
-  def dereference_variable(name)
-    value = @liquid_context[name] # Finds variables named like 'include.my_variable', found in @liquid_context.scopes.first
-    value ||= @page[name] if @page # Finds variables named like 'page.my_variable'
-    value ||= dereference_include_variable(name)
-    value ||= ''
-    value
-  end
-
-  # Sets @params by replacing any Liquid variable names with their values
-  def liquid_context=(context)
-    @liquid_context = context
-    @params = @keys_values.map { |k, _v| lookup_variable(k) }
-  end
-
-  def lookup_variable(symbol)
-    string = symbol.to_s
-    return string unless string.start_with?('{{') && string.end_with?('}}')
-
-    dereference_variable(string.delete_prefix('{{').delete_suffix('}}'))
-  end
-
-  def page
-    @liquid_context.registers[:page]
-  end
-end