Release 5.2.3

Ensure <title> is rendered for pages (#1710 )
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-18 13:43:00 +02:00 · 2021-04-05 09:26:50 -07:00
5 changed files with 37 additions and 9 deletions
@@ -1,3 +1,7 @@
+# 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.2'
-  s.date              = '2021-03-27'
+  s.version           = '5.2.3'
+  s.date              = '2021-04-18'
  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.2'
+  VERSION = '5.2.3'

  def self.assets_path
    ::File.expand_path('gollum/public', ::File.dirname(__FILE__))
@@ -16,6 +16,11 @@ 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
@@ -263,11 +268,6 @@ module Precious
          end
        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
@@ -38,7 +38,31 @@ context "Precious::Views::Page" do
    assert_include @view.breadcrumb, "数学 📘"
  end

-  test "page header retains unicde and ASCII characters" do
+  test 'page <title> is the page header from content, if present' do
+    page_title = 'Page header from content'
+    @wiki.write_page(page_title, :markdown, 'Contents', commit_details)
+
+    @view = Precious::Views::Page.new.tap do |view|
+      view.instance_variable_set :@page, @wiki.page(page_title)
+      view.instance_variable_set :@h1_title, true
+    end
+
+    assert_equal @view.title, 'Page header from content'
+  end
+
+  test 'page <title> is URL path title if no h1 present' do
+    @wiki.write_page('dir/My path title', :markdown, 'Contents', commit_details)
+    page = @wiki.page('dir/My path title')
+
+    @view = Precious::Views::Page.new.tap do |view|
+      view.instance_variable_set :@page, page
+      view.instance_variable_set :@h1_title, false
+    end
+
+    assert_equal @view.title, 'My path title'
+  end
+
+  test "page header retains unicode and ASCII characters" do
    title = "数学 📘"
    @wiki.write_page(title, :markdown, "How old is Bilbo?")
    page = @wiki.page(title)