jekyll_href 1.2.12 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b91d0d8398def7c990920615a1e12f97de4472f5444ae9fc3869504d49084b8
-  data.tar.gz: 19f84b38dc1f3205763a1be316671bad0ac65a3af25621e5455164f362c39ec8
+  metadata.gz: 15395e432574a69be4a28def40f3c20bf199fa762f8ca94155408e864921c406
+  data.tar.gz: 4d7385465ad6ddd8b9f52c6efbb62f7fd757015d10f23017e63639ddfc8e6670
 SHA512:
-  metadata.gz: 92e483de85abd7cfdf2aeede0de99d0cc0772d3d112b6652394f04f3f97f52d6aaa2b4f39ac150c02cbd25d0162b56809b8c8dec1a356d5a9777b86d888b21aa
-  data.tar.gz: fd835168ec7beb443ea70c646aac51cb80b4ab9a9826f881b74ee0af6670ad9ffe74937e3e063f762f44b32d7c060f4c69faeda6d8fe0935fd68525c8d3dbdf2
+  metadata.gz: 595817a332ef1fe8044249f075efc94a8fc6ba4f284ba2d97ef504d72cabf63799831c808e8450fe6c935d859c5296dda3805e42fd3ada764be2fe2c9985b616
+  data.tar.gz: 07b1e783d4b0015097229fda3a2257fdfc8b7b523673f212bdde3c7423eb889badd30a6f36b57c3dcd95eaea321f1f48cdd9db90f96cee167852b6f9b8aa4341

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 1.2.13 / 2024-12-23
+
+* Fixed reference to undefined `url_matches`.
+* References that point to draft pages are rendered differently in production mode,
+  and an info-level log message is generated.
+
+
 ## 1.2.12 / 2024-08-17
 
 * Enhanced `match` so that if no label parameter is provided, the title of the matched web page is used.

data/jekyll_href.gemspec

@@ -3,15 +3,15 @@ require_relative 'lib/jekyll_href/version'
 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.email    = ['mslinn@mslinn.com']
+  spec.files    = Dir['.rubocop.yml', 'LICENSE.*', 'Rakefile', '{lib,spec}/**/*', '*.gemspec', '*.md']
   spec.homepage = 'https://www.mslinn.com/jekyll_plugins/jekyll_href.html'
-  spec.license = 'MIT'
+  spec.license  = 'MIT'
   spec.metadata = {
     'allowed_push_host' => 'https://rubygems.org',
     'bug_tracker_uri'   => "#{github}/issues",
@@ -19,20 +19,21 @@ Gem::Specification.new do |spec|
     'homepage_uri'      => spec.homepage,
     'source_code_uri'   => github,
   }
-  spec.name = 'jekyll_href'
+  spec.name                 = 'jekyll_href'
+  spec.platform             = Gem::Platform::RUBY
   spec.post_install_message = <<~END_MESSAGE
 
     Thanks for installing #{spec.name}!
 
   END_MESSAGE
-  spec.require_paths = ['lib']
+  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.version = JekyllHrefVersion::VERSION
+  spec.summary               = "Generates an 'a href' tag, possibly with target='_blank' and rel='nofollow'."
+  spec.version               = JekyllHrefVersion::VERSION
 
   spec.add_dependency 'ipaddress'
   spec.add_dependency 'jekyll', '>= 3.5.0'
   spec.add_dependency 'jekyll_all_collections'
-  spec.add_dependency 'jekyll_plugin_support', '>= 1.0.2'
+  spec.add_dependency 'jekyll_plugin_support', '>= 1.0.3'
   spec.add_dependency 'typesafe_enum'
 end

data/lib/href_match.rb

@@ -9,7 +9,8 @@ module JekyllSupport
         msg = "HRef error: No url matches '#{@link}', found on line #{@line_number} (after front matter) of #{@path}"
         @logger.error { msg }
         abort msg if @die_if_nomatch
