gollum-lib 4.2.10-java → 5.0.a.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '082172479f673ebbd6eacedeb7f2edb540f312dac8307ea68b347b9eca14b961'
-  data.tar.gz: 48b46d753206cb6cb9650d3d9e398e726fd5451340b27b09c860847e1542504e
+SHA1:
+  metadata.gz: ae72c5766cef3dfac6331528aa1bbae51b168dd9
+  data.tar.gz: 3ef52f1eea546e5204ae4ba48ab0a07d36e7c206
 SHA512:
-  metadata.gz: 6e5dfec01055468484d7c0dd582c56c566dce3fe1435d189e31b4207d3f20a4d05533a709c4218600cdb2524c788a43b59e45fcc59fd820b1048d4da2d690fe5
-  data.tar.gz: 8e2ff18cf89c7b933acf162797b88e973aa9c5d68b4d3b3234de0cd52aeed53b0512e86bf1a26df7a5e7fa73c3f56dc53a014403788ddebebcda50e7f9ccc426
+  metadata.gz: 653feadd2f5ab77be231fc6b1c749e035b28dc610e80ab513ef62c70176f149767eb4638fc7143dfeadb1e0d668d7daa4967850191b8f57c2d1db0de9edb668d
+  data.tar.gz: e72ae4b5f112ad0d15a7001b651ead4ebec0b7b691ef7ab408dc0895fb405b7d64c71366050cf5bd7761ae468b1dd294c0b576f34a3a1695528e85c92f142551

data/Gemfile

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

data/README.md

@@ -19,7 +19,8 @@ Gollum-lib follows the rules of [Semantic Versioning](http://semver.org/) and us
 
 ## SYSTEM REQUIREMENTS
 
-- Ruby 1.9.3+ (>2.0 recommended)
+- Python 2.5+ (2.7.3 recommended)
+- Ruby 2.1.0+ (>= 2.3.3 recommended)
 - 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!)
 

data/ROADMAP

@@ -0,0 +1,6 @@
+# Roadmap to 5.x
+
+* Unicode everywhere
+* Reduce whitespace substitution array to a single character to reduce lookup times
+* Benchmarking
+* 

data/Rakefile

@@ -118,14 +118,14 @@ end
 
 desc 'Create a release build'
 task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
+  unless `git branch` =~ /gollum-lib-5.x/
+    puts "You must be on the gollum-lib-5.x branch to release!"
     exit!
   end
   sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git pull --rebase origin master"
+  sh "git pull --rebase origin gollum-lib-5.x"
   sh "git tag v#{version}"
-  sh "git push origin master"
+  sh "git push origin gollum-lib-5.x"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
   sh "gem push pkg/#{name}-#{version}-java.gem"

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 = '>= 1.9'
+    s.required_ruby_version = '>= 2.1'
 
     s.name              = 'gollum-lib'
     s.version           = version
     s.platform          = platform if platform
-    s.date              = '2018-10-01'
+    s.date              = '2017-04-08'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'
 
@@ -25,20 +25,15 @@ def specification(version, default_adapter, platform = nil)
     s.extra_rdoc_files = %w(README.md LICENSE)
 
     s.add_dependency *default_adapter
-    s.add_dependency 'rouge', '~> 2.1'
-    if RUBY_VERSION < '2.1'
-      s.add_dependency 'nokogiri', '~> 1.6.1'
-    else
-      s.add_dependency 'nokogiri', '>= 1.6.1', '< 2.0'
-    end
+    s.add_dependency 'rouge', '~> 2.0'
+    s.add_dependency 'nokogiri', '~> 1.7', '>= 1.7.1'
     s.add_dependency 'stringex', '~> 2.6'
-    s.add_dependency 'sanitize', '~> 2.1.1', '>= 2.1.1'
+    s.add_dependency 'sanitize', '~> 2.1'
     s.add_dependency 'github-markup', '~> 1.6'
     s.add_dependency 'gemojione', '~> 3.2'
-    s.add_dependency 'twitter-text', '1.14.7'
 
     s.add_development_dependency 'org-ruby', '~> 0.9.9'
-    s.add_development_dependency 'kramdown', '~> 1.6.0'
+    s.add_development_dependency 'kramdown', '~> 1.13'
     s.add_development_dependency 'RedCloth', '~> 4.2.9'
     s.add_development_dependency 'mocha', '~> 1.1.0'
     s.add_development_dependency 'shoulda', '~> 3.5.0'
