Force utf8 encoding for diffs

.github/workflows/docker-deploy.yml

@@ -1,39 +0,0 @@
-name: Deploy docker
-on: [push]
-env:
-  DEPLOY_NAME: gollumwiki/gollum:latest
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    if: ${{ github.ref == 'refs/heads/master' }}
-    steps:
-      - name: Check Out Repo
-        uses: actions/checkout@v2
-      - name: Login
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Cache docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: ./Dockerfile
-          builder: ${{ steps.buildx.outputs.name }}
-          push: true
-          tags: ${{ env.DEPLOY_NAME }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/docker-test.yml

@@ -1,38 +0,0 @@
-name: Build and Test Docker
-on: [push, pull_request]
-env:
-  CI_IMAGE: gollum-ci-img
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check Out Repo
-        uses: actions/checkout@v2
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Cache docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - name: Build
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: ./Dockerfile
-          builder: ${{ steps.buildx.outputs.name }}
-          push: false
-          tags: ${{ env.CI_IMAGE }}
-          outputs: type=docker
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
-      - name: docker state
-        run: docker image ls
-      - name: Run gollum as test
-        run: docker run -e CI=true ${{ env.CI_IMAGE }} --irb

.github/workflows/release.yml

@@ -1,25 +0,0 @@
-on:
-  push:
-    # Sequence of patterns matched against refs/tags
-    tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-
-name: Create Release
-
-jobs:
-  build:
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: false
-          prerelease: false

.github/workflows/test.yaml

@@ -1,46 +1,29 @@
 name: Ruby Build
 on: [push, pull_request]
 jobs:
-  jruby_build:
-    name: JRuby (${{ matrix.ruby }})
+  build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [jruby-9.2.18]
+        ruby: [2.4.0, 2.6.0, 3.0.0, jruby-9.2.18.0]
     steps:
+      - run: echo "The job was automatically triggered by a ${{ github.event_name }} event."
+      - run: echo "This job is now running on a ${{ runner.os }} server hosted by GitHub!"
+      - run: echo "The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
       - name: Check out repository code
         uses: actions/checkout@v2
+      - run: echo "The ${{ github.repository }} repository has been cloned to the runner."
+      - run: echo "The workflow is now ready to test your code on the runner."
       - name: List files in the repository
         run: |
           ls ${{ github.workspace }}
-      - name: Set up Java
-        uses: actions/setup-java@v2
+      - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
+          java-version: '9'
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - name: Run tests
-        run: bundle exec rake
-  mri_build:
-    name: Ruby (${{ matrix.ruby }})
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [2.6, 2.7, 3.0]
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - name: List files in the repository
-        run: |
-          ls ${{ github.workspace }}
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - name: Run tests
+      - name: exec rake
         run: bundle exec rake

.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+  - 2.4.0
+  - 2.6.0
+  - 3.0.0
+  - jruby-9.2.18.0
+jdk:
+  - oraclejdk9
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install libicu-dev

Dockerfile

@@ -1,40 +0,0 @@
-FROM ruby:2.7-alpine AS builder
-
-RUN apk add \
-    build-base \
-    cmake \
-    git \
-    icu-dev \
-    openssl-dev
-
-COPY Gemfile* /tmp/
-COPY gollum.gemspec* /tmp/
-WORKDIR /tmp
-RUN bundle install
-
-RUN gem install \
-    asciidoctor \
-    creole \
-    wikicloth \
-    org-ruby \
-    RedCloth \
-    bibtex-ruby \
-    && echo "gem-extra complete"
-
-WORKDIR /app
-COPY . /app
-RUN bundle exec rake install
-
-
-FROM ruby:2.7-alpine
-
-COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
-
-RUN apk add \
-    bash \
-    git
-
-VOLUME /wiki
-WORKDIR /wiki
-COPY docker-run.sh /docker-run.sh
-ENTRYPOINT ["/docker-run.sh"]

Gemfile

@@ -1,26 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'warbler', platforms: :jruby
-
-# FIXME:
-#
-# There's an issue in 1.12.5 that causes XHTML elements to be generated badly,
-# causing Gollum's test suite to fail.[1] The issue has been fixed upstream,
-# but we're still waiting for a new Nokogiri point release.
-#
-# However, 1.12.5 is a security patch, so we don't want end users to use an
-# older version of Nokogiri. But this is safe to do in our CI environment.
-#
-# Once there's a new Nokogiri release, we can remove this dependency and JRuby
-# CI should pass normally again.
-#
-# Note that Nokogiri 1.11+ does not support Ruby v2.4.x anymore. So to make our
-# current CI workflows pass, we should only try to install this version of
-# Nokogiri for newer Ruby versions.
-#
-# [1]: https://github.com/gollum/gollum/issues/1779
-gem 'nokogiri', '1.12.4' unless RUBY_VERSION.include? '2.4'
+if RUBY_PLATFORM == 'java'
+  gem 'warbler'
+end
 
 gemspec
 
-gem 'rake', '~> 13.0'
+gem 'rake', '~> 13.0'

README.md

@@ -37,11 +37,11 @@ Gollum runs on Unix-like systems using its [adapter](https://github.com/gollum/r
 ## INSTALLATION
 
 1. Ruby is best installed either via [RVM](https://rvm.io/) or a package manager of choice.
-2. Gollum is best installed via RubyGems:
+2. Gollum is best installed via RubyGems:  
 	```
 	[sudo] gem install gollum
 	```
-
+	
 Installation examples for individual systems can be seen [here](https://github.com/gollum/gollum/wiki/Installation).
 
 To run, simply:
@@ -84,19 +84,19 @@ See [here](https://github.com/gollum/gollum/wiki/Custom-rendering-gems) for inst
 
 ### Rack
 
-Gollum can also be run with any [rack-compatible web server](https://github.com/rack/rack#supported-web-servers). More on that [over here](https://github.com/gollum/gollum/wiki/Gollum-via-Rack).
+Gollum can also be ran with any [rack-compatible web server](https://github.com/rack/rack#supported-web-servers). More on that [over here](https://github.com/gollum/gollum/wiki/Gollum-via-Rack).
 
 ### Rack, with an authentication server
 
-Gollum can also be run alongside a CAS (Central Authentication Service) SSO (single sign-on) server. With a bit of tweaking, this adds basic user-support to Gollum. To see an example and an explanation, navigate [over here](https://github.com/gollum/gollum/wiki/Gollum-via-Rack-and-CAS-SSO).
+Gollum can also be ran alongside a CAS (Central Authentication Service) SSO (single sign-on) server. With a bit of tweaking, this adds basic user-support to Gollum. To see an example and an explanation, navigate [over here](https://github.com/gollum/gollum/wiki/Gollum-via-Rack-and-CAS-SSO).
 
 ### Docker
 
-Gollum can also be run via [Docker](https://www.docker.com/). More on that [over here](https://github.com/gollum/gollum/wiki/Gollum-via-Docker).
+Gollum can also be ran via [Docker](https://www.docker.com/). More on that [over here](https://github.com/gollum/gollum/wiki/Gollum-via-Docker).
 
 ### Service
 
-Gollum can also be run as a service. More on that [over here](https://github.com/gollum/gollum/wiki/Gollum-as-a-service).
+Gollum can also be ran as a service. More on that [over here](https://github.com/gollum/gollum/wiki/Gollum-as-a-service).
 
 ## CONFIGURATION
 
@@ -126,7 +126,7 @@ Gollum comes with the following command line options:
 | --no-display-metadata | none  | Do not render metadata tables in pages. |
 | --user-icons      | [MODE]    | Tell Gollum to use specific user icons for history view. Can be set to `gravatar`, `identicon` or `none`. Default: `none`. |
 | --mathjax-config  | [FILE]    | Specify path to a custom MathJax configuration. If not specified, uses the `mathjax.config.js` file from repository root. |
-| --template-dir    | [PATH]    | Specify custom mustache template directory. Only overrides templates that exist in this directory. |
+| --template-dir    | [PATH]    | Specify custom mustache template directory. |
 | --template-page   | none      | Use _Template in root as a template for new pages. Must be committed. |
 | --emoji           | none      | Parse and interpret emoji tags (e.g. `:heart:`) except when the leading colon is backslashed (e.g. `\:heart:`). |
 | --lenient-tag-lookup | none | 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. |
@@ -150,7 +150,3 @@ When `--config` option is used, certain inner parts of Gollum can be customized.
 ## CONTRIBUTING
 
 Please consider helping out! See [CONTRIBUTING](CONTRIBUTING.md) for information on how to submit issues, and how to start hacking on gollum.
-
-## THANKS TO
-
-[![Testing Powered By SauceLabs](https://opensource.saucelabs.com/images/opensauce/powered-by-saucelabs-badge-gray.png?sanitize=true "Testing Powered By SauceLabs")](https://saucelabs.com)

bin/gollum

@@ -149,7 +149,7 @@ MSG
     'Can be set to \'gravatar\' or \'identicon\'. Default: standard avatar.') do |mode|
     wiki_options[:user_icons] = mode.to_s
   end
-  opts.on('--template-dir [PATH]', 'Specify custom mustache template directory. Only overrides templates that exist in this directory.') do |path|
+  opts.on('--template-dir [PATH]', 'Specify custom mustache template directory.') do |path|
     wiki_options[:template_dir] = path
   end
   opts.on('--template-page', 'Use _Template.{ext} as a template for new pages.') do
@@ -206,7 +206,7 @@ begin
 rescue OptionParser::InvalidOption => e
   puts "gollum: #{e.message}"
   puts 'gollum: try \'gollum --help\' for more information'
-  exit 1
+  exit
 end
 
 # --gollum-path wins over ARGV[0]
@@ -271,6 +271,7 @@ else
   Precious::App.set(:environment, ENV.fetch('RACK_ENV', :production).to_sym)
   Precious::App.set(:gollum_path, gollum_path)
   Precious::App.set(:wiki_options, wiki_options)
+  Precious::App.settings.mustache[:templates] = wiki_options[:template_dir] if wiki_options[:template_dir]
 
   if cfg = options[:config]
     # If the path begins with a '/' it will be considered an absolute path,

docker-run.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Initialize the wiki
-if [ ! -d .git ]; then
-    git init
-fi
-
-# Start gollum service
-[[ "$@" != *--mathjax* ]] && echo "WARNING: Mathjax will soon be disabled by default. To explicitly enable it, use --mathjax" >&2
-exec gollum $@ --mathjax

gollum.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   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-sinatra', '>= 1.0.1', '< 2'
+  s.add_dependency 'mustache-sinatra', '~> 1.0'
   s.add_dependency 'useragent', '~> 0.16.2'
   s.add_dependency 'gemojione', '~> 4.1'
   s.add_dependency 'octicons', '~> 12.0'
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test', '~> 0.6.3'
   s.add_development_dependency 'shoulda', '~> 3.6.0'
   s.add_development_dependency 'minitest-reporters', '~> 1.3.6'
+  s.add_development_dependency 'twitter_cldr', '~> 3.2.0'
   s.add_development_dependency 'mocha', '~> 1.8.0'
   s.add_development_dependency 'test-unit', '~> 3.3.0'
 

lib/gollum/app.rb

@@ -20,10 +20,8 @@ require 'gollum/views/layout'
 require 'gollum/views/editable'
 require 'gollum/views/has_page'
 require 'gollum/views/has_user_icons'
-require 'gollum/views/has_math'
 require 'gollum/views/pagination'
 require 'gollum/views/rss.rb'
-require 'gollum/views/template_cascade'
 
 require File.expand_path '../helpers', __FILE__
 
@@ -112,11 +110,7 @@ module Precious
       @wiki_title = settings.wiki_options.fetch(:title, 'Gollum Wiki')
 
       forbid unless @allow_editing || request.request_method == 'GET'
-
-      if settings.wiki_options[:template_dir]
-        Precious::Views::Layout.extend Precious::Views::TemplateCascade
-        Precious::Views::Layout.template_priority_path = settings.wiki_options[:template_dir]
-      end
+      Precious::App.set(:mustache, {:templates => settings.wiki_options[:template_dir]}) if settings.wiki_options[:template_dir]
 
       @base_url = url('/', false).chomp('/').force_encoding('utf-8')
       @page_dir = settings.wiki_options[:page_file_dir].to_s
@@ -126,7 +120,6 @@ module Precious
       @css = settings.wiki_options[:css]
       @js  = settings.wiki_options[:js]
       @mathjax_config = settings.wiki_options[:mathjax_config]
-      @mathjax = settings.wiki_options[:mathjax]
 
       @use_static_assets = settings.wiki_options.fetch(:static, settings.environment != :development)
       @static_assets_path = settings.wiki_options.fetch(:static_assets_path, ::File.join(File.dirname(__FILE__), 'public/assets'))
@@ -219,6 +212,7 @@ module Precious
           if page = wikip.page
               @page         = page
               @content      = page.text_data
+              @mathjax      = wiki.mathjax
               @etag         = page.sha
               mustache :edit
           else
@@ -240,7 +234,7 @@ module Precious
         halt 500 unless tempfile.is_a? Tempfile
 
         if wiki.per_page_uploads
-          dir = request.referer.match(/^https?:\/\/#{request.host_with_port}\/(.*)/)[1]          
+          dir = request.referer.sub(request.base_url, '')
           # remove base path if it is set
           dir.sub!(/^#{wiki.base_path}/, '') if wiki.base_path
           # remove base_url and gollum/* subpath if necessary
@@ -416,7 +410,7 @@ module Precious
         else
           sha2, sha1 = sha1, "#{sha1}^" if !sha2
           @versions  = [sha1, sha2]
-          @diff      = wiki.repo.diff(@versions.first, @versions.last, @page.path)
+          @diff      = wiki.repo.diff(@versions.first, @versions.last, @page.path).force_encoding('utf-8')
           @message   = 'The patch does not apply.'
           mustache :compare
         end
@@ -481,7 +475,7 @@ module Precious
         @versions = [start_version, end_version]
         wiki      = wikip.wiki
         @page     = wikip.page
-        @diff     = wiki.repo.diff(@versions.first, @versions.last, @page.path)
+        @diff     = wiki.repo.diff(@versions.first, @versions.last, @page.path).force_encoding('utf-8')
         if @diff.empty?
           @message = 'Could not compare these two revisions, no differences were found.'
           mustache :error
@@ -525,7 +519,7 @@ module Precious
           @commit = wiki.repo.commit(version)
           parent = @commit.parent
           parent_id = parent.nil? ? nil : parent.id
-          @diff = wiki.repo.diff(parent_id, version)
+          @diff = wiki.repo.diff(parent_id, version).force_encoding('utf-8')
           mustache :commit
         rescue Gollum::Git::NoSuchShaFound
           @message = "Invalid commit: #{@version}"
@@ -614,6 +608,7 @@ module Precious
         # Extensions and layout data
         @editable      = true
         @toc_content   = wiki.universal_toc ? @page.toc_data : nil
+        @mathjax       = wiki.mathjax
         @h1_title      = wiki.h1_title
         @bar_side      = wiki.bar_side
         @allow_uploads = wiki.allow_uploads
@@ -647,7 +642,7 @@ module Precious
 
     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.text_data) : nil
+      template_page ? Gollum::TemplateFilter.apply_filters(template_page.raw_data) : nil
     end
 
     def update_wiki_page(wiki, page, content, commit, name = nil, format = nil)

lib/gollum/public/assets/.sprockets-manifest-4f9a7c1631645007e06e679282bea889.json

@@ -1 +1 @@
-{"files":{"app-f05401ee374f0c7f48fc2bc08e30b4f4db705861fd5895ed70998683b383bfb5.js":{"logical_path":"app.js","mtime":"2021-07-10T00:40:20+09:00","size":136040,"digest":"f05401ee374f0c7f48fc2bc08e30b4f4db705861fd5895ed70998683b383bfb5","integrity":"sha256-8FQB7jdPDH9I/CvAjjC09NtwWGH9WJXtcJmGg7ODv7U="},"editor-9881d0c7ae663293f0e3a7e72729eec7e940fa613185c076709b76d292f5703a.js":{"logical_path":"editor.js","mtime":"2021-07-10T00:42:29+09:00","size":744886,"digest":"9881d0c7ae663293f0e3a7e72729eec7e940fa613185c076709b76d292f5703a","integrity":"sha256-mIHQx65mMpPw46fnJynux+lA+mExhcB2cJt20pL1cDo="},"app-cb122b4c17500faa5e013cb43334fafcf2dd7d72f694b06d9616f8b33fefb694.css":{"logical_path":"app.css","mtime":"2021-07-10T00:39:36+09:00","size":396625,"digest":"cb122b4c17500faa5e013cb43334fafcf2dd7d72f694b06d9616f8b33fefb694","integrity":"sha256-yxIrTBdQD6peATy0MzT6/PLdfXL2lLBtlhb4sz/vtpQ="},"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css":{"logical_path":"criticmarkup.css","mtime":"2021-07-08T05:19:03+09:00","size":646,"digest":"31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4","integrity":"sha256-Ma5dMoK7uOe3w8mRfp+2jjMVprSnXabOxI0huIRpBcQ="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2021-07-08T05:19:03+09:00","size":75,"digest":"512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb","integrity":"sha256-USSYw2i+DT+xuhBd+oQomuSDgOyfy++Ui9TiOwsJW/s="}},"assets":{"app.js":"app-f05401ee374f0c7f48fc2bc08e30b4f4db705861fd5895ed70998683b383bfb5.js","editor.js":"editor-9881d0c7ae663293f0e3a7e72729eec7e940fa613185c076709b76d292f5703a.js","app.css":"app-cb122b4c17500faa5e013cb43334fafcf2dd7d72f694b06d9616f8b33fefb694.css","criticmarkup.css":"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css"}}
+{"files":{"app-0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838.js":{"logical_path":"app.js","mtime":"2021-07-08T06:42:59+09:00","size":136020,"digest":"0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838","integrity":"sha256-D9Io4mv75v4xotomjrDpjngMEZHBqRit84M3eUbpyDg="},"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js":{"logical_path":"editor.js","mtime":"2021-07-08T05:19:03+09:00","size":744866,"digest":"db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf","integrity":"sha256-2xDINRMG6S8ZJroiXQzZyOiGSCs7mCCoWCXsOrq18c8="},"app-cb122b4c17500faa5e013cb43334fafcf2dd7d72f694b06d9616f8b33fefb694.css":{"logical_path":"app.css","mtime":"2021-07-08T06:42:59+09:00","size":396625,"digest":"cb122b4c17500faa5e013cb43334fafcf2dd7d72f694b06d9616f8b33fefb694","integrity":"sha256-yxIrTBdQD6peATy0MzT6/PLdfXL2lLBtlhb4sz/vtpQ="},"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css":{"logical_path":"criticmarkup.css","mtime":"2021-07-08T05:19:03+09:00","size":646,"digest":"31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4","integrity":"sha256-Ma5dMoK7uOe3w8mRfp+2jjMVprSnXabOxI0huIRpBcQ="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2021-07-08T05:19:03+09:00","size":75,"digest":"512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb","integrity":"sha256-USSYw2i+DT+xuhBd+oQomuSDgOyfy++Ui9TiOwsJW/s="}},"assets":{"app.js":"app-0fd228e26bfbe6fe31a2da268eb0e98e780c1191c1a918adf383377946e9c838.js","editor.js":"editor-db10c8351306e92f1926ba225d0cd9c8e886482b3b9820a85825ec3abab5f1cf.js","app.css":"app-cb122b4c17500faa5e013cb43334fafcf2dd7d72f694b06d9616f8b33fefb694.css","criticmarkup.css":"criticmarkup-31ae5d3282bbb8e7b7c3c9917e9fb68e3315a6b4a75da6cec48d21b8846905c4.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css"}}

lib/gollum/public/gollum/javascript/editor/gollum.editor.js

@@ -218,7 +218,7 @@
           $form.attr('action', this.href || routePath('preview'));
           $form.attr('target', '_blank');
           var paths = window.location.pathname.split('/');
-          $form.attr('page', decodeURIComponent(paths[ paths.length - 1 ]) || '')
+          $form.attr('page', paths[ paths.length - 1 ] || '')
           $form.submit();
 
 

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

@@ -345,7 +345,7 @@ $(document).ready(function() {
     var formData = new FormData($('#gollum-editor-form').get(0));
     var paths = window.location.pathname.split('/');
     var sectionAnchor = window.location.hash.substr(1);
-    formData.append('page', decodeURIComponent(paths[ paths.length - 1 ]) || '')
+    formData.append('page', paths[ paths.length - 1 ] || '')
     $.ajax({
       url: routePath('preview'),
       data: formData,

lib/gollum/views/create.rb

@@ -2,7 +2,6 @@ module Precious
   module Views
     class Create < Layout
       include Editable
-      include HasMath
 
       attr_reader :page, :name
 
@@ -42,9 +41,9 @@ module Precious
       def content
         @template_page
       end
-
+      
       private
-
+      
       def find_format
         @found_format ||= (Gollum::Page.format_for("#{@name}#{@ext}") || default_markup)
       end

lib/gollum/views/edit.rb

@@ -3,7 +3,6 @@ module Precious
     class Edit < Layout
       include Editable
       include HasPage
-      include HasMath
 
       attr_reader :page, :content
 
@@ -19,6 +18,10 @@ module Precious
       def page_name
         @name
       end
+      
+      def mathjax
+        @mathjax
+      end
 
       def header
         if @header.nil?
@@ -64,7 +67,7 @@ module Precious
       def etag
         @etag
       end
-
+      
       def allow_uploads
         @allow_uploads
       end

lib/gollum/views/has_math.rb

@@ -1,11 +0,0 @@
-module Precious
-  module HasMath
-    def mathjax
-      @mathjax
-    end
-
-    def mathjax_config
-      @mathjax_config
-    end
-  end
-end

lib/gollum/views/page.rb

@@ -2,10 +2,9 @@ module Precious
   module Views
     class Page < Layout
       include HasPage
-      include HasMath
 
       attr_reader :content, :page, :header, :footer, :preview, :historical
-
+      
       VALID_COUNTER_STYLES = ['decimal', 'decimal-leading-zero', 'arabic-indic', 'armenian', 'upper-armenian',
         'lower-armenian', 'bengali', 'cambodian', 'khmer', 'cjk-decimal', 'devanagari', 'georgian', 'gujarati', 'gurmukhi',
         'hebrew', 'kannada', 'lao', 'malayalam', 'mongolian', 'myanmar', 'oriya', 'persian', 'lower-roman', 'upper-roman',
@@ -62,11 +61,11 @@ module Precious
       def editable
         @editable
       end
-
+      
       def search
         true
       end
-
+      
       def history
         true
       end
@@ -74,11 +73,11 @@ module Precious
       def latest_changes
         true
       end
-
+      
       def overview
-        true
+        true 
       end
-
+        
       def allow_editing
         @allow_editing
       end
@@ -158,6 +157,14 @@ module Precious
         @toc_content
       end
 
+      def mathjax
+        @mathjax
+      end
+
+      def mathjax_config
+        @mathjax_config
+      end
+
       def use_identicon
         @page.wiki.user_icons == 'identicon'
       end
@@ -175,7 +182,7 @@ module Precious
       # Returns Hash.
       def metadata
         @page.metadata
-      end
+      end   
 
       # Access to embedded metadata.
       #

lib/gollum/views/template_cascade.rb

@@ -1,36 +0,0 @@
-module Precious
-  module Views
-    module TemplateCascade
-      def template_priority_path
-        @@template_priority_path
-      end
-
-      def template_priority_path=(path)
-        @@template_priority_path = File.expand_path(path)
-        @template = nil
-      end
-
-      def first_path_available(name)
-        priority = File.join(template_priority_path, "#{name}.#{template_extension}")
-        default = File.join(template_path, "#{name}.#{template_extension}")
-        File.exists?(priority) ? priority : default
-      end
-
-      # Method should track lib/mustache/settings.rb from Mustache project.
-      def template_file
-        @template_file || first_path_available(template_name)
-      end
-
-      # Method should track lib/mustache.rb from Mustache project.
-      def partial(name)
-        path = first_path_available(name)
-        begin
-          File.read(path)
-        rescue
-          raise if raise_on_context_miss?
-          ""
-        end
-      end
-    end
-  end
-end

test/examples/template_cascade/navbar.mustache

@@ -1,8 +0,0 @@
-<nav>
-  <div style="background-color: red;">NAVBAR_OVERRIDE</div>
-
-  <p>Still include an original partial to ensure the fallback works even when nested from an overriden partial:</p>
-  <div>
-    {{>mobilenav}}
-  </div>
-</nav>

test/examples/template_cascade/page.mustache

@@ -1,12 +0,0 @@
-<div id="wiki-wrapper" class="page">
-
-<p>Include an overridden partial:</p>
-<div id="head">
-	{{#navbar?}}{{>navbar}}{{/navbar?}}
-</div>
-
-<div style="background-color: red;">PAGE_OVERRIDE</div>
-
-{{>wiki_content}}
-
-</div>

test/helper.rb

@@ -6,6 +6,7 @@ require 'mocha/setup'
 require 'fileutils'
 require 'minitest/reporters'
 require 'minitest/spec'
+require 'twitter_cldr'
 require 'tmpdir'
 
 # Silence locale validation warning

test/test_app.rb

@@ -39,29 +39,40 @@ context "Frontend" do
     assert_match /<pre><code>one\ntwo\nthree\nfour\n<\/code><\/pre>\n/m, last_response.body
   end
 
+  def nfd utf8
+    TwitterCldr::Normalization.normalize(utf8, using: :nfd)
+  end
+  
   test 'mathjax assets are served' do
     get '/gollum/assets/mathjax/MathJax.js'
     assert last_response.ok?
   end
-
-  test "UTF-8 headers href preserved" do
-    page_content = <<~TEXT
-      ## 한글
-
-      Test page "utfh1" content.
-    TEXT
-
-    @wiki.write_page('utfh1',
-                     :markdown,
-                     page_content,
-                     {name: 'user1', email: 'user1'})
-
-    get 'utfh1'
-    expected = "<h2 class=\"editable\"><a class=\"anchor\" (href|id)=\"(#)?한글\" (href|id)=\"(#)?한글\"></a>한글</h2>"
-
-    assert_match /#{expected}/, last_response.body
+  
+  test 'compare with utf8' do
+    commit = { :name => 'user1', :email => 'user1' }
+    @wiki.write_page('Utf8', :markdown, '\n中文', commit)
+    page = @wiki.page('Utf8')
+    @wiki.update_page(page, nil, nil, "No utf-8", commit)
+    get "/gollum/compare/Utf8.md/#{page.versions.first.id}..#{page.versions.last.id}"
+    assert last_response.body.include?('<div class="gi pl-2">+\n中文</div>')
   end
 
+  test "UTF-8 headers href preserved" do
+    page = 'utfh1'
+    text = nfd('한글')
+
+    # don't use h1 or it will be promoted to replace file name
+    # which doesn't generate a normal header link
+    @wiki.write_page(page, :markdown, '## ' + text,
+                     { :name => 'user1', :email => 'user1' });
+
+    get page
+    expected = "<h2 class=\"editable\"><a class=\"anchor\" (href|id)=\"(#)?#{text}\" (href|id)=\"(#)?#{text}\"></a>#{text}</h2>"
+    actual   = nfd(last_response.body)
+
+    assert_match /#{expected}/, actual
+  end
+  
   test 'rss feed' do
     channel_title = <<EOF
 <title>Gollum Wiki Latest Changes</title>
@@ -326,7 +337,7 @@ EOF
   test "create with template succeed if template exists" do
     Precious::App.set(:wiki_options, { :template_page => true })
     page='_Template'
-    post '/gollum/create', :content => 'fake template with some Utf-8: Ü', :page => page,
+    post '/gollum/create', :content => 'fake template', :page => page,
       :path               => '/', :format => 'markdown', :message => ''
     follow_redirect!      
     assert last_response.ok?
@@ -445,21 +456,6 @@ EOF
     Precious::App.set(:wiki_options, {allow_uploads: false, per_page_uploads: false})
   end
   
-  test "upload a file with https referer" do
-    temp_upload_file = Tempfile.new(['https_upload', '.file']) << 'abc'
-    temp_upload_file.close
-    Precious::App.set(:wiki_options, {allow_uploads: true, per_page_uploads: true})
-    post "/gollum/upload_file", {:file => Rack::Test::UploadedFile.new(::File.open(temp_upload_file))}, {'HTTP_REFERER' => 'https://localhost:4567/Home.md', 'HTTP_HOST' => 'localhost:4567'}
-    
-    assert_equal 302, last_response.status # redirect is expected
-    @wiki.clear_cache
-    # Find the file in a page-specific subdir (here: Home), based on referer
-    file = @wiki.file("uploads/Home/#{::File.basename(temp_upload_file.path)}")
-    assert_equal 'abc', file.raw_data
-    Precious::App.set(:wiki_options, {allow_uploads: false, per_page_uploads: false})
-  end
-  
-  
   test "guard against uploading an existing file" do
     temp_upload_file = Tempfile.new(['upload', '.file']) << 'abc'
     temp_upload_file.close

test/test_template_cascade.rb

@@ -1,43 +0,0 @@
-# ~*~ encoding: utf-8 ~*~
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-class TestTemplateCascade < Minitest::Unit::TestCase
-  include Rack::Test::Methods
-
-  def setup
-    @path = cloned_testpath('examples/lotr.git')
-    Precious::App.set(:gollum_path, @path)
-    Precious::App.set(:wiki_options, {template_dir: testpath('examples/template_cascade')})
-    @wiki = Gollum::Wiki.new(@path)
-  end
-
-  def teardown
-    FileUtils.rm_rf(@path)
-  end
-
-  def app
-    Precious::App
-  end
-
-  def test_overridden_page_template_is_used
-    get '/Home'
-
-    assert last_response.body.include?('PAGE_OVERRIDE')
-  end
-
-  def test_overridden_navbar_partial_is_used
-    get '/Home'
-
-    assert last_response.body.include?('NAVBAR_OVERRIDE')
-  end
-
-  def test_overridden_templates_are_ignore_without_template_dir_set
-    Precious::App.set(:wiki_options, {template_dir: nil})
-
-    get '/Home'
-    assert_equal '/Home', last_request.fullpath
-    assert last_response.ok?
-    assert_no_match /PAGE_OVERRIDE/, last_response.body
-    assert_no_match /NAVBAR_OVERRIDE/, last_response.body
-  end
-end