jekyll_href 1.0.14 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e77bc04770e6fae8eeb1a595be3e3faf81fe6c77c023a9a711a3a97d51b3a828
-  data.tar.gz: c9ff34ea2c4611fefb8f36e99471ad55a490b60d68c255fbcc06ce3791acc90e
+  metadata.gz: '0656497a33e45341646549dc55a45747f8418acd5f84298e145134bf7c10eec5'
+  data.tar.gz: 2c938cbc5e5f09bc2b8ea42ea11dde9d28e44e74512d7ebc203bccc2d127a8f6
 SHA512:
-  metadata.gz: 9727eed971f210d18ab6826a297b5563bf899ab1c14bbd9a988fa31405d1521357ca6fa48894ab3dfacfda11371f025c83908ed5ef1519ce7fb04ba9f25605d9
-  data.tar.gz: e82fbe117198467601a940fbc24fd9a2a40ec802b263e43324cfaaca7467f8b704f16ad1dc6214a02154ba88f04006de7f9830c08a2857c49a8614515f016f4e
+  metadata.gz: cdbdfe53569e693e1a81cb3e30b773cc239f81ce05f46ad2f20fe638dfef0777ca4cbcafd79ba9faedc9af1bb416f2a9628abbf8d82f423dd66ef36233059402
+  data.tar.gz: 1a74a3ace7f95d965a4db351501b908345257ab6138ab9ad3f4647499230e2d2a24fcd02c17fd0577376c913dc60cb3689b526046097a33a107ccea3ea3ce484

data/.rubocop.yml

@@ -21,7 +21,19 @@ Layout/LineLength:
 Layout/MultilineMethodCallIndentation:
   Enabled: false
 
-Metrics/BlockLength:
+Metrics/AbcSize:
+  Max: 25
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/MethodLength:
+  Max: 30
+
+Metrics/PerceivedComplexity:
+  Max: 10
+
+Style/FrozenStringLiteralComment:
   Enabled: false
 
 Style/PercentLiteralDelimiters:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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.
+
 ## 1.0.14 / 2023-01-09
   * Added `blank` parameter.
 

data/README.md

@@ -4,14 +4,17 @@
 
 `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`.
+The Liquid tag generates an `a href` HTML tag,
+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.
 
-CAUTION: if linked text contains a single or double quote you will see the error message: `Liquid Exception: Unmatched quote`.
-Instead, use ' (`'`), " (`"`), ‘ (`‘`), ’ (`’`), “ (`“`), and ” (`”`)
+CAUTION: if linked text contains a single or double quote,
+you will see the error message: `Liquid Exception: Unmatched quote`.
+Instead, use ' (`'`), " (`"`), ‘ (`‘`),
+’ (`’`), “ (`“`), and ” (`”`)
 
 In `_config.yml`, if a section called `plugin-vars` exists,
 then its name/value pairs are available for substitution.
@@ -131,7 +134,8 @@ The `match` option looks through the pages collection for a URL with containing
 
 
 ## Additional Information
