gollum-lib 5.0.a.4 → 5.0

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

@@ -21,15 +21,14 @@ class Gollum::Filter::TOC < Gollum::Filter
         next if (i == 0 && header.name =~ /[Hh]1/) && @markup.wiki && @markup.wiki.h1_title
 
         anchor_name = generate_anchor_name(header)
-        
         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)
+        toc_str = @toc_doc.to_xml(@markup.class.to_xml_opts)
       end
 
-      data  = @doc.to_xml(@markup.to_xml_opts)
+      data  = @doc.to_xml(@markup.class.to_xml_opts)
     end
 
     @markup.toc = toc_str
@@ -51,7 +50,7 @@ class Gollum::Filter::TOC < Gollum::Filter
             e.remove
           end
         end
-        toc_clone.to_xml(@markup.to_xml_opts)
+        toc_clone.to_xml(@markup.class.to_xml_opts)
       end
     end
 
@@ -60,9 +59,9 @@ class Gollum::Filter::TOC < Gollum::Filter
 
   private
 
-  # Generates the anchor name from the given header element 
+  # Generates the anchor name from the given header element
   # removing all non alphanumeric characters, replacing them
-  # with single dashes.  
+  # with single dashes.
   #
   # Generates heading ancestry prefixing the headings
   # ancestor names to the generated name.
@@ -70,31 +69,28 @@ class Gollum::Filter::TOC < Gollum::Filter
   # Prefixes duplicate anchors with an index
   def generate_anchor_name(header)
     name = header.content
-    level = header.name.gsub(/[hH]/, '').to_i
+    level = header.name[1..-1].to_i
 
     # normalize the header name
-    name.gsub!(/[^\d\w\u00C0-\u1FFF\u2C00-\uD7FF]/, "-")
-    name.gsub!(/-+/, "-")
-    name.gsub!(/^-/, "")
-    name.gsub!(/-$/, "")
+    name.gsub!(/[^\d\w\u00C0-\u1FFF\u2C00-\uD7FF]/, '-')
+    name.gsub!(/-+/, '-')
+    name.gsub!(/^-/, '')
+    name.gsub!(/-$/, '')
     name.downcase!
 
-    @current_ancestors[level - 1] = name
-    @current_ancestors = @current_ancestors.take(level)
-    anchor_name = @current_ancestors.compact.join("_")
-
     # Ensure duplicate anchors have a unique prefix or the toc will break
-    index = increment_anchor_index(anchor_name)
-    anchor_name = "#{index}-#{anchor_name}" unless index.zero? # if the index is zero this name is unique
-
-    anchor_name
+    index = increment_anchor_index(name)
+    index.zero? ? name : "#{name}-#{index}"
   end
 
   # Creates an anchor element with the given name and adds it before
   # the given header element.
   def add_anchor_to_header(header, name)
-    anchor_element = %Q(<a class="anchor" id="#{name}" href="##{name}"><i class="fa fa-link"></i></a>)
-    header.children.before anchor_element # Add anchor element before the header
+    a = Nokogiri::XML::Node.new('a', @doc)
+    a['class'] = 'anchor'
+    a['id'] = name
+    a['href'] = "##{name}"
+    header.children.before(a) # Add anchor element before the header
   end
 
   # Adds an entry to the TOC for the given header.  The generated entry

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

@@ -10,7 +10,7 @@ class Gollum::Filter::YAML < Gollum::Filter
     data.gsub!(YAML_FRONT_MATTER_REGEXP) do
       @markup.metadata ||= {}
       begin
-        frontmatter = ::YAML.safe_load(@markup.sanitize.clean(Regexp.last_match[1]))
+        frontmatter = ::YAML.safe_load(sanitize(Regexp.last_match[1]))
         @markup.metadata.merge!(frontmatter) if frontmatter.respond_to?(:keys) && frontmatter.respond_to?(:values)
       rescue ::Psych::SyntaxError, ::Psych::DisallowedClass, ::Psych::BadAlias => error
         @markup.metadata['errors'] ||= []

data/lib/gollum-lib/git_access.rb

@@ -218,30 +218,5 @@ module Gollum
       cache      = instance_variable_get("@#{name}_map")
       cache[key] = value || :_nil
     end
-
-    # Parses a line of output from the `ls-tree` command.
-    #
-    # line - A String line of output:
-    #          "100644 blob 839c2291b30495b9a882c17d08254d3c90d8fb53  Home.md"
-    #
-    # Returns an Array of BlobEntry instances.
-    def parse_tree_line(line)
-      mode, _type, sha, size, *name = line.split(/\s+/)
-      BlobEntry.new(sha, name.join(' '), size.to_i, mode.to_i(8))
-    end
-
-    # Decode octal sequences (\NNN) in tree path names.
-    #
-    # path - String path name.
-    #
-    # Returns a decoded String.
-    def decode_git_path(path)
-      if path[0] == ?" && path[-1] == ?"
-        path = path[1...-1]
-        path.gsub!(/\\\d{3}/) { |m| m[1..-1].to_i(8).chr }
-      end
-      path.gsub!(/\\[rn"\\]/) { |m| eval(%("#{m}")) }
-      path
-    end
   end
 end

data/lib/gollum-lib/helpers.rb

@@ -1,13 +1,23 @@
 # ~*~ encoding: utf-8 ~*~
+
 module Gollum
   module Helpers
-
-    def trim_leading_slash(url)
-      return url if url.nil?
+    
+    # If url starts with a leading slash, trim down its number of leading slashes to 1. Else, return url unchanged.
+    def trim_leading_slashes(url)
+      return nil if url.nil?
       url.gsub!('%2F', '/')
       return '/' + url.gsub(/^\/+/, '') if url[0, 1] == '/'
       url
     end
+    
+    # Take a link path and turn it into a string for display as link text.
+    # For example:
+    # '/opt/local/bin/ruby.ext' -> 'ruby'
+    def path_to_link_text(str)
+      return nil unless str
+      ::File.basename(str, ::File.extname(str))
+    end
 
   end
 end

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

@@ -0,0 +1,9 @@
+module Gollum
+  class Macro
+    class Audio < Gollum::Macro
+      def render (fname)
+        "<audio width=\"100%\" height=\"100%\" src=\"#{fname}\" controls=\"\"> HTML5 audio is not supported on this Browser.</audio>"
+      end
+    end
+  end
+end

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

@@ -3,7 +3,8 @@ 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}</a></li>" }.join + '</ul>'
+          prepath = @wiki.base_path.sub(/\/$/, '')
+          result  = '<ul>' + @wiki.pages.map { |p| "<li><a href=\"#{prepath}/#{p.escaped_url_path}\">#{p.url_path}</a></li>" }.join + '</ul>'
         end
         "<div class=\"toc\"><div class=\"toc-title\">#{title}</div>#{result}</div>"
       end

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

@@ -2,12 +2,14 @@ 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.sub(toc_root_path,"").sub(/^\//,'')
-              "<li><a href=\"/#{page.url_path}\">#{path_display}</a></li>"
+      def render(title = "Navigate this directory", toc_root_path = ::File.dirname(@page.url_path), full_path = false)
+        pages = @wiki.pages
+        if pages.size > 0
+          prepath=@wiki.base_path.sub(/\/$/, '')
+          list_items = pages.map do |page|
+            if toc_root_path == '.' || page.url_path =~ /^#{toc_root_path}\//
+              path_display = (full_path || toc_root_path == '.') ? page.url_path  : page.url_path.sub(/^#{toc_root_path}\//,"").sub(/^\//,'')
+              "<li><a href=\"#{prepath}/#{page.escaped_url_path}\">#{path_display}</a></li>"
             end
           end
           result = "<ul>#{list_items.join}</ul>"

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

@@ -0,0 +1,19 @@
+module Gollum
+  class Macro
+    class Note < Gollum::Macro
+      def render(notice, octicon = 'info')
+        icon = ""
+        unless octicon.empty?
+          begin
+            icon = Octicons::Octicon.new(octicon, {width: 24, height: 24})
+          rescue RuntimeError
+            icon = Octicons::Octicon.new('info', {width: 24, height: 24})
+          end
+          icon.options[:class] << ' mr-2'
+          icon = icon.to_svg
+        end
+        "<div class='flash'>#{icon}#{notice}</div>"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Gollum
+  class Macro
+    class Octicon < Gollum::Macro
+      def render(symbol, height = nil, width = nil)
+        parameters = {}
+        parameters[:height] = height if height
+        parameters[:width]  = width if width
+        "<div>#{Octicons::Octicon.new(symbol, parameters).to_svg}</div>"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Gollum
+  class Macro
+    class Warn < Gollum::Macro
+      def render(warning)
+        icon = Octicons::Octicon.new('alert', {width: 24, height: 24})
+        icon.options[:class] << ' mr-2'
+        "<div class='flash flash-warn'>#{icon.to_svg}#{warning}</div>"
+      end
+    end
+  end
+end

data/lib/gollum-lib/markup.rb

@@ -1,6 +1,5 @@
 # ~*~ encoding: utf-8 ~*~
 require 'digest/sha1'
-require 'cgi'
 require 'rouge'
 require 'base64'
 
@@ -23,6 +22,10 @@ module Gollum
 
     class << self
 
+      def to_xml_opts
+        { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
+      end
+
       # Only use the formats that are specified in config.rb
       def formats
         if defined? Gollum::Page::FORMAT_NAMES
@@ -66,7 +69,6 @@ module Gollum
     attr_accessor :toc
     attr_accessor :metadata
     attr_reader :encoding
-    attr_reader :sanitize
     attr_reader :format
     attr_reader :wiki
     attr_reader :page
@@ -74,8 +76,8 @@ module Gollum
     attr_reader :sub_page
     attr_reader :name
     attr_reader :include_levels
-    attr_reader :to_xml_opts
     attr_reader :dir
+    attr_reader :historical
 
     # Initialize a new Markup object.
     #
@@ -91,9 +93,8 @@ module Gollum
       @sub_page    = page.sub_page
       @parent_page = page.parent_page
       @page        = page
-      @dir         = ::File.dirname(page.path)
+      @dir         = ::File.dirname("/#{@page.url_path}")
       @metadata    = nil
-      @to_xml_opts = { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
     end
 
     # Whether or not this markup's format uses reversed-order links ([description | url] rather than [url | description]). Defaults to false.
@@ -124,6 +125,11 @@ module Gollum
         data = filter.extract(data)
       end
 
+      # Since the last 'extract' action in our chain *should* be the markup
+      # to HTML converter, we now have HTML which we can parse and yield, for
+      # anyone who wants it
+      yield Nokogiri::HTML::DocumentFragment.parse(data) if block_given?
+
       # Then we process the data through the chain *backwards*
       filter_chain.reverse.each do |filter|
         data = filter.process(data)
@@ -133,48 +139,27 @@ module Gollum
     end
 
     # Render the content with Gollum wiki syntax on top of the file's own
-    # markup language.
+    # markup language. Takes an optional block that will be executed after
+    # the markup rendering step in the filter chain.
     #
     # no_follow - Boolean that determines if rel="nofollow" is added to all
     #             <a> tags.
     # encoding  - Encoding Constant or String.
     #
     # Returns the formatted String content.
-    def render(no_follow = false, encoding = nil, include_levels = 10)
-      @sanitize = no_follow ? @wiki.history_sanitizer : @wiki.sanitizer
-
+    def render(no_follow = false, encoding = nil, include_levels = 10, &block)
+      @historical     = no_follow
       @encoding       = encoding
       @include_levels = include_levels
 
-      data     = @data.dup
+      data = @data.dup
 
       filter_chain = @wiki.filter_chain.reject {|filter| skip_filter?(filter)}
       filter_chain.map! do |filter_sym|
         Gollum::Filter.const_get(filter_sym).new(self)
       end
 
-      # Since the last 'extract' action in our chain *should* be the markup
-      # to HTML converter, we now have HTML which we can parse and yield, for
-      # anyone who wants it
-      if block_given?
-        yield Nokogiri::HTML::DocumentFragment.parse(data)
-      end
-
-      process_chain data, filter_chain
-    end
-
-    # Find the given file in the repo.
-    #
-    # name - The String absolute or relative path of the file.
-    #
-    # Returns the Gollum::File or nil if none was found.
-    def find_file(name, version=@version)
-      if name =~ /^\//
-        @wiki.file(name[1..-1], version)
-      else
-        path = @dir == '.' ? name : ::File.join(@dir, name)
-        @wiki.file(path, version)
-      end
+      process_chain(data, filter_chain, &block)
     end
 
     # Hook for getting the formatted value of extracted tag data.

data/lib/gollum-lib/markups.rb

@@ -55,12 +55,16 @@ end
 
 module Gollum
   class Markup
-    GitHub::Markup::Markdown::MARKDOWN_GEMS['kramdown'] = proc { |content|
-        Kramdown::Document.new(content, :auto_ids => false, :smart_quotes => ["'", "'", '"', '"'].map{|char| char.codepoints.first}).to_html
-    }
-    GitHub::Markup::Markdown::MARKDOWN_GEMS['pandoc-ruby'] = proc { |content|
-        PandocRuby.convert(content, :s, :from => :markdown, :to => :html, :filter => 'pandoc-citeproc')
-    } if gem_exists?('pandoc-ruby')
+    if gem_exists?('pandoc-ruby')
+      GitHub::Markup::Markdown::MARKDOWN_GEMS.delete('kramdown')
+      GitHub::Markup::Markdown::MARKDOWN_GEMS['pandoc-ruby'] = proc { |content|
+          PandocRuby.convert(content, :from => :markdown, :to => :html, :filter => 'pandoc-citeproc')
+      }
+    else
+      GitHub::Markup::Markdown::MARKDOWN_GEMS['kramdown'] = proc { |content|
+          Kramdown::Document.new(content, :input => "GFM", :hard_wrap => 'false', :auto_ids => false, :math_engine => nil, :smart_quotes => ["'", "'", '"', '"'].map{|char| char.codepoints.first}).to_html
+      }
+    end
 
     # markdown, rdoc, and plain text are always supported.
     register(:markdown, "Markdown", :extensions => ['md','mkd','mkdn','mdown','markdown'])
@@ -76,7 +80,7 @@ module Gollum
     register(:creole, "Creole",
              :enabled => MarkupRegisterUtils::gem_exists?("creole"),
              :reverse_links => true)
-    register(:rest, "reStructuredText",
+    register(:rst, "reStructuredText",
              :enabled => MarkupRegisterUtils::executable_exists?("python2"),
              :extensions => ['rest', 'rst'])
     register(:asciidoc, "AsciiDoc",

data/lib/gollum-lib/page.rb

@@ -1,21 +1,28 @@
 # ~*~ encoding: utf-8 ~*~
 module Gollum
-  class Page
+  class Page < Gollum::File
     include Pagination
-
-    Wiki.page_class = self
     
     SUBPAGENAMES = [:header, :footer, :sidebar]
-    
-    # Sets a Boolean determing whether this page is a historical version.
-    #
-    # Returns nothing.
-    attr_writer :historical
 
-    # Parent page if this is a sub page
-    #
-    # Returns a Page
-    attr_accessor :parent_page
+    class << self
+      # For use with self.find: returns true if the given query corresponds to the in-repo path of the BlobEntry. 
+      #
+      # query     - The String path to match.
+      # entry     - The BlobEntry to check against.
+      # global_match - If true, find a File matching path's filename, but not its directory (so anywhere in the repo)
+      def path_match(query, entry, global_match = false, hyphened_tags = false, case_insensitive = false)
+        return false if "#{entry.name}".empty?
+        return false unless valid_extension?(entry.name)
+        entry_name = valid_extension?(query) ? entry.name : strip_filename(entry.name)     
+        match_path = ::File.join([
+          '/',
+          global_match ? nil : entry.dir,
+        entry_name
+        ].compact)
+        path_compare(query, match_path, hyphened_tags, case_insensitive)
+      end
+    end
 
     # Checks if a filename has a valid, registered extension
     #
@@ -27,14 +34,14 @@ module Gollum
     end
 
     # Checks if a filename has a valid extension understood by GitHub::Markup.
-    # Also, checks if the filename has no "_" in the front (such as
-    # _Footer.md).
+    # Also, checks if the filename is subpages (such as _Footer.md).
     #
     # filename - String filename, like "Home.md".
     #
     # Returns true or false.
     def self.valid_page_name?(filename)
-      !(filename =~ /^_/) && self.valid_extension?(filename)
+      subpage_names = SUBPAGENAMES.map(&:capitalize).join("|")
+      filename =~ /^_(#{subpage_names})/ ? false : self.valid_extension?(filename)
     end
 
     # Public: The format of a given filename.
@@ -59,32 +66,27 @@ module Gollum
       ::File.basename(filename.to_s, ::File.extname(filename.to_s))
     end
 
-    # Public: Initialize a page.
+    # Public: Initialize a Page.
     #
-    # wiki - The Gollum::Wiki in question.
+    # wiki - The Gollum::Wiki
+    # blob - The Gollum::Git::Blob
+    # path - The String path
+    # version - The String SHA or Gollum::Git::Commit version
+    # try_on_disk - If true, try to get an on disk reference for this page.
     #
     # Returns a newly initialized Gollum::Page.
-    def initialize(wiki)
-      @wiki           = wiki
-      @blob           = nil
+    def initialize(wiki, blob, path, version, try_on_disk = false)
+      super
       @formatted_data = nil
       @doc            = nil
       @parent_page    = nil
+      @historical     = @version.to_s == version.to_s
     end
 
-    # Public: The SHA hash identifying this page
-    #
-    # Returns the String SHA.
-    def sha
-      @blob && @blob.id
-    end
-
-    # Public: The on-disk filename of the page including extension.
+    # Parent page if this is a sub page
     #
-    # Returns the String name.
-    def filename
-      @blob && @blob.name
-    end
+    # Returns a Page
+    attr_accessor :parent_page
 
     # Public: The on-disk filename of the page with extension stripped.
     #
@@ -105,7 +107,7 @@ module Gollum
     #
     # Returns the fully sanitized String title.
     def title
-      Sanitize.clean(name).strip
+      @wiki.sanitizer.clean(name).strip
     end
 
     # Public: Determines if this is a sub-page
@@ -116,30 +118,11 @@ module Gollum
       filename =~ /^_/
     end
 
-    # Public: The path of the page within the repo.
-    #
-    # Returns the String path.
-    attr_reader :path
-
-    # Public: The url path required to reach this page within the repo.
-    #
-    # Returns the String url_path
-    def url_path
-      construct_path(filename)
-    end
-
     # Public: Defines title for page.rb
     #
     # Returns the String title
     def url_path_title
-      metadata_title || construct_path(name)
-    end
-
-    # Public: The url_path, but CGI escaped.
-    #
-    # Returns the String url_path
-    def escaped_url_path
-      CGI.escape(self.url_path).gsub('%2F', '/')
+      metadata_title || name
     end
 
     # Public: Metadata title
@@ -148,35 +131,16 @@ module Gollum
     #
     # Returns the String title or nil if not defined
     def metadata_title
-      if metadata
-        title = metadata['title']
-        return title unless title.nil?
-      end
-
-      nil
+      metadata ? metadata['title'] : nil
     end
 
     # Public: Whether or not to display the metadata
     def display_metadata?
-      return false if metadata.empty? || (metadata.size == 1 && metadata['title'])
+      return false if (metadata.keys - ['title', 'header_enum']).empty?
       return false if metadata['display_metadata'] == false
       @wiki.display_metadata
     end
 
-    # Public: The raw contents of the page.
-    #
-    # Returns the String data.
-    def raw_data
-      return nil unless @blob
-
-      if !@wiki.repo.bare && @blob.is_symlink
-        new_path = @blob.symlink_target(::File.join(@wiki.repo.path, '..', self.path))
-        return IO.read(new_path) if new_path
-      end
-
-      @blob.data
-    end
-
     # Public: A text data encoded in specified encoding.
     #
     # encoding - An Encoding or nil
@@ -225,8 +189,12 @@ module Gollum
     #
     # Returns Hash of metadata.
     def metadata
-      formatted_data if markup.metadata == nil
-      markup.metadata || {}
+      unless @metadata
+        formatted_data if markup.metadata == nil
+        @metadata = @wiki.metadata.merge(markup.metadata || {})
+      else
+        @metadata
+      end
     end
 
     # Public: The format of the page.
@@ -240,20 +208,15 @@ module Gollum
     #
     # Returns a Gollum::Markup instance.
     def markup
-      @markup ||= @wiki.markup_classes[format].new(self)
+      @markup ||= ::Gollum::Markup.new(self)
     end
 
-    # Public: The current version of the page.
-    #
-    # Returns the Gollum::Git::Commit.
-    attr_reader :version
-
     # Public: All of the versions that have touched the Page.
     #
     # options - The options Hash:
-    #           :page     - The Integer page number (default: 1).
-    #           :per_page - The Integer max count of items to return.
-    #           :follow   - Follow's a file across renames, slower.  (default: false)
+    #           :page_num  - The Integer page number (default: 1).
+    #           :per_page  - The Integer max count of items to return.
+    #           :follow    - Follow's a file across renames, slower.  (default: false)
     #
     # Returns an Array of Gollum::Git::Commit.
     def versions(options = {})
@@ -317,77 +280,11 @@ module Gollum
       format == :markdown ? "md" : format.to_s
     end
 
-    #########################################################################
-    #
-    # Internal Methods
-    #
-    #########################################################################
-
     # The underlying wiki repo.
     #
     # Returns the Gollum::Wiki containing the page.
     attr_reader :wiki
 
-    # Set the Gollum::Git::Commit version of the page.
-    #
-    # Returns nothing.
-    attr_writer :version
-
-    # Find a page in the given Gollum repo.
-    #
-    # name    - The human or canonical String page name to find.
-    # version - The String version ID to find.
-    #
-    # Returns a Gollum::Page or nil if the page could not be found.
-    def find(name, version, dir = nil, exact = false)
-      map = @wiki.tree_map_for(version.to_s)
-      if (page = find_page_in_tree(map, name, dir, exact))
-        page.version    = version.is_a?(Gollum::Git::Commit) ?
-            version : @wiki.commit_for(version)
-        page.historical = page.version.to_s == version.to_s
-        page
-      end
-    rescue Gollum::Git::NoSuchShaFound
-    end
-
-    # Find a page in a given tree.
-    #
-    # map         - The Array tree map from Wiki#tree_map.
-    # name        - The canonical String page name.
-    # checked_dir - Optional String of the directory a matching page needs
-    #               to be in.  The string should
-    #
-    # Returns a Gollum::Page or nil if the page could not be found.
-    def find_page_in_tree(map, name, checked_dir = nil, exact = false)
-      return nil if !map || name.to_s.empty?
-
-      checked_dir = BlobEntry.normalize_dir(checked_dir)
-      checked_dir = '' if exact && checked_dir.nil?
-      query       = checked_dir ? ::File.join(checked_dir, name) : name
-
-      map.each do |entry|
-        next if entry.name.to_s.empty? || !self.class.valid_extension?(entry.name)
-        entry_name =  ::File.extname(name).empty? ? ::Gollum::Page.strip_filename(entry.name) : entry.name
-        path = checked_dir ? ::File.join(entry.dir, entry_name) : entry_name
-        next unless query.downcase == path.downcase
-        return entry.page(@wiki, @version)
-      end
-
-      return nil # nothing was found
-    end
-
-    # Populate the Page with information from the Blob.
-    #
-    # blob - The Gollum::Git::Blob that contains the info.
-    # path - The String directory path of the page file.
-    #
-    # Returns the populated Gollum::Page.
-    def populate(blob, path=nil)
-      @blob = blob
-      @path = "#{path}/#{blob.name}"[1..-1]
-      self
-    end
-
     # The full directory path for the given tree.
     #
     # treemap - The Hash treemap containing parentage information.
@@ -396,7 +293,7 @@ module Gollum
     # Returns the String path.
     def tree_path(treemap, tree)
       if (ptree = treemap[tree])
-        tree_path(treemap, ptree) + '/' + tree.name
+        "#{tree_path(treemap, ptree)}#{::File::SEPARATOR}#{tree.name}"
       else
         ''
       end
@@ -409,7 +306,7 @@ module Gollum
     def find_sub_pages(subpagenames = SUBPAGENAMES, map = nil)
       subpagenames.each{|subpagename| instance_variable_set("@#{subpagename}", nil)}
       return nil if self.filename =~ /^_/ || ! self.version
-      
+
       map ||= @wiki.tree_map_for(@wiki.ref, true)
       valid_names = subpagenames.map(&:capitalize).join("|")
       # From Ruby 2.2 onwards map.select! could be used
@@ -425,34 +322,51 @@ module Gollum
             searchpath = dir == Pathname.new('.') ? Pathname.new(filename) : dir + filename
             entrypath = ::Pathname.new(blob_entry.path)
             # Ignore extentions
-            entrypath = entrypath.dirname + entrypath.basename(entrypath.extname)      
+            entrypath = entrypath.dirname + entrypath.basename(entrypath.extname)
             entrypath == searchpath
           end
-          
+
           if subpageblob
             instance_variable_set("@#{subpagename}", subpageblob.page(@wiki, @version) )
+            instance_variable_get("@#{subpagename}").parent_page = self
             break
           end
 
           break if dir == Pathname.new('.')
         end
-      end  
+      end
     end
 
     def inspect
       %(#<#{self.class.name}:#{object_id} #{name} (#{format}) @wiki=#{@wiki.repo.path.inspect}>)
     end
 
-    private
+  end
 
-    def construct_path(name)
-      path = if self.path.include?('/')
-        self.path.sub(/\/[^\/]+$/, '/')
-          else
-            ''
-          end
-      path << name   
+  class PreviewPage < Gollum::Page
+    include Pagination
+
+    SUBPAGENAMES.each do |subpage|
+      define_method(subpage) do
+        instance_variable_get("@#{subpage}")
+      end
+      define_method("set_#{subpage}") do |val|
+        instance_variable_set("@#{subpage}", PreviewPage.new(@wiki, "_#{subpage.to_s.capitalize}.md", val, @version, self))
+      end
+    end
+
+    attr_accessor :path
+
+    def initialize(wiki, name, data, version, parent_page = nil)
+      @wiki           = wiki 
+      @path           = name
+      @blob           = OpenStruct.new(:name => name, :data => data, :is_symlink => false)
+      @version        = version
+      @formatted_data = nil
+      @doc            = nil
+      @parent_page    = parent_page
+      @historical     = false
     end
-    
   end
+
 end