gollum-lib 5.0.a.4-java → 5.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3579bcfc342afcfe2b398241c190fbba84cfe2c5c922576aaaecb512bab5cd8
-  data.tar.gz: 9387c63c0f369902cf50439b750864fc2c4f86834da46576da7e1c8dc51464c6
+  metadata.gz: 5662c1525277435507ced6f525a59cf50b16a054e5026acd2a014c6ded340789
+  data.tar.gz: f9bd5b7bdf94bad28f59317199544fc7fdb9cf99e8fefd576de96316f7cf77e1
 SHA512:
-  metadata.gz: 4a9bfdbb8a78a024d9c66c4cfa3d185b4156c3bd86068006ea26977db3dcb456691863a19359917cd3e5d70bf5c92f261bd4b47b977d21727608c783b6f0ce58
-  data.tar.gz: 29ac662c80e6b90fad991b7bb421486cf2b1a5b5a3838f342bbdfb0d26f23a6680a98cd6372077a5ed3e8e07578a9470600a4c9a427346fcc36700e735f8f9c5
+  metadata.gz: f19aeec8848ae1d3b67264de96cc4e10050e0a662106ef554a23efc50e54c5a1369f0fe8b8ef4d87c88d137dac885b07af708b8760365ef632fdf3fe9695d8fe
+  data.tar.gz: c6d87ce1dc06acef4a4db237073c9240ae41d614df9e1c01772e4b0ad9b23c2cb9ae2b33596c298718075d2d810d4c7922d5bc71b38af832329bbfdbad8d4f53

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
-gemspec :name => 'gollum-lib'
+
+gemspec :name => 'gollum-lib'

data/README.md

