jekyll_href 1.0.7 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 838cadb39ae8e31f560af6c84010e03e2f79770c46dc2002751e39ffc9173a40
-  data.tar.gz: a6fc7f1c32e794e625f643c9ba6dd5943e0417699f1020d18eee9d9ce6062585
+  metadata.gz: ed7504969773757ecab66ef862c11968ec563622c07f3840f34aaa8bc86b34fd
+  data.tar.gz: 835d3f059cdc96f6095d2443a2ed19df5ffa79fc32a696f5fe7bdac76794c959
 SHA512:
-  metadata.gz: 10b5ed831641ff8e3b8cfa0994c9555dcef27eb27c4d3a72814cb867d3401623f7142c923ac2f0358cfe5dfd41cc843247bda4ea421daaf8ec8f1abdeab43a10
-  data.tar.gz: 91fd8a125ea762140ba0047d7aeabdb9325f9914809b08c9aa9490fe1a806ff7ec3b4eb2b2791a75816efc0b7d36ea3da8efaa67b8087d7abed0e8af7f2c662f
+  metadata.gz: def5d5a884f5804461a656144fe2a87f13c07b34ec28d5577ddb8bbfcf4f04aa4773514d34d33bcbe6967da1a74bad60d501ecaa835e33a9441d0352f4460da0
+  data.tar.gz: efc68d1bfc4c072e2de8b0d33d723ff9d206996d1ff9fc1fdea5fd905707c5df54227b62ca20160359e8ab3c84a09c3582c1edccfc9a06c6f9b1d177fb8b4318

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.0.10 / 2022-04-27
+  * Works from pre-computed `site['all_collections']` provided by a new dependency called `jekyll_all_collections`.
+
+## 1.0.9 / 2022-04-25
+  * Match now looks at all collections, not just posts
+
+## 1.0.8 / 2022-04-11
+  * Fixed match text
+
 ## 1.0.7 / 2022-04-11
   * Fixed bad reference when more than one URL matches
 

data/README.md

@@ -16,6 +16,9 @@ Also provides a convenient way to generate formatted and clickable URIs.
 Note that the url should not be enclosed in quotes.
 Also please note that the square brackets denote optional parameters, and should not be typed.
 
+`match` will attempt to match the url fragment (specified as a regex) to a URL in any collection.
+If multiple documents have matching URL an error is thrown.
+
 
 ### 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).

data/jekyll_href.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.version = JekyllHrefVersion::VERSION
 
   spec.add_dependency 'jekyll', '>= 3.5.0'
+  spec.add_dependency 'jekyll_all_collections'
   spec.add_dependency 'jekyll_plugin_logger'
 
   spec.add_development_dependency 'debase'

data/lib/jekyll_href/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllHrefVersion
-  VERSION = "1.0.7"
+  VERSION = "1.0.10"
 end

data/lib/jekyll_href.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "jekyll_plugin_logger"
+require "jekyll_all_collections"
 require "liquid"
 require_relative "jekyll_href/version"
 
@@ -51,6 +52,7 @@ require_relative "jekyll_href/version"
 #   <code>django.core.management.execute_from_command_line</code> %}
 
 class ExternalHref < Liquid::Tag
+
   # @param tag_name [String] is the name of the tag, which we already know.
   # @param command_line [Hash, String, Liquid::Tag::Parser] the arguments from the web page.
   # @param _parse_context [Liquid::ParseContext] tokenized command line
@@ -58,11 +60,11 @@ class ExternalHref < Liquid::Tag
   def initialize(tag_name, command_line, _parse_context)
     super
 
+    @logger = PluginMetaLogger.instance.new_logger(self, PluginMetaLogger.instance.config)
     @match = false
     @tokens = command_line.strip.split
     @follow = get_value("follow", " rel='nofollow'")
     @target = get_value("notarget", " target='_blank'")
-    @logger = PluginMetaLogger.instance.new_logger(self, PluginMetaLogger.instance.config)
 
     match_index = @tokens.index("match")
     if match_index
@@ -76,10 +78,14 @@ class ExternalHref < Liquid::Tag
   end
 
   # Method prescribed by the Jekyll plugin lifecycle.
+  # @param liquid_context [Liquid::Context]
   # @return [String]
-  def render(context)
-    match(context) if @match
-    link = replace_vars(context, @link)
+  def render(liquid_context)
+    @site = liquid_context.registers[:site]
+    JekyllAllCollections::maybe_compute_all_collections(@site)
+
+    match(liquid_context) if @match
+    link = replace_vars(liquid_context, @link)
     @logger.debug { "@link=#{@link}; link=#{link}" }
     "<a href='#{link}'#{@target}#{@follow}>#{@text}</a>"
   end
@@ -111,38 +117,39 @@ class ExternalHref < Liquid::Tag
     value
   end
 
-  def match(context) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
-    site = context.registers[:site]
-    config = site.config['href']
+  def match(liquid_context) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+    config = @site.config['href']
     die_if_nomatch = !config.nil? && config['nomatch'] && config['nomatch']=='fatal'
 
     path, fragment = @link.split('#')
 
-    @logger.debug { "@link=#{@link}" }
-    @logger.debug { "site.posts[0].url  = #{site.posts.docs[0].url}" }
-    @logger.debug { "site.posts[0].path = #{site.posts.docs[0].path}" }
-    posts = site.posts.docs.select { |x| x.url.include?(path) }
-    case posts.length
+    @logger.debug {
+      <<~END_DEBUG
+        @link=#{@link}
+        @site.posts.docs[0].url  = #{@site.posts.docs[0].url}
+        @site.posts.docs[0].path = #{@site.posts.docs[0].path}
+      END_DEBUG
+    }
+
+    all_urls = @site.all_collections.map(&:url)
+    url_matches = all_urls.select { |url| url.include? path }
+    case url_matches.length
     when 0
-      if die_if_nomatch
-        abort "href error: No url matches '#{@link}'"
-      else
-        @link = "#"
-        @text = "<i>#{@link} is not available</i>"
-      end
+      abort "href error: No url matches '#{@link}'" if die_if_nomatch
+      @link = "#"
+      @text = "<i>#{@link} is not available</i>"
     when 1
-      @link = posts.first.url
+      @link = url_matches.first
       @link = "#{@link}\##{fragment}" if fragment
     else
-      abort "Error: More than one url matched: #{ posts.map(&:relative_path).join(", ")}"
+      abort "Error: More than one url matched '#{path}': #{ url_matches.join(", ")}"
     end
   end
 
-  def replace_vars(context, link)
-    variables = context.registers[:site].config['plugin-vars']
+  def replace_vars(liquid_context, link)
+    variables = @site.config['plugin-vars']
     variables.each do |name, value|
-      # puts "#{name}=#{value}"
-      link = link.gsub("{{#{name}}}", value)
+      link = link.gsub "{{#{name}}}", value
     end
     link
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_href
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.10
 platform: ruby
 authors:
 - Mike Slinn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: jekyll_all_collections
+  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: jekyll_plugin_logger
   requirement: !ruby/object:Gem::Requirement