jekyll-wikilinks 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9067c4d2ad9673d39b79195cb9bd4ef955e5cccac52702bfdd731c9d0aade4b7
-  data.tar.gz: 9b5a31b067e375100933d101b9bab94b8a1d19e17327ab0306cea6ea83543b18
+  metadata.gz: c2acbae9be49d78fdcbbe55411349c1321ac86cd8222ccd44657d04bbbd446ea
+  data.tar.gz: 28811da20a489fbd36c8566aea26b493e5a26b11e1e020f52d88b69d17d30e08
 SHA512:
-  metadata.gz: e3ff8a744de37ca82b01bed3ebeff321c43fa442a923fe9c1a19da6affbc0a54e6bc6f0a9901b86b66b223fe55a7f8277d7594e740d040faa80bfb71cc64e215
-  data.tar.gz: b04df5871d0c527e4d86c3e560205da232b2b1fe48bfe23919c0b400d6888ed373e6b5fffa6a6da687b89620096ef09223e0a691ec1e1dd8c00a533223f124e6
+  metadata.gz: 914ed17d2a796330f190f7e97edb14f7dc328445c2e0a044ddc35532d927bca469baabb90a179455e39d04c368188bdeb328e1a7ce8a1be7d2f01a3356594ebc
+  data.tar.gz: 8bdd89667f8beba351bfd7233245135222d1cb3a432b9ff4b3df2c471252b5f9b09e2cc95cb75f57607e6d47ca73559f7c964b8b1f977a8a5ecd3b734b9d751a

data/lib/jekyll-wikilinks/patch/doc_manager.rb

@@ -4,6 +4,7 @@ require_relative "../util/regex"
 module Jekyll
   module WikiLinks
 
+    # todo: move these methods to the 'WikiLink' classes...?
     #
     # this class is responsible for answering any questions
     # related to jekyll markdown documents
@@ -55,6 +56,13 @@ module Jekyll
         return docs[0]
       end
 
+      def get_doc_by_fpath(file_path)
+        Jekyll.logger.error("Jekyll-Wikilinks: Must provide a 'file_path'") if file_path.nil? || file_path.empty?
+        docs = @md_docs.select{ |d| d.relative_path == (file_path + ".md") }
+        return nil if docs.nil? || docs.empty? || docs.size > 1
+        return docs[0]
+      end
+
       def get_doc_by_url(url)
         Jekyll.logger.error("Jekyll-Wikilinks: Must provide a 'url'") if url.nil? || url.empty?
         docs = @md_docs.select{ |d| d.url == url }
@@ -78,12 +86,15 @@ module Jekyll
 
       # validators
 
-      def file_exists?(filename)
+      def file_exists?(filename, file_path=nil)
         Jekyll.logger.error("Jekyll-Wikilinks: Must provide a 'filename'") if filename.nil? || filename.empty?
-        docs = @md_docs.select{ |d| File.basename(d.basename, File.extname(d.basename)) == filename }
-        docs += @static_files.select{ |d| File.basename(d.relative_path) == filename }
-        return false if docs.nil? || docs.empty? || docs.size > 1
-        return true
+        if file_path.nil?
+          return false if get_doc_by_fname(filename).nil? && get_image_by_fname(filename).nil?
+          return true
+        else
+          return false if get_doc_by_fpath(file_path).nil?
+          return true
+        end
       end
 
       def doc_has_header?(doc, header)

data/lib/jekyll-wikilinks/util/parser.rb

@@ -76,6 +76,8 @@ module Jekyll
         end
         # replace text
         return if @wikilink_inlines.nil?
+        # process typed wikilinks first so we don't accidentally 
+        # overwrite them when handling untyped wikilinks
         self.sort_typed_first
         @wikilink_inlines.each do |wikilink|
           doc_content.gsub!(
@@ -125,24 +127,34 @@ module Jekyll
         # markdown file processing
         linked_doc = wikilink.linked_doc
         link_type_txt = wikilink.is_typed? ? " #{$wiki_conf.css_name("typed")} #{wikilink.link_type}" : ""
-        
-        inner_txt = wikilink.label_txt if wikilink.labelled?
         lnk_doc_rel_url = relative_url(linked_doc.url)
-        
-        if (wikilink.level == "file")
-          inner_txt = "#{linked_doc['title'].downcase}" if inner_txt.nil?
+        if wikilink.labelled?
+          inner_txt = wikilink.label_txt
+        elsif linked_doc.data.keys.include?('title')
+          inner_txt = linked_doc.data['title'].downcase
+        # in case there is no 'title' frontmatter attribute 
+        # (i'm seeing deprecation warnings, but there might 
+        #  be bugs caused by not using this...)
+        elsif linked_doc.respond_to?(:title)
+          inner_txt = linked_doc.title.downcase
+        # pages don't have automatically generated titles
+        else
+          inner_txt = Jekyll::Utils.slugify(linked_doc.basename)
+        end
+        # level-specific
+        if (wikilink.level == "file_path" || wikilink.level == "filename")
           return build_html_embed(
-            linked_doc['title'],
+            linked_doc.title,
             linked_doc.content,
             lnk_doc_rel_url
           ) if wikilink.embedded?
         elsif (wikilink.level == "header")
           # from: https://github.com/jekyll/jekyll/blob/6855200ebda6c0e33f487da69e4e02ec3d8286b7/Rakefile#L74
           lnk_doc_rel_url += "\#" + Jekyll::Utils.slugify(wikilink.header_txt)
-          inner_txt = "#{linked_doc['title'].downcase} > #{wikilink.header_txt.downcase}" if inner_txt.nil?
+          inner_txt += " > #{wikilink.header_txt.downcase}" if !wikilink.labelled?
         elsif (wikilink.level == "block")
           lnk_doc_rel_url += "\#" + wikilink.block_id
-          inner_txt = "#{linked_doc['title'].downcase} > ^#{wikilink.block_id}" if inner_txt.nil?
+          inner_txt += " > ^#{wikilink.block_id}" if !wikilink.labelled?
         else
           Jekyll.logger.error("Jekyll-Wikilinks: Invalid wikilink level")
         end

data/lib/jekyll-wikilinks/util/regex.rb

@@ -22,7 +22,7 @@ module Jekyll
 
     # wikitext usable char requirements
     REGEX_LINK_TYPE_CHARS = /[^\n\s\!\#\^\|\]]+/i
-    REGEX_FILENAME_CHARS  = /[^\\\/:\#\^\|\[\]]+/i
+    REGEX_FILENAME_CHARS  = /[^\\:\#\^\|\[\]]+/i
     REGEX_HEADER_CHARS    = /[^\!\#\^\|\[\]]+/i
     REGEX_BLOCK_ID_CHARS  = /[^\\\/:\!\#\^\|\[\]^\n]+/i
     REGEX_LABEL_CHARS     = /(.+?)(?=\]{2}[^\]])/i

data/lib/jekyll-wikilinks/util/wikilink.rb

@@ -136,19 +136,30 @@ module Jekyll
     end
 
     class WikiLinkInline
-      attr_accessor :context_filename, :embed, :link_type, :filename, :header_txt, :block_id, :label_txt
+      attr_accessor :context_filename, :embed, :link_type, :file_path, :path_type, :filename, :header_txt, :block_id, :label_txt
 
+      FILE_PATH = "file_path"
       FILENAME = "filename"
       HEADER_TXT = "header_txt"
       BLOCK_ID = "block_id"
 
       # parameters ordered by appearance in regex
-      def initialize(doc_mngr, context_filename, embed, link_type, filename, header_txt, block_id, label_txt)
+      def initialize(doc_mngr, context_filename, embed, link_type, file_string, header_txt, block_id, label_txt)
+        if file_string.include?('/') && file_string[0] == '/'
+          @path_type = "absolute"
+          @file_path ||= file_string[1...] # remove leading '/' to match `jekyll_collection_doc.relative_path`
+          @filename ||= file_string.split('/').last
+        elsif file_string.include?('/') && file_string[0] != '/'
+          Jekyll.logger.error("Jekyll-Wikilinks: Relative file paths are not yet supported, please use absolute file paths that start with '/' for #{file_string}")
+          # todo:
+          # @path_type = "relative"
+        else
+          @filename ||= file_string
+        end
         @doc_mngr ||= doc_mngr
         @context_filename ||= context_filename
         @embed ||= embed
         @link_type ||= link_type
-        @filename ||= filename
         @header_txt ||= header_txt
         @block_id ||= block_id
         @label_txt ||= label_txt
@@ -164,35 +175,45 @@ module Jekyll
       def md_regex
         regex_embed = embedded? ? REGEX_LINK_EMBED : %r{}
         regex_link_type = is_typed? ? %r{#{@link_type}#{REGEX_LINK_TYPE}} : %r{}
-        filename = described?(FILENAME) ? @filename : ""
+        if !@file_path.nil?
+          file_string = described?(FILE_PATH) ? @file_path : ""
+          file_string = '/' + file_string if @path_type == "absolute"
+        else
+          file_string = described?(FILENAME) ? @filename : ""
+        end
         if described?(HEADER_TXT)
           header = %r{#{REGEX_LINK_HEADER}#{@header_txt}}
           block = %r{}
         elsif described?(BLOCK_ID)
           header = %r{}
           block = %r{#{REGEX_LINK_BLOCK}#{@block_id}}
-        elsif !described?(FILENAME)
+        elsif !described?(FILENAME) && !described?(FILE_PATH)
           Jekyll.logger.error("Jekyll-Wikilinks: WikiLinkInline.md_regex error")
         end
         label_ =  labelled? ? %r{#{REGEX_LINK_LABEL}#{label_txt}} : %r{}
-        return %r{#{regex_embed}#{regex_link_type}#{REGEX_LINK_LEFT}#{filename}#{header}#{block}#{label_}#{REGEX_LINK_RIGHT}}
+        return %r{#{regex_embed}#{regex_link_type}#{REGEX_LINK_LEFT}#{file_string}#{header}#{block}#{label_}#{REGEX_LINK_RIGHT}}
       end
 
       def md_str
         embed = embedded? ? "!" : ""
         link_type = is_typed? ? "#{@link_type}::" : ""
-        filename = described?(FILENAME) ? @filename : ""
+        if !@file_path.nil?
+          file_string = described?(FILE_PATH) ? @file_path : ""
+          file_string = '/' + file_string if @path_type == "absolute"
+        else
+          file_string = described?(FILENAME) ? @filename : ""
+        end
         if described?(HEADER_TXT)
           header = "\##{@header_txt}"
           block = ""
         elsif described?(BLOCK_ID)
           header = ""
           block = "\#\^#{@block_id}"
-        elsif !described?(FILENAME)
+        elsif !described?(FILENAME) && !described?(FILE_PATH)
           Jekyll.logger.error("Jekyll-Wikilinks: WikiLinkInline.md_str error")
         end
         label_ = labelled? ? "\|#{@label_txt}" : ""
-        return "#{embed}#{link_type}\[\[#{filename}#{header}#{block}#{label_}\]\]"
+        return "#{embed}#{link_type}\[\[#{file_string}#{header}#{block}#{label_}\]\]"
       end
 
       # 'fm' -> frontmatter
@@ -216,7 +237,11 @@ module Jekyll
       end
 
       def linked_doc
-        return @doc_mngr.get_doc_by_fname(@filename)
+        # by file path
+        return @doc_mngr.get_doc_by_fpath(@file_path) if !@file_path.nil?
+        # by filename
+        return @doc_mngr.get_doc_by_fname(@filename) if @file_path.nil?
+        return nil
       end
 
       def linked_img
@@ -258,6 +283,7 @@ module Jekyll
 
       # this method helps to make the 'WikiLinkInline.level' code read like a clean truth table.
       def described?(chunk)
+        return (!@file_path.nil? && !@file_path.empty?) if chunk == FILE_PATH
         return (!@filename.nil? && !@filename.empty?) if chunk == FILENAME
         return (!@header_txt.nil? && !@header_txt.empty?) if chunk == HEADER_TXT
         return (!@block_id.nil? && !@block_id.empty?) if chunk == BLOCK_ID
@@ -265,16 +291,17 @@ module Jekyll
       end
 
       def level
-        return "file" if described?(FILENAME) && !described?(HEADER_TXT) && !described?(BLOCK_ID)
-        return "header" if described?(FILENAME) && described?(HEADER_TXT) && !described?(BLOCK_ID)
-        return "block" if described?(FILENAME) && !described?(HEADER_TXT) && described?(BLOCK_ID)
+        return "file_path" if described?(FILE_PATH) && described?(FILENAME) && !described?(HEADER_TXT) && !described?(BLOCK_ID)
+        return "filename"  if !described?(FILE_PATH) && described?(FILENAME) && !described?(HEADER_TXT) && !described?(BLOCK_ID)
+        return "header"    if (described?(FILE_PATH) || described?(FILENAME)) && described?(HEADER_TXT) && !described?(BLOCK_ID)
+        return "block"     if (described?(FILE_PATH) || described?(FILENAME)) && !described?(HEADER_TXT) && described?(BLOCK_ID)
         return "invalid"
       end
 
       # validation methods
 
       def is_valid?
-        return false if !@doc_mngr.file_exists?(@filename)
+        return false if !@doc_mngr.file_exists?(@filename, @file_path)
         return false if (self.level == "header") && !@doc_mngr.doc_has_header?(self.linked_doc, @header_txt)
         return false if (self.level == "block") && !@doc_mngr.doc_has_block_id?(self.linked_doc, @block_id)
         return true

data/lib/jekyll-wikilinks/version.rb

@@ -3,7 +3,7 @@
 module Jekyll
   module WikiLinks
 
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-wikilinks
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - manunamz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll