jekyll_href 1.1.0 → 1.2.2

data/spec/href_spec.rb

@@ -1,50 +1,10 @@
-require 'jekyll'
-require 'jekyll_plugin_logger'
-require 'yaml'
 require_relative '../lib/jekyll_href'
 
-Registers = Struct.new(:page, :site)
-
-# Mock for Collections
-class Collections
-  def values
-    []
-  end
-end
-
-# Mock for Site
-class SiteMock
-  attr_reader :config
-
-  def initialize
-    @config = YAML.safe_load(File.read('_config.yml'))
-  end
-
-  def collections
-    Collections.new
-  end
-end
-
-# Mock for Liquid::ParseContent
-class TestParseContext < Liquid::ParseContext
-  attr_reader :line_number, :registers
-
-  def initialize
-    super
-    @line_number = 123
-
-    @registers = Registers.new(
-      { 'path' => 'https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss' },
-      SiteMock.new
-    )
-  end
-end
-
-# Lets get this party started
-class MyTest # rubocop:disable Metrics/ClassLength
+class MyTest
   Dir.chdir 'demo'
+  HashArray.reset
 
-  RSpec.describe ExternalHref do
+  RSpec.describe HrefTag::HrefTag do
     let(:logger) do
       PluginMetaLogger.instance.new_logger(self, PluginMetaLogger.instance.config)
     end
@@ -59,209 +19,194 @@ class MyTest # rubocop:disable Metrics/ClassLength
       )
     end
 
-    it "Obtains internal link with blank" do
-      href = ExternalHref.send(
+    it 'obtains internal link with blank' do
+      href = described_class.send(
         :new,
         'href',
-        'blank ./path/page.html internal link text'.dup,
+        + 'blank path/page.html internal link text',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq('')
-      expect(href.link).to   eq('./path/page.html')
+      expect(href.link).to   eq('path/page.html')
       expect(href.target).to eq(" target='_blank'")
       expect(href.text).to   eq('internal link text')
     end
 
-    it "Obtains external link with text" do
-      href = ExternalHref.send(
+    it 'obtains external link with text' do
+      href = described_class.send(
         :new,
         'href',
-        'https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss  SoundCloud RSS Feed'.dup,
+        + 'summary_exclude https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss  SoundCloud RSS Feed',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq(" rel='nofollow'")
       expect(href.link).to   eq('https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss')
       expect(href.target).to eq(" target='_blank'")
       expect(href.text).to   eq('SoundCloud RSS Feed')
     end
 
-    it "Obtains external link using url parameter with text" do
-      href = ExternalHref.send(
+    it 'obtains external link using url parameter with text' do
+      href = described_class.send(
         :new,
         'href',
-        'url="https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss" SoundCloud RSS Feed'.dup,
+        + 'summary_exclude url="https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss" SoundCloud RSS Feed',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq(" rel='nofollow'")
       expect(href.link).to   eq('https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss')
       expect(href.target).to eq(" target='_blank'")
       expect(href.text).to   eq('SoundCloud RSS Feed')
     end
 
-    it "Obtains external link without scheme or text" do
-      href = ExternalHref.send(
+    it 'obtains external link without scheme or text' do
+      href = described_class.send(
         :new,
         'href',
-        'super-fake-merger.com'.dup,
+        + 'super-fake-merger.com',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq(" rel='nofollow'")
       expect(href.link).to   eq('https://super-fake-merger.com')
       expect(href.target).to eq(" target='_blank'")
       expect(href.text).to   eq('<code>super-fake-merger.com</code>')
     end
 
-    it "Expands YAML hash with link text" do
-      href = ExternalHref.send(
+    it 'expands YAML hash with link text' do
+      href = described_class.send(
         :new,
         'href',
-        '{{github}}/diasks2/confidential_info_redactor <code>confidential_info_redactor</code>'.dup,
+        + '{{github}}/diasks2/confidential_info_redactor <code>confidential_info_redactor</code>',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      linkk = href.send(:replace_vars, linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq(" rel='nofollow'")
       expect(href.link).to   eq('https://github.com/diasks2/confidential_info_redactor')
       expect(href.target).to eq(" target='_blank'")
       expect(href.text).to   eq('<code>confidential_info_redactor</code>')
     end
 
-    it "Obtains external link with follow" do
-      href = ExternalHref.send(
+    it 'obtains external link with follow' do
+      href = described_class.send(
         :new,
         'href',
-        'follow https://www.mslinn.com Awesome'.dup,
+        + 'follow https://www.mslinn.com Awesome',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq('')
       expect(href.link).to   eq('https://www.mslinn.com')
       expect(href.target).to eq(" target='_blank'")
       expect(href.text).to   eq('Awesome')
     end
 
-    it "Obtains external link with follow and notarget" do
-      href = ExternalHref.send(
+    it 'obtains external link with follow and notarget' do
+      href = described_class.send(
         :new,
         'href',
-        'follow notarget https://www.mslinn.com Awesome'.dup,
+        + 'follow notarget https://www.mslinn.com Awesome',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq('')
       expect(href.link).to   eq('https://www.mslinn.com')
       expect(href.target).to eq('')
       expect(href.text).to   eq('Awesome')
     end
 
-    it "Obtains external link with blank" do
-      href = ExternalHref.send(
+    it 'obtains external link with blank' do
+      href = described_class.send(
         :new,
         'href',
-        'blank https://www.mslinn.com Awesome'.dup,
+        + 'blank https://www.mslinn.com Awesome',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq(" rel='nofollow'")
       expect(href.link).to   eq('https://www.mslinn.com')
       expect(href.target).to eq(" target='_blank'")
       expect(href.text).to   eq('Awesome')
     end
 
-    it "Implicitly computes external link from text" do
-      href = ExternalHref.send(
+    it 'implicitly computes external link from text' do
+      href = described_class.send(
         :new,
         'href',
-        'www.mslinn.com'.dup,
+        + 'www.mslinn.com',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq(" rel='nofollow'")
       expect(href.link).to   eq('https://www.mslinn.com')
       expect(href.target).to eq(" target='_blank'")
       expect(href.text).to   eq('<code>www.mslinn.com</code>')
     end
 
-    it "Implicitly computes external link from text with follow and notarget" do
-      href = ExternalHref.send(
+    it 'implicitly computes external link from text with follow and notarget' do
+      href = described_class.send(
         :new,
         'href',
-        'follow notarget www.mslinn.com'.dup,
+        + 'follow notarget www.mslinn.com',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq('')
       expect(href.link).to   eq('https://www.mslinn.com')
       expect(href.target).to eq('')
       expect(href.text).to   eq('<code>www.mslinn.com</code>')
     end
 
-    it "Implicitly computes external link from text with blank" do
-      href = ExternalHref.send(
+    it 'implicitly computes external link from text with blank' do
+      href = described_class.send(
         :new,
         'href',
-        'follow blank www.mslinn.com'.dup,
+        + 'follow blank www.mslinn.com',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq('')
       expect(href.link).to   eq('https://www.mslinn.com')
       expect(href.target).to eq(" target='_blank'")
       expect(href.text).to   eq('<code>www.mslinn.com</code>')
+
+      # hrefs = HashArray.instance_variable_get(:@global_hrefs)
+      # expect(hrefs).to eq(
+      #   {
+      #     "index.html" => [
+      #       "<a href='https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss' target='_blank' rel='nofollow'>SoundCloud RSS Feed</a>",
+      #       "<a href='https://github.com/diasks2/confidential_info_redactor' target='_blank' rel='nofollow'><code>confidential_info_redactor</code></a>",
+      #       "<a href='https://super-fake-merger.com' target='_blank' rel='nofollow'><code>super-fake-merger.com</code></a>",
+      #       "<a href='https://www.mslinn.com' target='_blank'><code>www.mslinn.com</code></a>"
+      #     ],
+      #   }
+      # )
     end
 
-    it "Obtains mailto without text" do
-      href = ExternalHref.send(
+    it 'obtains mailto without text' do
+      href = described_class.send(
         :new,
         'href',
-        'mailto:mslinn@mslinn.com'.dup,
+        + 'mailto:mslinn@mslinn.com',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq('')
       expect(href.link).to   eq('mailto:mslinn@mslinn.com')
       expect(href.target).to eq('')
       expect(href.text).to   eq('<code>mslinn@mslinn.com</code>')
     end
 
-    it "Obtains mailto with text" do
-      href = ExternalHref.send(
+    it 'obtains mailto with text' do
+      href = described_class.send(
         :new,
         'href',
-        'mailto:mslinn@mslinn.com Mike Slinn'.dup,
+        + 'mailto:mslinn@mslinn.com Mike Slinn',
         parse_context
       )
-      href.send(:globals_initial, parse_context)
-      linkk = href.send(:compute_linkk)
-      href.send(:globals_update, href.helper.argv, linkk)
+      href.render TestLiquidContext.new
       expect(href.follow).to eq('')
       expect(href.link).to   eq('mailto:mslinn@mslinn.com')
       expect(href.target).to eq('')

data/spec/spec_helper.rb

@@ -1,10 +1,13 @@
-require "liquid"
-require "fileutils"
+require 'jekyll'
+require 'jekyll_plugin_logger'
+require 'liquid'
+require 'fileutils'
+require 'yaml'
 require_relative "../lib/jekyll_href"
 
 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
@@ -12,3 +15,65 @@ RSpec.configure do |config|
 
   config.filter_run_when_matching focus: true
 end
+
+Registers = Struct.new(:page, :site)
+
+# Mock for Collections
+class Collections
+  def values
+    []
+  end
+end
+
+# Mock for Site
+class SiteMock
+  attr_reader :config
+
+  def initialize
+    @config = YAML.safe_load(File.read('../demo/_config.yml'))
+    @config['env'] = { 'JEKYLL_ENV' => 'development' }
+  end
+
+  def collections
+    Collections.new
+  end
+end
+
+class TestLiquidContext < Liquid::Context
+  def initialize
+    super
+
+    page = {
+      "content"     => "blah blah",
+      "description" => "Jekyll plugin support demo",
+      "dir"         => "/",
+      "excerpt"     => nil,
+      "layout"      => "default",
+      "name"        => "index.html",
+      "path"        => "index.html",
+      "title"       => "Welcome",
+      "url"         => "/",
+    }
+
+    @content = "Interior of the tag"
+    @registers = Registers.new(
+      page,
+      SiteMock.new
+    )
+  end
+end
+
+# Mock for Liquid::ParseContent
+class TestParseContext < Liquid::ParseContext
+  attr_reader :line_number, :registers
+
+  def initialize
+    super
+    @line_number = 123
+
+    @registers = Registers.new(
+      { 'path' => 'path/to/page.html' },
+      SiteMock.new
+    )
+  end
+end

data/spec/status_persistence.txt

@@ -1,15 +1,29 @@
 example_id                                                        | status | run_time        |
 ----------------------------------------------------------------- | ------ | --------------- |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:1]  | passed | 0.00581 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:2]  | passed | 0.00416 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:3]  | passed | 0.00401 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:4]  | passed | 0.00384 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:5]  | passed | 0.00401 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:6]  | passed | 0.00405 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:7]  | passed | 0.00501 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:8]  | passed | 0.00461 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:9]  | passed | 0.00397 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:10] | passed | 0.0039 seconds  |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:11] | passed | 0.00404 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:12] | passed | 0.00427 seconds |
-/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:13] | passed | 0.0041 seconds  |
+./spec/hash_array_spec.rb[1:1]                                    | passed | 0.17104 seconds |
+./spec/href_spec.rb[1:1]                                          | passed | 0.03236 seconds |
+./spec/href_spec.rb[1:2]                                          | passed | 0.02884 seconds |
+./spec/href_spec.rb[1:3]                                          | passed | 0.02956 seconds |
+./spec/href_spec.rb[1:4]                                          | passed | 0.02841 seconds |
+./spec/href_spec.rb[1:5]                                          | passed | 0.02897 seconds |
+./spec/href_spec.rb[1:6]                                          | passed | 0.02866 seconds |
+./spec/href_spec.rb[1:7]                                          | passed | 0.02966 seconds |
+./spec/href_spec.rb[1:8]                                          | passed | 0.02983 seconds |
+./spec/href_spec.rb[1:9]                                          | passed | 0.02735 seconds |
+./spec/href_spec.rb[1:10]                                         | passed | 0.02928 seconds |
+./spec/href_spec.rb[1:11]                                         | passed | 0.02861 seconds |
+./spec/href_spec.rb[1:12]                                         | passed | 0.02958 seconds |
+./spec/href_spec.rb[1:13]                                         | passed | 0.02714 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:1]  | passed | 0.02582 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:2]  | passed | 0.01031 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:3]  | passed | 0.01045 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:4]  | passed | 0.01038 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:5]  | passed | 0.01081 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:6]  | passed | 0.01053 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:7]  | passed | 0.01125 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:8]  | passed | 0.01113 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:9]  | passed | 0.01088 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:10] | passed | 0.01066 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:11] | failed | 0.06099 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:12] | passed | 0.01096 seconds |
+/mnt/_/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:13] | passed | 0.01028 seconds |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_href
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -28,58 +28,42 @@ dependencies:
   name: jekyll_all_collections
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: 0.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: jekyll_plugin_logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
   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'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: 0.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: shellwords
+  name: jekyll_plugin_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
 description: 'Generates an ''a href'' tag, possibly with target=''_blank'' and rel=''nofollow''.
 
   '
@@ -95,20 +79,23 @@ files:
 - README.md
 - Rakefile
 - jekyll_href.gemspec
+- lib/hash_array.rb
+- lib/href_summary_tag.rb
+- lib/href_tag.rb
 - lib/jekyll_href.rb
 - lib/jekyll_href/version.rb
-- lib/jekyll_tag_helper2.rb
+- spec/hash_array_spec.rb
 - spec/href_spec.rb
 - spec/spec_helper.rb
 - spec/status_persistence.txt
-homepage: https://www.mslinn.com/blog/2020/10/03/jekyll-plugins.html#href
+homepage: https://www.mslinn.com/jekyll/3000-jekyll-plugins.html#href
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
   bug_tracker_uri: https://github.com/mslinn/jekyll_href/issues
   changelog_uri: https://github.com/mslinn/jekyll_href/CHANGELOG.md
-  homepage_uri: https://www.mslinn.com/blog/2020/10/03/jekyll-plugins.html#href
+  homepage_uri: https://www.mslinn.com/jekyll/3000-jekyll-plugins.html#href
   source_code_uri: https://github.com/mslinn/jekyll_href
 post_install_message: |2+
 
