diff --git a/gollum.gemspec b/gollum.gemspec index 25e60a4f..53a0ec18 100644 --- a/gollum.gemspec +++ b/gollum.gemspec @@ -5,8 +5,8 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 1.9' s.name = 'gollum' - s.version = '4.1.2' - s.date = '2017-08-07' + s.version = '4.1.3' + s.date = '2018-09-17' s.rubyforge_project = 'gollum' s.license = 'MIT' @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.rdoc_options = ['--charset=UTF-8'] s.extra_rdoc_files = %w[README.md LICENSE] - s.add_dependency 'gollum-lib', '>= 4.2.7' + s.add_dependency 'gollum-lib', '>= 4.2.9' s.add_dependency 'kramdown', '~> 1.9.0' s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.4' s.add_dependency 'mustache', ['>= 0.99.5', '< 1.0.0'] diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb index de2a868a..82577fe5 100644 --- a/lib/gollum/app.rb +++ b/lib/gollum/app.rb @@ -490,11 +490,11 @@ module Precious }x do |path| @path = extract_path(path) if path wiki_options = settings.wiki_options.merge({ :page_file_dir => @path }) - wiki = Gollum::Wiki.new(settings.gollum_path, wiki_options) - @results = wiki.pages - @results += wiki.files if settings.wiki_options[:show_all] + @wiki = Gollum::Wiki.new(settings.gollum_path, wiki_options) + @results = @wiki.pages + @results += @wiki.files if settings.wiki_options[:show_all] @results = @results.sort_by { |p| p.name.downcase } # Sort Results alphabetically, fixes 922 - @ref = wiki.ref + @ref = @wiki.ref mustache :pages end diff --git a/lib/gollum/views/pages.rb b/lib/gollum/views/pages.rb index cf9f8b4e..f90feb80 100644 --- a/lib/gollum/views/pages.rb +++ b/lib/gollum/views/pages.rb @@ -23,7 +23,7 @@ module Precious end end - breadcrumb.join(" / ") + @wiki.sanitizer.clean(breadcrumb.join(" / ")) else "Home" end @@ -60,7 +60,7 @@ module Precious result = Hash[folders.sort_by{| key, value | key.downcase} ].values.join("\n") + "\n" result += Hash[page_files.sort_by{ | key, value | key.downcase } ].values.join("\n") - result + @wiki.sanitizer.clean(result) else "" end diff --git a/test/test_pages_view.rb b/test/test_pages_view.rb index 9f279d0e..6fe23b75 100644 --- a/test/test_pages_view.rb +++ b/test/test_pages_view.rb @@ -2,6 +2,18 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper')) require File.expand_path '../../lib/gollum/views/pages', __FILE__ +class FakeSane + def clean(data) + data + end +end + +class FakeWiki + def sanitizer + FakeSane.new + end +end + FakePageResult = Struct.new(:path) do def name File.basename(path, File.extname(path)).gsub("-", " ") @@ -27,6 +39,7 @@ end context "Precious::Views::Pages" do setup do @page = Precious::Views::Pages.new + @page.instance_variable_set("@wiki", FakeWiki.new) end test "breadcrumb" do