jekyll_href 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0656497a33e45341646549dc55a45747f8418acd5f84298e145134bf7c10eec5'
-  data.tar.gz: 2c938cbc5e5f09bc2b8ea42ea11dde9d28e44e74512d7ebc203bccc2d127a8f6
+  metadata.gz: 22db125f99912c6bd0a7cbbaa15ca8311cc7914a80ecbe6a828535ad5844fa96
+  data.tar.gz: 3ce4d813af1541bdae8269fa370233ffe21c890de48da1e8e400eba67be59823
 SHA512:
-  metadata.gz: cdbdfe53569e693e1a81cb3e30b773cc239f81ce05f46ad2f20fe638dfef0777ca4cbcafd79ba9faedc9af1bb416f2a9628abbf8d82f423dd66ef36233059402
-  data.tar.gz: 1a74a3ace7f95d965a4db351501b908345257ab6138ab9ad3f4647499230e2d2a24fcd02c17fd0577376c913dc60cb3689b526046097a33a107ccea3ea3ce484
+  metadata.gz: 1f4a20b4e784614fb2e21a29c274fe5a1d69f522ae728772860c8933d27305c16aa03cd4b4d2a15b49c0d65da8ce5bf5e3ca61171c6d27a073a783046b0f6c89
+  data.tar.gz: b5eceadcf6aabfa9f80459f79848af9176cd81dd17e073de61b8e21dc4f6ba3a09ed197d029773411a0a9ca22bf1df74119729675f6c1d4736cbeba173038529

data/.rubocop.yml

@@ -1,19 +1,36 @@
-#require: rubocop-jekyll
-#inherit_gem:
-#  rubocop-jekyll: .rubocop.yml
+require:
+  # - rubocop-jekyll
+  - rubocop-md
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
+
+# inherit_gem:
+#   rubocop-jekyll: .rubocop.yml
 
 AllCops:
   Exclude:
-      - vendor/**/*
-      - Gemfile*
+    - demo/_site/**/*
+    - exe/**/*
+    - vendor/**/*
+    - Gemfile*
   NewCops: enable
   TargetRubyVersion: 2.6
 
-# Gemspec/RequireMFA:
-#   Enabled: false
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: false
+
+Gemspec/RequireMFA:
+  Enabled: false
 
 Layout/HashAlignment:
-  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+  Exclude:
+    - jekyll_href.gemspec
+
+Layout/InitialIndentation:
+  Exclude:
+    - README.md
 
 Layout/LineLength:
   Max: 150
@@ -21,17 +38,51 @@ Layout/LineLength:
 Layout/MultilineMethodCallIndentation:
   Enabled: false
 
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - jekyll_href.gemspec
+
 Metrics/AbcSize:
-  Max: 25
+  Max: 45
+
+Metrics/BlockLength:
+  Exclude:
+    - jekyll_href.gemspec
+    - spec/**/*
+  Max: 40
+
+Metrics/ClassLength:
+  Exclude:
+    - spec/**/*
+  Max: 40
 
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 20
 
 Metrics/MethodLength:
-  Max: 30
+  Max: 40
 
 Metrics/PerceivedComplexity:
-  Max: 10
+  Max: 15
+
+Naming/FileName:
+  Exclude:
+    - Rakefile
+
+RSpec/ExampleLength:
+  Max: 20
+
+RSpec/MultipleExpectations:
+  Max: 15
+
+Style/CommandLiteral:
+  Enabled: false
+
+Style/CommentedKeyword:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
 
 Style/FrozenStringLiteralComment:
   Enabled: false
@@ -42,6 +93,10 @@ Style/PercentLiteralDelimiters:
 Style/RegexpLiteral:
   Enabled: false
 
+Style/StringConcatenation:
+  Exclude:
+    - spec/**/*
+
 Style/StringLiterals:
   Enabled: false
 
@@ -49,4 +104,4 @@ Style/StringLiteralsInInterpolation:
   Enabled: false
 
 Style/TrailingCommaInHashLiteral:
-  Enabled: false
+  EnforcedStyleForMultiline: comma

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.2.1 / 2023-03-21
+  * Added `shy` and `wbr` options.
+
+## 1.2.0 / 2023-02-16
+  * Updated to `jekyll_plugin_support` v1.5.0
+
+## 1.1.1 / 2023-02-14
+  * Now dependent on `jekyll_plugin_support`
+
 ## 1.1.0 / 2023-02-03
   * Updated to `jekyll_all_collections` plugin v0.2.0.
   * Fixed insidious bug where a valid link was not used properly.

data/README.md

@@ -5,27 +5,35 @@
 `Jekyll_href` is a Jekyll plugin that provides a new Liquid tag: `href`.
 It provides a convenient way to generate formatted and clickable URIs.
 The Liquid tag generates an `a href` HTML tag,
-which by default contains `target="_blank"` and `rel=nofollow`.
+which by default contains `target="_blank"` and `rel="nofollow"`.
 
 If the url starts with `http`, or the `match` keyword is specified:
  - The url will open in a new tab or window.
- - The url will include `rel=nofollow` for SEO purposes.
+ - The url will include `rel="nofollow"` for SEO purposes.
 
 CAUTION: if linked text contains a single or double quote,
 you will see the error message: `Liquid Exception: Unmatched quote`.
-Instead, use ' (`'`), " (`"`), ‘ (`‘`),
-’ (`’`), “ (`“`), and ” (`”`)
+Instead, use:
 
+ - `'` (')
+ - `"` (")
+ - `‘` (‘)
+ - `’` (’)
+ - `“` (“)
+ - `”` (”)
+
+
+## Configuration
 In `_config.yml`, if a section called `plugin-vars` exists,
 then its name/value pairs are available for substitution.
 ```yaml
-  plugin-vars:
-    django-github: 'https://github.com/django/django/blob/3.1.7'
-    django-oscar-github: 'https://github.com/django-oscar/django-oscar/blob/3.0.2'
+plugin-vars:
+  django-github: 'https://github.com/django/django/blob/3.1.7'
+  django-oscar-github: 'https://github.com/django-oscar/django-oscar/blob/3.0.2'
 ```
 
 
-## Syntax 1 (requires `url` does not have embedded spaces):
+## Syntax 1 (requires `url` does not have embedded spaces)
 ```
 {% href [match | [follow] [blank|notarget]] url text to display %}
 ```
@@ -34,7 +42,7 @@ then its name/value pairs are available for substitution.
  3. The square brackets denote optional keyword parameters, and should not be typed.
 
 
-## Syntax 2 (always works):
+## Syntax 2 (always works)
 This syntax is recommended when the URL contains a colon (:).
 ```
 {% href [match | [follow] [blank|notarget]]
@@ -48,9 +56,9 @@ This syntax is recommended when the URL contains a colon (:).
   3. The square brackets denote optional keyword parameters, and should not be typed.
 
 
-## Syntax 3 (implicit URL):
+## Syntax 3 (implicit URL)
 ```
-{% href [match | [follow] [blank|notarget]] www.domain.com %}
+{% href [match | [follow] [blank|notarget]] [shy|wbr] www.domain.com %}
 ```
 The URI provided, for example `www.domain.com`,
 is used to form the URL by prepending `https://`,
@@ -94,6 +102,50 @@ The `match` option looks through the pages collection for a URL with containing
 `Match` implies `follow` and `notarget`.
 
 
+### `shy`
+`shy` is only applicable for syntax 3 (implicit URL).
+This option causes displayed urls to have an ­ inserted after each slash (/).
+If both `shy` and `wbr` are specified, `wbr` prevails.
+
+For example:
+```
+{% href shy mslinn.com/path/to/page.html %}
+```
+Expands to:
+```
+<a href="https://mslinn.com/path/to/page.html">mslinn.com/&shy;path/&shy;to/&shy;page.html</a>
+```
+
+### `shy`
+`shy` is only applicable for syntax 3 (implicit URL).
+This option causes displayed urls to have an [`&amp;shy;`](https://developer.mozilla.org/en-US/docs/Web/CSS/hyphens) inserted after each slash (/).
+If both `shy` and `wbr` are specified, `wbr` prevails.
+
+For example:
+```
+{% href shy mslinn.com/path/to/page.html %}
+```
+Expands to:
+```
+<a href="https://mslinn.com/path/to/page.html" rel="nofollow" target="_blank">mslinn.com/&shy;path/&shy;to/&shy;page.html</a>
+```
+
+### `wbr`
+`wbr` is only applicable for syntax 3 (implicit URL).
+It add [line break opportunites](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/wbr).
+This option causes displayed urls to have an `&lt;wbr&gt;` inserted after each slash (/).
+If both `shy` and `wbr` are specified, `wbr` prevails.
+
+For example:
+```
+{% href wbr mslinn.com/path/to/page.html %}
+```
+Expands to:
+```
+<a href="https://mslinn.com/path/to/page.html" rel="nofollow" target="_blank">mslinn.com/<wbr>path/<wbr>to/<wbr>page.html</a>
+```
+
+
 ## Examples
  1. Generates `nofollow` and `target` attributes:
     ```

data/Rakefile

@@ -1,2 +1,3 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+
 task default: %i[]

data/jekyll_href.gemspec

@@ -1,6 +1,6 @@
 require_relative 'lib/jekyll_href/version'
 
-Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
+Gem::Specification.new do |spec|
   github = 'https://github.com/mslinn/jekyll_href'
 
   spec.authors = ['Mike Slinn']
@@ -32,8 +32,5 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.version = JekyllHrefVersion::VERSION
 
   spec.add_dependency 'jekyll', '>= 3.5.0'
-  spec.add_dependency 'jekyll_all_collections', '>= 0.2.0'
-  spec.add_dependency 'jekyll_plugin_logger'
-  spec.add_dependency 'key-value-parser'
-  spec.add_dependency 'shellwords'
+  spec.add_dependency 'jekyll_all_collections', '~> 0.3.0', '>= 0.3.1'
 end

data/lib/jekyll_href/version.rb

@@ -1,3 +1,3 @@
 module JekyllHrefVersion
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/lib/jekyll_href.rb

@@ -1,47 +1,32 @@
 require 'jekyll_all_collections'
 require 'jekyll_plugin_logger'
+require 'jekyll_plugin_support'
 require 'liquid'
 require_relative 'jekyll_href/version'
-require_relative './jekyll_tag_helper2'
 
 # @author Copyright 2020 Michael Slinn
 # @license SPDX-License-Identifier: Apache-2.0
 # Generates an href.
 
 # Implements href Jekyll tag
-class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
+class ExternalHref < JekyllSupport::JekyllTag # rubocop:disable Metrics/ClassLength
   attr_reader :follow, :helper, :line_number, :match, :page, :path, :site, :text, :target, :url
   attr_accessor :link
 
-  # @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 = JekyllTagHelper2.new(tag_name, markup, @logger)
-  end
+  include JekyllHrefVersion
 
   # Method prescribed by the Jekyll plugin lifecycle.
   # @param liquid_context [Liquid::Context]
   # @return [String]
-  def render(liquid_context)
-    super
-    globals_initial(liquid_context)
+  def render_impl
+    globals_initial
     linkk = compute_linkk
     linkk = replace_vars(linkk)
     @link_save = linkk
     @helper_save = @helper.clone
     globals_update(@helper.argv, linkk) # Sets @link and @text, might clear @follow and @target
     handle_match if @match
+
     "<a href='#{@link}'#{@target}#{@follow}>#{@text}</a>"
   end
 
@@ -77,21 +62,19 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
     abort msg.red
   end
 
-  def globals_initial(liquid_context)
-    # Sets @follow, @helper, @match, @page, @path, @site, @target, @url
-    @helper.liquid_context = liquid_context
-
-    @page = liquid_context.registers[:page]
+  # Sets @follow, @helper, @match, @path, @shy, @target, @url, @wbr
+  def globals_initial
     @path = @page['path']
-    @site = liquid_context.registers[:site]
     AllCollectionsHooks.compute(@site)
 
     @follow = @helper.parameter_specified?('follow') ? '' : " rel='nofollow'"
     @match  = @helper.parameter_specified?('match')
     @blank  = @helper.parameter_specified?('blank')
+    @shy    = @helper.parameter_specified?('shy')
     @target = @blank ? " target='_blank'" : nil
     @target ||= @helper.parameter_specified?('notarget') ? '' : " target='_blank'"
     @url    = @helper.parameter_specified?('url')
+    @wbr    = @helper.parameter_specified?('wbr')
   end
 
   # Might set @follow, @linkk, @target, and @text
@@ -108,10 +91,19 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
     else
       @text = tokens.join(' ').strip
       if @text.to_s.empty?
-        @text = "<code>#{linkk}</code>"
+        text = linkk
+        text = linkk.gsub('/', '/&shy;') if @shy
+        text = linkk.gsub('/', '/<wbr>') if @wbr
+        @text = "<code>#{text}</code>"
         @link = "https://#{linkk}"
       else
-        @link = linkk
+        @link = if @shy
+                  linkk.gsub('/', '/&shy;')
+                elsif @wbr
+                  linkk.gsub('/', '/<wbr>')
+                else
+                  linkk
+                end
       end
     end
 
@@ -154,7 +146,7 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
       @text = "<i>#{@link} is not available</i>"
     when 1
       @link = url_matches.first
-      @link = "#{@link}\##{@fragment}" if @fragment
+      @link = "#{@link}##{@fragment}" if @fragment
     else
       abort "Error: More than one url matched '#{@path}': #{url_matches.join(', ')}"
     end
@@ -171,7 +163,6 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
     @logger.debug { "@link=#{@link}" }
     text
   end
-end
 
-PluginMetaLogger.instance.info { "Loaded jekyll_href v#{JekyllHrefVersion::VERSION} plugin." }
-Liquid::Template.register_tag('href', ExternalHref)
+  JekyllPluginHelper.register(self, 'href')
+end

data/spec/href_spec.rb

@@ -40,8 +40,7 @@ class TestParseContext < Liquid::ParseContext
   end
 end
 
-# Lets get this party started
-class MyTest # rubocop:disable Metrics/ClassLength
+class MyTest
   Dir.chdir 'demo'
 
   RSpec.describe ExternalHref do
@@ -60,14 +59,14 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Obtains internal link with blank" do
-      href = ExternalHref.send(
+      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_initial
+      linkk = href.send :compute_linkk
       href.send(:globals_update, href.helper.argv, linkk)
       expect(href.follow).to eq('')
       expect(href.link).to   eq('./path/page.html')
@@ -76,10 +75,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Obtains external link with text" do
-      href = ExternalHref.send(
+      href = described_class.send(
         :new,
         'href',
-        'https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss  SoundCloud RSS Feed'.dup,
+        + 'https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss  SoundCloud RSS Feed',
         parse_context
       )
       href.send(:globals_initial, parse_context)
@@ -92,10 +91,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Obtains external link using url parameter with text" do
-      href = ExternalHref.send(
+      href = described_class.send(
         :new,
         'href',
-        'url="https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss" SoundCloud RSS Feed'.dup,
+        + 'url="https://feeds.soundcloud.com/users/soundcloud:users:7143896/sounds.rss" SoundCloud RSS Feed',
         parse_context
       )
       href.send(:globals_initial, parse_context)
@@ -108,10 +107,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Obtains external link without scheme or text" do
-      href = ExternalHref.send(
+      href = described_class.send(
         :new,
         'href',
-        'super-fake-merger.com'.dup,
+        + 'super-fake-merger.com',
         parse_context
       )
       href.send(:globals_initial, parse_context)
@@ -124,10 +123,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Expands YAML hash with link text" do
-      href = ExternalHref.send(
+      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)
@@ -141,10 +140,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Obtains external link with follow" do
-      href = ExternalHref.send(
+      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)
@@ -157,10 +156,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Obtains external link with follow and notarget" do
-      href = ExternalHref.send(
+      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)
@@ -173,10 +172,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Obtains external link with blank" do
-      href = ExternalHref.send(
+      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)
@@ -189,10 +188,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Implicitly computes external link from text" do
-      href = ExternalHref.send(
+      href = described_class.send(
         :new,
         'href',
-        'www.mslinn.com'.dup,
+        + 'www.mslinn.com',
         parse_context
       )
       href.send(:globals_initial, parse_context)
@@ -205,10 +204,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Implicitly computes external link from text with follow and notarget" do
-      href = ExternalHref.send(
+      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)
@@ -221,10 +220,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Implicitly computes external link from text with blank" do
-      href = ExternalHref.send(
+      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)
@@ -237,10 +236,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Obtains mailto without text" do
-      href = ExternalHref.send(
+      href = described_class.send(
         :new,
         'href',
-        'mailto:mslinn@mslinn.com'.dup,
+        + 'mailto:mslinn@mslinn.com',
         parse_context
       )
       href.send(:globals_initial, parse_context)
@@ -253,10 +252,10 @@ class MyTest # rubocop:disable Metrics/ClassLength
     end
 
     it "Obtains mailto with text" do
-      href = ExternalHref.send(
+      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)

data/spec/status_persistence.txt

@@ -1,15 +1,15 @@
 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  |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:1]  | passed | 0.00817 seconds |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:2]  | passed | 0.00349 seconds |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:3]  | passed | 0.0033 seconds  |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:4]  | passed | 0.00307 seconds |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:5]  | passed | 0.00315 seconds |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:6]  | passed | 0.0032 seconds  |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:7]  | passed | 0.0035 seconds  |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:8]  | passed | 0.00323 seconds |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:9]  | passed | 0.0032 seconds  |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:10] | passed | 0.00307 seconds |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:11] | passed | 0.00317 seconds |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:12] | passed | 0.00357 seconds |
+/mnt/f/work/jekyll/my_plugins/jekyll_href/spec/href_spec.rb[1:13] | passed | 0.0035 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.1
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -28,58 +28,22 @@ 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:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: jekyll_plugin_logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: 0.3.0
     - - ">="
       - !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:
-    - - ">="
-      - !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:
+        version: 0.3.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 description: 'Generates an ''a href'' tag, possibly with target=''_blank'' and rel=''nofollow''.
 
   '
@@ -97,7 +61,6 @@ files:
 - jekyll_href.gemspec
 - lib/jekyll_href.rb
 - lib/jekyll_href/version.rb
-- lib/jekyll_tag_helper2.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