@@ -64,6 +59,7 @@ def specification(version, default_adapter, platform = nil)
     HISTORY.md
     LICENSE
     README.md
+    ROADMAP
     Rakefile
     docs/sanitization.md
     gemspec.rb
@@ -78,7 +74,6 @@ def specification(version, default_adapter, platform = nil)
     lib/gollum-lib/filter/code.rb
     lib/gollum-lib/filter/emoji.rb
     lib/gollum-lib/filter/macro.rb
-    lib/gollum-lib/filter/metadata.rb
     lib/gollum-lib/filter/plain_text.rb
     lib/gollum-lib/filter/plantuml.rb
     lib/gollum-lib/filter/remote_code.rb
@@ -87,8 +82,8 @@ def specification(version, default_adapter, platform = nil)
     lib/gollum-lib/filter/tags.rb
     lib/gollum-lib/filter/toc.rb
     lib/gollum-lib/filter/wsd.rb
+    lib/gollum-lib/filter/yaml.rb
     lib/gollum-lib/git_access.rb
-    lib/gollum-lib/gitcode.rb
     lib/gollum-lib/helpers.rb
     lib/gollum-lib/hook.rb
     lib/gollum-lib/macro.rb

data/lib/gollum-lib.rb

@@ -34,10 +34,6 @@ require File.expand_path('../gollum-lib/markups', __FILE__)
 require File.expand_path('../gollum-lib/sanitization', __FILE__)
 require File.expand_path('../gollum-lib/filter', __FILE__)
 
-# Set ruby to UTF-8 mode
-# This is required for Ruby 1.8.7 which gollum still supports.
-$KCODE = 'U' if RUBY_VERSION[0, 3] == '1.8'
-
 module Gollum
 
   def self.assets_path

data/lib/gollum-lib/committer.rb

@@ -86,10 +86,6 @@ module Gollum
     #
     # Returns nothing (modifies the Index in place).
     def add_to_index(dir, name, format, data, allow_same_ext = false)
-      # spaces must be dashes
-      dir.gsub!(' ', '-')
-      name.gsub!(' ', '-')
-
       path = @wiki.page_file_name(name, format)
 
       dir  = '/' if dir.strip.empty?

data/lib/gollum-lib/file_view.rb

@@ -10,13 +10,12 @@ module Gollum
     # set pages to wiki.pages + wiki.files and show_all to true
     def initialize(pages, options = {})
       @pages    = pages
-      @wiki     = @pages.first ? @pages.first.wiki : nil
       @show_all = options[:show_all] || false
       @checked  = options[:collapse_tree] ? '' : "checked"
     end
 
     def enclose_tree(string)
-      sanitize_html(%Q(<ol class="tree">\n) + string + %Q(</ol>))
+      %Q(<ol class="tree">\n) + string + %Q(</ol>)
     end
 
     def new_page(page)
@@ -97,7 +96,7 @@ module Gollum
         </li>
         HTML
 
-        return enclose_tree(html)
+        return enclose_tree html
       end
 
       sorted_folders = []
@@ -154,11 +153,8 @@ module Gollum
         changed = false
       end
 
-      enclose_tree(html)
+      # return the completed html
+      enclose_tree html
     end # end render_files
-
-    def sanitize_html(data)
-      @wiki ? @wiki.sanitizer.clean(data) : data
-    end
   end # end FileView class
 end # end Gollum module

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

@@ -5,7 +5,7 @@ class Gollum::Filter::Tags < Gollum::Filter
   # Extract all tags into the tagmap and replace with placeholders.
   def extract(data)
     return data if @markup.format == :txt || @markup.format == :asciidoc
