noumenon 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.2.1
+
+## New Features
+
+* The nav_menu helper, and ContentRepository#children now includes the root item by default, and sorts
+  on path name.
+
 # 0.2.0
 
 ## Backwards Compatiability Broken

data/lib/noumenon/content_repository/file_system.rb

@@ -60,27 +60,26 @@ class Noumenon::ContentRepository::FileSystem < Noumenon::ContentRepository
   #
   # @see Noumenon::Repository#children
   # @api public
-  def children(root = "/", depth = 1)
+  def children(root = "/", depth = 1, include_root = true)
     root.gsub! /\/$/, ''
     
     pattern = File.join(repository_path(root), "*")
-    items = Dir.glob(pattern).collect do |i|
+    
+    items = Dir.glob(pattern).collect { |i|
       i.gsub(repository_path("/"), "/").
         gsub(".yml", "")
-    end
-    
-    # We're not interested in indexes, since they're not children.
-    items.delete(File.join(root, "index"))
+    }.reject { |i| i.gsub(root, "").split("/").size > depth + 1 }
+    items.delete(File.join(root, "index")) unless include_root
      
-    items.reject { |i| i.gsub(root, "").split("/").size > depth + 1 }.collect do |item|
-      path = item == "" ? "/" : item
+    items.collect { |item|
+      path = item == "" ? "/" : item.gsub("index", "")
       
       # Loading every item probably isn't scalable, but it'll do for now. We can add caching
       # at a later date if needed.
       page = get(path).merge({ path: path })
-      page[:children] = children(page[:path], depth - 1) if depth - 1 > 0
+      page[:children] = children(page[:path], depth - 1, false) if depth - 1 > 0
       page
-    end
+    }.sort { |a, b| a[:path] <=> b[:path] }
   end
   
   # Save a static asset to the repository.

data/lib/noumenon/template/core_tags.rb

@@ -58,20 +58,20 @@ module Noumenon::Template::CoreTags
   # @api public
   # @example
   #   <header>
-  #     {{ nav_menu }}
+  #     {% nav_menu %}
   #   </header>
   #
   #   <div id="sidebar">
   #     <h1>About Our Stuff</h1>
   #     <nav>
-  #       {{ nav_menu root=/about depth=1 }}
+  #       {% nav_menu root=/about depth=1 include_root=false %}
   #     </nav>
   #   </div>
   class NavigationTag < Liquid::Tag
     def initialize(tag_name, syntax, tokens)
       super
       
-      @options = { depth: 1, root: "/" }
+      @options = { depth: 1, root: "/", include_root: true }
      
       syntax.split(" ").each do |option|
         key, value = option.split("=")
@@ -80,6 +80,8 @@ module Noumenon::Template::CoreTags
           @options[:depth] = value.to_i
         when "root"
           @options[:root] = value
+        when "include_root"
+          @options[:include_root] = [ "true", "yes", "1" ].include?(value)
         end
       end
     end
@@ -98,7 +100,7 @@ module Noumenon::Template::CoreTags
     end
     
     def render(context)
-      render_list Noumenon.content_repository.children(@options[:root], @options[:depth])
+      render_list Noumenon.content_repository.children(@options[:root], @options[:depth], @options[:include_root])
     end
   end
   Liquid::Template.register_tag('nav_menu', NavigationTag)

data/lib/noumenon/version.rb

@@ -1,5 +1,5 @@
 module Noumenon
   # The current version of Noumenon.
   # @api public
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/noumenon/content_repository/file_system_spec.rb

@@ -131,7 +131,7 @@ describe Noumenon::ContentRepository::FileSystem do
       end
       
       it "does not list items below the top level" do
-        subject.children("/").should have(2).items
+        subject.children("/").should have(3).items
       end
       
       describe "each item" do
@@ -142,13 +142,15 @@ describe Noumenon::ContentRepository::FileSystem do
         end
 
         it "has a path" do
-          items[0][:path].should == "/about"
-          items[1][:path].should == "/contact"
+          items[0][:path].should == "/"
+          items[1][:path].should == "/about"
+          items[2][:path].should == "/contact"
         end
 
         it "has a title" do
-          items[0][:title].should == "About"
-          items[1][:title].should == "Contact"
+          items[0][:title].should == "Home"
+          items[1][:title].should == "About"
+          items[2][:title].should == "Contact"
         end
       end
     end
@@ -158,7 +160,8 @@ describe Noumenon::ContentRepository::FileSystem do
       
       describe "an item with children" do
         it "has an array of children" do
-          items[0][:children].should have(2).items
+          items[1][:children].should have(2).items
+          items[1][:children][0][:title].should == "Location"
         end
       end
     end
@@ -167,9 +170,10 @@ describe Noumenon::ContentRepository::FileSystem do
       let(:items) { subject.children("/about") }
 
       it "lists only items below that point" do
-        items.should have(2).items
-        items[0][:title].should == "Location"
-        items[1][:title].should == "Team"
+        items.should have(3).items
+        items[0][:title].should == "About"
+        items[1][:title].should == "Location"
+        items[2][:title].should == "Team"
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: noumenon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jon Wood