jekyll_href 1.0.9 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d98dd353e927f8df1cf3832b2afefebb7be6dda942346cfaefb4899ec4de2606
-  data.tar.gz: 3bae16798938728a608f21161324d5843da1e0df1e210ac0e34cf894d5d29ed4
+  metadata.gz: 33ad179cd8d6770d3828246bdc51cdbe398f7fd3f50b0101481e2dacd597191e
+  data.tar.gz: 543a944799bdb811fd84f3afb4ce0b8239e2008208feb0612360307bd1843c69
 SHA512:
-  metadata.gz: 27cc832e73c2eaf4db34dcb6cb67c026702ed9e106aa965d61a572cb44c0c4edcc0ca08ad0039c24e074734ecbce6f71643f6e049e76d6830ba64a548a35ed04
-  data.tar.gz: 819b74d3d7c6e1a6a6bc7d01797cccaa0c888dfcc7d3e8464b65c1d150bf5fa4dca349275e487163cf24ec38e7acaceae9d525a73f8eb5bf2676383cb85aa1a3
+  metadata.gz: be0fd539b076cedb893cee10a528f4a3c71d2ec01e84c16a26455ec4c4aacded321bc11f96ac8ff5d6647b2cdf3692aba9bb843e419d67c54aab9a47edb63ff9
+  data.tar.gz: f2d3abce3b08922eefa404905d1f61f319150662f891dd03171e716479d16e068e4e2a02b9975b5f609716f942876ee9b7d542d14236dba141fb4fcaa6e3ce66

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.0.12 / 2022-08-09
+  * No longer abends if `plugin-vars` is not present in `_config.yml`
+
+## 1.0.11 / 2022-04-27
+  * Suppresses target and rel=nofollow attributes for mailto: links.
+
+## 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,11 +34,12 @@ 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'
+  # 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'
+  # spec.add_development_dependency 'ruby-debug-ide'
 end

data/lib/jekyll_href/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllHrefVersion
-  VERSION = "1.0.9"
+  VERSION = "1.0.12"
 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,15 @@ 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)
+    @target = @follow = "" if link.start_with? "mailto:"
     @logger.debug { "@link=#{@link}; link=#{link}" }
     "<a href='#{link}'#{@target}#{@follow}>#{@text}</a>"
   end
@@ -111,9 +118,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 +127,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 +147,10 @@ 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']
+    return link unless variables
+
     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.12
 platform: ruby
 authors:
 - Mike Slinn
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: jekyll_plugin_logger
+  name: jekyll_all_collections
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,27 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debase
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
+  name: jekyll_plugin_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -68,7 +54,7 @@ dependencies:
         version: '0'
 description: 'Generates an ''a href'' tag, possibly with target=''_blank'' and rel=''nofollow''.
 
-'
+  '
 email:
 - mslinn@mslinn.com
 executables: []
@@ -110,8 +96,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Generates an 'a href' tag, possibly with target='_blank' and rel='nofollow'.
 test_files: []
+...