gollum-descendant_tree 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 011a69d0b24bc3d9070a5730df90e4f497472d82
+  data.tar.gz: 9ff25b636b2f48f602fa2217aaa30f28ae3be760
+SHA512:
+  metadata.gz: a238b3f368852651c6f6556540973a1c46495c0b14d6fff1327ff775ea1e57c82b72bfdc4bb62674c92cc855a98edf6fd956a6bbcf020f6e8f5f7c9587ab33a8
+  data.tar.gz: 663a8044f4de0356a6e0afa31241aa585ce8586cc07718179fe525b9801c8a208e6c9f313b409ae0bd4bae2ec55a526846182aabdfc8f07926ccdeaeff728750

data/README.md

@@ -4,7 +4,7 @@ DescendantTree adds a helper function, similar to Gollum's Table of Contents (TO
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your Gollum application's Gemfile:
 
     gem 'gollum-descendant_tree'
 

data/lib/gollum/descendant_tree/tree_builder.rb

@@ -11,15 +11,14 @@ module Gollum
       def tree
         current_page_name = get_current_page_name
         page_descendants = []
-        previous_page = ''
         @wiki.pages.each do |page|
+          set_current_nest_index(page) if page.filename == @name
           if (page.url_path.include?(current_page_name))
             page_descendants << {
               title: page.title,
               url_path: page.url_path,
-              nest_index: get_current_index(page, previous_page)
+              nest_index: get_current_index(page)
             }
-            previous_page = page
           end
           
         end
@@ -28,16 +27,12 @@ module Gollum
 
       private
       
-      def get_current_index(current, previous)
-        return 0 if previous == ''
-        current_path_array = get_path_array(current)
-        previous_path_array = get_path_array(previous)
-        i = -1
-        previous_path_array.reverse_each do |node|
-          next if current_path_array.include?(node)
-          i += 1
-        end
-        @current_nest_index -= i
+      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
       end
 
       def get_current_page_name

data/lib/gollum/descendant_tree/version.rb

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

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

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+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')
+    expect(tree_builder.tree).to eq(tree_with_correct_nesting)
+  end
+
+  def pages
+    build_mock_pages
+  end
+end

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

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Gollum::DescendantTree::TreeRenderer do
+
+  it "correctly renders a tree with indexes" do
+    tree_renderer = Gollum::DescendantTree::TreeRenderer.new
+    expect(tree_renderer.render(tree_with_correct_nesting)).to eq(correct_output)
+  end
+
+  def correct_output
+    "<ul class='tree'>\n<li><a href='/home/current_page'>Current Page</a><ul>\n<li><a href='/home/current_page/child'>Child</a><ul>\n<li><a href='/home/current_page/child/grandchild'>Grandchild</a><ul>\n<li><a href='/home/current_page/child/grandchild/greatgrandchild'>GreatGrandchild</a></li></ul>\n</li></ul>\n<li><a href='/home/current_page/child_sibling'>Child Sibling</a></ul></li>\n</ul>\n"
+  end
+end

data/spec/support/test_helpers.rb

@@ -4,11 +4,12 @@ module Gollum
       module PageMockFactory
         def build_mock_pages
           pages_info = [
-            ['current_page', 'current_page.md', 'Current Page'],
-            ['current_page/child','child.md','Child'],
-            ['current_page/child/grandchild','grandchild.md','Grandchild'],
-            ['current_page/child/grandchild/greatgrandchild','greatgrandchild.md','GreatGrandchild'],
-            ['current_page/child_sibling', 'childsibling.md', 'Child Sibling']
+            ['home', 'home.md', 'Home'],
+            ['home/current_page', 'current_page.md', 'Current Page'],
+            ['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']
           ]
           pages = []
           pages_info.each do |page|
@@ -24,6 +25,16 @@ module Gollum
           page.stub(:title).and_return(page_config[2])
           page
         end
+
+        def tree_with_correct_nesting
+          [
+            {:title=>"Current Page", :url_path=>"home/current_page", :nest_index=>0},
+            {:title=>"Child", :url_path=>"home/current_page/child", :nest_index=>1},
+            {:title=>"Grandchild", :url_path=>"home/current_page/child/grandchild", :nest_index=>2},
+            {:title=>"GreatGrandchild",:url_path=>"home/current_page/child/grandchild/greatgrandchild", :nest_index=>3},
+            {:title=>"Child Sibling", :url_path=>"home/current_page/child_sibling", :nest_index=>1}
+          ]
+        end
       end
     end
   end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: gollum-descendant_tree
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Aaron Froehlich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70271551146020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70271551146020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70271551144980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271551144980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70271551141900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70271551141900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: gollum
-  requirement: &70271551140480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70271551140480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: titleize
-  requirement: &70271551139500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70271551139500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Provides a tag that can be used in gollum to output descedants of the
   current page
 email:
@@ -86,41 +100,40 @@ files:
 - lib/gollum/descendant_tree/tree_renderer.rb
 - lib/gollum/descendant_tree/version.rb
 - lib/gollum/markup.rb
-- spec/gollum/descendant_tree/markup_spec.rb
-- spec/gollum/descendant_tree/tree_builder_spec.rb
-- spec/gollum/descendant_tree/tree_renderer_spec.rb
+- spec/lib/gollum/descendant_tree/markup_spec.rb
+- spec/lib/gollum/descendant_tree/tree_builder_spec.rb
+- spec/lib/gollum/descendant_tree/tree_renderer_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_helpers.rb
 homepage: https://github.com/singlebrook/gollum-descendant_tree
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Descendant Tree is similar to Gollum's _TOC_ tag, except that it outputs
   an unordered list of all descendants of the current page, as determined by the page
   paths.
 test_files:
-- spec/gollum/descendant_tree/markup_spec.rb
-- spec/gollum/descendant_tree/tree_builder_spec.rb
-- spec/gollum/descendant_tree/tree_renderer_spec.rb
+- spec/lib/gollum/descendant_tree/markup_spec.rb
+- spec/lib/gollum/descendant_tree/tree_builder_spec.rb
+- spec/lib/gollum/descendant_tree/tree_renderer_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_helpers.rb

data/spec/gollum/descendant_tree/tree_builder_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-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')
-    expect(tree_builder.tree).to eq(tree_with_correct_nesting)
-  end
-
-  def pages
-    build_mock_pages
-  end
-
-  def tree_with_correct_nesting
-    [{:title=>"Current Page", :url_path=>"current_page", :nest_index=>0},
-      {:title=>"Child", :url_path=>"current_page/child", :nest_index=>1},
-      {:title=>"Grandchild", :url_path=>"current_page/child/grandchild", :nest_index=>2},
-      {:title=>"GreatGrandchild",:url_path=>"current_page/child/grandchild/greatgrandchild", :nest_index=>3},
-      {:title=>"Child Sibling", :url_path=>"current_page/child_sibling", :nest_index=>1}]
-  end
-
-end

data/spec/gollum/descendant_tree/tree_renderer_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe Gollum::DescendantTree::TreeRenderer do
-
-  it "correctly renders a tree with indexes" do
-    wiki = double
-    wiki.stub(:pages).and_return(pages)
-    tree_renderer = Gollum::DescendantTree::TreeRenderer.new
-    expect(tree_renderer.render(tree_with_nesting)).to eq(correct_output)
-  end
-
-  def pages
-    build_mock_pages
-  end
-
-  def correct_output
-    "<ul class='tree'>\n<li><a href='/current_page'>Current Page</a><ul>\n<li><a href='/current_page/child'>Child</a><ul>\n<li><a href='/current_page/child/grandchild'>Grandchild</a><ul>\n<li><a href='/current_page/child/grandchild/greatgrandchild'>GreatGrandchild</a></li></ul>\n</li></ul>\n<li><a href='/current_page/child_sibling'>Child Sibling</a></ul></li>\n</ul>\n"
-  end
-
-  def tree_with_nesting
-    [{:title=>"Current Page", :url_path=>"current_page", :nest_index=>0},
-      {:title=>"Child", :url_path=>"current_page/child", :nest_index=>1},
-      {:title=>"Grandchild", :url_path=>"current_page/child/grandchild", :nest_index=>2},
-      {:title=>"GreatGrandchild",:url_path=>"current_page/child/grandchild/greatgrandchild", :nest_index=>3},
-      {:title=>"Child Sibling", :url_path=>"current_page/child_sibling", :nest_index=>1}]
-  end
-end