jekyll-wikilinks 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb34f22e418709f097d81cbcd13a0917ab903247145bb0db4846a346c0b86f38
-  data.tar.gz: 62bff9a52a5e965a542071a0d577ea3a962c3acd604643d0955de449e924de7a
+  metadata.gz: 9067c4d2ad9673d39b79195cb9bd4ef955e5cccac52702bfdd731c9d0aade4b7
+  data.tar.gz: 9b5a31b067e375100933d101b9bab94b8a1d19e17327ab0306cea6ea83543b18
 SHA512:
-  metadata.gz: '087c441fc74aa0da7659bf070eb3c2b079033d8a567002e00603825498afb6ef30d259372e18799506e4fc2b7b3cc3c3501f0a67dd4e559eefd463214ee6a502'
-  data.tar.gz: 8abe1efd8a9b2eecd13b1d83599c09ee29db9e2e943ed097bf49aa000fd1a6caea2c6cedc1bb05fdce6fb4bfa3d1852b01221420e91f647d8aff61b7bce6ac50
+  metadata.gz: e3ff8a744de37ca82b01bed3ebeff321c43fa442a923fe9c1a19da6affbc0a54e6bc6f0a9901b86b66b223fe55a7f8277d7594e740d040faa80bfb71cc64e215
+  data.tar.gz: b04df5871d0c527e4d86c3e560205da232b2b1fe48bfe23919c0b400d6888ed373e6b5fffa6a6da687b89620096ef09223e0a691ec1e1dd8c00a533223f124e6

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

@@ -23,46 +23,56 @@ module Jekyll
       end
 
       def populate(doc, wikilink_blocks, wikilink_inlines)
-        # blocks
+        #        #
+        # blocks #
+        #        #
         wikilink_blocks.each do |wlbl|
           if wlbl.is_valid?
+            #
             # attributes
+            #
             target_attr = @index[doc.url].attributes.detect { |atr| atr['type'] == wlbl.link_type }
-            ## create
+            # create
             if target_attr.nil?
               @index[doc.url].attributes << wlbl.linked_fm_data
-            ## append
+            # append
             else
-              target_attr['urls'] += wlbl.urls
+              target_attr['urls'] += wlbl.urls 
             end
+            ## append missing docs
+            @index[doc.url].missing += wlbl.missing_doc_filenames 
+            #
             # attributed
+            #
             wlbl.linked_docs.each do |linked_doc|
               target_attr = @index[linked_doc.url].attributed.detect { |atr| atr['type'] == wlbl.link_type }
-              ## create
+              # create
               if target_attr.nil?
                 @index[linked_doc.url].attributed << wlbl.context_fm_data
-              ## append
+              # append
               else
                 target_attr['urls'] << doc.url
               end
             end
           else
-            wlbl.filenames.each do |fn|
-              @index[doc.url].missing << fn
-            end
+            #
+            # invalid || empty
+            #
+            @index[doc.url].missing += wlbl.missing_doc_filenames
           end
         end
-        # inlines
+        #         #
+        # inlines #
+        #         #
         wikilink_inlines.each do |wlil|
-          if !wlil.is_img?
-            if wlil.is_valid?
-              # forelink
-              @index[doc.url].forelinks << wlil.linked_fm_data
-              # backlink
-              @index[wlil.linked_doc.url].backlinks << wlil.context_fm_data
-            else
-              @index[doc.url].missing << wlil.filename
-            end
+          return if wlil.is_img?
+          if wlil.is_valid?
+            # forelink
+            @index[doc.url].forelinks << wlil.linked_fm_data
+            # backlink
+            @index[wlil.linked_doc.url].backlinks << wlil.context_fm_data
+          else
+            @index[doc.url].missing << wlil.filename
           end
         end
       end

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

@@ -68,7 +68,7 @@ module Jekyll
       end
 
       def urls
-        # return @filenames.map { |f| @doc_mngr.get_doc_by_fname(f) }
+        # return @filenames.map { |f| @doc_mngr.get_doc_by_fname(f).url }.compact()
         urls = []
         @filenames.each do |f|
           doc = @doc_mngr.get_doc_by_fname(f)
@@ -87,9 +87,10 @@ module Jekyll
       end
 
       def linked_fm_data
+        valid_urls = self.urls.select{ |url| @doc_mngr.get_doc_by_url(url) }
         return {
           'type' => @link_type,
-          'urls' => self.urls,
+          'urls' => valid_urls,
         }
       end
 
@@ -106,6 +107,15 @@ module Jekyll
         return docs
       end
 
+      def missing_doc_filenames
+        missing_doc_fnames = [] 
+        @filenames.each do |f|
+          doc = @doc_mngr.get_doc_by_fname(f)
+          missing_doc_fnames << f if doc.nil?
+        end
+        return missing_doc_fnames
+      end
+
       # descriptor methods
 
       def has_filenames?
@@ -119,11 +129,8 @@ module Jekyll
       # validation methods
 
       def is_valid?
-        return false if !is_typed?
-        return false if !has_filenames?
-        @filenames.each do |f|
-          return false if !@doc_mngr.file_exists?(f)
-        end
+        all_filenames_missing = linked_docs.empty?
+        return false if !is_typed? || !has_filenames? || all_filenames_missing
         return true
       end
     end

data/lib/jekyll-wikilinks/version.rb

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

metadata

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