gollum-descendant_tree 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 011a69d0b24bc3d9070a5730df90e4f497472d82
-  data.tar.gz: 9ff25b636b2f48f602fa2217aaa30f28ae3be760
+  metadata.gz: e58211e3637a19ad2fd57668d7f109269c71d5bb
+  data.tar.gz: 83f25aa50e62b98f8face77e7aef54ae33d910c7
 SHA512:
-  metadata.gz: a238b3f368852651c6f6556540973a1c46495c0b14d6fff1327ff775ea1e57c82b72bfdc4bb62674c92cc855a98edf6fd956a6bbcf020f6e8f5f7c9587ab33a8
-  data.tar.gz: 663a8044f4de0356a6e0afa31241aa585ce8586cc07718179fe525b9801c8a208e6c9f313b409ae0bd4bae2ec55a526846182aabdfc8f07926ccdeaeff728750
+  metadata.gz: ef85eed1b68e6a236d58b5e5cbfb3cdbf94edb877f588b389ff700ecf6f1057003dc1c593535486b6fa8347bd74c3ba27e3bb1efbc512d86d8e4fecc7c976d74
+  data.tar.gz: 90f8ff0e540930f8f699c441e63c5355065527ba05a49c4b8dc59e75f88da68634ead0ba5359645cb764da9090153891e7d4bbe0eca2c2a2f4081e27e28a9c73

data/lib/gollum/descendant_tree/tree_builder.rb

@@ -2,18 +2,19 @@ module Gollum
   module DescendantTree
     class TreeBuilder
 
-      def initialize (wiki, name)
+      def initialize (wiki, name, dir)
         @wiki = wiki
         @name = name
+        @dir = dir
         @current_nest_index = 0
+        set_current_page_identifier
       end
 
       def tree
-        current_page_name = get_current_page_name
         page_descendants = []
         @wiki.pages.each do |page|
           set_current_nest_index(page) if page.filename == @name
-          if (page.url_path.include?(current_page_name))
+          if (is_descendant?(page))
             page_descendants << {
               title: page.title,
               url_path: page.url_path,
@@ -27,16 +28,21 @@ module Gollum
 
       private
       
+      def set_current_page_identifier
+        current_page_name = @name.split('.').first
+        @current_page_identifier = (@dir.length > 1) ? @dir + '/' + current_page_name : current_page_name
+      end
+
       def set_current_nest_index(page)
         @current_nest_index = get_path_array(page).length
       end
 
-      def get_current_index(page)
-        get_path_array(page).length - @current_nest_index
+      def is_descendant?(page)
+        return true if page.url_path.include?(@current_page_identifier)
       end
 
-      def get_current_page_name
-        @name.split('.').first
+      def get_current_index(page)
+        get_path_array(page).length - @current_nest_index
       end
 
       def get_path_array(page)

data/lib/gollum/descendant_tree/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module DescendantTree
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
   end
 end

data/lib/gollum/markup.rb

@@ -3,7 +3,7 @@ module Gollum
 
     def render_with_descendant_tree (no_follow = false, encoding = nil)
       data = render_without_descendant_tree(no_follow, encoding)
-      tree_builder = Gollum::DescendantTree::TreeBuilder.new(@wiki, @name)
+      tree_builder = Gollum::DescendantTree::TreeBuilder.new(@wiki, @name, @dir)
       tree = tree_builder.tree
       tree_renderer = Gollum::DescendantTree::TreeRenderer.new
       #[[_TREE_]] is already rendered from Markup.render

data/spec/lib/gollum/descendant_tree/tree_builder_spec.rb

@@ -5,7 +5,7 @@ describe Gollum::DescendantTree::TreeBuilder do
   it "returns the correct tree" do
     wiki = double
     wiki.stub(:pages).and_return(pages)
-    tree_builder = Gollum::DescendantTree::TreeBuilder.new(wiki, 'current_page.md')
+    tree_builder = Gollum::DescendantTree::TreeBuilder.new(wiki, 'current_page.md', 'home')
     expect(tree_builder.tree).to eq(tree_with_correct_nesting)
   end
 

data/spec/support/test_helpers.rb

@@ -9,7 +9,8 @@ module Gollum
             ['home/current_page/child','child.md','Child'],
             ['home/current_page/child/grandchild','grandchild.md','Grandchild'],
             ['home/current_page/child/grandchild/greatgrandchild','greatgrandchild.md','GreatGrandchild'],
-            ['home/current_page/child_sibling', 'childsibling.md', 'Child Sibling']
+            ['home/current_page/child_sibling', 'childsibling.md', 'Child Sibling'],
+            ['home/sibling/current_page', 'current_page.md', 'Sibling']
           ]
           pages = []
           pages_info.each do |page|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-descendant_tree
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Aaron Froehlich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler