Change spacing behaviour of #wiki-sidebar

To make `#wiki-sidebar` and `#wiki-footer` more similar, we can make
sure `px-4` padding is applied to the `-content` container, rather than
the outer container.

CONTRIBUTING.md

@@ -21,7 +21,7 @@ Before submitting an issue, **please carefully look through the following places
 
 Security vulnerabilities can be reported directly to the maintainers using these GPG keys:
 
-* [@dometto](https://pgp.mit.edu/pks/lookup?op=vindex&search=0xD637E455CD3E27BF)
+* [@dometto](https://keys.openpgp.org/vks/v1/by-fingerprint/02354CC9F820B52CC2791979BB8CCC95FD83B795)
 
 Lastly, please **consider helping out** by opening a Pull Request!
 
@@ -70,7 +70,7 @@ An example of how to add a test file to the bare repository lotr.git.
 ```
 mkdir tmp
 cd tmp
-git clone ../lotr.git/
+git clone ../test/examples/lotr.git/
 git log
 echo "test" > test.md
 git add .

Gemfile

@@ -6,5 +6,5 @@ end
 
 gemspec
 
-gem "rake", '~> 12.3', '>= 12.3.3'
+gem "rake", '~> 13.0'
 

README.md

@@ -4,8 +4,9 @@ gollum -- A git-based Wiki
 [![Gem Version](https://badge.fury.io/rb/gollum.svg)](http://badge.fury.io/rb/gollum)
 [![Build Status](https://travis-ci.org/gollum/gollum.svg?branch=master)](https://travis-ci.org/gollum/gollum)
 [![Open Source Helpers](https://www.codetriage.com/gollum/gollum/badges/users.svg)](https://www.codetriage.com/gollum/gollum)
+[![Cutting Edge Dependency Status](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum/svg 'Cutting Edge Dependency Status')](https://dometto-cuttingedge.herokuapp.com/github/gollum/gollum/info)
 
-**Please update to gollum 5.1.1 to counter a recent exploit in the kramdown rendering gem, [CVE-2020-14001](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-14001)**
+**Please update to gollum 5.1.2 to counter a recent exploit. More info will follow after CVE is assigned.**
 
 **Gollum version 5.0 is out!** See [here](https://github.com/gollum/gollum/wiki/5.0-release-notes) for a list of changes and new features compared to Gollum version 4.x, and see some [Screenshots](https://github.com/gollum/gollum/wiki/Screenshots) of Gollum's features.
 

bin/gollum

@@ -152,7 +152,7 @@ MSG
   opts.on('--template-dir [PATH]', 'Specify custom mustache template directory.') do |path|
     wiki_options[:template_dir] = path
   end
-  opts.on('--template-page', 'Use _Template in root as a template for new pages.') do
+  opts.on('--template-page', 'Use _Template.{ext} as a template for new pages.') do
     wiki_options[:template_page] = true
   end
   opts.on('--lenient-tag-lookup', 'Internal links resolve case-insensitively, will treat spaces as hyphens, and will match the first page found with a certain filename, anywhere in the repository. Provides compatibility with Gollum 4.x.') do

contrib/automation/gollum-post

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+#
+# Distributed under the terms of the MIT License.
+#
+# Author: Sam Baskinger <basking2@yahoo.com>
+#
+# Description: gollum-post is an example script that shows how 
+#              to post a file to Gollum. This may be used
+#              to build scripts around CI/CD pipelines that 
+#              publish their documentation to Gollum.
+#
+
+require 'uri'
+require 'mechanize'
+require 'digest'
+
+GOLLUM=URI('https://mygollum.server')
+
+m = Mechanize.new()
+
+page="TestPage"
+path="/automated/docs"
+format="asciidoc"
+content="""
+= This is #{page}
+
+This page is automatically generated.
+"""
+message='Posting current documentation.'
+
+# Check if the page exists.
+p = m.get("#{GOLLUM}#{path}/#{page}")
+
+# If we were redirected to the creat page...
+if p.uri.to_s =~ /\/gollum\/create/
+
+  # ... then create the page.
+  p = m.post("#{GOLLUM}/gollum/create",
+             'keybinding' => 'default',
+             'page' => page,
+             'path' => path,
+             'format' => 'asciidoc',
+             'message' => 'Publish bot.',
+             'content' => content)
+else
+  # ... else, get the previous content and update it.
+  p = m.get("#{GOLLUM}/gollum/edit#{path}/#{page}")
+
+  # Get the previous content. You _could_ check if this is unchanged at this 
+  # step and post nothing.
+  previous_content = p.xpath('//textarea[@id="gollum-editor-body"]')[0].text
+
+  # The previous ETag is the Git SHA-1. We need this to replace the previous contents.
+  prev_etag = Digest::SHA1.hexdigest("blob #{previous_content.length}\0#{previous_content}")
+
+  # Post the updated document using the ETag of the previous document to avoid collisions.
+  p = m.post("#{GOLLUM}/gollum/edit#{path}/#{page}",
+             'keybinding' => 'default',
+             'page' => page,
+             'path' => path,
+             'format' => 'asciidoc',
+             'message' => message,
+             'etag' => prev_etag,
+             'content' => content)
+end
+

gollum.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9'
 
   s.name              = 'gollum'
-  s.version           = '5.1.1'
-  s.date              = '2020-08-11'
+  s.version           = '5.1.2'
+  s.date              = '2021-01-03'
   s.license           = 'MIT'
 
   s.summary     = 'A simple, Git-powered wiki.'
@@ -23,18 +23,18 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency 'gollum-lib', '~> 5.0'
+  s.add_dependency 'gollum-lib', '~> 5.1'
   s.add_dependency 'kramdown', '~> 2.3'
-  s.add_dependency 'kramdown-parser-gfm', '~> 1.0.0'
+  s.add_dependency 'kramdown-parser-gfm', '~> 1.1.0'
   s.add_dependency 'sinatra', '~> 2.0'
   s.add_dependency 'sinatra-contrib', '~> 2.0'
-  s.add_dependency 'mustache', ['>= 0.99.5', '< 1.0.0']
+  s.add_dependency 'mustache-sinatra', '~> 1.0'
   s.add_dependency 'useragent', '~> 0.16.2'
   s.add_dependency 'gemojione', '~> 4.1'
-  s.add_dependency 'octicons', '~> 8.5'
+  s.add_dependency 'octicons', '~> 12.0'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sass', '~> 3.5'
-  s.add_dependency 'uglifier', '~> 3.2'
+  s.add_dependency 'uglifier', '~> 4.2'
   s.add_dependency 'sprockets-helpers', '~> 1.2'
   s.add_dependency 'rss', '~> 0.2.9'
   s.add_dependency 'therubyrhino', '~> 2.1.0'
@@ -68,15 +68,15 @@ Gem::Specification.new do |s|
     lib/gollum/app.rb
     lib/gollum/assets.rb
     lib/gollum/helpers.rb
-    lib/gollum/public/assets/.sprockets-manifest-459226ba5fc211b78ba9a3aa6ebde96c.json
+    lib/gollum/public/assets/.sprockets-manifest-35882cacf71c40928e0c2dc9b8acf8fe.json
+    lib/gollum/public/assets/app-4215e58002a43c4b2e9f0f7caa05a81c7c09d22a918c6fe40cd8e423db3110b5.css
+    lib/gollum/public/assets/app-4215e58002a43c4b2e9f0f7caa05a81c7c09d22a918c6fe40cd8e423db3110b5.css.gz
     lib/gollum/public/assets/app-6e925e38a12a40c4fa9e0400cc874e0f4f97b66fdeb90a144dea527dbb544fbd.js
     lib/gollum/public/assets/app-6e925e38a12a40c4fa9e0400cc874e0f4f97b66fdeb90a144dea527dbb544fbd.js.gz
-    lib/gollum/public/assets/app-b205e593a30f1cc0054e2e9ed9fc8af3658d8ef4a62b9708c20f204560deefb7.css
-    lib/gollum/public/assets/app-b205e593a30f1cc0054e2e9ed9fc8af3658d8ef4a62b9708c20f204560deefb7.css.gz
     lib/gollum/public/assets/criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css
     lib/gollum/public/assets/criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css.gz
-    lib/gollum/public/assets/editor-b2c10f22ef6ca1e120956a2d11ff4ca19ac44d7e7240f5cc43ec949184d8b708.js
-    lib/gollum/public/assets/editor-b2c10f22ef6ca1e120956a2d11ff4ca19ac44d7e7240f5cc43ec949184d8b708.js.gz
+    lib/gollum/public/assets/editor-b621bfe2cb8823516fb3a96c32e82001b297f6754117b47bdad6e59db85a9d08.js
+    lib/gollum/public/assets/editor-b621bfe2cb8823516fb3a96c32e82001b297f6754117b47bdad6e59db85a9d08.js.gz
     lib/gollum/public/assets/print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css
     lib/gollum/public/assets/print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css.gz
     lib/gollum/public/gollum/javascript/HOWTO_UPDATE_ACE.md

lib/gollum.rb

@@ -12,7 +12,7 @@ require 'rhino' if RUBY_PLATFORM == 'java'
 require File.expand_path('../gollum/uri_encode_component', __FILE__)
 
 module Gollum
-  VERSION = '5.1.1'
+  VERSION = '5.1.2'
 
   def self.assets_path
     ::File.expand_path('gollum/public', ::File.dirname(__FILE__))
@@ -33,4 +33,20 @@ module Gollum
       super(message || "Cannot write #{@dir}/#{@attempted_path}, found #{@dir}/#{@existing_path}.")
     end
   end
+  
+  class TemplateFilter
+    @@filters = {}
+
+    def self.add_filter(pattern, &replacement)
+      @@filters[pattern] = replacement
+    end
+
+    def self.apply_filters(data)
+      @@filters.each do |pattern, replacement|
+        data.gsub!(pattern, replacement.call)
+      end
+      data
+    end
+  end
+
 end

lib/gollum/app.rb

@@ -303,12 +303,13 @@ module Precious
           redirect to("/#{page.escaped_url_path}")
           return
         end
-        committer.commit
-        
+
         # Renaming preserves format, so add the page's format to the renamed path to retrieve the renamed page
         new_path = "#{rename}.#{Gollum::Page.format_to_ext(page.format)}"
         # Add a redirect from the old page to the new
-        wiki.add_redirect(page.url_path, clean_url(new_path)) if @redirects_enabled
+        wiki.add_redirect(page.url_path, clean_url(new_path), commit) if @redirects_enabled
+
+        committer.commit
 
         page = wiki_page(new_path).page
         return if page.nil?
@@ -318,9 +319,8 @@ module Precious
       post '/edit/*' do
         etag      = params[:etag]        
         path      = "/#{clean_url(sanitize_empty_params(params[:path]))}"
-        page_name = CGI.unescape(params[:page])
         wiki      = wiki_new
-        page      = wiki.page(::File.join(path, page_name))
+        page      = wiki.page(::File.join(path, params[:page]))
 
         return if page.nil?
         if etag != page.sha
@@ -352,14 +352,11 @@ module Precious
 
       get '/create/*' do
         forbid unless @allow_editing
-        if settings.wiki_options[:template_page] then
-          temppage = wiki_page('/_Template')
-          @template_page = (temppage.page != nil) ? temppage.page.raw_data : 'Template page option is set, but no /_Template page is present or committed.'
-        end
         wikip = wiki_page(params[:splat].first)
         @name = wikip.name
         @ext  = wikip.ext
         @path = wikip.path
+        @template_page = load_template(@path) if settings.wiki_options[:template_page]
         @allow_uploads = wikip.wiki.allow_uploads
         @upload_dest   = find_upload_dest(wikip.fullpath)
 
@@ -417,7 +414,7 @@ module Precious
 
       post '/preview' do
         wiki           = wiki_new
-        @name          = params[:page] ? strip_page_name(CGI.unescape(params[:page])) : 'Preview'
+        @name          = params[:page] ? strip_page_name(params[:page]) : 'Preview'
         @page          = wiki.preview_page(@name, params[:content], params[:format])
         ['sidebar', 'header', 'footer'].each do |subpage|
           @page.send("set_#{subpage}".to_sym, params[subpage]) if params[subpage]
@@ -639,6 +636,11 @@ module Precious
       end
     end
 
+    def load_template(path)
+      template_page = wiki_page(::File.join(path, '_Template')).page || wiki_page('/_Template').page
+      template_page ? Gollum::TemplateFilter.apply_filters(template_page.raw_data) : nil
+    end
+
     def update_wiki_page(wiki, page, content, commit, name = nil, format = nil)
       return if !page ||
           ((!content || page.raw_data == content) && page.format == format)

lib/gollum/public/assets/.sprockets-manifest-459226ba5fc211b78ba9a3aa6ebde96c.json

@@ -1 +0,0 @@
-{"files":{"app-6e925e38a12a40c4fa9e0400cc874e0f4f97b66fdeb90a144dea527dbb544fbd.js":{"logical_path":"app.js","mtime":"2020-08-03T18:13:54+02:00","size":136032,"digest":"6e925e38a12a40c4fa9e0400cc874e0f4f97b66fdeb90a144dea527dbb544fbd","integrity":"sha256-bpJeOKEqQMT6ngQAzIdOD0+Xtm/euQoUTepSfbtUT70="},"editor-b2c10f22ef6ca1e120956a2d11ff4ca19ac44d7e7240f5cc43ec949184d8b708.js":{"logical_path":"editor.js","mtime":"2020-08-03T18:13:54+02:00","size":747273,"digest":"b2c10f22ef6ca1e120956a2d11ff4ca19ac44d7e7240f5cc43ec949184d8b708","integrity":"sha256-ssEPIu9soeEglWotEf9MoZrETX5yQPXMQ+yUkYTYtwg="},"app-b205e593a30f1cc0054e2e9ed9fc8af3658d8ef4a62b9708c20f204560deefb7.css":{"logical_path":"app.css","mtime":"2020-03-30T11:12:22+02:00","size":298111,"digest":"b205e593a30f1cc0054e2e9ed9fc8af3658d8ef4a62b9708c20f204560deefb7","integrity":"sha256-sgXlk6MPHMAFTi6e2fyK82WNjvSmK5cIwg8gRWDe77c="},"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css":{"logical_path":"criticmarkup.css","mtime":"2020-03-29T22:28:51+02:00","size":646,"digest":"31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4","integrity":"sha256-Ma5dMoK7uOe3w8mRfp+2jjMVprSnXabOxI0huIRpBcQ="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2020-03-30T11:12:22+02:00","size":75,"digest":"512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb","integrity":"sha256-USSYw2i+DT+xuhBd+oQomuSDgOyfy++Ui9TiOwsJW/s="}},"assets":{"app.js":"app-6e925e38a12a40c4fa9e0400cc874e0f4f97b66fdeb90a144dea527dbb544fbd.js","editor.js":"editor-b2c10f22ef6ca1e120956a2d11ff4ca19ac44d7e7240f5cc43ec949184d8b708.js","app.css":"app-b205e593a30f1cc0054e2e9ed9fc8af3658d8ef4a62b9708c20f204560deefb7.css","criticmarkup.css":"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css"}}

lib/gollum/public/assets/.sprockets-manifest-e3f9b0be36ac3bccc4c006a52e352500.json

@@ -0,0 +1 @@
+{"files":{"app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js":{"logical_path":"app.js","mtime":"2021-02-19T21:46:58-08:00","size":135925,"digest":"7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2","integrity":"sha256-ekvRFfS8fs45vIBzyg/618XlXMWDexRkoS3q1JBc77I="},"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js":{"logical_path":"editor.js","mtime":"2021-02-17T20:47:49-08:00","size":744866,"digest":"db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf","integrity":"sha256-2xDINRMG6S8ZJroiXQzZyOiGSCs7mCCoWCXsOrq18c8="},"app-7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6.css":{"logical_path":"app.css","mtime":"2021-02-19T21:46:58-08:00","size":396661,"digest":"7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6","integrity":"sha256-egu/8ui60wM+fBfg4PiG8zap0j07kS3NKuOJxItLY+Y="},"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css":{"logical_path":"criticmarkup.css","mtime":"2021-02-17T20:47:49-08:00","size":646,"digest":"31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4","integrity":"sha256-Ma5dMoK7uOe3w8mRfp+2jjMVprSnXabOxI0huIRpBcQ="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2021-02-17T20:47:49-08:00","size":75,"digest":"512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb","integrity":"sha256-USSYw2i+DT+xuhBd+oQomuSDgOyfy++Ui9TiOwsJW/s="}},"assets":{"app.js":"app-7a4bd115f4bc7ece39bc8073ca0ffad7c5e55cc5837b1464a12dead4905cefb2.js","editor.js":"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js","app.css":"app-7a0bbff2e8bad3033e7c17e0e0f886f336a9d23d3b912dcd2ae389c48b4b63e6.css","criticmarkup.css":"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css"}}

lib/gollum/public/gollum/javascript/app.js

@@ -7,3 +7,4 @@
 //= require gollum.placeholder
 //= require editor/sections
 //= require jquery.resize
+//= require polyfills

lib/gollum/public/gollum/javascript/gollum.js.erb

@@ -156,12 +156,12 @@ $(document).ready(function() {
   }
 
 
-  if ($('#minibutton-upload-page').length) {
+  if ($('.minibutton-upload-page').length) {
     new ClipboardJS('#ClipboardJSlink');
-    $('#minibutton-upload-page').parent().removeClass('jaws');
-    $('#minibutton-upload-page').click(function(e) {
+    $('.minibutton-upload-page').parent().removeClass('jaws');
+    $('.minibutton-upload-page').click(function(e) {
       e.preventDefault();
-      
+
       $.GollumDialog.init({
         title: 'Upload File',
         fields: [
@@ -213,9 +213,9 @@ $(document).ready(function() {
     });
   }
 
-  if ($('#minibutton-rename-page').length) {
-    $('#minibutton-rename-page').parent().removeClass('jaws');
-    $('#minibutton-rename-page').click(function(e) {
+  if ($('.minibutton-rename-page').length) {
+    $('.minibutton-rename-page').parent().removeClass('jaws');
+    $('.minibutton-rename-page').click(function(e) {
       e.preventDefault();
 
       var path = decodeURI(pagePath());
@@ -257,9 +257,9 @@ $(document).ready(function() {
     });
   }
 
-  if ($('#minibutton-new-page').length) {
-    $('#minibutton-new-page').parent().removeClass('jaws');
-    $('#minibutton-new-page').click(function(e) {
+  if ($('.minibutton-new-page').length) {
+    $('.minibutton-new-page').parent().removeClass('jaws');
+    $('.minibutton-new-page').click(function(e) {
       e.preventDefault();
       var path = pagePath();
       if( path === undefined && $('#file-browser').length != 0 ){

lib/gollum/public/gollum/javascript/polyfills.js

@@ -0,0 +1,6 @@
+// Polyfill to support Internet Explorer
+if (!Array.prototype.includes) {
+  Array.prototype.includes = function (x) {
+    return 0 <= this.indexOf(x)
+  };
+}

lib/gollum/public/gollum/stylesheets/_layout.scss

@@ -1,83 +0,0 @@
-// Describes base page layout
-
-/* @section wrapper */
-#wiki-wrapper {
-  margin: 0 auto;
-  overflow: visible;
-  width: 100%;
-
-  @include desktop-breakpoint {
-    @include desktop-page-layout;
-  }
-}
-
-/* @section content */
-#wiki-content {
-  height: 1%;
-  overflow: visible;
-
-  .wrap {
-    height: 1%;
-    overflow: auto;
-  }
-  
-  &.uploading {
-    opacity: 0.5;
-  }
-  
-  p, li {
-    code {
-      white-space:pre-wrap;
-      word-wrap:break-word;
-    }
-  }
-  
-}
-
-/* @section body */
-#wiki-body {
-  display: block;
-  width: 100%;
-  margin-right: 3%;
-
-  @include largemobile-breakpoint {
-    float: left;
-    clear: left;
-
-    .has-sidebar & {
-      width: $layout-with-sidebar - $layout-with-sidebar-leeway;
-    }
-
-    .has-leftbar & {
-      float: right;
-      clear: right;
-    }
-  }
-}
-
-/* @section sidebar */
-#wiki-sidebar {
-  @include largemobile-breakpoint {
-    width: $layout-sidebar;
-    
-    .has-leftbar & {
-      float: left;
-    }
-
-    .has-rightbar & {
-      float: right;
-    }
-  }
-}
-
-/* @section footer */
-
-#wiki-footer {
-  clear: both;
-
-  @include largemobile-breakpoint {
-    .has-sidebar & {
-      width: $layout-with-sidebar;
-    }
-  }
-}

lib/gollum/public/gollum/stylesheets/template.scss.erb

@@ -53,19 +53,85 @@ a {
 /* Markdown body */
 
 .header-enum {
-  h2 {counter-reset: h3}
-  h3 {counter-reset: h4}
-  h4 {counter-reset: h5}
-  h5 {counter-reset: h6}
-
   --header-enum-style: decimal;
-  
-  h1:before {counter-increment: h1; content: counter(h1, var(--header-enum-style)) ". ";}
-  h2:before {counter-increment: h2; content: counter(h1, var(--header-enum-style)) "."  counter(h2, var(--header-enum-style)) ". ";}
-  h3:before {counter-increment: h3; content: counter(h1, var(--header-enum-style)) "." counter(h2, var(--header-enum-style)) "." counter(h3, var(--header-enum-style)) ". ";}
-  h4:before {counter-increment: h4; content: counter(h1, var(--header-enum-style)) "." counter(h2, var(--header-enum-style)) "." counter(h3, var(--header-enum-style)) "." counter(h4, var(--header-enum-style)) ". ";}
-  h5:before {counter-increment: h5; content: counter(h1, var(--header-enum-style)) "." counter(h2, var(--header-enum-style)) "." counter(h3, var(--header-enum-style)) "." counter(h4, var(--header-enum-style)) "." counter(h5, var(--header-enum-style)) ". ";}
-  h6:before {counter-increment: h6; content: counter(h1, var(--header-enum-style)) "." counter(h2, var(--header-enum-style)) "." counter(h3, var(--header-enum-style)) "." counter(h4, var(--header-enum-style)) "." counter(h5, var(--header-enum-style)) "." counter(h6, var(--header-enum-style)) ". ";}
+
+  h1 {
+    counter-increment: h1;
+    counter-reset: h2;
+
+    &:before {
+      content: counter(h1, var(--header-enum-style)) ". ";
+    }
+  }
+
+  h2 {
+    counter-increment: h2;
+    counter-reset: h3;
+
+    &:before {
+      content:
+        counter(h1, var(--header-enum-style))
+        "." counter(h2, var(--header-enum-style))
+        ". ";
+    }
+  }
+
+  h3 {
+    counter-reset: h4;
+    counter-increment: h3;
+
+    &:before {
+      content:
+        counter(h1, var(--header-enum-style))
+        "." counter(h2, var(--header-enum-style))
+        "." counter(h3, var(--header-enum-style))
+        ". ";
+    }
+  }
+
+  h4 {
+    counter-increment: h4;
+    counter-reset: h5;
+
+    &:before {
+      content:
+        counter(h1, var(--header-enum-style))
+        "." counter(h2, var(--header-enum-style))
+        "." counter(h3, var(--header-enum-style))
+        "." counter(h4, var(--header-enum-style))
+        ". ";
+    }
+  }
+
+  h5 {
+    counter-increment: h5;
+    counter-reset: h6;
+
+    &:before {
+      content:
+        counter(h1, var(--header-enum-style))
+        "." counter(h2, var(--header-enum-style))
+        "." counter(h3, var(--header-enum-style))
+        "." counter(h4, var(--header-enum-style))
+        "." counter(h5, var(--header-enum-style))
+        ". ";
+    }
+  }
+
+  h6 {
+    counter-increment: h6;
+
+    &:before {
+      content:
+        counter(h1, var(--header-enum-style))
+        "." counter(h2, var(--header-enum-style))
+        "." counter(h3, var(--header-enum-style))
+        "." counter(h4, var(--header-enum-style))
+        "." counter(h5, var(--header-enum-style))
+        "." counter(h6, var(--header-enum-style))
+        ". ";
+    }
+  }
 }
 
 #footer {
@@ -77,43 +143,58 @@ a {
   padding: 1em 1em 1em 0;
   font-size: 15px;
   line-height: 1.7;
-  overflow: hidden;
   word-wrap: break-word;
 
   /* MediaWiki's TOC table -- this does not pertain to gollum's own TOC functionality */
   table.toc {
     width: auto;
     display: inline-table;
+
     .anchor {
       display: none;
     }
   }
 
-  .anchor {
-    display: inline-block;
-    position: absolute;
-    opacity: 0;
-    background: url('data:image/svg+xml;utf8,<%= rocticon_css(:link) %>') no-repeat;
-    background-size: 0.6em 1.35em;
-    padding-right: 0.5em;
-    padding-top: 0.4em;
-    margin-left: -0.8em;
-    width: 1em;
-    height: 1em;
-    text-decoration: none;
-    transition-property: opacity;
-    transition: 0.1s;
-  }
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    $anchor-icon-size: 20px;
 
-  *:hover > .anchor, .anchor:focus{
-    opacity: 1;
-  }
+    position: relative;
 
-  .anchor.edit {
-    margin-left: 2em !important;
-    margin-top: 0.5em;
-    height: 0.5em;
-    background: url('data:image/svg+xml;utf8,<%= rocticon_css(:pencil) %>') no-repeat;
+    .anchor {
+      display: inline-block;
+      position: absolute;
+      margin-top: 0.1em;
+      width: $anchor-icon-size;
+      text-decoration: none;
+      opacity: 0;
+      transition: opacity 0.1s ease-in-out;
+
+      &:before {
+        content: url('data:image/svg+xml;utf8,<%= rocticon_css(:link) %>');
+      }
+
+      &:not(.edit) {
+        left: -($anchor-icon-size/2);
+      }
+
+      &.edit {
+        margin-left: ($anchor-icon-size/2);
+
+        &:before {
+          content: url('data:image/svg+xml;utf8,<%= rocticon_css(:pencil) %>');
+        }
+      }
+    }
+
+    &:hover > .anchor,
+    .anchor:focus {
+      opacity: 1;
+    }
   }
 
   a {
@@ -125,13 +206,6 @@ a {
       color: inherit;
       text-decoration: none;
     }
-
-    &:first-child {
-      h1, h2, h3, h4, h5, h6 {
-        margin-top: 0;
-        padding-top: 0;
-      }
-    }
   }
 
   > *:first-child {
@@ -166,18 +240,6 @@ a {
     border-bottom: 1px solid #eee;
   }
 
-  h3 {
-  }
-
-  h4 {
-  }
-
-  h5 {
-  }
-
-  h6 {
-  }
-
   p, blockquote, ul, ol, dl, table, pre {
     margin: 15px 0;
   }
@@ -615,6 +677,10 @@ a {
     color: #999;
     background-color: #EAF2F5;
   }
+
+  .gg {
+    color: #000000a0;
+  }
 }
 
 .type-csharp {
@@ -639,15 +705,24 @@ a {
     .s, .sc {
       color: #A31515;
     }
-  } 
+  }
 }
 
 div.pagination a.disabled {
   pointer-events: none;
 }
 
+nav.actions {
+  scrollbar-width: none;
+  -ms-overflow-style: -ms-autohiding-scrollbar;
+
+  ::webkit-scrollbar {
+    display: none;
+  }
+}
+
 .search-results {
   .search-context li:nth-child(n+4) {
     display: none;
    }
-}
+}

lib/gollum/templates/layout.mustache

@@ -5,13 +5,13 @@
   <meta name="MobileOptimized" content="width">
   <meta name="HandheldFriendly" content="true">
   <meta name="viewport" content="width=device-width">
+  {{#sprockets_stylesheet_tag}}primer{{/sprockets_stylesheet_tag}}
   {{#sprockets_stylesheet_tag}}app{{/sprockets_stylesheet_tag}}
   {{#sprockets_stylesheet_tag}}print print{{/sprockets_stylesheet_tag}}
 
   {{#css}}<link rel="stylesheet" type="text/css" href="{{custom_css}}" media="all">{{/css}}
   {{#noindex}}<meta name="robots" content="noindex, nofollow" />{{/noindex}}
 
-
   <script>
   var criticMarkup = '{{critic_markup}}';
 	var baseUrl = '{{base_url}}';

lib/gollum/templates/mobilenav.mustache

@@ -0,0 +1,72 @@
+<details class="details-reset details-overlay">
+  <summary class="btn btn-invisible" aria-haspopup="true">
+    <span aria-label="Open menu">☰</span>
+  </summary>
+
+  <div class="SelectMenu mx-sm-2">
+    <div class="SelectMenu-modal">
+      <div class="SelectMenu-divider py-3">
+        <h2 class="h6">Current Page</h2>
+        <div>{{page_header}}</div>
+      </div>
+
+      {{#history}}
+        <a
+          class="SelectMenu-item"
+          href="{{history_path}}/{{escaped_url_path}}"
+          role="menuitem"
+        >
+          <span>History</span>
+        </a>
+      {{/history}}
+
+      {{#allow_editing}}
+        {{#allow_uploads}}
+          <a class="SelectMenu-item minibutton-upload-page" role="menuitem">
+            <span>Upload</span>
+          </a>
+        {{/allow_uploads}}
+
+        {{#editable}}
+          <a class="SelectMenu-item minibutton-rename-page" role="menuitem">
+            <span>Rename</span>
+          </a>
+
+          <a
+            class="SelectMenu-item minibutton-edit-page"
+            href="{{edit_path}}/{{escaped_url_path}}"
+            role="menuitem"
+          >
+            <span>Edit</span>
+          </a>
+        {{/editable}}
+      {{/allow_editing}}
+
+      <div class="SelectMenu-divider py-3">
+        <h2 class="h6">Main Menu</h2>
+      </div>
+
+      <div class="SelectMenu-list">
+        <a class="SelectMenu-item" role="menuitem" href="{{page_route}}">
+          Home
+        </a>
+
+        {{#overview}}
+          <a class="SelectMenu-item" role="menuitem" href="{{overview_path}}">
+            Overview
+          </a>
+        {{/overview}}
+
+        {{#latest_changes}}
+          <a
+            class="SelectMenu-item"
+            href="{{latest_changes_path}}"
+            role="menuitem"
+          >
+            Latest Changes
+          </a>
+        {{/latest_changes}}
+      </div>
+    </div>
+  </div>
+</details>

lib/gollum/templates/navbar.mustache

@@ -1,43 +1,105 @@
-<nav class="actions pt-4">
-	
-	<div class="TableObject">
-		<div class="TableObject-item">
-	    <a class="btn" id="minibutton-home" href="{{page_route}}">Home</a>
-	  </div>
+<nav class="actions pt-4 px-2 px-lg-0 overflow-x-scroll">
+  <div class="TableObject">
+    <div class="TableObject-item hide-lg hide-xl">
+      {{>mobilenav}}
+    </div>
 
+    <div class="TableObject-item hide-sm hide-md">
+      <a class="btn btn-sm" id="minibutton-home" href="{{page_route}}">
+        Home
+      </a>
+    </div>
+
+    <div
+      class="TableObject-item TableObject-item--primary px-2"
+      {{^search}}style="visibility:hidden"{{/search}}
+    >
+      {{>searchbar}}
+    </div>
+
+    <div class="TableObject-item hide-sm hide-md">
+      <div class="BtnGroup" style="display: flex;">
+        {{#overview}}
+          <a
+            class="btn BtnGroup-item btn-sm"
+            href="{{overview_path}}"
+            id="minibutton-overview"
+          >
+            Overview
+          </a>
+        {{/overview}}
+
+        {{#latest_changes}}
+          <a
+            class="btn BtnGroup-item btn-sm"
+            href="{{latest_changes_path}}"
+            id="minibutton-latest-changes"
+          >
+            Latest Changes
+          </a>
+        {{/latest_changes}}
+      </div>
+    </div>
+
+    {{#history}}
+      <div class="TableObject-item pl-2 hide-sm hide-md">
+        <a
+          class="btn btn-sm"
+          href="{{history_path}}/{{escaped_url_path}}"
+          id="minibutton-history"
+        >
+          Page History
+        </a>
+      </div>
+    {{/history}}
 
-  	<div class="TableObject-item TableObject-item--primary px-2" {{^search}}style="visibility:hidden"{{/search}}>
-			{{>searchbar}}
-	  </div>
-		
-	  <div class="TableObject-item">
-	    {{#overview}}<a class="btn" id="minibutton-overview" href="{{overview_path}}">Overview</a>{{/overview}}
-			{{#latest_changes}}<a class="btn" id="minibutton-latest-changes" href="{{latest_changes_path}}">Latest Changes</a>{{/latest_changes}}
-	  </div>
-	
-		{{#history}}
-		<div class="TableObject-item pl-1">
-			<a class="btn" id="minibutton-history" href="{{history_path}}/{{escaped_url_path}}">Page History</a>
-		</div>
-		{{/history}}
-		
     {{#allow_editing}}
-		  <div class="TableObject-item pl-1">
-				{{#allow_uploads}}
-					<a class="btn" id="minibutton-upload-page" href="#">Upload</a>
-	    	{{/allow_uploads}}
-				{{#editable}}
-					<a class="btn" id="minibutton-rename-page" href="#">Rename</a>
-					<a class="btn" id="minibutton-edit-page" href="{{edit_path}}/{{escaped_url_path}}">Edit</a>
-					<a class="btn btn-primary" id="minibutton-new-page" href="#">New</a>
-				{{/editable}}
-				{{^editable}}
-					{{#newable}}
-						<a class="btn btn-primary" id="minibutton-new-page" href="#">New</a>
-					{{/newable}}
-				{{/editable}}
-			</div>
-		{{/allow_editing}}
-			
-	</div>
-</nav>
+      <div class="TableObject-item px-2">
+        <div class="BtnGroup" style="display: flex;">
+          {{#allow_uploads}}
+            <a
+              class="btn BtnGroup-item btn-sm hide-sm hide-md
+                minibutton-upload-page"
+            >
+              Upload
+            </a>
+          {{/allow_uploads}}
+
+          {{#editable}}
+            <a
+              class="btn BtnGroup-item btn-sm hide-sm hide-md
+                minibutton-rename-page"
+            >
+              Rename
+            </a>
+            <a
+              class="btn BtnGroup-item btn-sm hide-sm hide-md"
+              href="{{edit_path}}/{{escaped_url_path}}"
+              id="minibutton-edit-page"
+            >
+              Edit
+            </a>
+          {{/editable}}
+        </div>
+      </div>
+
+      {{#editable}}
+        <div class="TableObject-item">
+          <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
+            New
+          </a>
+        </div>
+      {{/editable}}
+
+      {{^editable}}
+        {{#newable}}
+          <div class="TableObject-item">
+            <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
+              New
+            </a>
+          </div>
+        {{/newable}}
+      {{/editable}}
+    {{/allow_editing}}
+  </div>
+</nav>

lib/gollum/templates/overview.mustache

@@ -18,7 +18,7 @@
 						<span class="pr-2">{{{icon}}}</span>
 						<span><a href="{{url}}">{{name}}</a></span>
 						{{#allow_editing}}
-							{{#is_file}}<button class="btn btn-sm float-right delete-file" data-file-path="{{url}}" data-confirm="Are you sure you want to delete {{name}}?">{{#octicon}}trashcan{{/octicon}}</button>{{/is_file}}
+							{{#is_file}}<button class="btn btn-sm float-right delete-file" data-file-path="{{file_path}}" data-confirm="Are you sure you want to delete {{name}}?">{{#octicon}}trash{{/octicon}}</button>{{/is_file}}
 						{{/allow_editing}}
 		      </li>
 				{{/files_folders}}

lib/gollum/templates/wiki_content.mustache

@@ -1,7 +1,6 @@
-<div id="wiki-content">
+<div id="wiki-content" class="px-2 px-lg-0">
 	<h1 class="pt-4">{{page_header}}</h1>
 	<div class="breadcrumb">{{{breadcrumb}}}</div>
-	
 
 	<div class="{{#has_header}}has-header{{/has_header}}{{#has_footer}} has-footer{{/has_footer}}{{#has_sidebar}} has-sidebar has-{{bar_side}}bar{{/has_sidebar}}{{#has_toc}} has-toc{{/has_toc}}">
 	  {{#has_toc}}
@@ -9,14 +8,7 @@
 	    {{{toc_content}}}
 	  </div>
 	  {{/has_toc}}
-	  {{#has_sidebar}}
-	  <div id="wiki-sidebar" class="gollum-{{sidebar_format}}-content">
-	    <div id="sidebar-content" class="Box Box--condensed col-3 markdown-body px-4 float-{{bar_side}}">
-	      {{{sidebar_content}}}
-	    </div>
-	  </div>
-	  {{/has_sidebar}}
-	  <div id="wiki-body" class="gollum-{{format}}-content overflow-hidden {{#left_bar}}pl-4{{/left_bar}}">
+	  <div id="wiki-body" class="gollum-{{format}}-content">
 	    {{#has_header}}
 	    <div id="wiki-header" class="gollum-{{header_format}}-content">
 	      <div id="header-content" class="markdown-body">
@@ -24,14 +16,23 @@
 	      </div>
 	    </div>
 	    {{/has_header}}
-	    <div class="markdown-body {{#header_enum?}}header-enum{{/header_enum?}}" {{#header_enum?}}style="--header-enum-style:{{header_enum_style}};"{{/header_enum?}}>
-	      {{{rendered_metadata}}}
-	      {{{content}}}
+	    <div class="main-content clearfix container-lg">
+	      <div class="markdown-body {{#header_enum?}}header-enum{{/header_enum?}} {{#has_sidebar}}float-md-{{body_side}} col-md-9{{/has_sidebar}}" {{#header_enum?}}style="--header-enum-style:{{header_enum_style}};"{{/header_enum?}}>
+	        {{{rendered_metadata}}}
+	        {{{content}}}
+	      </div>
+	      {{#has_sidebar}}
+          <div id="wiki-sidebar" class="Box Box--condensed float-md-{{body_side}} col-md-3">
+	        <div id="sidebar-content" class="gollum-{{sidebar_format}}-content markdown-body px-4">
+	          {{{sidebar_content}}}
+	        </div>
+	      </div>
+	      {{/has_sidebar}}
 	    </div>
 	  </div>
 	  {{#has_footer}}
-	  <div id="wiki-footer" class="gollum-{{footer_format}}-content">
-	    <div id="footer-content" class="Box Box-condensed markdown-body pl-2">
+	  <div id="wiki-footer" class="gollum-{{footer_format}}-content my-2">
+	    <div id="footer-content" class="Box Box-condensed markdown-body px-4">
 	      {{{footer_content}}}
 	    </div>
 	  </div>
@@ -57,5 +58,5 @@
 	  {{/historical}}
 	</div>
 
-	
+
 </div>

lib/gollum/views/commit.rb

@@ -23,12 +23,19 @@ module Precious
       end
 
       def files
-        files = @diff.split(%r{^diff --git a/.+ b/.+$}).reject(&:empty?)
+        files = @diff.force_encoding(Encoding::UTF_8).scan(%r{
+          ^diff\ --git\         # diff start
+          .+?                   # diff body
+          (?=^diff\ --git|\Z)   # scan until next diff or string
+        }sxmu)
+
         files.map do |diff|
-          matched = diff.match(%r{(?<=^--- a/).+$})
-          matched = diff.match(%r{(?<=^\+\+\+ b/).+$}) if matched.nil?
+          match = diff.match(%r{^diff --git (")?[ab]/(.+)(?(1)") (")?[ab]/(.+)(?(3)")})
+          path = match[2]
+          path = match[4] if path.nil?
+
           {
-            path: matched[0],
+            path: path,
             lines: lines(diff)
           }
         end

lib/gollum/views/compare.rb

@@ -19,16 +19,21 @@ module Precious
 
       def lines(diff = @diff)
         lines = []
-        lines_to_parse = diff.split("\n")[4..-1]
-        # If the diff is of a rename, the diff header will be one line longer than normal because it will contain a line starting with '+++' to indicate the 'new' filename.
-        # Make sure to skip that header line if it is present.
-        lines_to_parse = lines_to_parse[1..-1] if lines_to_parse[0].start_with?('+++')
+        lines_to_parse = diff.split("\n")[3..-1]
+        lines_to_parse = lines_to_parse[2..-1] if lines_to_parse[0].start_with?('---')
+
+        if lines_to_parse.nil? || lines_to_parse.empty?
+          lines_to_parse = []  # File is created without content
+        else
+          lines_to_parse = lines_to_parse[1..-1] if lines_to_parse[0].start_with?('+++')
+        end
+
         lines_to_parse.each_with_index do |line, line_index|
           lines << { :line  => line,
                      :class => line_class(line),
                      :ldln  => left_diff_line_number(line),
                      :rdln  => right_diff_line_number(line) }
-        end if diff
+        end
         lines
       end
 
@@ -41,6 +46,8 @@ module Precious
       def line_class(line)
         if line =~ /^@@/
           'gc'
+        elsif git_line?(line)
+          'gg'
         elsif line =~ /^\+/
           'gi'
         elsif line =~ /^\-/
@@ -53,7 +60,7 @@ module Precious
       @left_diff_line_number = nil
 
       def left_diff_line_number(line)
-        if line =~ /^@@/
+        if git_line?(line)
           m, li                  = *line.match(/\-(\d+)/)
           @left_diff_line_number = li.to_i
           @current_line_number   = @left_diff_line_number
@@ -75,7 +82,7 @@ module Precious
       @right_diff_line_number = nil
 
       def right_diff_line_number(line)
-        if line =~ /^@@/
+        if git_line?(line)
           m, ri                   = *line.match(/\+(\d+)/)
           @right_diff_line_number = ri.to_i
           @current_line_number    = @right_diff_line_number
@@ -93,6 +100,10 @@ module Precious
         end
         ret
       end
+
+      def git_line?(line)
+        !!(line =~ /^(\\ No newline|Binary files|@@)/)
+      end
     end
   end
 end

lib/gollum/views/helpers.rb

@@ -61,7 +61,10 @@ module Precious
         url.compact!
         return nil if url.empty?
 
-        ::File.join(*url).gsub(%r{/{2,}}, '/')
+        _url = ::File.join(*url)
+        _url.gsub!(%r{/{2,}}, '/')
+        _url.gsub!(%r{\?}, '%3F')
+        _url
       end
     end
 

lib/gollum/views/overview.rb

@@ -4,6 +4,7 @@ module Precious
   module Views
     class Overview < Layout
       attr_reader :results, :ref, :allow_editing, :newable
+      HIDDEN_PATHS = ['.gitkeep']
 
       def title
         "Overview of #{@ref}"
@@ -25,9 +26,9 @@ module Precious
             title = crumb.basename
 
             if title == path.basename
-              breadcrumb << %{<li class="breadcrumb-item" aria-current="page">#{title}</li>}
+              breadcrumb << %{<li class="breadcrumb-item" aria-current="page">#{CGI.escapeHTML(title.to_s)}</li>}
             else
-              breadcrumb << %{<li class="breadcrumb-item"><a href="#{overview_path}/#{crumb}/">#{title}</a></li>}
+              breadcrumb << %{<li class="breadcrumb-item"><a href="#{overview_path}/#{crumb}/">#{CGI.escapeHTML(title.to_s)}</a></li>}
             end
           end
           breadcrumb << %{</ol></nav>}
@@ -51,9 +52,9 @@ module Precious
               folder_path = @path ? "#{@path}/#{folder_name}" : folder_name
               folder_url  = "#{overview_path}/#{folder_path}/"
               files_and_folders << {name: folder_name, icon: rocticon('file-directory'), type: 'dir', url: folder_url, is_file: false}
-            elsif result_path != '.gitkeep'
+            elsif !HIDDEN_PATHS.include?(result_path) 
               file_url = page_route(result.escaped_url_path)
-              files_and_folders << {name: result.filename, icon: rocticon('file'), type: 'file', url: file_url, is_file: true}
+              files_and_folders << {name: result.filename, icon: rocticon('file'), type: 'file', url: file_url, file_path: result.escaped_url_path, is_file: true}
             end
           end
           # 1012: Overview should list folders first, followed by files and pages sorted alphabetically

lib/gollum/views/page.rb

@@ -16,15 +16,10 @@ module Precious
       DEFAULT_AUTHOR = 'you'
       @@to_xml       = { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
 
-      def title
-        h1 = @h1_title ? page_header_from_content(@content) : false
-        h1 || @page.url_path_title # url_path_title is the metadata title if present, otherwise the filename-based title
-      end
-
       def page_header
         title
       end
-            
+
       def breadcrumb
         path = Pathname.new(@page.url_path).parent
         return '' if path.to_s == '.'
@@ -32,7 +27,7 @@ module Precious
         path.descend do |crumb|
           element = "#{crumb.basename}"
           next if element == @page.title
-          breadcrumb << %{<li class="breadcrumb-item"><a href="#{overview_path}/#{crumb}/">#{element}</a></li>}
+          breadcrumb << %{<li class="breadcrumb-item"><a href="#{overview_path}/#{crumb}/">#{CGI.escapeHTML(element.to_s)}</a></li>}
         end
         breadcrumb << %{</ol></nav>}
         breadcrumb.join("\n")
@@ -123,7 +118,11 @@ module Precious
       def bar_side
         @bar_side.to_s
       end
-      
+
+      def body_side
+        @bar_side == :right ? "left" : "right"
+      end
+
       def left_bar
         @bar_side == :left
       end
@@ -265,6 +264,10 @@ module Precious
         result << "</tr>\n</table>\n"
       end
 
+      def title
+        h1 = @h1_title ? page_header_from_content(@content) : false
+        h1 || @page.url_path_title # url_path_title is the metadata title if present, otherwise the filename-based title
+      end
     end
   end
 end

test/examples/lotr.git/logs/HEAD

@@ -10,3 +10,4 @@ cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc
 563cc3701db990caf63e4ce9c3697a062890ca48 874f597a5659b4c3b153674ea04e406ff393975e Charles Pence <charles@charlespence.net> 1363478075 -0400	push
 874f597a5659b4c3b153674ea04e406ff393975e 7bdfe65face6f7cf9877d8c1d8c1dd974a63745e Nathan Lowe <techwiz96@gmail.com> 1421012322 -0500	push
 7bdfe65face6f7cf9877d8c1d8c1dd974a63745e f803c64d11407b23797325e3843f3f378b78f611 Dawa Ometto <dawa.ometto@phil.uu.nl> 1492034760 +0200	push
+f803c64d11407b23797325e3843f3f378b78f611 181c757cca395d4da18701d069a6b8123e88e040 ViChyavIn <nikita.vyach.ivanov@gmail.com> 1609841455 +0500	push

test/examples/lotr.git/logs/refs/heads/master

@@ -10,3 +10,4 @@ cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc
 563cc3701db990caf63e4ce9c3697a062890ca48 874f597a5659b4c3b153674ea04e406ff393975e Charles Pence <charles@charlespence.net> 1363478075 -0400	push
 874f597a5659b4c3b153674ea04e406ff393975e 7bdfe65face6f7cf9877d8c1d8c1dd974a63745e Nathan Lowe <techwiz96@gmail.com> 1421012322 -0500	push
 7bdfe65face6f7cf9877d8c1d8c1dd974a63745e f803c64d11407b23797325e3843f3f378b78f611 Dawa Ometto <dawa.ometto@phil.uu.nl> 1492034760 +0200	push
+f803c64d11407b23797325e3843f3f378b78f611 181c757cca395d4da18701d069a6b8123e88e040 ViChyavIn <nikita.vyach.ivanov@gmail.com> 1609841455 +0500	push

test/examples/lotr.git/refs/heads/master

@@ -1 +1 @@
-f803c64d11407b23797325e3843f3f378b78f611
+181c757cca395d4da18701d069a6b8123e88e040

test/test_app.rb

@@ -474,7 +474,7 @@ EOF
   end
 
   test "previews content" do
-    post "/gollum/preview", :content => 'abc', :format => 'markdown', :page => 'Samewise%20Gamgee.mediawiki'
+    post "/gollum/preview", :content => 'abc', :format => 'markdown', :page => 'Samewise Gamgee.mediawiki'
     assert last_response.ok?
     assert last_response.body.include?('Samewise Gamgee</h1>')
   end

test/test_compare.rb

@@ -0,0 +1,47 @@
+# ~*~ encoding: utf-8 ~*~
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require File.expand_path '../../lib/gollum/views/commit', __FILE__
+
+def get_commit_diff(sha1)
+  commit = @wiki.repo.commit(sha1)
+  @wiki.repo.diff(commit.parent.id, sha1)
+end
+
+context "Precious::Views::Compare" do
+  setup do
+    @path    = cloned_testpath('examples/lotr.git')
+    # Precious::App.set(:gollum_path, @path)
+    @wiki = Gollum::Wiki.new(@path)
+  end
+
+  test 'file addition diff' do
+    view = Precious::Views::Compare.new
+    diff = get_commit_diff 'fbabba862dfa7ac35b39042dd4ad780c9f67b8cb'
+    view.instance_variable_set(:@diff, diff)
+
+    assert_equal [
+      {:line=>"@@ -0,0 +1 @@", :class=>"gc", :ldln=>"...", :rdln=>"..."},
+      {:line=>"+# Eye Of Sauron", :class=>"gi", :ldln=>" ", :rdln=>"1"}
+    ], view.lines
+  end
+
+  test 'empty file addition diff' do
+    view = Precious::Views::Compare.new
+    diff = get_commit_diff '181c757cca395d4da18701d069a6b8123e88e040'
+    view.instance_variable_set(:@diff, diff)
+
+    assert_equal [], view.lines
+  end
+
+  test 'binary file addition diff' do
+    view = Precious::Views::Compare.new
+    diff = get_commit_diff 'afe2034d400ba21e13361f38f74900c51dbc7fde'
+    view.instance_variable_set(:@diff, diff)
+
+    lines = view.lines
+    line = lines[0].delete :line
+
+    assert_match %r{Binary files (/dev/null and b/Mordor/eye.jpg )?differ}, line
+    assert_equal [{:class=>"gg", :ldln=>"...", :rdln=>"..."}], lines
+  end
+end

test/test_latest_changes_view.rb

@@ -35,9 +35,11 @@ context 'Precious::Views::LatestChanges' do
     get(@url)
     body = last_response.body
 
+    commits_list_elements = body.scan(%r{<li class="Box-row Box-row--hover-gray border-top d-flex flex-items-center">})
+    assert !commits_list_elements.nil?, "the commits should be listed with this tag"
+    assert commits_list_elements.length == 10, "/latest_changes should include the :pagination_count commit"
+
     assert body.include?("Charles Pence</span>"), "/latest_changes should include Author Charles Pence"
-    assert body.include?('1db89eb'), "/latest_changes should include the :pagination_count commit"
-    assert !body.include?('a8ad3c0'), "/latest_changes should not include more than :pagination_count commits"
     assert body.include?('<a href="/Data-Two.csv/874f597a5659b4c3b153674ea04e406ff393975e">Data-Two.csv</a>'), "/latest_changes include links to modified files in #{body}"
     assert body.include?('<a href="/Hobbit.md/874f597a5659b4c3b153674ea04e406ff393975e">Hobbit.md</a>'), "/latest_changes should include links to modified pages in #{body}"
   end

test/test_overview_view.rb

@@ -44,6 +44,23 @@ context "Precious::Views::Overview" do
     assert_equal "<nav aria-label=\"Breadcrumb\"><ol><li class=\"breadcrumb-item\"><a href=\"/gollum/overview\">Home</a></li>\n<li class=\"breadcrumb-item\"><a href=\"/gollum/overview/Mordor/\">Mordor</a></li>\n<li class=\"breadcrumb-item\"><a href=\"/gollum/overview/Mordor/Eye-Of-Sauron/\">Eye-Of-Sauron</a></li>\n<li class=\"breadcrumb-item\" aria-current=\"page\">Saruman</li>\n</ol></nav>", @page.breadcrumb
   end
 
+  test "breadcrumbs guard against malicious filenames" do
+    malicious_path = '<script>alert("malicious-content");/Very Bad'
+    @page.instance_variable_set("@path", malicious_path)
+    @page.instance_variable_set("@base_url", "")
+
+    refute_includes @page.breadcrumb, malicious_path
+    assert_includes @page.breadcrumb, ">&lt;script&gt;alert(&quot;malicious-content&quot;);</a>"
+  end
+
+  test "breadcrumbs retain unicode and ASCII characters" do
+    title = "数学 📘"
+    @page.instance_variable_set("@path", title)
+    @page.instance_variable_set("@base_url", "")
+
+    assert_includes @page.breadcrumb, title
+  end
+
   test "breadcrumb with no path" do
     assert_equal 'Home', @page.breadcrumb
   end
@@ -72,6 +89,17 @@ context "Precious::Views::Overview" do
     assert_equal result[:name], 'Orc'
   end
 
+  test "files_folders retain unicode and ASCII characters" do
+    @page.instance_variable_set("@path", "Mordor")
+    @page.instance_variable_set("@base_url", "")
+    @page.instance_variable_set("@results", [
+      FakePageResult.new("Mordor/Eye-Of-Sauron-👁️-数学.md")
+    ])
+    result = @page.files_folders.first
+
+    assert result[:name], "Eye Of Sauron 👁️ 数学"
+  end
+
   test "base url" do
     # based on test "files_folders"
     @page.instance_variable_set("@path", "Mordor")
@@ -79,5 +107,7 @@ context "Precious::Views::Overview" do
     results = [FakePageResult.new("Mordor/Eye-Of-Sauron.md"), FakeFileResult.new("Mordor/Aragorn.pdf"), FakePageResult.new("Mordor/Orc/Saruman.md"), FakePageResult.new("Mordor/.gitkeep")]
     @page.instance_variable_set("@results", results)
     assert_equal @page.files_folders.first[:url], '/wiki/gollum/overview/Mordor/Orc/'
+    assert_equal @page.files_folders.last[:url], '/wiki/Mordor/Eye-Of-Sauron'
+    assert_equal @page.files_folders.last[:file_path], 'Mordor/Eye-Of-Sauron'
   end
 end

test/test_page_view.rb

@@ -13,6 +13,43 @@ context "Precious::Views::Page" do
     FileUtils.rm_rf(@path)
   end
 
+  test "breadcrumbs guard against malicious input" do
+    malicious_path = '<script>alert("malicious-content");/Very Bad'
+    @wiki.write_page(malicious_path, :markdown, 'Is Bilbo a hobbit? Why certainly!')
+    page = @wiki.page(malicious_path)
+    @view = Precious::Views::Page.new
+    @view.instance_variable_set :@page, page
+    @view.instance_variable_set :@content, page.formatted_data
+    @view.instance_variable_set :@h1_title, false
+
+    refute_includes @view.breadcrumb, malicious_path
+    assert_includes @view.breadcrumb, ">&lt;script&gt;alert(&quot;malicious-content&quot;);</a>"
+  end
+
+  test "breadcrumbs retain unicode and ASCII characters" do
+    path = "数学 📘/Age of Bilbo"
+    @wiki.write_page(path, :markdown, "How old is Bilbo?")
+    page = @wiki.page(path)
+    @view = Precious::Views::Page.new
+    @view.instance_variable_set :@page, page
+    @view.instance_variable_set :@content, page.formatted_data
+    @view.instance_variable_set :@h1_title, false
+
+    assert_include @view.breadcrumb, "数学 📘"
+  end
+
+  test "page header retains unicde and ASCII characters" do
+    title = "数学 📘"
+    @wiki.write_page(title, :markdown, "How old is Bilbo?")
+    page = @wiki.page(title)
+    @view = Precious::Views::Page.new
+    @view.instance_variable_set :@page, page
+    @view.instance_variable_set :@content, page.formatted_data
+    @view.instance_variable_set :@h1_title, false
+
+    assert @view.page_header, "数学 📘"
+  end
+
   test "h1 title sanitizes correctly" do
     title = 'H1'
     @wiki.write_page(title, :markdown, '# 1 & 2 <script>alert("js")</script>' + "\n # 3", commit_details)
@@ -24,10 +61,46 @@ context "Precious::Views::Page" do
     @view.instance_variable_set :@h1_title, true
 
     # Test page_header_from_content(@content)
-    actual = @view.title
-    assert_equal '1 & 2', actual
+    assert @view.page_header, "1 & 2"
   end
 
+  test "page header uses filename when h1_title is false" do
+    title = "H1"
+    contents = <<~TEXT
+      # First H1 header
+      # Second H1 header
+    TEXT
+
+    @wiki.write_page(title, :markdown, contents, commit_details)
+    page = @wiki.page(title)
+
+    @view = Precious::Views::Page.new
+    @view.instance_variable_set :@page, page
+    @view.instance_variable_set :@content, page.formatted_data
+    @view.instance_variable_set :@h1_title, false
+
+    assert_equal @view.page_header, "H1"
+  end
+
+  test "page header uses filename when h1_title is true" do
+    contents = <<~TEXT
+      # First H1 header
+      # Second H1 header
+    TEXT
+
+    @wiki.write_page("H1", :markdown, contents, commit_details)
+    page = @wiki.page("H1")
+
+    @view = Precious::Views::Page.new
+    @view.instance_variable_set :@page, page
+    @view.instance_variable_set :@content, page.formatted_data
+    @view.instance_variable_set :@h1_title, true
+
+    assert_equal @view.page_header, "First H1 header"
+  end
+
+
+
   test "metadata is rendered into a table" do
     title = 'metadata test'
     @wiki.write_page(title, :markdown, "---\nsome: metadata\nhere: for you\n---\n# Some markdown\nIn this doc")
@@ -93,21 +166,6 @@ EOS
     assert_equal "594e928cc5dcb6d833dfb86bb36076fd4a84eea7", @view.id
   end
 
-  test "h1 title can be disabled" do
-    title = 'H1'
-    @wiki.write_page(title, :markdown, '# 1 & 2 <script>alert("js")</script>' + "\n # 3", commit_details)
-    page = @wiki.page(title)
-
-    @view = Precious::Views::Page.new
-    @view.instance_variable_set :@page, page
-    @view.instance_variable_set :@content, page.formatted_data
-    @view.instance_variable_set :@h1_title, false
-
-    # Title is based on file name when h1_title is false.
-    actual = @view.title
-    assert_equal title, actual
-  end
-
   test "breadcrumbs" do
     @wiki.write_page('subdir/BC Test 1', :markdown, 'Test', commit_details)
     page = @wiki.page('subdir/BC Test 1')
@@ -127,4 +185,20 @@ EOS
     @view.instance_variable_set :@content, page.formatted_data
     assert_equal @view.breadcrumb, ''
   end
+
+  test "body_side is 'right' by default" do
+    @view = Precious::Views::Page.new
+    assert_equal @view.body_side, "right"
+  end
+
+  test "body_side is 'left' if bar_side side is 'right'" do
+    @view = Precious::Views::Page.new
+    @view.instance_variable_set :@bar_side, :right
+    assert_equal @view.body_side, "left"
+  end
+
+  test "links to pages containing ?" do
+    @view = Precious::Views::Page.new
+    assert_equal @view.page_route("Page?"), '/Page%3F'
+  end
 end