jekyll-relative-links 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebecb8d06a1ed741d58bb3eb520815f3f5d58ef4fa05aa38de5a8974798db59f
-  data.tar.gz: 24c147b3cdeb009e06de487ad126f26196f5d8b20a32e76123085fc7c7355610
+  metadata.gz: dc58c9b968be5f460493796546b5da7dcb3ec9dc70521790e7475945eb7808ff
+  data.tar.gz: ff9390b8df13ac3cbdd9034a2bfdac93b14e8f0d3a9396a07839f2be791b87ab
 SHA512:
-  metadata.gz: 927fda48316aa1da296cbf95c9c1f191aae160412369b72fb36eae9dcef7849d87c846f0327565adb30bb7cd3a606e48612bad0859a1d822c73fd17118b4cdfe
-  data.tar.gz: 6072633be060cde647b92f88672e57a9d7b584952a73b7b3dd0bf4aed3c8199cc53b9498fe30a6483c4225a250c1537e705a66acd938997d60ffa5355cbc4cff
+  metadata.gz: 67c213b7308561caee8f28bb8132667d0f5fc8d9001c74eb65cbde328a81265a4183863762f5934f262ffa676504f19b9011eac679e2f5abc9583e1d019c46cb
+  data.tar.gz: '012508fa52c056fcd891c15bb2d75e636e97053e3e53b244f5a63fa66edde0aa68ff760fbb0816fe07f149105770803f6be604da7e1029647a4af7d4120c3340'

data/lib/jekyll-relative-links/generator.rb

@@ -8,9 +8,11 @@ module JekyllRelativeLinks
     include Jekyll::Filters::URLFilters
 
     LINK_TEXT_REGEX = %r!(.*?)!.freeze
-    FRAGMENT_REGEX = %r!(#.+?)?!.freeze
-    INLINE_LINK_REGEX = %r!\[#{LINK_TEXT_REGEX}\]\(([^\)]+?)#{FRAGMENT_REGEX}\)!.freeze
-    REFERENCE_LINK_REGEX = %r!^\s*?\[#{LINK_TEXT_REGEX}\]: (.+?)#{FRAGMENT_REGEX}\s*?$!.freeze
+    FRAGMENT_REGEX = %r!(#.+?|)?!.freeze
+    TITLE_REGEX = %r{(\s+"(?:\\"|[^"])*(?<!\\)"|\s+"(?:\\'|[^'])*(?<!\\)')?}.freeze
+    FRAG_AND_TITLE_REGEX = %r!#{FRAGMENT_REGEX}#{TITLE_REGEX}!.freeze
+    INLINE_LINK_REGEX = %r!\[#{LINK_TEXT_REGEX}\]\(([^)]+?)#{FRAG_AND_TITLE_REGEX}\)!.freeze
+    REFERENCE_LINK_REGEX = %r!^\s*?\[#{LINK_TEXT_REGEX}\]: (.+?)#{FRAG_AND_TITLE_REGEX}\s*?$!.freeze
     LINK_REGEX = %r!(#{INLINE_LINK_REGEX}|#{REFERENCE_LINK_REGEX})!.freeze
     CONVERTER_CLASS = Jekyll::Converters::Markdown
     CONFIG_KEY = "relative_links"
@@ -48,27 +50,35 @@ module JekyllRelativeLinks
       return document if document.content.nil?
 
       document.content = document.content.dup.gsub(LINK_REGEX) do |original|
-        link_type, link_text, relative_path, fragment = link_parts(Regexp.last_match)
-        next original unless replaceable_link?(relative_path)
+        link = link_parts(Regexp.last_match)
+        next original unless replaceable_link?(link.path)
 
-        path = path_from_root(relative_path, url_base)
+        path = path_from_root(link.path, url_base)
         url  = url_for_path(path)
         next original unless url
 
-        replacement_text(link_type, link_text, url, fragment)
+        link.path = url
+        replacement_text(link)
       end
+
+      replace_relative_links_excerpt!(document)
     rescue ArgumentError => e
       raise e unless e.to_s.start_with?("invalid byte sequence in UTF-8")
     end
 
     private
 
+    # Stores info on a Markdown Link (avoid rubocop's Metrics/ParameterLists warning)
+    Link = Struct.new(:link_type, :text, :path, :fragment, :title)
+
     def link_parts(matches)
-      link_type     = matches[2] ? :inline : :reference
-      link_text     = matches[link_type == :inline ? 2 : 5]
-      relative_path = matches[link_type == :inline ? 3 : 6]
-      fragment      = matches[link_type == :inline ? 4 : 7]
-      [link_type, link_text, relative_path, fragment]
+      last_inline = 5
+      link_type = matches[2] ? :inline : :reference
+      link_text = matches[link_type == :inline ? 2 : last_inline + 1]
+      relative_path = matches[link_type == :inline ? 3 : last_inline + 2]
+      fragment = matches[link_type == :inline ? 4 : last_inline + 3]
+      title = matches[link_type == :inline ? 5 : last_inline + 4]
+      Link.new(link_type, link_text, relative_path, fragment, title)
     end
 
     def context
@@ -84,6 +94,7 @@ module JekyllRelativeLinks
     end
 
     def url_for_path(path)
+      path = CGI.unescape(path)
       target = potential_targets.find { |p| p.relative_path.sub(%r!\A/!, "") == path }
       relative_url(target.url) if target&.url
     end
@@ -93,18 +104,22 @@ module JekyllRelativeLinks
     end
 
     def path_from_root(relative_path, url_base)
+      is_absolute = relative_path.start_with? "/"
+
       relative_path.sub!(%r!\A/!, "")
-      absolute_path = File.expand_path(relative_path, url_base)
+      base = is_absolute ? "" : url_base
+      absolute_path = File.expand_path(relative_path, base)
       absolute_path.sub(%r!\A#{Regexp.escape(Dir.pwd)}/!, "")
     end
 
-    def replacement_text(type, text, url, fragment = nil)
-      url << fragment if fragment
+    # @param link [Link] A Link object describing the markdown link to make
+    def replacement_text(link)
+      link.path << link.fragment if link.fragment
 
-      if type == :inline
-        "[#{text}](#{url})"
+      if link.link_type == :inline
+        "[#{link.text}](#{link.path}#{link.title})"
       else
-        "\n[#{text}]: #{url}"
+        "\n[#{link.text}]: #{link.path}#{link.title}"
       end
     end
 
@@ -153,5 +168,9 @@ module JekyllRelativeLinks
     def global_entry_filter
       @global_entry_filter ||= Jekyll::EntryFilter.new(site)
     end
+
+    def replace_relative_links_excerpt!(document)
+      document.data["excerpt"] = Jekyll::Excerpt.new(document) if document.data["excerpt"]
+    end
   end
 end

data/lib/jekyll-relative-links/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllRelativeLinks
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-relative-links
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ben Balter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: kramdown-parser-gfm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -42,37 +62,59 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
-    - - "<"
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
-    - - "<"
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rubocop-jekyll
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
-description: 
+        version: '2.0'
+description:
 email:
 - ben.balter@github.com
 executables: []
@@ -87,7 +129,7 @@ homepage: https://github.com/benbalter/jekyll-relative-links
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: A Jekyll plugin to convert relative links to markdown files to their rendered
   equivalents.