jekyll-awesome-nav 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b40b8ac598c39b7d6ea9b1235a4089893bd73e52d8722e8a2c4af8115aa468
-  data.tar.gz: d4109676b6da69d8f40d623b55d40087d57c45f46c718fa349116a9080807bf9
+  metadata.gz: 8b77d4ad15599d518da1a7535f19fc68b945e6e16544b8198f591f94aab1bed5
+  data.tar.gz: f9c47d4e02a46679fa8e87f838ed9c2cb00d5b4d1bb0c5dfd7c4f561bc4b4366
 SHA512:
-  metadata.gz: 89bb231311898453666edc086e0a54d6593d6c2644749e4f8a021253b0d272bb56f9bb0c522b9eac17314ea94ccd33e0d2289bd01dde5b69fc9f5f95b2b61ec9
-  data.tar.gz: 7c05e014b8ad8ae8d6fc31f3382af750f10bde1d481f1ad1e19def058645c85e6a4db8b95514a674736da12170e2a49d30898a248ed8c4296d526f967257823c
+  metadata.gz: 925d4fc6bc37d7243c906f480f017b96ec48f7315a1e18a42ab8b08060445ffe868ee5f592945fc1ae446e08c0fb5a68ef1079d8237ad78354f65612675ba565
+  data.tar.gz: a01bbf7f22823601fb1c6bc34e2b2ace36a69618af1ba584c2c0d3aef62fdd4ffb76715db5663b9fa6e74246e3295b8c363869c4ac3331977c52c2339d506fcd

data/lib/jekyll/awesome_nav/navigation_result.rb

@@ -42,7 +42,7 @@ module Jekyll
 
       def breadcrumbs_for(page)
         page_url = Utils.normalize_url(page.url)
-        trail = find_trail(serialized_tree, page_url)
+        trail = find_trail(internal_serialized_tree, page_url)
         return root_breadcrumb(page) if trail.nil? && Utils.source_dir_for(page) == @root_dir && Utils.index_page?(page)
         return [] unless trail
 
@@ -51,12 +51,10 @@ module Jekyll
 
           crumb = { "title" => item["title"] }
           crumb["url"] = item["url"] if item["url"]
+          crumb["dir"] = item["__dir"] if item.key?("__dir")
           crumb
         end
 
-        breadcrumbs = trim_root_breadcrumb(breadcrumbs)
-        return breadcrumbs if @root_dir.empty?
-
         prepend_root_breadcrumb(breadcrumbs)
       end
 
@@ -66,6 +64,10 @@ module Jekyll
 
       private
 
+      def internal_serialized_tree
+        @internal_serialized_tree ||= Serializer.serialize_tree(@tree, include_internal: true)
+      end
+
       def local_nav_nodes
         @local_nav_nodes ||= begin
           map = { @root_dir => @tree.map(&:deep_dup) }
@@ -87,15 +89,14 @@ module Jekyll
       end
 
       def root_breadcrumb(page)
-        title = page.data["nav_title"] || page.data["title"] || Utils.titleize(Utils.last_segment(@root_dir))
-        title = resolved_root_title if title.to_s.empty?
-        [{ "title" => title, "url" => Utils.normalize_url(page.url) }]
+        [{ "title" => root_breadcrumb_title, "url" => Utils.normalize_url(page.url), "dir" => @root_dir }]
       end
 
       def prepend_root_breadcrumb(breadcrumbs)
         root_crumb = {
-          "title" => resolved_root_title,
-          "url" => Utils.normalize_url(@root_page&.url || "/#{@root_dir}/")
+          "title" => root_breadcrumb_title,
+          "url" => Utils.normalize_url(@root_page&.url || "/#{@root_dir}/"),
+          "dir" => @root_dir
         }
 
         return [root_crumb] + breadcrumbs[1..] if same_breadcrumb_url?(breadcrumbs.first, root_crumb)
@@ -103,25 +104,12 @@ module Jekyll
         [root_crumb] + breadcrumbs
       end
 
-      def trim_root_breadcrumb(breadcrumbs)
-        return breadcrumbs if breadcrumbs.empty?
-
-        root_crumb = {
-          "title" => resolved_root_title,
-          "url" => Utils.normalize_url(@root_page&.url || "/#{@root_dir}/")
-        }
-
-        return breadcrumbs unless same_breadcrumb_url?(breadcrumbs.first, root_crumb)
-
-        breadcrumbs[1..] || []
-      end
-
       def neighbor_map
         @neighbor_map ||= begin
           items = []
           if @root_page
             items << {
-              "title" => resolved_root_title,
+              "title" => root_breadcrumb_title,
               "url" => Utils.normalize_url(@root_page.url)
             }
           end
@@ -168,6 +156,12 @@ module Jekyll
         Utils.normalize_url(left["url"]) == Utils.normalize_url(right["url"])
       end
 
+      def root_breadcrumb_title
+        return "home" if @root_dir.empty?
+
+        resolved_root_title
+      end
+
       def resolved_root_title
         title = @root_page&.data&.fetch("nav_title", nil) ||
                 @root_page&.data&.fetch("title", nil) ||

data/lib/jekyll/awesome_nav/serializer.rb

@@ -18,7 +18,7 @@ module Jekyll
         item = { "title" => node.title }
         item["url"] = node.url if node.url
         item["children"] = serialize_tree(node.children, include_internal: include_internal) if node.section? && node.children.any?
-        item["__dir"] = node.dir if include_internal && node.dir
+        item["__dir"] = node.dir if include_internal && !node.dir.nil?
         item
       end
     end

data/lib/jekyll/awesome_nav/version.rb

@@ -2,7 +2,7 @@
 
 module Jekyll
   module AwesomeNav
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
 
     def self.warn_if_unstamped_version(output = $stderr)
       return unless VERSION == "0.0.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-awesome-nav
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Allison Thackston