jekyll-relative-links 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76726e81607582ad28cfc9f754031b52bd77fdb384605eb47a85b9d15dc199fc
-  data.tar.gz: ba1748034e9a65d36c42098226ea194b7d011bfa903aa2fa7faa8acbfb3ee853
+  metadata.gz: ebecb8d06a1ed741d58bb3eb520815f3f5d58ef4fa05aa38de5a8974798db59f
+  data.tar.gz: 24c147b3cdeb009e06de487ad126f26196f5d8b20a32e76123085fc7c7355610
 SHA512:
-  metadata.gz: fcdc1d5f4dd5a4f70d747618a8fa0258204b268109c348d8bd6878121753a242c344cb96ff9af5f1d965350ce78ef9e59bfdb5af11d01653e1e1e9960e10ad2b
-  data.tar.gz: 606bf27188ebfb358abb26387b40ca896e198eb6d75fba1c2b19c36a07f21c442bd848e40b913ff03181f0857f747a018e1d90bc234b00f26cc0bc379374baa2
+  metadata.gz: 927fda48316aa1da296cbf95c9c1f191aae160412369b72fb36eae9dcef7849d87c846f0327565adb30bb7cd3a606e48612bad0859a1d822c73fd17118b4cdfe
+  data.tar.gz: 6072633be060cde647b92f88672e57a9d7b584952a73b7b3dd0bf4aed3c8199cc53b9498fe30a6483c4225a250c1537e705a66acd938997d60ffa5355cbc4cff

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

@@ -2,33 +2,34 @@
 
 module JekyllRelativeLinks
   class Generator < Jekyll::Generator
-    attr_accessor :site
+    attr_accessor :site, :config
 
     # Use Jekyll's native relative_url filter
     include Jekyll::Filters::URLFilters
 
-    LINK_TEXT_REGEX = %r!([^\]]+)!
-    FRAGMENT_REGEX = %r!(#.+?)?!
-    INLINE_LINK_REGEX = %r!\[#{LINK_TEXT_REGEX}\]\(([^\)]+?)#{FRAGMENT_REGEX}\)!
-    REFERENCE_LINK_REGEX = %r!^\s*?\[#{LINK_TEXT_REGEX}\]: (.+?)#{FRAGMENT_REGEX}\s*?$!
-    LINK_REGEX = %r!(#{INLINE_LINK_REGEX}|#{REFERENCE_LINK_REGEX})!
+    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
+    LINK_REGEX = %r!(#{INLINE_LINK_REGEX}|#{REFERENCE_LINK_REGEX})!.freeze
     CONVERTER_CLASS = Jekyll::Converters::Markdown
-    CONFIG_KEY = "relative_links".freeze
-    ENABLED_KEY = "enabled".freeze
-    COLLECTIONS_KEY = "collections".freeze
+    CONFIG_KEY = "relative_links"
+    ENABLED_KEY = "enabled"
+    COLLECTIONS_KEY = "collections"
+    LOG_KEY = "Relative Links:"
 
     safe true
     priority :lowest
 
-    def initialize(site)
-      @site    = site
-      @context = context
+    def initialize(config)
+      @config = config
     end
 
     def generate(site)
+      return if disabled?
+
       @site    = site
       @context = context
-      return if disabled?
 
       documents = site.pages
       documents = site.pages + site.docs_to_write if collections?
@@ -36,6 +37,8 @@ module JekyllRelativeLinks
       documents.each do |document|
         next unless markdown_extension?(document.extname)
         next if document.is_a?(Jekyll::StaticFile)
+        next if excluded?(document)
+
         replace_relative_links!(document)
       end
     end
@@ -46,16 +49,13 @@ module JekyllRelativeLinks
 
       document.content = document.content.dup.gsub(LINK_REGEX) do |original|
         link_type, link_text, relative_path, fragment = link_parts(Regexp.last_match)
-        next original if fragment?(relative_path) || absolute_url?(relative_path)
+        next original unless replaceable_link?(relative_path)
 
         path = path_from_root(relative_path, url_base)
         url  = url_for_path(path)
+        next original unless url
 
-        if url
-          replacement_text(link_type, link_text, url, fragment)
-        else
-          original
-        end
+        replacement_text(link_type, link_text, url, fragment)
       end
     rescue ArgumentError => e
       raise e unless e.to_s.start_with?("invalid byte sequence in UTF-8")
@@ -72,7 +72,7 @@ module JekyllRelativeLinks
     end
 
     def context
-      JekyllRelativeLinks::Context.new(site)
+      @context ||= JekyllRelativeLinks::Context.new(site)
     end
 
     def markdown_extension?(extension)
@@ -85,7 +85,7 @@ module JekyllRelativeLinks
 
     def url_for_path(path)
       target = potential_targets.find { |p| p.relative_path.sub(%r!\A/!, "") == path }
-      relative_url(target.url) if target && target.url
+      relative_url(target.url) if target&.url
     end
 
     def potential_targets
@@ -110,17 +110,22 @@ module JekyllRelativeLinks
 
     def absolute_url?(string)
       return unless string
+
       Addressable::URI.parse(string).absolute?
     rescue Addressable::URI::InvalidURIError
       nil
     end
 
     def fragment?(string)
-      string && string.start_with?("#")
+      string&.start_with?("#")
+    end
+
+    def replaceable_link?(string)
+      !fragment?(string) && !absolute_url?(string)
     end
 
     def option(key)
-      site.config[CONFIG_KEY] && site.config[CONFIG_KEY][key]
+      config[CONFIG_KEY] && config[CONFIG_KEY][key]
     end
 
     def disabled?
@@ -130,5 +135,23 @@ module JekyllRelativeLinks
     def collections?
       option(COLLECTIONS_KEY) == true
     end
+
+    def excluded?(document)
+      return false unless option("exclude")
+
+      entry_filter = if document.respond_to?(:collection)
+                       document.collection.entry_filter
+                     else
+                       global_entry_filter
+                     end
+
+      entry_filter.glob_include?(option("exclude"), document.relative_path).tap do |excluded|
+        Jekyll.logger.debug(LOG_KEY, "excluded #{document.relative_path}") if excluded
+      end
+    end
+
+    def global_entry_filter
+      @global_entry_filter ||= Jekyll::EntryFilter.new(site)
+    end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-relative-links
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -40,18 +40,38 @@ dependencies:
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.49.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.49.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: 0.7.0
 description: 
 email:
 - ben.balter@github.com
@@ -82,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to convert relative links to markdown files to their rendered