-More information is available on my web site about [my Jekyll plugins](https://www.mslinn.com/blog/2020/10/03/jekyll-plugins.html).
+More information is available on my website about
+[my Jekyll plugins](https://www.mslinn.com/blog/2020/10/03/jekyll-plugins.html).
 
 
 ## Installation
@@ -148,10 +152,6 @@ And then execute:
 
     $ bundle install
 
-Or install it yourself as:
-
-    $ gem install jekyll_href
-
 
 ## Generated HTML
 
@@ -223,7 +223,8 @@ Which renders as: [`mslinn.com`](https://mslinn.com)
 
 ## Development
 
-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.
+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.
 
 Install development dependencies like this:
 ```
@@ -236,7 +237,7 @@ $ bundle exec rake install
 ```
 
 ## Test
-A test web site is provided in the `demo` directory.
+A test website is provided in the `demo` directory.
  1. Set breakpoints.
 
  2. Initiate a debug session from the command line:

data/Rakefile

@@ -1,4 +1,2 @@
-# frozen_string_literal: true
-
 require "bundler/gem_tasks"
 task default: %i[]

data/jekyll_href.gemspec

@@ -1,47 +1,39 @@
-# frozen_string_literal: true
+require_relative 'lib/jekyll_href/version'
 
-require_relative "lib/jekyll_href/version"
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
+  github = 'https://github.com/mslinn/jekyll_href'
 
-Gem::Specification.new do |spec|
-  github = "https://github.com/mslinn/jekyll_href"
-
-  spec.authors = ["Mike Slinn"]
-  spec.bindir = "exe"
+  spec.authors = ['Mike Slinn']
+  spec.bindir = 'exe'
   spec.description = <<~END_OF_DESC
     Generates an 'a href' tag, possibly with target='_blank' and rel='nofollow'.
   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#href"
-  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#href'
+  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_href"
+  spec.name = 'jekyll_href'
   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.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.6.0'
   spec.summary = "Generates an 'a href' tag, possibly with target='_blank' and rel='nofollow'."
   spec.test_files = spec.files.grep(%r!^(test|spec|features)/!)
   spec.version = JekyllHrefVersion::VERSION
 
   spec.add_dependency 'jekyll', '>= 3.5.0'
-  spec.add_dependency 'jekyll_all_collections'
+  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_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'
 end

data/lib/jekyll_href/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module JekyllHrefVersion
-  VERSION = "1.0.14"
+  VERSION = '1.1.0'.freeze
 end

data/lib/jekyll_href.rb

@@ -1,9 +1,7 @@
-# frozen_string_literal: true
-
-require "jekyll_all_collections"
-require "jekyll_plugin_logger"
-require "liquid"
-require_relative "jekyll_href/version"
+require 'jekyll_all_collections'
+require 'jekyll_plugin_logger'
+require 'liquid'
+require_relative 'jekyll_href/version'
 require_relative './jekyll_tag_helper2'
 
 # @author Copyright 2020 Michael Slinn
@@ -49,8 +47,10 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
 
   private
 
-  def compute_linkk # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    # Does not look at or compute @link
+  # Does not look at or compute @link
+  def compute_linkk
+    return @link if @link
+
     linkk = @url
     if linkk.nil? || !linkk
       linkk = @helper.argv&.shift
@@ -63,7 +63,7 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
     linkk
   end
 
-  def dump_linkk_relations(linkk) # rubocop:disable Metrics/MethodLength
+  def dump_linkk_relations(linkk)
     msg = <<~END_MESSAGE
       jekyll_href error: no url was provided on #{@path}:#{@line_number}.
         @helper.markup=#{@helper.markup}
@@ -77,14 +77,14 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
     abort msg.red
   end
 
-  def globals_initial(liquid_context) # rubocop:disable Metrics/MethodLength
+  def globals_initial(liquid_context)
     # Sets @follow, @helper, @match, @page, @path, @site, @target, @url
     @helper.liquid_context = liquid_context
 
     @page = liquid_context.registers[:page]
     @path = @page['path']
     @site = liquid_context.registers[:site]
-    JekyllAllCollections.maybe_compute_all_collections(@site)
+    AllCollectionsHooks.compute(@site)
 
     @follow = @helper.parameter_specified?('follow') ? '' : " rel='nofollow'"
     @match  = @helper.parameter_specified?('match')
@@ -94,8 +94,8 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
     @url    = @helper.parameter_specified?('url')
   end
 
-  def globals_update(tokens, linkk) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    # Might set @follow, @linkk, @target, and @text
+  # Might set @follow, @linkk, @target, and @text
+  def globals_update(tokens, linkk)
     if linkk.start_with? 'mailto:'
       @link = linkk
       @target = @follow = ''
@@ -106,7 +106,7 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
       end
       return
     else
-      @text = tokens.join(" ").strip
+      @text = tokens.join(' ').strip
       if @text.to_s.empty?
         @text = "<code>#{linkk}</code>"
         @link = "https://#{linkk}"
@@ -115,7 +115,7 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
       end
     end
 
-    return if @link.start_with? "http"
+    return if @link.start_with? 'http'
 
     @follow = ''
     @target = '' unless @blank
@@ -127,11 +127,11 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
     @target = '' unless @blank
   end
 
-  def match_post # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
-    # Might set @link and @text
+  # Might set @link and @text
+  def match_post
     config = @site.config['href']
-    die_if_nomatch = !config.nil? && config['nomatch'] && config['nomatch'] == 'fatal'
-    path, fragment = @link.split('#')
+    @die_if_nomatch = !config.nil? && config['nomatch'] && config['nomatch'] == 'fatal'
+    @path, @fragment = @link.split('#')
 
     @logger.debug do
       <<~END_DEBUG
@@ -142,22 +142,26 @@ class ExternalHref < Liquid::Tag # rubocop:disable Metrics/ClassLength
     end
 
     all_urls = @site.all_collections.map(&:url)
-    url_matches = all_urls.select { |url| url.include? path }
+    compute_link_and_text(all_urls)
+  end
+
+  def compute_link_and_text(all_urls)
+    url_matches = all_urls.select { |url| url&.include? @path }
     case url_matches.length
     when 0
-      abort "href error: No url matches '#{@link}'" if die_if_nomatch
-      @link = "#"
+      abort "href error: No url matches '#{@link}'" if @die_if_nomatch
+      @link = '#'
       @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(", ")}"
+      abort "Error: More than one url matched '#{@path}': #{url_matches.join(', ')}"
     end
   end
 
+  # Replace names in plugin-vars with values
   def replace_vars(text)
-    # Replace names in plugin-vars with values
     variables = @site.config['plugin-vars']
     return text unless variables
 

data/lib/jekyll_tag_helper2.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'shellwords'
 require 'key_value_parser'
 

data/spec/href_spec.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'jekyll'
 require 'jekyll_plugin_logger'
 require 'yaml'

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "liquid"
 require "fileutils"
 require_relative "../lib/jekyll_href"

data/spec/status_persistence.txt

@@ -1,15 +1,15 @@
 example_id                                                        | status | run_time        |
 ----------------------------------------------------------------- | ------ | --------------- |
-/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  |
+/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  |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_href
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: jekyll_plugin_logger
   requirement: !ruby/object:Gem::Requirement