jekyll-graph 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a0cf412d49fe1abbc5280977f3bc732f7ff42836abddb64a948e26d4f5dc89
-  data.tar.gz: 29914337ea3a859ea54a5585e10944cb3334d48c7d9a021902e2ab8f87130f64
+  metadata.gz: 4ed0feb31f2a12640c7ba6611b2768a0d2424fff77a5d6909876e5f1b586abd0
+  data.tar.gz: 856133d37f0c83fc570ea8437edea51a4181d5b43f8e832b310ea17a08966a4c
 SHA512:
-  metadata.gz: 58d70f942b2024ba62c52c7fcd1a88162f36e342e02268ba198852f6dd09b08f7768edb2a7504abecb0495ae4d8f0d1071dc40320868bd95c06bc94330e82364
-  data.tar.gz: 66f5daee147641ad9ac8c1c71c8baffe90a6d3400d6e52f42e725cf886444775e38272dbb7907be3df2e892e835e9230ebe4690774a3cc2decdd71f899652152
+  metadata.gz: 7cff6886e6391bb8920746f0f248fb13ed8f795841c66c714f0c91b158afa0c16253d82249941fee5b2b4e018a2d715af2fd4527509ab3af7d0626f415c52d68
+  data.tar.gz: cbd240e478d07b67f92c8da3d8a31c261e3a3ea58a9052838b7fd4bb30da830dc37092c72453db65e2aab293a9bdf38d022f522cba227008947d3c45bfeb2275

data/CHANGELOG.md

@@ -1,4 +1,19 @@
-## [0.0.3] 2021-11-22
+## [0.0.7] - 2022-01-27
+### Change
+- Bump jekyll-wikilinks version number (0.0.11).
+## [0.0.6] - 2022-01-24
+### Change
+- Move jekyll patch files to patch/ dir.
+- Bump jekyll-wikilinks version number (0.0.10).
+## [0.0.5] - 2021-11-23
+### Change
+- 'relatives' -> 'lineage' for tree nodes.
+
+## [0.0.4] - 2021-11-22
+### Fix
+- Custom path config related fix in scripts.
+
+## [0.0.3] - 2021-11-22
 ### Change
 - Fix javascript inheritance.
 - Decrement missing node log messages from 'warn' to 'debug'.

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 gem "jekyll", "~> 4.2.0"
 gem "jekyll-namespaces", "~> 0.0.3"
-gem "jekyll-wikilinks", "~> 0.0.8"
+gem "jekyll-wikilinks", "~> 0.0.11"
 
 gem "rake", "~> 13.0.3"
 gem "rspec", "~> 3.10"

data/README.md

@@ -6,7 +6,7 @@
 
 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).
 
