jekyll_href 1.0.6 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b645b13bded894df1a6c5d7f171cc0a9b9830b62ee8d7b86f9195d00ced75f2
-  data.tar.gz: 5c87ad30bd506bbda270b5dd3d70d19b960cfcd66ec0c59abe8e86cef0f40dd2
+  metadata.gz: d98dd353e927f8df1cf3832b2afefebb7be6dda942346cfaefb4899ec4de2606
+  data.tar.gz: 3bae16798938728a608f21161324d5843da1e0df1e210ac0e34cf894d5d29ed4
 SHA512:
-  metadata.gz: 04d04877c7bafdf0c2185efb20800d6ec0faeced8c1ddaef22dac34336da4c48ab220bca831d4711535e462021ce851a7b1e5e4be3d272d719b93c66442603cc
-  data.tar.gz: 85b4d3753ddf997139dab7fde06e39c8361f796a5cf4a7d0eb7ad16a369ea7865656a3749232f41e8356899c59f7406c165747915db594c9204161685090597c
+  metadata.gz: 27cc832e73c2eaf4db34dcb6cb67c026702ed9e106aa965d61a572cb44c0c4edcc0ca08ad0039c24e074734ecbce6f71643f6e049e76d6830ba64a548a35ed04
+  data.tar.gz: 819b74d3d7c6e1a6a6bc7d01797cccaa0c888dfcc7d3e8464b65c1d150bf5fa4dca349275e487163cf24ec38e7acaceae9d525a73f8eb5bf2676383cb85aa1a3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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
+
 ## 1.0.6 / 2022-04-05
   * Updated to `jekyll_plugin_logger` v2.1.0
 

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/lib/jekyll_href/version.rb

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

data/lib/jekyll_href.rb

@@ -58,11 +58,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
@@ -118,31 +118,36 @@ class ExternalHref < Liquid::Tag
 
     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[0].url  = #{site.posts.docs[0].url}
+        site.posts[0].path = #{site.posts.docs[0].path}
+      END_DEBUG
+    }
+    urls = site.collections
+               .values
+               .map { |x| x.class.method_defined?(:docs) ? x.docs : x }
+               .flatten
+               .map(&:url) # TODO Optimize this by caching the result
+    url_matches = 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: #{ matches.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']
     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.6
+  version: 1.0.9
 platform: ruby
 authors:
 - Mike Slinn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll