jekyll-jtd-toc-nav 0.2.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e47efee6a267af3e358e577ef316d23751943725d55820830a1dc4c03b51768
-  data.tar.gz: f4f987f57a4ca7a8f1d718af39ab385eb9d8edfcd1526d5eb537f0983fd6c942
+  metadata.gz: d78498cdafec4ae7aae82bc4e2cf319711e5ae17ad881cd7495149ba29af7e97
+  data.tar.gz: e80b1d91582fa159c4e10047e29947e1c2cfd7315ac312def881bc3b8a860811
 SHA512:
-  metadata.gz: d43e9ebd07ce40722600133b6bee1b66af44bcfd8f06f4977a7ae2e099e979d0a780a0fd328da24fa6e06979e7d8dcfffc1e5bc8d46e83280b48f222d33342db
-  data.tar.gz: 8787e52ccb3cf97ca332ecf11533861f8d32bdfcf6c6c39fd33c2698d1d37329a734b3cde0286e9557a683f621bf3c16d69cf6a36c9e2df18c1534d67041a3d9
+  metadata.gz: 573528e4c17b0bd289f4e00bc68e8ed053c09ebc2d46bd20cfe4742e1144035e06f5d852292810a48c80edca974579cc8f733f68a449a360a7f745eec19c18a3
+  data.tar.gz: aa7bbf410a6cc1b71713a689d9c11902b1eb640a9589ec1afb5de0cdca07a1205f2c9f58a10b09ce8bc0ec7ddcd4a468d99f9df2e2f09e29ffbf928d695d5229

data/lib/jekyll/jtd_toc_nav/injector.rb

@@ -3,29 +3,30 @@
 module Jekyll
   module JtdTocNav
     class Injector
-      DEFAULT_LEVELS = (2..4).to_a
+      DEFAULT_LEVELS = (1..4).to_a
 
       def initialize(site:)
         @site = site
       end
 
       def levels
-        raw = @site.config["sidebar_toc_levels"]
-        return DEFAULT_LEVELS if raw.nil?
-
-        if raw.is_a?(String) && raw.include?("..")
-          a, b = raw.split("..", 2).map { |x| Integer(x) rescue nil }
-          return DEFAULT_LEVELS if a.nil? || b.nil?
-          return (a..b).to_a
-        end
+        configured_levels(@site.config["sidebar_toc_levels"]) || DEFAULT_LEVELS
+      end
 
-        if raw.is_a?(Array)
-          ints = raw.map { |x| Integer(x) rescue nil }.compact
-          return DEFAULT_LEVELS if ints.empty?
-          return ints
+      def levels_for(page_like)
+        data = page_like.data if page_like.respond_to?(:data)
+        if data.respond_to?(:key?) && data.key?("sidebar_toc_levels")
+          raw = data["sidebar_toc_levels"]
+          parsed = configured_levels(raw)
+          return parsed if parsed
+
+          Jekyll.logger.warn(
+            "jtd-toc-nav:",
+            "invalid sidebar_toc_levels on #{page_label(page_like)}: #{raw.inspect}"
+          )
         end
 
-        DEFAULT_LEVELS
+        levels
       end
 
       def expand_all?
@@ -38,7 +39,7 @@ module Jekyll
         html = page_like.output
         doc = Nokogiri::HTML(html)
 
-        headings = extract_headings(doc)
+        headings = extract_headings(doc, levels_for(page_like))
         return if headings.empty?
 
         nav = doc.at_css("#site-nav")
@@ -70,8 +71,62 @@ module Jekyll
 
       private
 
-      def extract_headings(doc)
-        selector = levels.map { |lvl| "main h#{lvl}" }.join(", ")
+      def configured_levels(raw)
+        return nil if raw.nil?
+
+        if raw.is_a?(Array)
+          ints = raw.map { |x| Integer(x) rescue nil }.compact
+          return nil if ints.empty?
+
+          return ints
+        end
+
+        parsed = parse_levels_spec(raw)
+        return nil if parsed.nil? || parsed.empty?
+
+        parsed
+      end
+
+      # "1..4", "2, 3, 5", or "2 3". Returns nil when the spec is not usable.
+      def parse_levels_spec(raw)
+        str = raw.to_s.strip
+        if (str.start_with?('"') && str.end_with?('"')) || (str.start_with?("'") && str.end_with?("'"))
+          str = str[1..-2].strip
+        end
+        return nil if str.empty?
+
+        if str.include?("..")
+          a_str, b_str = str.split("..", 2)
+          a = Integer(a_str.strip) rescue nil
+          b = Integer(b_str.strip) rescue nil
+          return nil if a.nil? || b.nil? || a > b
+
+          return (a..b).to_a
+        end
+
+        parts = str.split(/[\s,]+/).reject(&:empty?)
+        return nil if parts.empty?
+
+        ints = parts.map { |part| Integer(part) rescue nil }
+        return nil if ints.any?(&:nil?)
+
+        ints
+      end
+
+      def page_label(page_like)
+        if page_like.respond_to?(:relative_path) && page_like.relative_path
+          page_like.relative_path
+        elsif page_like.respond_to?(:path) && page_like.path
+          page_like.path
+        elsif page_like.respond_to?(:url)
+          page_like.url
+        else
+          "(unknown page)"
+        end
+      end
+
+      def extract_headings(doc, heading_levels)
+        selector = heading_levels.map { |lvl| "main h#{lvl}" }.join(", ")
         doc.css(selector).filter_map do |h|
           next if h["id"].to_s.empty?
           classes = h["class"].to_s.split(/\s+/)

data/lib/jekyll/jtd_toc_nav/version.rb

@@ -0,0 +1,6 @@
+module Jekyll
+  module JtdTocNav
+    VERSION = "0.4.0"
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-jtd-toc-nav
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.4.0
 platform: ruby
 authors:
 - directsun
@@ -44,6 +44,7 @@ extra_rdoc_files: []
 files:
 - lib/jekyll-jtd-toc-nav.rb
 - lib/jekyll/jtd_toc_nav/injector.rb
+- lib/jekyll/jtd_toc_nav/version.rb
 homepage: ''
 licenses:
 - MIT