-This gem is part of the [jekyll-bonsai](https://manunamz.github.io/jekyll-bonsai/) project. 🎋
+This gem is part of the [jekyll-bonsai](https://jekyll-bonsai.netlify.app/) project. 🎋
 
 ## Installation
 
@@ -41,15 +41,17 @@ export default class JekyllGraphSubClass extends JekyllGraph {
 
   constructor() {
     super();
+    // access graph with 'this.graph'
     // access graph div with 'this.graphDiv'
   }
   
   // ...
 }
 ```
+
 Call `this.drawNetWeb()` and `this.drawTree()` to actually draw the graph. You could do this simply on initialization or on a button click, etc.
 
-Unless otherwise defined, the `jekyll-graph.js` file will be generated into `_site/assets/js/`.
+Unless otherwise configured (see `path` vars below), the `jekyll-graph.js` file will be generated into `_site/assets/js/`.
 
 ## Configuration
 
@@ -64,6 +66,9 @@ graph:
     scripts: "/assets/js"
   net_web:
     enabled: true
+    exclude:
+      attrs: false
+      links: false
     force:
       charge:
       strength_x:
@@ -88,6 +93,8 @@ graph:
 
 `path.scripts`: An optional custom scripts location for the graph scripts to generate into. Location is relative to the assets location in the `_site/` directory (If `assets_path` is set, but `scripts_path` is not, the location will default to `_site/<assets_path>/js/`).
 
+`net_web.exclude.attrs` and `net_web.exclude.links`: Determines whether wikilink attributes and/or links are added to the net-web graph from the link index.
+
 `tree.enabled` and `net_web.enabled`: Toggles on/off the `tree` and `net_web` graphs, respectively. Be sure to disable graphs that are not in use.
 
 `tree.force` and `net_web.force`: These are force variables from d3's simulation forces. You can check out the [docs for details](https://github.com/d3/d3-force#simulation_force).
@@ -175,11 +182,11 @@ For the tree graph, `graph-tree.json`, `links` are built from a tree data struct
   "nodes": [
     {
       "id": "<some-id>",
-      "url": "<relative-url>", // site.baseurl wil be handled for you here
+      "url": "<lineage-url>", // site.baseurl wil be handled for you here
       "label": "<note's-title>",
-      "relatives": {
-          "nodes": [<relative-node-id>, ...],
-          "links": [<relative-link-id>, ...],
+      "lineage": {
+          "nodes": [<lineage-node-id>, ...],
+          "links": [<lineage-link-id>, ...],
       }
     },
     ...

data/jekyll-graph.gemspec

@@ -30,11 +30,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_dependency "jekyll", "~> 4.2.0"
 
   # 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.8"
+  spec.add_runtime_dependency "jekyll-wikilinks", "~> 0.0.11"
 end

data/lib/jekyll-graph/config.rb

@@ -7,9 +7,11 @@ module Jekyll
     class PluginConfig
 
       ASSETS_KEY = "assets"
+      ATTRS_KEY = "attrs"
       CONFIG_KEY = "graph"
       ENABLED_KEY = "enabled"
       EXCLUDE_KEY = "exclude"
+      LINKS_KEY = "links"
       NET_WEB_KEY = "net_web"
       PATH_KEY = "path"
       SCRIPTS_KEY = "scripts"
@@ -22,7 +24,7 @@ module Jekyll
         Jekyll.logger.debug("Excluded jekyll types in graph: ", option(EXCLUDE_KEY)) unless disabled?
       end
 
-      # options
+      # descriptors
 
       def disabled?
         return option(ENABLED_KEY) == false
@@ -49,6 +51,18 @@ module Jekyll
         return option_path(SCRIPTS_KEY)
       end
 
+      def use_attrs?
+        return true if option_net_web_exclude(ATTRS_KEY).nil?
+        return !option_net_web_exclude(ATTRS_KEY)
+      end
+
+      def use_links?
+        return true if option_net_web_exclude(LINKS_KEY).nil?
+        return !option_net_web_exclude(LINKS_KEY)
+      end
+
+      # options
+
       def option(key)
         @config[CONFIG_KEY] && @config[CONFIG_KEY][key]
       end
@@ -61,6 +75,10 @@ module Jekyll
         @config[CONFIG_KEY] && @config[CONFIG_KEY][NET_WEB_KEY] && @config[CONFIG_KEY][NET_WEB_KEY][key]
       end
 
+      def option_net_web_exclude(key)
+        @config[CONFIG_KEY] && @config[CONFIG_KEY][NET_WEB_KEY] && @config[CONFIG_KEY][NET_WEB_KEY][EXCLUDE_KEY] && @config[CONFIG_KEY][NET_WEB_KEY][EXCLUDE_KEY][key]
+      end
+
       def option_tree(key)
         @config[CONFIG_KEY] && @config[CONFIG_KEY][TREE_KEY] && @config[CONFIG_KEY][TREE_KEY][key]
       end

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

@@ -8,7 +8,7 @@ export default class JekyllGraph {
 
   // d3
   drawNetWeb () {
-    let assetsPath = '{{ site.graph.assets_path }}' !== '' ? '{{ site.graph.assets_path }}' : '/assets';
+    let assetsPath = '{{ site.graph.path.assets }}' !== '' ? '{{ site.graph.path.assets }}' : '/assets';
     fetch(`{{ site.baseurl }}${assetsPath}/graph-net-web.json`).then(res => res.json()).then(data => {
 
       // neighbors: replace ids with full object
@@ -110,7 +110,7 @@ export default class JekyllGraph {
   }
 
   drawTree () {
-    let assetsPath = '{{ site.graph.assets_path }}' !== '' ? '{{ site.graph.assets_path }}' : '/assets';
+    let assetsPath = '{{ site.graph.path.assets }}' !== '' ? '{{ site.graph.path.assets }}' : '/assets';
     fetch(`{{ site.baseurl }}${assetsPath}/graph-tree.json`).then(res => res.json()).then(data => {
       
       if (this.graph) {
@@ -127,19 +127,19 @@ export default class JekyllGraph {
       let hoverNode = null;
       let hoverLink = null;
 
-      // relatives: replace ids with full objects
+      // lineage: replace ids with full objects
       data.nodes.forEach(node => {
-        // relatives
-        let relativeNodes = [];
-        node.relatives.nodes.forEach(nNodeId => {
-          relativeNodes.push(data.nodes.find(node => node.id === nNodeId));
+        // lineage
+        let lineageNodes = [];
+        node.lineage.nodes.forEach(nNodeId => {
+          lineageNodes.push(data.nodes.find(node => node.id === nNodeId));
         });
         let relativeLinks = [];
-        node.relatives.links.forEach(nLink => {
+        node.lineage.links.forEach(nLink => {
           relativeLinks.push(data.links.find(link => link.source === nLink.source && link.target === nLink.target));
         });
-        node.relatives.nodes = relativeNodes;
-        node.relatives.links = relativeLinks;
+        node.lineage.nodes = lineageNodes;
+        node.lineage.links = relativeLinks;
         // siblings
         this.numSiblingsLeft[node.parent] = node.siblings.length;
       });
@@ -188,8 +188,8 @@ export default class JekyllGraph {
           highlightLinks.clear();
           if (node) {
             highlightNodes.add(node);
-            node.relatives.nodes.forEach(node => highlightNodes.add(node));
-            node.relatives.links.forEach(link => highlightLinks.add(link));
+            node.lineage.nodes.forEach(node => highlightNodes.add(node));
+            node.lineage.links.forEach(link => highlightLinks.add(link));
           }
           hoverNode = node || null;
         })
@@ -269,9 +269,9 @@ export default class JekyllGraph {
     } else if (hoverNode !== null && gType === "net-web" && !hoverNode.neighbors.nodes.includes(node)) {
       // non-neighbor to hoverNode
       fillText = false;
-    } else if (hoverNode !== null && gType === "tree" && hoverNode.relatives.nodes.includes(node)) {
+    } else if (hoverNode !== null && gType === "tree" && hoverNode.lineage.nodes.includes(node)) {
       // neighbor to hoverNode
-    } else if (hoverNode !== null && gType === "tree" && !hoverNode.relatives.nodes.includes(node)) {
+    } else if (hoverNode !== null && gType === "tree" && !hoverNode.lineage.nodes.includes(node)) {
       // non-neighbor to hoverNode
       fillText = false;
     } else if ((hoverNode === null && hoverLink !== null) && (hoverLink.source === node || hoverLink.target === node)) {

data/lib/jekyll-graph/version.rb

@@ -3,7 +3,7 @@
 module Jekyll
   module Graph
 
-    VERSION = "0.0.3"
+    VERSION = "0.0.7"
 
   end
 end

data/lib/jekyll-graph.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 require "jekyll"
 
-require_relative "jekyll-graph/context"
-require_relative "jekyll-graph/page"
+require_relative "jekyll-graph/patch/context"
+require_relative "jekyll-graph/patch/page"
 require_relative "jekyll-graph/version"
 
 # setup config
@@ -69,7 +69,7 @@ module Jekyll
         if !$graph_conf.disabled_tree?
           # generate json data
           json_tree_nodes, json_tree_links = self.generate_json_tree(@site.tree.root)
-          self.set_relatives(json_tree_nodes, json_tree_links)
+          self.set_lineage(json_tree_nodes, json_tree_links)
           tree_graph_content = JSON.dump(
             nodes: json_tree_nodes,
             links: json_tree_links,
@@ -138,20 +138,20 @@ module Jekyll
         end
       end
 
-      def set_relatives(json_nodes, json_links)
+      def set_lineage(json_nodes, json_links)
         # TODO: json nodes have relative_url, but node.id's/urls are doc urls.
         json_nodes.each do |json_node|
-          # set relatives
+          # set lineage
 
-          ancestor_node_ids, descendent_node_ids = @site.tree.get_all_relative_ids(json_node[:id])
-          relative_node_ids = ancestor_node_ids.concat(descendent_node_ids)
-          json_node[:relatives][:nodes] = relative_node_ids if !relative_node_ids.nil?
+          ancestor_node_ids, descendent_node_ids = @site.tree.get_all_lineage_ids(json_node[:id])
+          lineage_node_ids = ancestor_node_ids.concat(descendent_node_ids)
+          json_node[:lineage][:nodes] = lineage_node_ids if !lineage_node_ids.nil?
 
           # include current node when filtering for links along entire relative lineage
-          lineage_ids = relative_node_ids.concat([json_node[:id]])
+          lineage_ids = lineage_node_ids.concat([json_node[:id]])
 
-          json_relative_links = json_links.select { |l| lineage_ids.include?(l[:source]) && lineage_ids.include?(l[:target]) }
-          json_node[:relatives][:links] = json_relative_links if !json_relative_links.nil?
+          json_lineage_links = json_links.select { |l| lineage_ids.include?(l[:source]) && lineage_ids.include?(l[:target]) }
+          json_node[:lineage][:links] = json_lineage_links if !json_lineage_links.nil?
 
           # set siblings
 
@@ -203,10 +203,27 @@ module Jekyll
               },
             }
             # TODO: this link calculation ends up with duplicates -- re-visit this later.
-            @site.link_index.index[doc.url].attributes.each do |link| # link = { 'type' => str, 'urls' => [str, str, ...] }
-              # TODO: Header + Block-level wikilinks
-              link['urls'].each do |lu|
-                link_no_anchor = lu.match(/([^#]+)/i)[0]
+            if $graph_conf.use_attrs?
+              @site.link_index.index[doc.url].attributes.each do |link| # link = { 'type' => str, 'urls' => [str, str, ...] }
+                # TODO: Header + Block-level wikilinks
+                link['urls'].each do |lu|
+                  link_no_anchor = lu.match(/([^#]+)/i)[0]
+                  link_no_baseurl = @site.baseurl.nil? ? link_no_anchor : link_no_anchor.gsub(@site.baseurl, "")
+                  linked_doc = @md_docs.select{ |d| d.url == link_no_baseurl }
+                  if !linked_doc.nil? && linked_doc.size == 1 && !$graph_conf.excluded?(linked_doc.first.type)
+                    # TODO: add link['type'] to d3 graph
+                    net_web_links << {
+                      source: doc.url,
+                      target: linked_doc.first.url,
+                    }
+                  end
+                end
+              end
+            end
+            if $graph_conf.use_links?
+              @site.link_index.index[doc.url].forelinks.each do |link| # link = { 'type' => str, 'url' => str }
+                # TODO: Header + Block-level wikilinks
+                link_no_anchor = link['url'].match(/([^#]+)/i)[0]
                 link_no_baseurl = @site.baseurl.nil? ? link_no_anchor : link_no_anchor.gsub(@site.baseurl, "")
                 linked_doc = @md_docs.select{ |d| d.url == link_no_baseurl }
                 if !linked_doc.nil? && linked_doc.size == 1 && !$graph_conf.excluded?(linked_doc.first.type)
@@ -218,19 +235,6 @@ module Jekyll
                 end
               end
             end
-            @site.link_index.index[doc.url].forelinks.each do |link| # link = { 'type' => str, 'url' => str }
-              # TODO: Header + Block-level wikilinks
-              link_no_anchor = link['url'].match(/([^#]+)/i)[0]
-              link_no_baseurl = @site.baseurl.nil? ? link_no_anchor : link_no_anchor.gsub(@site.baseurl, "")
-              linked_doc = @md_docs.select{ |d| d.url == link_no_baseurl }
-              if !linked_doc.nil? && linked_doc.size == 1 && !$graph_conf.excluded?(linked_doc.first.type)
-                # TODO: add link['type'] to d3 graph
-                net_web_links << {
-                  source: doc.url,
-                  target: linked_doc.first.url,
-                }
-              end
-            end
 
           end
         end
@@ -252,7 +256,7 @@ module Jekyll
             namespace: node.namespace,
             url: "",
             level: level,
-            relatives: {
+            lineage: {
               nodes: [],
               links: [],
             },
@@ -278,7 +282,7 @@ module Jekyll
             namespace: node.namespace,
             url: relative_url(node.url),
             level: level,
-            relatives: {
+            lineage: {
               nodes: [],
               links: [],
             },

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-graph
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - manunamz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: jekyll-namespaces
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.11
 description:
 email:
 - manunamz@pm.me
@@ -59,9 +73,9 @@ files:
 - jekyll-graph.gemspec
 - lib/jekyll-graph.rb
 - lib/jekyll-graph/config.rb
-- lib/jekyll-graph/context.rb
 - lib/jekyll-graph/jekyll-graph.js
-- lib/jekyll-graph/page.rb
+- lib/jekyll-graph/patch/context.rb
+- lib/jekyll-graph/patch/page.rb
 - lib/jekyll-graph/tags.rb
 - lib/jekyll-graph/version.rb
 homepage: https://github.com/manunamz/jekyll-graph