jekyll-graph 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66875092a5dcc753a34bb074f399ec0e5de3cbaa9a25fa154fc585420bce6007
-  data.tar.gz: '0423681fcf78d2fc0487d318c02d52b8cfe9f93d4be79747bfa72b7a3ae00be5'
+  metadata.gz: 9c8e8d2c47a467d671a541f0383514514ce1dc661b547384badcf7ff127a7f48
+  data.tar.gz: b71d501a8c8b3eabcc7f5c54534d299bcb31b15459281ec57ee54a72275ddb07
 SHA512:
-  metadata.gz: d2439f89e5287ab1c298e9e4e42563b43961debe93200b69c2cf9f2768bb70ce97c9084c58c34f14ad331e1f3f414d07b54f66688047ff8764cebccba846addb
-  data.tar.gz: 4b9eec6d0e335d670714fb128736f2883d53d38d2c066acb3f2901fb3ba002d854276778c35ab18b4c707ae7ef74c34eaa66e47f667fb887c3c5127a7f29082e
+  metadata.gz: bc3bb48999037c60980546dbec3192ae9c857b11f73cc36d947370535f0a81e7420b2273af8bbd1ee24fb0fa637354f0dfca8658c5dcae521b78525c928cdf3c
+  data.tar.gz: a397d40e8f56f1968780bc0fcf8573471365746ff59a1ad6f4a2685e09dfb0a5756df1eaaf0141721a6caa9dec78ec91290926f3f7eed504319691656d5a22e7

data/README.md

@@ -1,12 +1,15 @@
 # Jekyll-Graph
 