@@ -19,10 +19,9 @@ Gollum-lib follows the rules of [Semantic Versioning](http://semver.org/) and us
 
 ## SYSTEM REQUIREMENTS
 
-- Python 2.5+ (2.7.3 recommended)
-- Ruby 2.1.0+ (>= 2.3.3 recommended)
+- Ruby 2.4.0+
 - Unix like operating system (OS X, Ubuntu, Debian, and more)
-- Will not work on Windows with the default [grit](https://github.com/github/grit) adapter, but might work via JRuby (please let us know!)
+- Will not work on Windows with the default [rugged](https://github.com/github/grit) adapter, but works via JRuby.
 
 ## INSTALLATION
 
@@ -92,7 +91,13 @@ Note that `base_path` just modifies the links.
 Get the latest version of the given human or canonical page name:
 
 ```ruby
-page = wiki.page('page-name')
+page = wiki.page('/page name') # Finds pages in the root directory of the wiki that are named 'page name' with a valid extension. 
+# => <Gollum::Page>
+
+page = wiki.page('page name') # For convenience, you can leave out the '/' in front. Paths are assumed to be relative to '/'.
+# => <Gollum::Page>
+
+page = wiki.page('page name.md') # You can also specifiy the extension explicitly to disambiguate between pages with the same name, but different formats.
 # => <Gollum::Page>
 
 page.raw_data
@@ -141,7 +146,7 @@ vsns.first.authored_date
 Get a specific version of a given canonical page file:
 
 ```ruby
-wiki.page('page-name', '5ec521178e0eec4dc39741a8978a2ba6616d0f0a')
+wiki.page('page name', '5ec521178e0eec4dc39741a8978a2ba6616d0f0a')
 ```
 
 Get the latest version of a given static file:
@@ -182,10 +187,10 @@ commit = { :message => 'commit message',
 ```
 
 Write a new version of a page (the file will be created if it does not already
-exist) and commit the change. The file will be written at the repo root.
+exist) and commit the change. The file will be written at the repo root if no subdirectory is specified.
 
 ```ruby
-wiki.write_page('Page Name', :markdown, 'Page contents', commit)
+wiki.write_page('Subdirectory/Page Name', :markdown, 'Page contents', commit)
 ```
 
 Update an existing page. If the format is different than the page's current

data/Rakefile

@@ -51,11 +51,11 @@ def gemspec_file
 end
 
 def gemspecs
-  ["#{name}.gemspec", "#{name}_java.gemspec"]
+  [RUBY_PLATFORM == 'java' ? "#{name}_java.gemspec" : "#{name}.gemspec"]
 end
 
 def gem_files
-  ["#{name}-#{version}.gem", "#{name}-#{version}-java.gem"]
+  [RUBY_PLATFORM == 'java' ? "#{name}-#{version}-java.gem" : "#{name}-#{version}.gem"]
 end
 
 def replace_header(head, header_name)
@@ -107,7 +107,7 @@ end
 
 desc "Build and install"
 task :install => :build do
-  sh "gem install --local --no-ri --no-rdoc pkg/#{name}-#{version}.gem"
+  sh "gem install --local --no-document pkg/#{name}-#{version}.gem"
 end
 
 #############################################################################
@@ -118,14 +118,14 @@ end
 
 desc 'Create a release build'
 task :release => :build do
-  unless `git branch` =~ /gollum-lib-5.x/
-    puts "You must be on the gollum-lib-5.x branch to release!"
+  unless `git branch` =~ /master/
+    puts "You must be on the master branch to release!"
     exit!
   end
   sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git pull --rebase origin gollum-lib-5.x"
+  sh "git pull --rebase origin master"
   sh "git tag v#{version}"
-  sh "git push origin gollum-lib-5.x"
+  sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
   sh "gem push pkg/#{name}-#{version}-java.gem"

data/adapter_dependencies.rb

@@ -0,0 +1,7 @@
+# Set the default git adapter for use in gollum-lib.gemspec and gollum-lib_java.gemspec
+
+if RUBY_PLATFORM == 'java' then
+  DEFAULT_ADAPTER_REQ = ['gollum-rjgit_adapter', '>= 0.5.1', '~> 0.5.1']
+else
+  DEFAULT_ADAPTER_REQ = ['gollum-rugged_adapter', '>= 0.99.4', '~> 0.99.4']
+end

data/gemspec.rb

@@ -3,12 +3,12 @@ def specification(version, default_adapter, platform = nil)
     s.specification_version = 2 if s.respond_to? :specification_version=
     s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
     s.rubygems_version = '0.0.1'
-    s.required_ruby_version = '>= 2.1'
+    s.required_ruby_version = '>= 2.4'
 
     s.name              = 'gollum-lib'
     s.version           = version
     s.platform          = platform if platform
-    s.date              = '2018-09-17'
+    s.date              = '2020-03-29'
     s.date              = '2017-04-13'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'
@@ -28,27 +28,29 @@ def specification(version, default_adapter, platform = nil)
     s.add_dependency *default_adapter
     s.add_dependency 'rouge', '~> 3.1'
     s.add_dependency 'nokogiri', '~> 1.8'
-    s.add_dependency 'stringex', '~> 2.6'
-    s.add_dependency 'sanitize', '~> 2.1'
-    s.add_dependency 'github-markup', '~> 1.6'
-    s.add_dependency 'gemojione', '~> 3.2'
+    s.add_dependency 'loofah', '~> 2.3'
+    s.add_dependency 'github-markup', '~> 3.0'
+    s.add_dependency 'gemojione', '~> 4.1'
+    s.add_dependency 'octicons', '~> 8.5'
     s.add_dependency 'twitter-text', '1.14.7'
 
     s.add_development_dependency 'org-ruby', '~> 0.9.9'
-    s.add_development_dependency 'kramdown', '~> 1.13'
+    s.add_development_dependency 'kramdown', '~> 2.1.0'
+    s.add_development_dependency 'kramdown-parser-gfm', '~> 1.1.0'
     s.add_development_dependency 'RedCloth', '~> 4.2.9'
     s.add_development_dependency 'mocha', '~> 1.2.0'
     s.add_development_dependency 'shoulda', '~> 3.5.0'
     s.add_development_dependency 'wikicloth', '~> 0.8.3'
     s.add_development_dependency 'bibtex-ruby', '~> 4.3'
     s.add_development_dependency 'citeproc-ruby', '~> 1.1'
-    s.add_development_dependency 'rake', '~> 10.4.0'
+    s.add_development_dependency 'unicode_utils', '~> 1.4.0' # required by citeproc-ruby on ruby < 2.4
+    s.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
     s.add_development_dependency 'pry', '~> 0.10.1'
     # 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 'minitest-reporters', '~> 1.4'
     s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
     # required by guard
     s.add_development_dependency 'guard', '~> 2.8.2'
@@ -63,8 +65,8 @@ def specification(version, default_adapter, platform = nil)
     HISTORY.md
     LICENSE
     README.md
-    ROADMAP
     Rakefile
+    adapter_dependencies.rb
     docs/sanitization.md
     gemspec.rb
     gollum-lib.gemspec
@@ -77,6 +79,7 @@ def specification(version, default_adapter, platform = nil)
     lib/gollum-lib/filter.rb
     lib/gollum-lib/filter/bibtex.rb
     lib/gollum-lib/filter/code.rb
+    lib/gollum-lib/filter/critic_markup.rb
     lib/gollum-lib/filter/emoji.rb
     lib/gollum-lib/filter/macro.rb
     lib/gollum-lib/filter/pandoc_bib.rb
@@ -93,14 +96,19 @@ def specification(version, default_adapter, platform = nil)
     lib/gollum-lib/hook.rb
     lib/gollum-lib/macro.rb
     lib/gollum-lib/macro/all_pages.rb
+    lib/gollum-lib/macro/audio.rb
     lib/gollum-lib/macro/global_toc.rb
     lib/gollum-lib/macro/navigation.rb
+    lib/gollum-lib/macro/note.rb
+    lib/gollum-lib/macro/octicon.rb
     lib/gollum-lib/macro/series.rb
     lib/gollum-lib/macro/video.rb
+    lib/gollum-lib/macro/warn.rb
     lib/gollum-lib/markup.rb
     lib/gollum-lib/markups.rb
     lib/gollum-lib/page.rb
     lib/gollum-lib/pagination.rb
+    lib/gollum-lib/redirects.rb
     lib/gollum-lib/sanitization.rb
     lib/gollum-lib/version.rb
     lib/gollum-lib/wiki.rb

data/gollum-lib.gemspec

@@ -1,8 +1,4 @@
 require File.join(File.dirname(__FILE__), 'gemspec.rb')
+require File.join(File.dirname(__FILE__), 'adapter_dependencies.rb')
 require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
-  if RUBY_PLATFORM == 'java' then
-    default_adapter = ['gollum-rjgit_adapter', '~> 0.3']
-  else
-    default_adapter = ['gollum-grit_adapter', '~> 1.0']
-  end
-Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)
+Gem::Specification.new &specification(Gollum::Lib::VERSION, DEFAULT_ADAPTER_REQ)

data/gollum-lib_java.gemspec

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

data/lib/gollum-lib.rb

@@ -5,15 +5,17 @@ require 'digest/sha1'
 require 'ostruct'
 require 'pathname'
 
-DEFAULT_ADAPTER = RUBY_PLATFORM == 'java' ? 'rjgit' : 'grit'
+DEFAULT_ADAPTER = RUBY_PLATFORM == 'java' ? 'rjgit' : 'rugged'
 
+module Gollum; end
 Gollum::GIT_ADAPTER = DEFAULT_ADAPTER if !defined?(Gollum::GIT_ADAPTER)
 require "#{Gollum::GIT_ADAPTER.downcase}_adapter"
 
 # external
 require 'github/markup'
-require 'sanitize'
+require 'erb'
 require 'gemojione'
+require 'loofah'
 
 # internal
 require File.expand_path('../gollum-lib/git_access', __FILE__)
@@ -22,9 +24,10 @@ require File.expand_path('../gollum-lib/committer', __FILE__)
 require File.expand_path('../gollum-lib/pagination', __FILE__)
 require File.expand_path('../gollum-lib/blob_entry', __FILE__)
 require File.expand_path('../gollum-lib/wiki', __FILE__)
+require File.expand_path('../gollum-lib/redirects', __FILE__)
+require File.expand_path('../gollum-lib/file', __FILE__)
 require File.expand_path('../gollum-lib/page', __FILE__)
 require File.expand_path('../gollum-lib/macro', __FILE__)
-require File.expand_path('../gollum-lib/file', __FILE__)
 require File.expand_path('../gollum-lib/file_view', __FILE__)
 require File.expand_path('../gollum-lib/markup', __FILE__)
 require File.expand_path('../gollum-lib/markups', __FILE__)
@@ -40,19 +43,16 @@ module Gollum
   class Error < StandardError; end
 
   class DuplicatePageError < Error
-    attr_accessor :dir
-    attr_accessor :existing_path
     attr_accessor :attempted_path
 
-    def initialize(dir, existing, attempted, message = nil)
-      @dir            = dir
-      @existing_path  = existing
+    def initialize(attempted, message = nil)
       @attempted_path = attempted
-      super(message || "Cannot write #{@dir}/#{@attempted_path}, found #{@dir}/#{@existing_path}.")
+      super(message || "Cannot write #{@attempted_path}: path already exists.")
     end
   end
 
   class InvalidGitRepositoryError < StandardError; end
   class NoSuchPathError < StandardError; end
+  class IllegalDirectoryPath < StandardError; end
 
 end

data/lib/gollum-lib/blob_entry.rb

@@ -47,10 +47,7 @@ module Gollum
     #
     # Returns a Gollum::Page instance.
     def page(wiki, commit)
-      blob         = self.blob(wiki.repo)
-      page         = wiki.page_class.new(wiki).populate(blob, self.dir)
-      page.version = commit
-      page
+      ::Gollum::Page.new(wiki, self.blob(wiki.repo), self.dir, commit)
     end
 
     # Gets a File instance for this blob.
@@ -59,10 +56,7 @@ module Gollum
     #
     # Returns a Gollum::File instance.
     def file(wiki, commit)
-      blob         = self.blob(wiki.repo)
-      file         = wiki.file_class.new(wiki).populate(blob, self.dir)
-      file.version = commit
-      file
+      ::Gollum::File.new(wiki, self.blob(wiki.repo), self.dir, commit)
     end
 
     def inspect

data/lib/gollum-lib/committer.rb

@@ -30,7 +30,6 @@ module Gollum
       @wiki      = wiki
       @options   = options
       @callbacks = []
-      after_commit { |*args| Hook.execute(:post_commit, *args) }
     end
 
     # Public: References the Git index for this commit.
@@ -71,82 +70,46 @@ module Gollum
       end
     end
 
-    # Adds a page to the given Index.
+    # Adds a path to the Index.
     #
-    # dir    - The String subdirectory of the Gollum::Page without any
-    #          prefix or suffix slashes (e.g. "foo/bar").
-    # name   - The String Gollum::Page filename_stripped.
-    # format - The Symbol Gollum::Page format.
+    # path   - The String path to be added
     # data   - The String wiki data to store in the tree map.
     #
-    # Raises Gollum::DuplicatePageError if a matching filename already exists.
+    # Raises Gollum::DuplicatePageError if a matching filename already exists, unless force_overwrite is explicitly enabled.
     # This way, pages are not inadvertently overwritten.
     #
     # Returns nothing (modifies the Index in place).
-    def add_to_index(dir, name, format, data)
-      path = @wiki.page_file_name(name, format)
-
-      dir  = '/' if dir.strip.empty?
-
-      fullpath = ::File.join(*[dir, path])
-      fullpath = fullpath[1..-1] if fullpath =~ /^\//
-
-      if index.current_tree && (tree = index.current_tree / (@wiki.page_file_dir || '/'))
-        tree = tree / dir unless tree.nil?
-      end
-
-      if tree
-        downpath = path.downcase.sub(/\.\w+$/, '')
-
-        tree.blobs.each do |blob|
-          next if page_path_scheduled_for_deletion?(index.tree, fullpath)
-
-          existing_file     = blob.name.downcase.sub(/\.\w+$/, '')
-          existing_file_ext = ::File.extname(blob.name).sub(/^\./, '')
-
-          new_file_ext = ::File.extname(path).sub(/^\./, '')
-
-          if downpath == existing_file && (new_file_ext == existing_file_ext)
-            raise DuplicatePageError.new(dir, blob.name, path)
-          end
+    def add_to_index(path, data, options = {}, force_overwrite = false)
+      if tree = index.current_tree
+        unless page_path_scheduled_for_deletion?(index.tree, path) || force_overwrite
+          raise DuplicatePageError.new(path) if tree / path
         end
       end
 
-      fullpath = fullpath.force_encoding('ascii-8bit') if fullpath.respond_to?(:force_encoding)
-
-      begin
-        data = @wiki.normalize(data)
-      rescue ArgumentError => err
-        # Swallow errors that arise from data being binary
-        raise err unless err.message.include?('invalid byte sequence')
+      unless options[:normalize] == false
+        begin
+          data = @wiki.normalize(data)
+        rescue ArgumentError => err
+          # Swallow errors that arise from data being binary
+          raise err unless err.message.include?('invalid byte sequence')
+        end
       end
-      index.add(fullpath, data)
+      index.add(path, data)
     end
 
     # Update the given file in the repository's working directory if there
     # is a working directory present.
     #
-    # dir    - The String directory in which the file lives.
-    # name   - The String name of the page or the stripped filename
-    #          (should be pre-canonicalized if required).
-    # format - The Symbol format of the page.
+    # path    - The String path to update
     #
     # Returns nothing.
-    def update_working_dir(dir, name, format)
+    def update_working_dir(path)
       unless @wiki.repo.bare
-        if @wiki.page_file_dir && dir !~ /^#{@wiki.page_file_dir}/
-          dir = dir.size.zero? ? @wiki.page_file_dir : ::File.join(@wiki.page_file_dir, dir)
+        if @wiki.page_file_dir && !path.start_with?(@wiki.page_file_dir)
+          # Skip the path if it is not under the wiki's page file dir
+          return nil
         end
 
-        path =
-            if dir == ''
-              @wiki.page_file_name(name, format)
-            else
-              ::File.join(dir, @wiki.page_file_name(name, format))
-            end
-
-        path = path.force_encoding('ascii-8bit') if path.respond_to?(:force_encoding)
-
         Dir.chdir(::File.join(@wiki.repo.path, '..')) do
           if file_path_scheduled_for_deletion?(index.tree, path)
             @wiki.repo.git.rm(path, :force => true)
@@ -165,6 +128,7 @@ module Gollum
       @callbacks.each do |cb|
         cb.call(self, sha1)
       end
+      Hook.execute(:post_commit, self, sha1)
       sha1
     end
 
@@ -192,8 +156,7 @@ module Gollum
       parts = path.split('/')
       if parts.size == 1
         deletions = map.keys.select { |k| !map[k] }
-        downfile  = parts.first.downcase.sub(/\.\w+$/, '')
-        deletions.any? { |d| d.downcase.sub(/\.\w+$/, '') == downfile }
+        deletions.any? { |d| d == parts.first }
       else
         part = parts.shift
         if (rest = map[part])
@@ -230,7 +193,6 @@ module Gollum
 
     # Proxies methods t
     def method_missing(name, *args)
-      args.map! { |item| item.respond_to?(:force_encoding) ? item.force_encoding('ascii-8bit') : item }
       index.send(name, *args)
     end
   end

data/lib/gollum-lib/file.rb

@@ -2,55 +2,125 @@
 
 module Gollum
   class File
-    Wiki.file_class = self
+
+    # Does the filesystem support reading symlinks?
+    FS_SUPPORT_SYMLINKS = !Gem.win_platform?
+
+    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 - (Not implemented for File, see Page.path_match)
+      # hyphened_tags  - If true, replace spaces in match_path with hyphens.
+      # case_insensitive - If true, compare query and match_path case-insensitively
+      def path_match(query, entry, global_match = false, hyphened_tags = false, case_insensitive = false)
+        path_compare(query, ::File.join('/', entry.path), hyphened_tags, case_insensitive)
+      end
+      
+      # For use with self.path_match: returns true if 'query' and 'match_path' match, strictly or taking account of the following parameters:
+      # hyphened_tags  - If true, replace spaces in match_path with hyphens.
+      # case_insensitive - If true, compare query and match_path case-insensitively
+      def path_compare(query, match_path, hyphened_tags, case_insensitive)
+        if hyphened_tags
+          final_query = query.gsub(' ', '-')
+          final_match = match_path.gsub(' ', '-')
+        else
+          final_query = query
+          final_match = match_path
+        end
+        final_match.send(case_insensitive ? :casecmp? : :==, final_query)
+      end
+    end
+
+    # Find a file in the given Gollum wiki.
+    #
+    # wiki    - The wiki.
+    # path    - The full String path.
+    # version - The String version ID to find.
+    # try_on_disk - If true, try to return just a reference to a file
+    #               that exists on the disk.
+    # global_match - If true, find a File matching path's filename, but not it's directory (so anywhere in the repo)
+    #
+    # Returns a Gollum::File or nil if the file could not be found. Note
+    # that if you specify try_on_disk=true, you may or may not get a file
+    # for which on_disk? is actually true.
+    def self.find(wiki, path, version, try_on_disk = false, global_match = false)
+      map = wiki.tree_map_for(version.to_s)
+
+      query_path = Pathname.new(::File.join(['/', wiki.page_file_dir, path].compact)).cleanpath.to_s
+      query_path.sub!(/^\/\//, '/') if Gem.win_platform? # On Windows, Pathname#cleanpath will leave double slashes at the start of a path intact, so sub them out.
+
+      begin
+        entry = map.detect do |entry|
+          path_match(query_path, entry, global_match, wiki.hyphened_tag_lookup, wiki.case_insensitive_tag_lookup)
+        end
+        entry ? self.new(wiki, entry.blob(wiki.repo), entry.dir, version, try_on_disk) : nil
+      rescue Gollum::Git::NoSuchShaFound
+        nil
+      end
+    end
 
     # Public: Initialize a file.
     #
-    # 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 file.
     #
     # Returns a newly initialized Gollum::File.
-    def initialize(wiki)
+    def initialize(wiki, blob, path, version, try_on_disk = false)
       @wiki         = wiki
-      @blob         = nil
-      @path         = nil
-      @on_disk      = false
-      @on_disk_path = nil
+      @blob         = blob
+      @path         = "#{path}/#{blob.name}"[1..-1]
+      @version      = version.is_a?(Gollum::Git::Commit) ? version : @wiki.commit_for(version)
+      get_disk_reference if try_on_disk
     end
 
-    # Public: The url path required to reach this page within the repo.
+    # Public: The path of the page within the repo.
     #
-    # Returns the String url_path
-    def url_path
-      path = self.path
-      path = path.sub(/\/[^\/]+$/, '/') if path.include?('/')
-      path
-    end
+    # Returns the String path.
+    attr_reader :path
+
+    # Public: The Gollum::Git::Commit version of the file.
+    attr_accessor :version
 
-    # Public: The SHA hash identifying this file
+    # Public: Whether the file can be read from disk.
+    attr_accessor :on_disk
+
+    # Public: The SHA hash identifying this page
     #
     # Returns the String SHA.
     def sha
       @blob && @blob.id
     end
 
-    # Public: The url_path, but CGI escaped.
+    # Public: The on-disk filename of the page including extension.
     #
-    # Returns the String url_path
-    def escaped_url_path
-      CGI.escape(self.url_path).gsub('%2F', '/')
+    # Returns the String name.
+    def filename
+      @blob && @blob.name
     end
+    alias :name :filename
 
-    # Public: The on-disk filename of the file.
+    # Public: The url path required to reach this file within the repo.
     #
-    # Returns the String name.
-    def name
-      return @path if on_disk?
-      @blob && @blob.name
+    # Returns the String url_path
+    def url_path
+      # Chop off the page_file_dir and first slash if necessary
+      @wiki.page_file_dir ? self.path[@wiki.page_file_dir.length+1..-1] : self.path
     end
 
-    alias filename name
+    # Public: The url_path, but URL encoded.
+    #
+    # Returns the String url_path
+    def escaped_url_path
+      ERB::Util.url_encode(self.url_path).gsub('%2F', '/').force_encoding('utf-8')
+    end
 
-    # Public: The raw contents of the page.
+    # Public: The raw contents of the file.
     #
     # Returns the String data.
     def raw_data
@@ -69,7 +139,7 @@ module Gollum
     #
     # Returns true if this is a pointer to an on-disk file
     def on_disk?
-      @on_disk
+      !!@on_disk
     end
 
     # Public: The path to this file on disk
@@ -79,48 +149,29 @@ module Gollum
       @on_disk_path
     end
 
-    # Public: The Gollum::Git::Commit version of the file.
-    attr_accessor :version
-
-    # Public: The String path of the file.
-    attr_reader :path
-
     # Public: The String mime type of the file.
     def mime_type
       @blob && @blob.mime_type
     end
 
-    # Populate the File with information from the Blob.
-    #
-    # blob - The Gollum::Git::Blob that contains the info.
-    # path - The String directory path of the file.
-    #
-    # Returns the populated Gollum::File.
-    def populate(blob, path = nil)
-      @blob         = blob
-      @path         = "#{path}/#{blob.name}"[1..-1]
-      @on_disk      = false
-      @on_disk_path = nil
-      self
+    def self.protected_files
+      ['custom.css', 'custom.js', '.redirects.gollum']
     end
 
-    #########################################################################
-    #
-    # Internal Methods
-    #
-    #########################################################################
+    private
 
     # Return the file path to this file on disk, if available.
     #
     # Returns nil if the file isn't available on disk. This can occur if the
     # repo is bare, if the commit isn't the HEAD, or if there are problems
     # resolving symbolic links.
-    def get_disk_reference(name, commit)
+    def get_disk_reference
       return false if @wiki.repo.bare
-      return false if commit.sha != @wiki.repo.head.commit.sha
+      return false if @version.sha != @wiki.repo.head.commit.sha
+      return false if @blob.is_symlink && !FS_SUPPORT_SYMLINKS
 
       # This will try to resolve symbolic links, as well
-      pathname = Pathname.new(::File.expand_path(::File.join(@wiki.repo.path, '..', name)))
+      pathname = Pathname.new(::File.expand_path(::File.join(@wiki.repo.path, '..', @path)))
       if pathname.symlink?
         source   = ::File.readlink(pathname.to_path)
         realpath = ::File.join(::File.dirname(pathname.to_path), source)
@@ -129,36 +180,8 @@ module Gollum
       else
         @on_disk_path = pathname.to_path
       end
-      true
+      @on_disk = true
     end
 
-    # Find a file in the given Gollum repo.
-    #
-    # name    - The full String path.
-    # version - The String version ID to find.
-    # try_on_disk - If true, try to return just a reference to a file
-    #               that exists on the disk.
-    #
-    # Returns a Gollum::File or nil if the file could not be found. Note
-    # that if you specify try_on_disk=true, you may or may not get a file
-    # for which on_disk? is actually true.
-    def find(name, version, try_on_disk = false)
-      checked = name.downcase
-      map     = @wiki.tree_map_for(version)
-      commit  = version.is_a?(Gollum::Git::Commit) ? version : @wiki.commit_for(version)
-
-      if (result = map.detect { |entry| entry.path.downcase == checked })
-        @path    = name
-        @version = commit
-
-        if try_on_disk && get_disk_reference(name, commit)
-          @on_disk = true
-        else
-          @blob = result.blob(@wiki.repo)
-        end
-
-        self
-      end
-    end
   end
 end