jekyll-namespaces 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a486b2fb9c89ac6247a8650948f1111e81836bb374afe532cb08e254dccd831
-  data.tar.gz: 94e8c5b5404a1f4550fe2cc6fc06f40df372f61c7ba65a901bda40b4cca6766c
+  metadata.gz: 65ad7b1dd59a4c7ba4c74ede8dcc430aaa775e8b11827b3525fe22d529764d36
+  data.tar.gz: 4268a0a5d2eeec0c8997fbfcfd22e4794c22df851766a0f2620d4d2dda40d506
 SHA512:
-  metadata.gz: c214a76c788e7fe52bc27ec85977546237f714be562973c433fa94f94764c8c88fdf0202a595f9845b85a43b8549c23b9707b05b33176d2f13014395d0da03cb
-  data.tar.gz: e0a73b6a22a2c80d32f8142152d46da831f32e73989daa0271766c894cd1debe5245bf36d6aa750556a494ec6560248a98b3144af3edccbd4fa1bfec7ee7c962
+  metadata.gz: 2371310d132f8ba3bcaddb09e5e99a2997224cf457987fa1b12dbc954ab86526d4c9c6634141acb239694c11feb0c3718440442b22cb54779b87f773ea176d32
+  data.tar.gz: 2629b35bd44d2f72a3508f4b4edafe8e43b2baa6a1e20a9373afe0cceb35c1957ad2ac7d83f5f0a2eb32aa84f11bdea67be3f53b61663d105b229675e1f679cd

data/lib/jekyll-namespaces/tree.rb

@@ -26,7 +26,7 @@ module Jekyll
     # add unique path for the given doc to tree (node-class).
     def add_path(doc, node=nil, depth=1)
       node = @root if depth == 1
-      Jekyll.logger.error("Incorrect node in tree.add_path") if node == nil
+      Jekyll.logger.error("Jekyll-Namespaces: Incorrect node in tree.add_path") if node == nil
       levels = doc.data['slug'].split(/\s|\./)
       # handle doc if the given node was not root and we are at depth
       if depth == levels.length
@@ -58,7 +58,7 @@ module Jekyll
       self.add_path(doc, new_node, depth + 1)
     end
 
-    def get_all_relative_ids(target_node_id, node=@root, ancestors=[], descendents=[], found=false)
+    def get_all_lineage_ids(target_node_id, node=@root, ancestors=[], descendents=[], found=false)
       # found target node, stop adding ancestors and build descendents
       if target_node_id == node.url || target_node_id == node.namespace || found
         node.children.each do |child_node|
@@ -68,7 +68,7 @@ module Jekyll
           else
             descendents << child_node.doc.url
           end
-          self.get_all_relative_ids(target_node_id, child_node, ancestors.clone, descendents, found=true)
+          self.get_all_lineage_ids(target_node_id, child_node, ancestors.clone, descendents, found=true)
         end
         return ancestors, descendents
       # target node not yet found, build ancestors
@@ -81,17 +81,31 @@ module Jekyll
         end
         results = []
         node.children.each do |child_node|
-          results.concat(self.get_all_relative_ids(target_node_id, child_node, ancestors.clone))
+          results.concat(self.get_all_lineage_ids(target_node_id, child_node, ancestors.clone))
         end
         return results.select { |r| !r.nil? }
       end
     end
 
+
+    def get_sibling_ids(target_node_id, node=@root, parent=nil)
+      return [] if target_node_id === @root.url
+      # found target node
+      if target_node_id == node.url || target_node_id == node.namespace
+        return parent.children.select { |c| c.id }
+      # target node not yet found
+      else
+        node.children.each do |child_node|
+          self.get_sibling_ids(target_node_id, child_node, node)
+        end
+      end
+    end
+
     # find the parent and children of the 'target_doc'.
     # ('node' as in the current node, which first is root.)
-    def find_doc_immediate_relatives(target_doc, node=nil, ancestors=[])
+    def find_doc_ancestors_and_children_metadata(target_doc, node=nil, ancestors=[])
       node = @root if ancestors == []