+[![A WikiBonsai Project](https://img.shields.io/badge/%F0%9F%8E%8B-A%20WikiBonsai%20Project-brightgreen)](https://github.com/wikibonsai/wikibonsai)
+[![Ruby Gem](https://img.shields.io/gem/v/jekyll-graph)](https://rubygems.org/gems/jekyll-graph)
+
 ⚠️ This is gem is under active development! ⚠️
 
 ⚠️ Expect breaking changes and surprises until otherwise noted (likely by v0.1.0 or v1.0.0). ⚠️
 
-Jekyll-Graph generates data and renders a graph that allows visitors to navigate a jekyll site by clicking nodes in the graph. Nodes are generated from the site's markdown files. Links for the tree graph are generated from [`jekyll-namespaces`](https://github.com/manunamz/jekyll-namespaces) and links for the net-web graph from [`jekyll-wikilinks`](https://github.com/manunamz/jekyll-wikilinks).
+Jekyll-Graph generates data and renders a graph that allows visitors to navigate a jekyll site by clicking nodes in the graph. Nodes are generated from the site's markdown files. Links for the tree graph are generated from [`jekyll-semtree`](https://github.com/wikibonsai/jekyll-semtree) or [`jekyll-namespaces`](https://github.com/manunamz/jekyll-namespaces) and links for the net-web graph from [`jekyll-wikirefs`](https://github.com/wikibonsai/jekyll-wikirefs) [`jekyll-wikilinks`](https://github.com/manunamz/jekyll-wikilinks).
 
-This gem is part of the [jekyll-bonsai](https://jekyll-bonsai.netlify.app/) project. 🎋
+🏡 Build and maintain a treehouze to play in in your [WikiBonsai](https://github.com/wikibonsai/wikibonsai) digital garden.
 
 ## Installation
 
@@ -144,6 +147,8 @@ No configurations are strictly necessary for plugin defaults to work.
 Graph colors are determined by css variables which may be defined like so -- any valid css color works (hex, rgba, etc.):
 
 ```CSS
+/* make sure color vars are attached to the root of the html document */
+html {
   /* nodes */
   /* glow */
   --graph-node-current-glow: yellow;
@@ -159,6 +164,7 @@ Graph colors are determined by css variables which may be defined like so -- any
   --graph-particles-color: grey;
   /* label text */
   --graph-text-color: black;
+}
 ```
 
 ## Data

data/jekyll-graph.gemspec

@@ -34,7 +34,4 @@ Gem::Specification.new do |spec|
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
-
-  spec.add_runtime_dependency "jekyll-namespaces", "~> 0.0.3"
-  spec.add_runtime_dependency "jekyll-wikilinks", "~> 0.0.11"
 end

data/lib/jekyll-graph/jekyll-graph.js

@@ -227,7 +227,7 @@ export default class JekyllGraph {
   // draw helpers
 
   shiftNodeHeight(node) {
-    if (node.namespace !== 'root' && !this.shifted.includes(node)) {
+    if ((node.namespace !== 'root') && (node.namespace !== 'i.bonsai') && !this.shifted.includes(node)) {
       const padding = 5;
       let areSiblingsLeftEven = (this.numSiblingsLeft[node.parent] % 2) === 1;
       let altrntr = areSiblingsLeftEven ? 1 : -1;

data/lib/jekyll-graph/version.rb

@@ -3,7 +3,7 @@
 module Jekyll
   module Graph
 
-    VERSION = "0.0.8"
+    VERSION = "0.0.10"
 
   end
 end

data/lib/jekyll-graph.rb

@@ -37,7 +37,7 @@ module Jekyll
           return
         end
         if !$graph_conf.disabled_tree? && !site.respond_to?(:tree)
-          Jekyll.logger.error("Jekyll-Graph: To generate the tree graph, please either add and enable the 'jekyll-namespaces' plugin  or disable the tree in the jekyll-graph config")
+          Jekyll.logger.error("Jekyll-Graph: To generate the tree graph, please either add and enable the 'jekyll-semtree' or 'jekyll-namespaces' plugin, or disable the tree in the jekyll-graph config")
           return
         end
 
@@ -173,7 +173,7 @@ module Jekyll
             #
             @site.link_index.index[doc.url].missing.each do |missing_link_name|
               if net_web_nodes.none? { |node| node[:id] == missing_link_name }
-                Jekyll.logger.warn("Jekyll-Graph: Net-Web node missing: #{missing_link_name}, in: #{doc.data['title']}")
+                Jekyll.logger.warn("Jekyll-Graph: Net-Web node missing: #{missing_link_name}, in: #{File.basename(doc.basename, File.extname(doc.basename))}")
                 net_web_nodes << {
                   id: missing_link_name, # an id is necessary for link targets
                   url: '',
@@ -242,18 +242,24 @@ module Jekyll
         return net_web_nodes, net_web_links
       end
 
+      # used for both plugins:
+      # jekyll-semtree
+      # jekyll-namespace
       def generate_json_tree(node, json_parent="", tree_nodes=[], tree_links=[], level=0)
+        node = node.is_a?(String) ? @site.tree.nodes.detect { |n| n.text == node } : node
         #
         # missing nodes
         #
         if node.missing
-          Jekyll.logger.warn("Jekyll-Graph: Document for tree node missing: ", node.namespace)
+          missing_text = node.namespace ? node.namespace : node.text
+          Jekyll.logger.warn("Jekyll-Graph: Tree node missing: ", missing_text)
 
-          leaf = node.namespace.split('.').pop()
+          if node.namespace
+            leaf = node.namespace.split('.').pop()
+          end
           missing_node = {
-            id: node.namespace,
-            label: leaf.gsub('-', ' '),
-            namespace: node.namespace,
+            id: node.namespace ? node.namespace : node.text,
+            label: node.namespace ? leaf.gsub('-', ' ') : node.text,
             url: "",
             level: level,
             lineage: {
@@ -262,12 +268,15 @@ module Jekyll
             },
             siblings: [],
           }
+          if node.namespace
+            missing_node['namespace'] = node.namespace
+          end
           # non-root handling
           if !json_parent.empty?
             missing_node[:parent] = json_parent[:id]
             tree_links << {
               source: json_parent[:id],
-              target: node.namespace,
+              target: node.namespace ? node.namespace : node.text,
             }
           end
           tree_nodes << missing_node
@@ -279,7 +288,6 @@ module Jekyll
           existing_node = {
             id: node.url,
             label: node.title,
-            namespace: node.namespace,
             url: relative_url(node.url),
             level: level,
             lineage: {
@@ -288,6 +296,9 @@ module Jekyll
             },
             siblings: [],
           }
+          if node.namespace
+            existing_node['namespace'] = node.namespace
+          end
           # non-root handling
           if !json_parent.empty?
             existing_node[:parent] = json_parent[:id]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-graph
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - manunamz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -24,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: jekyll-namespaces
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-- !ruby/object:Gem::Dependency
-  name: jekyll-wikilinks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.11
 description:
 email:
 - manunamz@pm.me
@@ -100,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Add d3 graph generation to jekyll.