jekyll_href 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d98dd353e927f8df1cf3832b2afefebb7be6dda942346cfaefb4899ec4de2606
-  data.tar.gz: 3bae16798938728a608f21161324d5843da1e0df1e210ac0e34cf894d5d29ed4
+  metadata.gz: ed7504969773757ecab66ef862c11968ec563622c07f3840f34aaa8bc86b34fd
+  data.tar.gz: 835d3f059cdc96f6095d2443a2ed19df5ffa79fc32a696f5fe7bdac76794c959
 SHA512:
-  metadata.gz: 27cc832e73c2eaf4db34dcb6cb67c026702ed9e106aa965d61a572cb44c0c4edcc0ca08ad0039c24e074734ecbce6f71643f6e049e76d6830ba64a548a35ed04
-  data.tar.gz: 819b74d3d7c6e1a6a6bc7d01797cccaa0c888dfcc7d3e8464b65c1d150bf5fa4dca349275e487163cf24ec38e7acaceae9d525a73f8eb5bf2676383cb85aa1a3
+  metadata.gz: def5d5a884f5804461a656144fe2a87f13c07b34ec28d5577ddb8bbfcf4f04aa4773514d34d33bcbe6967da1a74bad60d501ecaa835e33a9441d0352f4460da0
+  data.tar.gz: efc68d1bfc4c072e2de8b0d33d723ff9d206996d1ff9fc1fdea5fd905707c5df54227b62ca20160359e8ab3c84a09c3582c1edccfc9a06c6f9b1d177fb8b4318

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 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
 

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.9"
+  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
@@ -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,9 +117,8 @@ 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('#')
@@ -121,16 +126,13 @@ class ExternalHref < Liquid::Tag
     @logger.debug {
       <<~END_DEBUG
         @link=#{@link}
-        site.posts[0].url  = #{site.posts.docs[0].url}
-        site.posts[0].path = #{site.posts.docs[0].path}
+        @site.posts.docs[0].url  = #{@site.posts.docs[0].url}
+        @site.posts.docs[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 }
+
+    all_urls = @site.all_collections.map(&:url)
+    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
@@ -144,8 +146,8 @@ class ExternalHref < Liquid::Tag
     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|
       link = link.gsub "{{#{name}}}", value
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_href
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Mike Slinn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-25 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