middleman-navigation 1.0.1 → 1.0.2

data/README.markdown

@@ -54,4 +54,8 @@ Example:
 
 *title*: is used to set a custom title to menu, default to file name
 
+### Root Item
 
+The site root is now included by default in the navigation. If you'd like it to be hidden, you can set hidden to true in the frontmatter for the index page. Unlike other pages, the children of the hidden index page will still be visible!
+
+Because it seems like the most reasonable semantic HTML, the site root is included at the same level as its children, at the beginning of the list. That doesn't support using weight to sort, but that could change if it becomes desirable.

data/lib/middleman-navigation/tree.rb

@@ -3,12 +3,11 @@ module Middleman
     class Tree
       def self.build(sitemap)
         @app = sitemap.app
-        root_path = @app.http_prefix + @app.index_file
-        root = sitemap.find_resource_by_destination_path root_path
+        @root = sitemap.find_resource_by_destination_path @app.http_prefix+@app.index_file
 
-        unless root.blank?
+        unless @root.blank?
           SimpleNavigation::Configuration.run do |navigation|
-            traverse(root, navigation)
+            traverse(@root, navigation)
           end
         end
       end
@@ -18,11 +17,12 @@ module Middleman
 
         unless children.blank?
           navigation.items do |level|
-            children.each do |child|
-              title = child.data.navigation[:title] || child.data.title
-              url = child.data.navigation[:destination] || child.url
+            if resource == @root
+              add_navigation_node @root, level unless @root.data.navigation[:hidden]
+            end
 
-              level.item child.destination_path, title, url, :highlights_on => %r(#{url}(#{@app.index_file})?)
+            children.each do |child|
+              add_navigation_node child, level
               traverse child, level
             end
           end
@@ -35,6 +35,13 @@ module Middleman
         visible.sort! {|a, b| a.data.navigation[:weight] <=> b.data.navigation[:weight]}
         visible
       end
+
+      def self.add_navigation_node(node, level)
+        title = node.data.navigation[:title] || node.data.title
+        url = node.data.navigation[:destination] || node.url
+
+        level.item node.destination_path, title, url, :highlights_on => %r(#{url}(#{@app.index_file})?)
+      end
     end
   end
 end

data/lib/middleman-navigation/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Navigation
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-navigation
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman