gollum-lib 4.1.0-java → 4.2.0-java

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWYyYjYxMWEyZGU4NzQ3OGY5NmZiMzMwNjRhZmEzZDRmOGMxMzVhZA==
-  data.tar.gz: !binary |-
-    YjY4ZTA4ZmI3YTQxYTBkNDk3Mzg2OGRjYTI2ODU1OTZhNmRlNjgzMQ==
+SHA1:
+  metadata.gz: ba4f85ee983f86c785ae1cc45000e7f1371788fb
+  data.tar.gz: cca82fcd5d80ada67af74521851cb2b9b7a8c6de
 SHA512:
-  metadata.gz: !binary |-
-    ZDkyMGY4NGZkOGY2ZDZjZWEzYmNjYWMwYTg3ZTE1ZTRlODUzZDQ2Y2Y3NmJj
-    OGNhNjI0M2RjYmQwMjhmNWRiZTRkM2M5MTE2YTI4ZDJmNzE1NDcxZDc4OGU2
-    YjYyYTRhYjhjZmE2MTg4NWYzMzZhN2FiYmNjZWEwZDdkOTQzNGY=
-  data.tar.gz: !binary |-
-    NTU0MDMzMjEzYWJiMzA3ZmExZTgzYmUxY2E5M2M5ZmFlYzdjZDhlNTJmNDQ1
-    ODM4YjY5Mzk5NzVmM2IzMDE5ZmEwYTdmMGFjZDc3OTYyZTVmMmI3ODEzZTcx
-    ZGRiNDYzMDMwOGM3Y2U3OTEwOThhZDIwNWI1MmE0MGM5NWZjYjQ=
+  metadata.gz: ffccdf6ba923e06a43d9d5287c7495cd6c3fefd57aa3751798c03bf6c047ca29aabb73f2c286b33bcf96b229f292f01d397ee7ca739f23e5d02d8e25736f0838
+  data.tar.gz: 6e3f127736115eefffbb1228a2a177741de303dc0060abb79ba2584a086cf3994537629c701507d4c933ad4c126a51ea8c4df32d550c22f55b1892f32cf1da69

data/HISTORY.md

@@ -1,3 +1,12 @@
+# v4.2.0
+
+* Changes since v4.1.0:
+  ** Various performance improvements
+  ** Dependency updates
+  ** Bugfixes
+  ** New Macro for listing contents of (sub)directories: `Navigation()`
+  ** Table of Contents now supports setting max heading level 
+
 # v4.0.2 /2015-0119
 
 * Bugfixes

data/gemspec.rb

@@ -8,7 +8,7 @@ def specification(version, default_adapter, platform = nil)
     s.name              = 'gollum-lib'
     s.version           = version
     s.platform          = platform if platform
-    s.date              = '2015-08-09'
+    s.date              = '2016-02-21'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'
 
@@ -25,11 +25,11 @@ def specification(version, default_adapter, platform = nil)
     s.extra_rdoc_files = %w(README.md LICENSE)
 
     s.add_dependency *default_adapter
-    s.add_dependency 'rouge', '~> 1.9'
+    s.add_dependency 'rouge', '~> 1.10'
     s.add_dependency 'nokogiri', '~> 1.6.4'
     s.add_dependency 'stringex', '~> 2.5.1'
     s.add_dependency 'sanitize', '~> 2.1.0'
-    s.add_dependency 'github-markup', '~> 1.3.3'
+    s.add_dependency 'github-markup', '~> 1.4.0'
 
     s.add_development_dependency 'org-ruby', '~> 0.9.9'
     s.add_development_dependency 'kramdown', '~> 1.6.0'
@@ -42,6 +42,7 @@ def specification(version, default_adapter, platform = nil)
     # required by pry
     s.add_development_dependency 'rb-readline', '~> 0.5.1'
     # updating minitest-reporters requires a new minitest which fails with gollum's tests.
+    s.add_development_dependency 'test-unit', '~> 3.1.5'
     s.add_development_dependency 'minitest-reporters', '~> 0.14.16'
     s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
     # required by guard
@@ -86,6 +87,7 @@ def specification(version, default_adapter, platform = nil)
     lib/gollum-lib/macro.rb
     lib/gollum-lib/macro/all_pages.rb
     lib/gollum-lib/macro/global_toc.rb
+    lib/gollum-lib/macro/navigation.rb
     lib/gollum-lib/macro/series.rb
     lib/gollum-lib/markup.rb
     lib/gollum-lib/markups.rb

data/gollum-lib_java.gemspec

@@ -1,4 +1,4 @@
 require File.join(File.dirname(__FILE__), 'gemspec.rb')
 require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
-default_adapter = ['gollum-rjgit_adapter', '~> 0.1']
+default_adapter = ['gollum-rjgit_adapter', '~> 0.3']
 Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter, "java")

data/lib/gollum-lib/committer.rb

@@ -94,7 +94,7 @@ module Gollum
 
       dir  = '/' if dir.strip.empty?
 
-      fullpath = ::File.join(*[@wiki.page_file_dir, dir, path].compact)
+      fullpath = ::File.join(*[dir, path])
       fullpath = fullpath[1..-1] if fullpath =~ /^\//
 
       if index.current_tree && (tree = index.current_tree / (@wiki.page_file_dir || '/'))

data/lib/gollum-lib/filter/code.rb

@@ -21,22 +21,24 @@ class Gollum::Filter::Code < Gollum::Filter
       data.gsub!(/^#{org_headers}#{org_name}#{org_begin}(.+?)#{org_end}$/mi) do
         cache_codeblock(Regexp.last_match[3], Regexp.last_match[4])
       end
+    when :markdown
+      data.gsub!(/^([ \t]*)(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n\1(~~~+)[ \t\r]*$/m) do
+        m_indent = Regexp.last_match[1]
+        m_start  = Regexp.last_match[2] # ~~~
+        m_lang   = Regexp.last_match[3]
+        m_code   = Regexp.last_match[4]
+        m_end    = Regexp.last_match[5] # ~~~
+        # start and finish tilde fence must be the same length
+        next '' if m_start.length != m_end.length
+        lang = m_lang ? m_lang.strip : nil
+        if lang
+          lang = lang.match(/\.([^}\s]+)/)
+          lang = lang[1] unless lang.nil?
+        end
+        "#{m_indent}#{cache_codeblock(lang, m_code, m_indent)}"
+      end  
     end
-    data.gsub!(/^([ \t]*)(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n\1(~~~+)[ \t\r]*$/m) do
-      m_indent = Regexp.last_match[1]
-      m_start  = Regexp.last_match[2] # ~~~
-      m_lang   = Regexp.last_match[3]
-      m_code   = Regexp.last_match[4]
-      m_end    = Regexp.last_match[5] # ~~~
-      # start and finish tilde fence must be the same length
-      next '' if m_start.length != m_end.length
-      lang = m_lang ? m_lang.strip : nil
-      if lang
-        lang = lang.match(/\.([^}\s]+)/)
-        lang = lang[1] unless lang.nil?
-      end
-      "#{m_indent}#{cache_codeblock(lang, m_code, m_indent)}"
-    end
+    
 
     data.gsub!(/^([ \t]*)``` ?([^\r\n]+)?\r?\n(.+?)\r?\n\1```[ \t]*\r?$/m) do
       "#{Regexp.last_match[1]}#{cache_codeblock(Regexp.last_match[2].to_s.strip, Regexp.last_match[3], Regexp.last_match[1])}" # print the SHA1 ID with the proper indentation
@@ -72,16 +74,12 @@ class Gollum::Filter::Code < Gollum::Filter
       encoding = @markup.encoding || 'utf-8'
 
       if defined? Pygments
-        # treat unknown and bash as standard pre tags
-        if !lang || lang.downcase == 'bash'
-          hl_code = "<pre>#{code}</pre>"
-        else
-          # Set the default lexer to 'text' to prevent #153
-          lexer = Pygments::Lexer[(lang)] || Pygments::Lexer['text']
+        # Set the default lexer to 'text' to prevent #153 and #154
+        lang = lang || 'text'
+        lexer = Pygments::Lexer[(lang)] || Pygments::Lexer['text']
 
-          # must set startinline to true for php to be highlighted without <?
-          hl_code = lexer.highlight(code, :options => { :encoding => encoding.to_s, :startinline => true })
-        end
+        # must set startinline to true for php to be highlighted without <?
+        hl_code = lexer.highlight(code, :options => { :encoding => encoding.to_s, :startinline => true })
       else # Rouge
         begin
           # if `lang` was not defined then assume plaintext

data/lib/gollum-lib/filter/tags.rb

@@ -73,7 +73,7 @@ class Gollum::Filter::Tags < Gollum::Filter
   #
   # Returns the String HTML version of the tag.
   def process_tag(tag)
-    if tag =~ /^_TOC_$/
+    if tag =~ /^_TOC_/
       %{[[#{tag}]]}
     elsif tag =~ /^_$/
       %{<div class="clearfloats"></div>}

data/lib/gollum-lib/filter/toc.rb

@@ -7,12 +7,13 @@ class Gollum::Filter::TOC < Gollum::Filter
   def process(data)
 
     @doc               = Nokogiri::HTML::DocumentFragment.parse(data)
-    @toc               = nil
+    @toc_doc           = nil
     @anchor_names      = {}
     @current_ancestors = []
 
+    toc_str            = ''
     if @markup.sub_page && @markup.parent_page
-      @toc = @markup.parent_page.toc_data
+      toc_str = @markup.parent_page.toc_data
     else
       @doc.css('h1,h2,h3,h4,h5,h6').each_with_index do |header, i|
         next if header.content.empty?
@@ -24,16 +25,37 @@ class Gollum::Filter::TOC < Gollum::Filter
         add_anchor_to_header header, anchor_name
         add_entry_to_toc     header, anchor_name
       end
+      if not @toc_doc.nil?
+        toc_str = @toc_doc.to_xml(@markup.to_xml_opts)
+      end
 
-      @toc  = @toc.to_xml(@markup.to_xml_opts) if @toc != nil
       data  = @doc.to_xml(@markup.to_xml_opts)
-      
     end
- 
-    @markup.toc = @toc
-    data.gsub("[[_TOC_]]") do
-      @toc.nil? ? '' : @toc
+
+    @markup.toc = toc_str
+
+    data.gsub!(/\[\[_TOC_(.*?)\]\]/) do
+      levels = nil
+      levels_match = Regexp.last_match[1].match /\|\s*levels\s*=\s*(\d+)/
+      if levels_match
+        levels = levels_match[1].to_i
+      end
+
+      if levels.nil? || toc_str.empty?
+        toc_str
+      else
+        @toc_doc ||= Nokogiri::HTML::DocumentFragment.parse(toc_str)
+        toc_clone = @toc_doc.clone
+        toc_clone.traverse do |e|
+          if e.name == 'ul' and e.ancestors('ul').length > levels - 1
+            e.remove
+          end
+        end
+        toc_clone.to_xml(@markup.to_xml_opts)
+      end
     end
+
+    data
   end
 
   private
@@ -78,26 +100,29 @@ class Gollum::Filter::TOC < Gollum::Filter
   # Adds an entry to the TOC for the given header.  The generated entry
   # is a link to the given anchor name
   def add_entry_to_toc(header, name)
-    @toc ||= Nokogiri::XML::DocumentFragment.parse('<div class="toc"><div class="toc-title">Table of Contents</div></div>')
-    tail ||= @toc.child
-    tail_level ||= 0
+    @toc_doc ||= Nokogiri::XML::DocumentFragment.parse('<div class="toc"><div class="toc-title">Table of Contents</div></div>')
+    @tail ||= @toc_doc.child
+    @tail_level ||= 0
 
     level = header.name.gsub(/[hH]/, '').to_i
 
-    while tail_level < level
-      node = Nokogiri::XML::Node.new('ul', @doc)
-      tail = tail.add_child(node)
-      tail_level += 1
-    end
-    
-    while tail_level > level
-      tail = tail.parent
-      tail_level -= 1
+    if @tail_level < level
+      while @tail_level < level
+        list = Nokogiri::XML::Node.new('ul', @doc)
+        @tail.add_child(list)
+        @tail = list.add_child(Nokogiri::XML::Node.new('li', @doc))
+        @tail_level += 1
+      end
+    else
+      while @tail_level > level
+        @tail = @tail.parent.parent
+        @tail_level -= 1
+      end
+      @tail = @tail.parent.add_child(Nokogiri::XML::Node.new('li', @doc))
     end
-    node = Nokogiri::XML::Node.new('li', @doc)
+
     # % -> %25 so anchors work on Firefox. See issue #475
-    node.add_child(%Q{<a href="##{name}">#{header.content}</a>})
-    tail.add_child(node)
+    @tail.add_child(%Q{<a href="##{name}">#{header.content}</a>})
   end
 
   # Increments the number of anchors with the given name

data/lib/gollum-lib/macro/global_toc.rb

@@ -3,7 +3,7 @@ module Gollum
     class GlobalTOC < Gollum::Macro
       def render(title = "Global Table of Contents")
         if @wiki.pages.size > 0
-          result = '<ul>' + @wiki.pages.map { |p| "<li><a href=\"#{p.url_path}\">#{p.url_path_display}</a></li>" }.join + '</ul>'
+          result = '<ul>' + @wiki.pages.map { |p| "<li><a href=\"/#{p.url_path}\">#{p.url_path_display}</a></li>" }.join + '</ul>'
         end
         "<div class=\"toc\"><div class=\"toc-title\">#{title}</div>#{result}</div>"
       end

data/lib/gollum-lib/macro/navigation.rb

@@ -0,0 +1,20 @@
+module Gollum
+  class Macro
+    class Navigation < Gollum::Macro
+
+      def render(title = "Navigate in the TOC", toc_root_path = ::File.dirname(@page.path), full_path = false)
+        if @wiki.pages.size > 0
+          list_items = @wiki.pages.map do |page|
+            if page.url_path.start_with?(toc_root_path)
+              path_display = full_path ? page.url_path_display  : page.url_path_display.sub(toc_root_path,"").sub(/^\//,'')
+              "<li><a href=\"/#{page.url_path}\">#{path_display}</a></li>"
+            end
+          end
+          result = "<ul>#{list_items.join}</ul>"
+        end
+        "<div class=\"toc\"><div class=\"toc-title\">#{title}</div>#{result}</div>"
+      end
+
+    end
+  end
+end

data/lib/gollum-lib/page.rb

@@ -281,6 +281,14 @@ module Gollum
       @wiki.repo.git.versions_for_path(@path, @wiki.ref, log_pagination_options(options))
     end
 
+    # Public: The last version that has touched the Page. Can be nil.
+    #
+    # Returns Gollum::Git::Commit, or nil.
+    def last_version
+      return @last_version if defined? @last_version
+      @last_version = @wiki.repo.git.versions_for_path(@path, @wiki.ref, {:max_count => 1}).first
+    end
+
     # Public: The first 7 characters of the current version.
     #
     # Returns the first 7 characters of the current version.

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '4.1.0'
+    VERSION = '4.2.0'
   end
 end

data/lib/gollum-lib/wiki.rb

@@ -310,7 +310,7 @@ module Gollum
       name = @page_class.cname(name) + '.' + ext
       blob = OpenStruct.new(:name => name, :data => data, :is_symlink => false)
       page.populate(blob)
-      page.version = @access.commit('master')
+      page.version = @access.commit(@ref)
       page
     end
 
@@ -337,6 +337,7 @@ module Gollum
       # spaces must be dashes
       sanitized_name = name.gsub(' ', '-')
       sanitized_dir  = dir.gsub(' ', '-')
+      sanitized_dir  = ::File.join([@page_file_dir, sanitized_dir].compact)
 
       multi_commit = !!commit[:committer]
       committer    = multi_commit ? commit[:committer] : Committer.new(self, commit)

metadata

@@ -1,340 +1,352 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: java
 authors:
 - Tom Preston-Werner
 - Rick Olson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum-rjgit_adapter
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC4x
-  type: :runtime
+        version: '0.3'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rouge
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC4x
-- !ruby/object:Gem::Dependency
-  name: rouge
+        version: '1.10'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
+        version: '1.10'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
+        version: 1.6.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: stringex
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
-- !ruby/object:Gem::Dependency
-  name: stringex
+        version: 2.5.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.1
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: sanitize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.1
-- !ruby/object:Gem::Dependency
-  name: sanitize
+        version: 2.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: github-markup
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: github-markup
+        version: 1.4.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :runtime
+        version: 1.4.0
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: org-ruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: org-ruby
+        version: 0.9.9
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.9
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: kramdown
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
-- !ruby/object:Gem::Dependency
-  name: kramdown
+        version: 1.6.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.0
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: RedCloth
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: RedCloth
+        version: 4.2.9
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.9
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: mocha
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.9
-- !ruby/object:Gem::Dependency
-  name: mocha
+        version: 1.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: shoulda
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: shoulda
+        version: 3.5.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.5.0
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: wikicloth
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: wikicloth
+        version: 0.8.3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.3
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
-- !ruby/object:Gem::Dependency
-  name: rake
+        version: 10.4.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.4.0
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.4.0
-- !ruby/object:Gem::Dependency
-  name: pry
+        version: 0.10.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.1
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rb-readline
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.1
-- !ruby/object:Gem::Dependency
-  name: rb-readline
+        version: 0.5.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.1
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: test-unit
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
+        version: 3.1.5
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.16
-  type: :development
+        version: 3.1.5
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.16
-- !ruby/object:Gem::Dependency
-  name: nokogiri-diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
+        version: 0.14.16
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: nokogiri-diff
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.2
-  type: :development
+        version: 0.2.0
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.2
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.2
-  type: :development
+        version: 2.8.2
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.2
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.3
-  type: :development
+        version: 2.3.2
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.3
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.4
-  type: :development
+        version: 0.9.3
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.4
-- !ruby/object:Gem::Dependency
-  name: rb-fchange
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
-  type: :development
+        version: 0.9.4
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rb-fchange
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.6
-- !ruby/object:Gem::Dependency
-  name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
+        version: 0.0.6
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: twitter_cldr
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  prerelease: false
+  type: :development
 description: A simple, Git-powered wiki with a sweet API and local frontend.
 email: tom@github.com
 executables: []
@@ -376,6 +388,7 @@ files:
 - lib/gollum-lib/macro.rb
 - lib/gollum-lib/macro/all_pages.rb
 - lib/gollum-lib/macro/global_toc.rb
+- lib/gollum-lib/macro/navigation.rb
 - lib/gollum-lib/macro/series.rb
 - lib/gollum-lib/markup.rb
 - lib/gollum-lib/markups.rb
@@ -389,25 +402,25 @@ homepage: http://github.com/gollum/gollum-lib
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: gollum-lib
-rubygems_version: 2.4.1
-signing_key: 
+rubygems_version: 2.4.5
+signing_key:
 specification_version: 2
 summary: A simple, Git-powered wiki.
 test_files: []