jekyll-wikilinks 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e65a8cc36608b07333b7fe02a0f37f100117c7ed94d0b2e0fa500520eee6a2aa
-  data.tar.gz: 8d28d1930fedbddfd17d13c431f42043cdfb3333493929f78977d8da122c0647
+  metadata.gz: 861b1b580036bacff2ddf67c3080e21ec36adfe550944fb637ee07ce6afa5b58
+  data.tar.gz: 62380a8fbc94fdb4646055999b1deaf339a561bf3fbdfb8f858b0b8e993573fb
 SHA512:
-  metadata.gz: bae180a6824ea1a646d9103a0e6701814e1792275ae1037119db819b91fc35a9d01d8fc5c4b64ea8ba689f9b799309fd662ce66e001fd89e1e83eb1114257fba
-  data.tar.gz: d9327ed183e0d9ade35f23633a70f01157b388cdb627de5890d63cfd151a0bf070ddf92313b92ca385f187b360b96fbaaa770b2dfc29cf9a28fc4ffdb45caa57
+  metadata.gz: fa76884a4da7bdca8ec6d389140a8c7f0b193563bba676abe81ea683b6932444abcfe1fb619c0e6186450f38eb81cced6067c154c275854fd73bc81b932c4455
+  data.tar.gz: 4e2ffa8675e1a6d5066f472d3b021d1d8c20a11104c1802b0dd451c45d92120b410aea44c8bf8b6af6a42b0d9d3bb287cb4469382e8c66d7e03448cff650c0da

data/lib/jekyll-wikilinks/config.rb

@@ -15,6 +15,7 @@ module Jekyll
       NAME_KEY = "name"
       # names
       ## valid
+      TYPED_KEY = "typed"
       WEB_KEY = "web"
       WIKI_KEY = "wiki"
       ## invalid
@@ -38,6 +39,7 @@ module Jekyll
 
       def css_name(name_key)
         return option_css_name(name_key) if option_css_name(name_key)
+        return "typed" if name_key == TYPED_KEY
         # valid
         return "wiki-link" if name_key == WIKI_KEY
         # invalid

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

@@ -44,7 +44,7 @@ module Jekyll
               filename,
             )
             @wikilink_blocks << typed_link_block_wikilink
-            doc_content.gsub!(typed_link_block_wikilink.md_regex, "")
+            doc_content.gsub!(typed_link_block_wikilink.md_regex, "\n")
           end
         end
       end
@@ -75,7 +75,7 @@ module Jekyll
               # process previous wikilink_list
               if !processing_wikilink_list.nil? && processing_wikilink_list.has_items?
                 @wikilink_blocks << processing_wikilink_list
-                doc_content.gsub!(processing_wikilink_list.md_regex, "")
+                doc_content.gsub!(processing_wikilink_list.md_regex, "\n")
               end
               processing_link_type = link_type
               processing_wikilink_list = WikiLinkBlock.new(processing_link_type, bullet_type, link_filename_1)
@@ -88,7 +88,7 @@ module Jekyll
           # process previous wikilink_list
           if !processing_wikilink_list.nil? && processing_wikilink_list.has_items?
             @wikilink_blocks << processing_wikilink_list
-            doc_content.gsub!(processing_wikilink_list.md_regex, "")
+            doc_content.gsub!(processing_wikilink_list.md_regex, "\n")
           end
         end
       end
@@ -131,7 +131,7 @@ module Jekyll
               # process previous wikilink_list
               if !processing_wikilink_list.nil? && processing_wikilink_list.has_items?
                 @wikilink_blocks << processing_wikilink_list
-                doc_content.gsub!(processing_wikilink_list.md_regex, "")
+                doc_content.gsub!(processing_wikilink_list.md_regex, "\n")
               end
               processing_link_type = link_type
               processing_wikilink_list = WikiLinkBlock.new(processing_link_type)
@@ -143,7 +143,7 @@ module Jekyll
           # process previous wikilink_list
           if !processing_wikilink_list.nil? && processing_wikilink_list.has_items?
             @wikilink_blocks << processing_wikilink_list
-            doc_content.gsub!(processing_wikilink_list.md_regex, "")
+            doc_content.gsub!(processing_wikilink_list.md_regex, "\n")
           end
         end
       end
@@ -164,6 +164,7 @@ module Jekyll
         end
         # replace text
         return if @wikilink_inlines.nil?
+        self.sort_typed_first
         @wikilink_inlines.each do |wikilink|
           doc_content.gsub!(
             wikilink.md_link_regex,
@@ -210,7 +211,7 @@ module Jekyll
         end
         linked_doc = @doc_manager.get_doc_by_fname(wikilink.filename)
   			if !linked_doc.nil?
-          link_type = wikilink.typed? ? " typed #{wikilink.link_type}" : ""
+          link_type = wikilink.typed? ? " #{$wiki_conf.css_name("typed")} #{wikilink.link_type}" : ""
 
   				# label
   				wikilink_inner_txt = wikilink.clean_label_txt if wikilink.labelled?
@@ -242,6 +243,21 @@ module Jekyll
   				return '<span class="' + $wiki_conf.css_name("invalid_wiki") + '">' + wikilink.md_link_str + '</span>'
   			end
   		end
+
+      # helpers
+
+      def sort_typed_first
+        # sorting inline wikilinks is necessary so when wikilinks are replaced,
+        # longer strings are replaced first so as not to accidentally overwrite 
+        # substrings
+        # (this is especially likely if there is a matching wikilink that 
+        #  appears as both untyped and typed in a document)
+        temp = @wikilink_inlines.dup
+        @wikilink_inlines.clear()
+        typed_wikilinks = temp.select { |wl| wl.typed? }
+        untyped_wikilinks = temp.select { |wl| !wl.typed? }
+        @wikilink_inlines = typed_wikilinks.concat(untyped_wikilinks)
+      end
     end
 
     # validation

data/lib/jekyll-wikilinks/version.rb

@@ -3,7 +3,7 @@
 module Jekyll
   module WikiLinks
 
-    VERSION = "0.0.6"
-    
+    VERSION = "0.0.7"
+
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-wikilinks
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - manunamz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.27
 signing_key:
 specification_version: 4
 summary: Add jekyll support for [[wikilinks]] (in markdown files).