-    data.gsub!(/(.?)\[\[(.+?)\]\]([^\[]?)/m) do
+    data.gsub!(/(.?)\[\[(.+?)\]\]([^\[]?)/) do
       if Regexp.last_match[1] == "'" && Regexp.last_match[3] != "'"
         "[[#{Regexp.last_match[2]}]]#{Regexp.last_match[3]}"
       elsif Regexp.last_match[2].include?('][')
@@ -279,13 +279,13 @@ class Gollum::Filter::Tags < Gollum::Filter
     parts.reverse! if @markup.reverse_links?
 
     name, page_name = *parts.compact.map(&:strip)
-    cname           = @markup.wiki.page_class.cname(page_name || name)
+    cname           = page_name ? page_name : name.to_s
 
     presence    = "absent"
     link_name   = cname
     page, extra = find_page_from_name(cname)
     if page
-      link_name = @markup.wiki.page_class.cname(page.name)
+      link_name = page.name
       presence  = "present"
     end
     link = ::File.join(@markup.wiki.base_path, page ? page.escaped_url_path : CGI.escape(link_name))

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

@@ -0,0 +1,27 @@
+require 'yaml'
+# Extract YAML frontmatter from data and build metadata table. 
+
+class Gollum::Filter::YAML < Gollum::Filter
+  
+  # Regexp thanks to jekyll
+  YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m
+
+  def extract(data)
+    data.gsub!(YAML_FRONT_MATTER_REGEXP) do
+      @markup.metadata ||= {}
+      begin
+        frontmatter = ::YAML.safe_load(@markup.sanitize.clean(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'] ||= []
+        @markup.metadata['errors'] << "Failed to load YAML frontmater: #{error.message}"
+      end
+      ''
+    end
+    data
+  end
+
+  def process(data)
+    data
+  end
+end

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

@@ -6,7 +6,7 @@ module Gollum
         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.gsub("-", " "), "").sub(/^\//,'')
+              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

data/lib/gollum-lib/markup.rb

@@ -31,7 +31,7 @@ module Gollum
         end
       end
 
-      # Register a file extension and associated markup type
+      # Register a file format
       #
       # ext     - The file extension
       # name    - The name of the markup type
@@ -99,7 +99,7 @@ module Gollum
       @format = format
       @name   = name
 
-      chain = [:Metadata, :PlainText, :Emoji, :TOC, :RemoteCode, :Code, :Sanitize, :WSD, :Tags, :Render]
+      chain = [:YAML, :PlainText, :Emoji, :TOC, :RemoteCode, :Code, :Sanitize, :WSD, :Tags, :Render]
 
       filter_chain = chain.map do |r|
         Gollum::Filter.const_get(r).new(self)

data/lib/gollum-lib/markups.rb

@@ -3,7 +3,7 @@ module Gollum
   class Markup
     
     GitHub::Markup::Markdown::MARKDOWN_GEMS['kramdown'] = proc { |content|
-        Kramdown::Document.new(content, :auto_ids => false, :input => "markdown").to_html
+        Kramdown::Document.new(content, :auto_ids => false, :smart_quotes => ["'", "'", '"', '"'].map{|char| char.codepoints.first}).to_html
     }
 
     register(:markdown,  "Markdown", :regexp => /md|mkdn?|mdown|markdown/)

data/lib/gollum-lib/page.rb

@@ -17,29 +17,25 @@ module Gollum
     # Returns a Page
     attr_accessor :parent_page
 
-
-    # Checks a filename against the registered markup extensions
+    # Find the Symbol format for the file extension
     #
-    # filename - String filename, like "Home.md"
+    # ext - String file extension, like ".md"
     #
-    # Returns e.g. ["Home", :markdown], or [] if the extension is unregistered
-    def self.parse_filename(filename)
-      return [] unless filename =~ /^(.+)\.([a-zA-Z]\w*)$/i
-      pref, ext = Regexp.last_match[1], Regexp.last_match[2]
-
+    # Returns the Symbol format associated with ext
+    def self.parse_extension(ext)
       Gollum::Markup.formats.each_pair do |name, format|
-        return [pref, name] if ext =~ format[:regexp]
+        return name if ext =~ format[:regexp]
       end
-      []
+      nil
     end
 
     # Checks if a filename has a valid, registered extension
     #
     # filename - String filename, like "Home.md".
     #
-    # Returns the matching String basename of the file without the extension.
-    def self.valid_filename?(filename)
-      self.parse_filename(filename).first
+    # Returns true or false.
+    def self.valid_extension?(filename)
+      !!self.parse_extension(::File.extname(filename))
     end
 
     # Checks if a filename has a valid extension understood by GitHub::Markup.
@@ -48,10 +44,9 @@ module Gollum
     #
     # filename - String filename, like "Home.md".
     #
-    # Returns the matching String basename of the file without the extension.
+    # Returns true or false.
     def self.valid_page_name?(filename)
-      match = valid_filename?(filename)
-      filename =~ /^_/ ? false : match
+      !(filename =~ /^_/) && self.valid_extension?(filename)
     end
 
     # Public: The format of a given filename.
@@ -60,15 +55,15 @@ module Gollum
     #
     # Returns the Symbol format of the page; one of the registered format types
     def self.format_for(filename)
-      self.parse_filename(filename).last
+      self.parse_extension(::File.extname(filename))
     end
 
     # Reusable filter to turn a filename (without path) into a canonical name.
-    # Strips extension, converts dashes to spaces.
+    # Strips extension, convert to string if possible.
     #
     # Returns the filtered String.
     def self.canonicalize_filename(filename)
-      strip_filename(filename).gsub('-', ' ')
+      self.strip_filename(filename.to_s)
     end
 
     # Reusable filter to strip extension and path from filename
@@ -107,8 +102,7 @@ module Gollum
       self.class.strip_filename(filename)
     end
 
-    # Public: The canonical page name without extension, and dashes converted
-    # to spaces.
+    # Public: The canonical page name without extension.
     #
     # Returns the String name.
     def name
@@ -116,8 +110,7 @@ module Gollum
     end
 
     # Public: The title will be constructed from the
-    # filename by stripping the extension and replacing any dashes with
-    # spaces.
+    # filename by stripping the extension.
     #
     # Returns the fully sanitized String title.
     def title
@@ -147,7 +140,7 @@ module Gollum
                ''
              end
 
-      path << Page.cname(self.name, '-', '-')
+      path << self.name
       path
     end
 
@@ -155,14 +148,14 @@ module Gollum
     #
     # Returns the String url_path
     def url_path_display
-      url_path.gsub("-", " ")
+      url_path
     end
 
     # Public: Defines title for page.rb
     #
     # Returns the String title
     def url_path_title
-      metadata_title || url_path_display
+      metadata_title || url_path
     end
 
     # Public: Metadata title
@@ -179,6 +172,13 @@ module Gollum
       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['display_metadata'] == false
+      @wiki.display_metadata
+    end
+
     # Public: The url_path, but CGI escaped.
     #
     # Returns the String url_path
@@ -224,7 +224,7 @@ module Gollum
       if @formatted_data && @doc then
         yield @doc if block_given?
       else
-        @formatted_data = markup_class.render(historical?, encoding, include_levels) do |doc|
+        @formatted_data = markup.render(historical?, encoding, include_levels) do |doc|
           @doc = doc
           yield doc if block_given?
         end
@@ -240,16 +240,16 @@ module Gollum
     # Returns the String data.
     def toc_data
       return @parent_page.toc_data if @parent_page and @sub_page
-      formatted_data if markup_class.toc == nil
-      markup_class.toc
+      formatted_data if markup.toc == nil
+      markup.toc
     end
 
     # Public: Embedded metadata.
     #
     # Returns Hash of metadata.
     def metadata
-      formatted_data if markup_class.metadata == nil
-      markup_class.metadata
+      formatted_data if markup.metadata == nil
+      markup.metadata || {}
     end
 
     # Public: The format of the page.
@@ -262,8 +262,8 @@ module Gollum
     # Gets the Gollum::Markup instance that will render this page's content.
     #
     # Returns a Gollum::Markup instance.
-    def markup_class
-      @markup_class ||= @wiki.markup_classes[format].new(self)
+    def markup
+      @markup ||= @wiki.markup_classes[format].new(self)
     end
 
     # Public: The current version of the page.
@@ -331,33 +331,6 @@ module Gollum
       !!@historical
     end
 
-    #########################################################################
-    #
-    # Class Methods
-    #
-    #########################################################################
-
-    # Convert a human page name into a canonical page name.
-    #
-    # name           - The String human page name.
-    # char_white_sub - Substitution for whitespace
-    # char_other_sub - Substitution for other special chars
-    #
-    # Examples
-    #
-    #   Page.cname("Bilbo Baggins")
-    #   # => 'Bilbo-Baggins'
-    #
-    #   Page.cname("Bilbo Baggins",'_')
-    #   # => 'Bilbo_Baggins'
-    #
-    # Returns the String canonical name.
-    def self.cname(name, char_white_sub = '-', char_other_sub = '-')
-      name.respond_to?(:gsub) ?
-          name.gsub(%r(\s), char_white_sub).gsub(%r([<>+]), char_other_sub) :
-          ''
-    end
-
     # Convert a format Symbol into an extension String.
     #
     # format - The format Symbol.
@@ -413,12 +386,13 @@ module Gollum
 
       checked_dir = BlobEntry.normalize_dir(checked_dir)
       checked_dir = '' if exact && checked_dir.nil?
-      name        = ::File.join(checked_dir, name) if checked_dir
+      query       = checked_dir ? ::File.join(checked_dir, name) : name
 
       map.each do |entry|
-        next if entry.name.to_s.empty?
-        path = checked_dir ? ::File.join(entry.dir, entry.name) : entry.name
-        next unless page_match(name, path)
+        next if entry.name.to_s.empty? || !self.class.valid_extension?(entry.name)
+        entry_name =  ::File.extname(name).empty? ? Page.canonicalize_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
 
@@ -451,22 +425,6 @@ module Gollum
       end
     end
 
-    # Compare the canonicalized versions of the two names.
-    #
-    # name     - The human or canonical String page name.
-    # path     - the String path on disk (including file extension).
-    #
-    # Returns a Boolean.
-    def page_match(name, path)
-      if (match = self.class.valid_filename?(path))
-        @wiki.ws_subs.each do |sub|
-          return true if Page.cname(name).downcase == Page.cname(match, sub).downcase
-        end
-      end
-      false
-    end
-
-
     # Loads sub pages. Sub page names (footers, headers, sidebars) are prefixed with
     # an underscore to distinguish them from other Pages. If there is not one within
     # the current directory, starts walking up the directory tree to try and find one
@@ -495,9 +453,7 @@ module Gollum
           end
           
           if subpageblob
-            subpage =  subpageblob.page(@wiki, @version)
-            subpage.parent_page = self
-            instance_variable_set("@#{subpagename}", subpage)
+            instance_variable_set("@#{subpagename}", subpageblob.page(@wiki, @version) )
             break
           end
 

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '4.2.10'
+    VERSION = '5.0.a.1'
   end
-end
+end

data/lib/gollum-lib/wiki.rb

@@ -22,9 +22,6 @@ module Gollum
       # Sets the default email for commits.
       attr_writer :default_committer_email
 
-      # Array of chars to substitute whitespace for when trying to locate file in git repo.
-      attr_writer :default_ws_subs
-
       # Sets sanitization options. Set to false to deactivate
       # sanitization altogether.
       attr_writer :sanitization
@@ -118,10 +115,6 @@ module Gollum
         @default_committer_email || 'anon@anon.com'
       end
 
-      def default_ws_subs
-        @default_ws_subs || ['_', '-']
-      end
-
       def default_options
         @default_options || {}
       end
@@ -144,9 +137,6 @@ module Gollum
     # Gets the String directory in which all page files reside.
     attr_reader :page_file_dir
 
-    # Gets the Array of chars to sub for ws in filenames.
-    attr_reader :ws_subs
-
     # Gets the boolean live preview value.
     attr_reader :live_preview
 
@@ -158,6 +148,10 @@ module Gollum
     # Defaults to false
     attr_reader :h1_title
 
+    # Whether or not to render a page's metadata on the page
+    # Defaults to true
+    attr_reader :display_metadata
+
     # Gets the custom index page for / and subdirs (e.g. foo/)
     attr_reader :index_page
 
@@ -186,7 +180,6 @@ module Gollum
     #           :sanitization  - An instance of Sanitization.
     #           :page_file_dir - String the directory in which all page files reside
     #           :ref - String the repository ref to retrieve pages from
-    #           :ws_subs       - Array of chars to sub for ws in filenames.
     #           :mathjax       - Set to false to disable mathjax.
     #           :user_icons    - Enable user icons on the history page. [gravatar, identicon, none].
     #                            Default: none
@@ -197,6 +190,7 @@ module Gollum
     #           :emoji         - Parse and interpret emoji tags (e.g. :heart:).
     #           :h1_title      - Concatenate all h1's on a page to form the
     #                            page title.
+    #           :display_metadata - Whether or not to render a page's metadata on the page. Default: true
     #           :index_page    - The default page to retrieve or create if the
     #                            a directory is accessed.
     #           :bar_side      - Where the sidebar should be displayed, may be:
@@ -233,7 +227,6 @@ module Gollum
       @repo                 = @access.repo
       @ref                  = options.fetch :ref, self.class.default_ref
       @sanitization         = options.fetch :sanitization, self.class.sanitization
-      @ws_subs              = options.fetch :ws_subs, self.class.default_ws_subs
       @history_sanitization = options.fetch :history_sanitization, self.class.history_sanitization
       @live_preview         = options.fetch :live_preview, true
       @universal_toc        = options.fetch :universal_toc, false
@@ -243,6 +236,7 @@ module Gollum
       @css                  = options.fetch :css, false
       @emoji                = options.fetch :emoji, false
       @h1_title             = options.fetch :h1_title, false
+      @display_metadata     = options.fetch :display_metadata, true
       @index_page           = options.fetch :index_page, 'Home'
       @bar_side             = options.fetch :sidebar, :right
       @user_icons           = ['gravatar', 'identicon'].include?(options[:user_icons]) ?
@@ -250,7 +244,7 @@ module Gollum
       @allow_uploads        = options.fetch :allow_uploads, false
       @per_page_uploads     = options.fetch :per_page_uploads, false
       @filter_chain         = options.fetch :filter_chain,
-                                            [:Metadata, :PlainText, :TOC, :RemoteCode, :Code, :Macro, :Emoji, :Sanitize, :WSD, :PlantUML, :Tags, :Render]
+                                            [:YAML, :PlainText, :TOC, :RemoteCode, :Code, :Macro, :Emoji, :Sanitize, :WSD, :PlantUML, :Tags, :Render]
       @filter_chain.delete(:Emoji) unless options.fetch :emoji, false
     end
 
@@ -310,8 +304,8 @@ module Gollum
     def preview_page(name, data, format)
       page = @page_class.new(self)
       ext  = @page_class.format_to_ext(format.to_sym)
-      name = @page_class.cname(name) + '.' + ext
-      blob = OpenStruct.new(:name => name, :data => data, :is_symlink => false)
+      filename = "#{name}.#{ext}"
+      blob = OpenStruct.new(:name => filename, :data => data, :is_symlink => false)
       page.populate(blob)
       page.version = @access.commit(@ref)
       page
@@ -337,21 +331,15 @@ module Gollum
     # Returns the String SHA1 of the newly written version, or the
     # Gollum::Committer instance if this is part of a batch update.
     def write_page(name, format, data, commit = {}, dir = '')
-      # spaces must be dashes
-      sanitized_name = name.gsub(' ', '-')
-      sanitized_dir  = dir.gsub(' ', '-')
-      sanitized_dir  = ::File.join([@page_file_dir, sanitized_dir].compact)
+      sanitized_dir  = ::File.join([@page_file_dir, dir].compact) 
 
       multi_commit = !!commit[:committer]
       committer    = multi_commit ? commit[:committer] : Committer.new(self, commit)
-
-      filename = Gollum::Page.cname(sanitized_name)
-
-      committer.add_to_index(sanitized_dir, filename, format, data)
+      committer.add_to_index(sanitized_dir, name, format, data)
 
       committer.after_commit do |index, _sha|
         @access.refresh
-        index.update_working_dir(sanitized_dir, filename, format)
+        index.update_working_dir(sanitized_dir, name, format)
       end
 
       multi_commit ? committer : committer.commit
@@ -436,7 +424,7 @@ module Gollum
       dir      = ::File.dirname(page.path)
       dir      = '' if dir == '.'
       filename = (rename = page.name != name) ?
-          Gollum::Page.cname(name) : page.filename_stripped
+          name : page.filename_stripped
 
       multi_commit = !!commit[:committer]
       committer    = multi_commit ? commit[:committer] : Committer.new(self, commit)
@@ -651,9 +639,9 @@ module Gollum
         results[file_name] = count.to_i
       end
 
-      # Use git ls-files '*query*' to search for file names. Grep only searches file content.
+      # Use ls_files '*query*' to search for file names. Grep only searches file content.
       # Spaces are converted to dashes when saving pages to disk.
-      @repo.git.ls_files(query.gsub(' ','-'), options).each do |path|
+      @repo.git.ls_files(query, options).each do |path|
         # Remove ext only from known extensions.
         file_name          = Page::valid_page_name?(path) ? path.chomp(::File.extname(path)) : path
         # If there's not already a result for file_name then
@@ -848,7 +836,7 @@ module Gollum
     #
     # Returns the String filename.
     def page_file_name(name, format)
-      name + '.' + @page_class.format_to_ext(format)
+      "#{name}.#{@page_class.format_to_ext(format)}"
     end
 
     # Fill an array with a list of pages.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 4.2.10
+  version: 5.0.a.1
 platform: java
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum-rjgit_adapter
@@ -31,34 +31,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
-    - - "<"
+        version: '1.7'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
-    - - "<"
+        version: '1.7'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -79,20 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
@@ -121,20 +115,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: twitter-text
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.14.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.14.7
 - !ruby/object:Gem::Dependency
   name: org-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -155,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -399,6 +379,7 @@ files:
 - HISTORY.md
 - LICENSE
 - README.md
+- ROADMAP
 - Rakefile
 - docs/sanitization.md
 - gemspec.rb
@@ -413,7 +394,6 @@ files:
 - lib/gollum-lib/filter/code.rb
 - lib/gollum-lib/filter/emoji.rb
 - lib/gollum-lib/filter/macro.rb
-- lib/gollum-lib/filter/metadata.rb
 - lib/gollum-lib/filter/plain_text.rb
 - lib/gollum-lib/filter/plantuml.rb
 - lib/gollum-lib/filter/remote_code.rb
@@ -422,8 +402,8 @@ files:
 - lib/gollum-lib/filter/tags.rb
 - lib/gollum-lib/filter/toc.rb
 - lib/gollum-lib/filter/wsd.rb
+- lib/gollum-lib/filter/yaml.rb
 - lib/gollum-lib/git_access.rb
-- lib/gollum-lib/gitcode.rb
 - lib/gollum-lib/helpers.rb
 - lib/gollum-lib/hook.rb
 - lib/gollum-lib/macro.rb
@@ -452,15 +432,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: gollum-lib
-rubygems_version: 2.7.7
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 2
 summary: A simple, Git-powered wiki.

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

@@ -1,29 +0,0 @@
-# Extract metadata for data and build metadata table.  Metadata consists of
-# key/value pairs in "key:value" format found between markers.  Each
-# key/value pair must be on its own line.  Internal whitespace in keys and
-# values is preserved, but external whitespace is ignored.
-#
-# Because ri and ruby 1.8.7 are awesome, the markers can't
-# be included in this documentation without triggering
-# `Unhandled special: Special: type=17`
-# Please read the source code for the exact markers
-class Gollum::Filter::Metadata < Gollum::Filter
-  def extract(data)
-    # The markers are `<!-- ---` and `-->`
-    data.gsub(/\<\!--+\s+---(.*?)--+\>/m) do
-      @markup.metadata ||= {}
-      # Split untrusted input on newlines, then remove bits that look like
-      # HTML elements before parsing each line.
-      Regexp.last_match[1].split("\n").each do |line|
-        line.gsub!(/<[^>]*>/, '')
-        k, v                      = line.split(':', 2)
-        @markup.metadata[k.strip] = (v ? v.strip : '') if k
-      end
-      ''
-    end
-  end
-
-  def process(data)
-    data
-  end
-end

data/lib/gollum-lib/gitcode.rb

@@ -1,48 +0,0 @@
-# ~*~ encoding: utf-8 ~*~
-require 'net/http'
-require 'net/https' # ruby 1.8.7 fix, remove at upgrade
-require 'uri'
-require 'open-uri'
-
-module Gollum
-  class Gitcode
-    def initialize(path)
-      raise(ArgumentError, 'path is nil or empty') if path.nil? or path.empty?
-
-      @uri = URI::HTTP.build({
-                                 :path   => self.unchomp(path),
-                                 :host   => 'raw.github.com',
-                                 :scheme => 'https',
-                                 :port   => 443 })
-    end
-
-    def contents
-      @contents ||= self.req @uri
-    end
-
-    def unchomp(p)
-      return p if p.nil?
-      p[0] == '/' ? p : ('/' + p)
-    end
-
-    def req(uri, cut = 1)
-      return "Too many redirects or retries" if cut >= 10
-      http         = Net::HTTP.new uri.host, uri.port
-      http.use_ssl = true
-      resp         = http.get uri.path, {
-          'Accept'        => 'text/plain',
-          'Cache-Control' => 'no-cache',
-          'Connection'    => 'keep-alive',
-          'Host'          => uri.host,
-          'User-Agent'    => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0'
-      }
-      code         = resp.code.to_i
-      return resp.body if code == 200
-      return "Not Found" if code == 404
-      return "Unhandled Response Code #{code}" unless code == 304 or not resp.header['location'].nil?
-      loc  = URI.parse resp.header['location']
-      uri2 = loc.relative?() ? (uri + loc) : loc # overloads (+)
-      return req uri2, (cut + 1)
-    end
-  end
-end