@@ -133,6 +120,7 @@ signing_key:
 specification_version: 4
 summary: Generates an 'a href' tag, possibly with target='_blank' and rel='nofollow'.
 test_files:
+- spec/hash_array_spec.rb
 - spec/href_spec.rb
 - spec/spec_helper.rb
 - spec/status_persistence.txt

data/lib/jekyll_tag_helper2.rb

@@ -1,94 +0,0 @@
-require 'shellwords'
-require 'key_value_parser'
-
-# Parses arguments and options
-class JekyllTagHelper2
-  attr_reader :argv, :keys_values, :liquid_context, :logger, :markup, :params, :tag_name
-
-  # 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 HrefError, "jekyll_href 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)
-    # @keys_values was a Hash[Symbol, String|Boolean] but now it is Hash[String, String|Boolean]
-    @tag_name = tag_name
-    @markup = markup # Useful for debugging
-    @argv = Shellwords.split(JekyllTagHelper2.expand_env(markup))
-    @keys_values = KeyValueParser \
-      .new({}, { array_values: false, normalize_keys: false, separator: /=/ }) \
-      .parse(@argv)
-    @logger = logger
-    @logger.debug { "@keys_values='#{@keys_values}'" }
-  end
-
-  def delete_parameter(key)
-    return if @keys_values.empty?
-
-    @params.delete(key)
-    @argv.delete_if { |x| x == key or x.start_with?("#{key}=") }
-    @keys_values.delete(key)
-  end
-
-  # @return if parameter was specified, removes it from the available tokens and returns value
-  def parameter_specified?(name)
-    return false if @keys_values.empty?
-
-    key = name
-    key = name.to_sym if @keys_values.first.first.instance_of?(Symbol)
-    value = @keys_values[key]
-    delete_parameter(name)
-    value
-  end
-
-  PREDEFINED_SCOPE_KEYS = %i[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