-        @text = "<i class='h_ref_error'>#{@link} is not available</i>"
+
+        @text = "<i class='h_ref_error'>#{@link} is not a valid local page</i>"
         @link_save = @link = '#'
       when 1
         @link = page_matches.first.url
@@ -17,7 +18,7 @@ module JekyllSupport
         @link_save = @link
         @text = page_matches.first.title unless @label
       else
-        logger.error { "Error: More than one url matched '#{@path}': #{url_matches.join(', ')}" }
+        logger.error { "Error: More than one url matched '#{@path}':\n  #{page_matches.map(&:url).join("\n  ")}" }
         exit! 2
       end
     end

data/lib/href_summary.rb

@@ -29,7 +29,7 @@ module JekyllSupport
         summary_exclude: @summary_exclude,
         summary_href:    @summary_href
       )
-      if @link_save.start_with? 'http'
+      if @link_type == LinkType::EXTERNAL
         add_global_link_for_page mini_href
       else
         add_local_link_for_page mini_href

data/lib/href_tag.rb

@@ -1,4 +1,5 @@
 require 'ipaddress'
+require 'jekyll_draft'
 require 'jekyll_all_collections'
 require 'jekyll_plugin_logger'
 require 'jekyll_plugin_support'
@@ -46,12 +47,17 @@ module JekyllSupport
 
       @helper_save = @helper.clone
       globals_update(@helper.argv, linkk) # Sets @link and @text, might clear @follow and @target
-      handle_match(linkk) if @match # Sets @text if not set by now
+      handle_match(linkk) if @match # Sets @text if not set by now, also @link_type, etc.
       raise HrefError, '@link_type was not set' if @link_type == LinkType::UNKNOWN
 
       save_summary
       klass = " class='#{@klass}'" if @klass
       style = " style='#{@style}'" if @style
+      if @link_type == LinkType::LOCAL && local_page_draft?(@link)
+        klass = "draft_link #{klass}".strip
+        return "<span #{klass}#{style} title='This page is not available yet.'>#{@text}</span>" if @mode == 'production'
+      end
+
       "<a href='#{@link}'#{klass}#{style}#{@target}#{@follow}>#{@text}</a>"
     rescue HRefError => e # jekyll_plugin_support handles StandardError
       @logger.error { e.logger_message }
@@ -64,6 +70,32 @@ module JekyllSupport
       "On line #{line_number} of #{path}: #{follow} #{match} #{target} #{link} => '#{text}'"
     end
 
+    def local_page_draft?(url)
+      filetype = File.extname url
+      page_matches = @site.all_collections.map.select { |page| page.url == url }
+      case page_matches.length
+      when 0
+        return false unless %w[htm html md].include? filetype
+
+        msg = "HRef error: No url matches '#{url}', found on line #{@line_number} (after front matter)"
+        @logger.error { msg }
+        abort msg if @die_if_nomatch
+
+        @text = "<i class='h_ref_error'>#{url} is not a valid local page</i>"
+        @link_save = @link = '#'
+        true
+      when 1
+        @link = page_matches.first.url
+        @link = "#{@link}##{@fragment}" if @fragment
+        @link_save = @link
+        @text = page_matches.first.title unless @label
+        Jekyll::Draft.draft? page_matches.first
+      else
+        logger.error { "Error: More than one url matched '#{url}'. Collections are: #{page_matches.join(', ')}" }
+        exit! 2
+      end
+    end
+
     JekyllSupport::JekyllPluginHelper.register(self, 'href')
   end
 end

data/lib/jekyll_href/version.rb

@@ -1,3 +1,3 @@
 module JekyllHrefVersion
-  VERSION = '1.2.12'.freeze
+  VERSION = '1.2.13'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_href
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors:
 - Mike Slinn
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ipaddress
@@ -58,14 +57,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
   requirement: !ruby/object:Gem::Requirement
@@ -136,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 3.6.0
 specification_version: 4
 summary: Generates an 'a href' tag, possibly with target='_blank' and rel='nofollow'.
 test_files: []