-      Jekyll.logger.error("Incorrect node in tree.find_doc_immediate_relatives") if node == nil
+      Jekyll.logger.error("Jekyll-Namespaces: Incorrect node in tree.find_doc_immediate_lineages") if node == nil
       if target_doc == node.doc
         children = []
         node.children.each do |child|
@@ -112,7 +126,7 @@ module Jekyll
         end
         results = []
         node.children.each do |child_node|
-          results.concat(self.find_doc_immediate_relatives(target_doc, child_node, ancestors.clone))
+          results.concat(self.find_doc_ancestors_and_children_metadata(target_doc, child_node, ancestors.clone))
         end
         return results.select { |r| !r.nil? }
       end
@@ -120,9 +134,8 @@ module Jekyll
 
     # ...for debugging
     def print_tree(node, ancestors=[])
-      Jekyll.logger.warn "Ancestors: ", ancestors.length
-      Jekyll.logger.warn node
-      Jekyll.logger.warn "Children: ", node.children
+      Jekyll.logger.warn("Jekyll-Namespaces: ")
+      Jekyll.logger.warn("Ancestors: #{ancestors.length}; #{node}; Children: #{node.children}")
       ancestors.append(node.id)
       node.children.each do |child_node|
         self.print_tree(child_node, ancestors.clone)

data/lib/jekyll-namespaces/version.rb

@@ -3,7 +3,7 @@
 module Jekyll
   module Namespaces
 
-    VERSION = "0.0.2"
-    
+    VERSION = "0.0.3"
+
   end
 end

data/lib/jekyll-namespaces.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 require "jekyll"
 
-require_relative "jekyll-namespaces/context"
-require_relative "jekyll-namespaces/site"
+require_relative "jekyll-namespaces/patch/context"
+require_relative "jekyll-namespaces/patch/site"
 require_relative "jekyll-namespaces/tree"
 require_relative "jekyll-namespaces/version"
 
@@ -37,20 +37,20 @@ module Jekyll
         docs += @site.docs_to_write.filter { |d| !excluded?(d.type) }
         @md_docs = docs.filter { |doc| markdown_extension?(doc.extname) }
         if @md_docs.empty?
-          Jekyll.logger.debug("No documents to process.")
+          Jekyll.logger.warn("Jekyll-Namespaces: No documents to process.")
         end
 
         # tree setup
         root_doc = @md_docs.detect { |d| d.data['slug'] == 'root' }
         if root_doc.nil?
-          Jekyll.logger.debug("No root.md detected.")
+          Jekyll.logger.error("Jekyll-Namespaces: No root.md detected.")
         end
         @site.tree = Tree.new(root_doc, @md_docs)
 
         # generate metadata
         @md_docs.each do |doc|
           doc.data['namespace'] = doc.data['slug']
-          doc.data['ancestors'], doc.data['children'] = @site.tree.find_doc_immediate_relatives(doc)
+          doc.data['ancestors'], doc.data['children'] = @site.tree.find_doc_ancestors_and_children_metadata(doc)
         end
 
       end
@@ -86,10 +86,10 @@ module Jekyll
 
       def old_config_warn()
         if @config.include?("d3_graph_data")
-          Jekyll.logger.warn "As of 0.0.2, 'd3_graph_data' should now be 'd3' and requires the 'jekyll-d3' plugin."
+          Jekyll.logger.warn("Jekyll-Namespaces: As of 0.0.2, 'd3_graph_data' should now be 'd3' and requires the 'jekyll-graph' plugin.")
         end
         if option_exist?("include")
-          Jekyll.logger.warn "As of 0.0.2, all markdown files are processed by default. Use 'exclude' config to exclude document types."
+          Jekyll.logger.warn("Jekyll-Namespaces: As of 0.0.2, all markdown files are processed by default. Use 'exclude' config to exclude document types.")
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-namespaces
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - manunamz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -18,8 +18,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-namespaces.rb
-- lib/jekyll-namespaces/context.rb
-- lib/jekyll-namespaces/site.rb
+- lib/jekyll-namespaces/patch/context.rb
+- lib/jekyll-namespaces/patch/site.rb
 - lib/jekyll-namespaces/tree.rb
 - lib/jekyll-namespaces/version.rb
 homepage: https://github.com/manunamz/jekyll-namespaces
@@ -44,7 +44,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 namespaced.filenames (in markdown files).