From cd4704aed7fe1b2d60c001bf8a14605c7a76cec0 Mon Sep 17 00:00:00 2001 From: risk Date: Mon, 8 Aug 2011 15:02:10 -0700 Subject: [PATCH] prefix name attributes too --- lib/gollum/sanitization.rb | 8 ++++++-- test/test_markup.rb | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/gollum/sanitization.rb b/lib/gollum/sanitization.rb index 511c8dbb..b5867042 100644 --- a/lib/gollum/sanitization.rb +++ b/lib/gollum/sanitization.rb @@ -52,9 +52,13 @@ module Gollum TRANSFORMERS = [ lambda do |env| node = env[:node] - return if env[:is_whitelisted] || !node.element? || !node['id'] + return if env[:is_whitelisted] || !node.element? prefix = env[:config][:id_prefix] - node['id'] = node['id'].gsub(/\A(#{prefix})?/, prefix) + %w(id name).each do |key| + if value = node[key] + node[key] = value.gsub(/\A(#{prefix})?/, prefix) + end + end {:node_whitelist => [node]} end, diff --git a/test/test_markup.rb b/test/test_markup.rb index 988a34d4..25dc935d 100644 --- a/test/test_markup.rb +++ b/test/test_markup.rb @@ -481,6 +481,16 @@ context "Markup" do compare(content, output, :textile) end + test "name prefix added" do + content = "abc\n\n__TOC__\n\n==Header==\n\nblah" + compare content, '', :mediawiki, [ + /id="wiki-toc"/, + /href="#wiki-Header"/, + /id="wiki-Header"/, + /name="wiki-Header"/ + ] + end + ######################################################################### # # TeX @@ -515,6 +525,7 @@ context "Markup" do if regexes.empty? assert_equal normal(output), normal(rendered) else + output = page.formatted_data regexes.each { |r| assert_match r, output } end end