Ensure <title> is rendered for pages

I made a mistake when I made `#title` a private method. I did not see that it was being called from `layout.mustache` to generate the `<title></title>` tag in the `<head></head>` of each page. This fixes my error, and adds tests so the behaviour is more explicit.
2021-04-04 13:16:52 -07:00
5 changed files with 17 additions and 24 deletions
@@ -2,7 +2,7 @@ rvm:
  - 2.4.0
  - 2.6.0
  - 3.0.0
-  - jruby-9.2.18.0
+  - jruby-9.2.9.0
 jdk:
  - oraclejdk9
 before_install:
@@ -1,7 +1,3 @@
 # 5.2.3 2021-04-18
 * Fix bug preventing page titles from being displayed
 # 5.2.1 2021-02-25
 * Fix include call to a missing asset (@benjaminwil). This caused slow first page loads on JRuby.
@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
  s.required_ruby_version = '>= 1.9'
  s.name              = 'gollum'
-  s.version           = '5.2.3'
+  s.version           = '5.2.2'
-  s.date              = '2021-04-18'
+  s.date              = '2021-03-27'
  s.license           = 'MIT'
  s.summary     = 'A simple, Git-powered wiki.'
@@ -12,7 +12,7 @@ require 'rhino' if RUBY_PLATFORM == 'java'
 require File.expand_path('../gollum/uri_encode_component', __FILE__)
 module Gollum
-  VERSION = '5.2.3'
+  VERSION = '5.2.2'
  def self.assets_path
    ::File.expand_path('gollum/public', ::File.dirname(__FILE__))
@@ -1,5 +1,4 @@
-# encoding: UTF-8
+# ~*~ encoding: utf-8 ~*~
 require 'cgi'
 require 'sinatra'
 require 'sinatra/namespace'
@@ -41,7 +40,7 @@ Gollum::set_git_max_filesize(190 * 10**6)
 # See the wiki.rb file for more details on wiki options
 module Precious
-
+  
  # For use with the --base-path option.
  class MapGollum
    def initialize(base_path)
@@ -64,14 +63,12 @@ module Precious
      @mg.call(env)
    end
  end
-
+  
  class App < Sinatra::Base
    register Mustache::Sinatra
    register Sinatra::Namespace
    include Precious::Helpers
-
+    
    Encoding.default_external = "UTF-8"
    dir = File.dirname(File.expand_path(__FILE__))
    set :sprockets, ::Precious::Assets.sprockets(dir)
@@ -105,7 +102,7 @@ module Precious
      @critic_markup = settings.wiki_options[:critic_markup]
      @redirects_enabled = settings.wiki_options.fetch(:redirects_enabled, true)
      @per_page_uploads = settings.wiki_options[:per_page_uploads]
-
+      
      @wiki_title = settings.wiki_options.fetch(:title, 'Gollum Wiki')
      forbid unless @allow_editing || request.request_method == 'GET'
@@ -123,7 +120,7 @@ module Precious
      @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'))
      @mathjax_path = ::File.join(File.dirname(__FILE__), 'public/gollum/javascript/MathJax')
-
+      
      Sprockets::Helpers.configure do |config|
        config.environment = settings.sprockets
        config.environment.context_class.class_variable_set(:@@base_url, @base_url)
@@ -222,7 +219,7 @@ module Precious
      # AJAX calls only
      post '/upload_file' do
-
+        
        wiki = wiki_new
        halt 405 unless wiki.allow_uploads
@@ -238,7 +235,7 @@ module Precious
          dir.sub!(/^#{wiki.base_path}/, '') if wiki.base_path
          # remove base_url and gollum/* subpath if necessary
          dir.sub!(/^\/gollum\/[-\w]+\//, '')
-          # remove file extension
+          # remove file extension 
          dir.sub!(/#{::File.extname(dir)}$/, '')
          # revert escaped whitespaces
          dir.gsub!(/%20/, ' ')
@@ -320,7 +317,7 @@ module Precious
      end
      post '/edit/*' do
-        etag      = params[:etag]
+        etag      = params[:etag]        
        path      = "/#{clean_url(sanitize_empty_params(params[:path]))}"
        wiki      = wiki_new
        page      = wiki.page(::File.join(path, params[:page]))
@@ -330,7 +327,7 @@ module Precious
          # Signal edit collision and return the page's most recent version
          halt 412, {etag: page.sha, text_data: page.text_data}.to_json
        end
-
+        
        committer = Gollum::Committer.new(wiki, commit_message)
        commit    = { :committer => committer }
@@ -351,7 +348,7 @@ module Precious
          commit[:message] = "Deleted #{filepath}"
          wiki.delete_file(filepath, commit)
        end
-      end
+      end      
      get '/create/*' do
        forbid unless @allow_editing
@@ -628,7 +625,7 @@ module Precious
        end
      end
    end
-
+    
    def show_file(file)
      return unless file
      if file.on_disk?
@@ -686,4 +683,4 @@ module Precious
    end
  end
-end
+end