Added necessary escaping

This commit is contained in:
Dawa Ometto
2018-09-17 21:57:52 +02:00
parent 612267d322
commit c2258c449e
4 changed files with 22 additions and 9 deletions
+3 -3
View File
@@ -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']
+4 -4
View File
@@ -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
+2 -2
View File
@@ -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
+13
View File
@@ -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