kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes syntax highlighting broken by r1930 (#2143). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1993 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-11-08 15:18:02 +00:00
parent 077723c90a
commit 9ae6e60c26
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/redcloth3.rb
View File

@ -1051,7 +1051,11 @@ class RedCloth3 < String
else else
htmlesc( aftertag, :NoQuotes ) if aftertag htmlesc( aftertag, :NoQuotes ) if aftertag
line = "<redpre##{ @pre_list.length }>" line = "<redpre##{ @pre_list.length }>"
@pre_list << "#{ $3.gsub(/<(#{ OFFTAGS })[^>]*>/, '<\\1>') }#{ aftertag }" $3.match(/<#{ OFFTAGS }([^>]*)>/)
tag = $1
$2.to_s.match(/(class\=\S+)/i)
tag << " #{$1}" if $1
@pre_list << "<#{ tag }>#{ aftertag }"
end end
elsif $1 and codepre > 0 elsif $1 and codepre > 0
if codepre - used_offtags.length > 0 if codepre - used_offtags.length > 0

20
test/unit/helpers/application_helper_test.rb
View File

@ -192,8 +192,9 @@ class ApplicationHelperTest < HelperTestCase
"<pre><div>content</div></pre>" => "<pre>&lt;div&gt;content&lt;/div&gt;</pre>", "<pre><div>content</div></pre>" => "<pre>&lt;div&gt;content&lt;/div&gt;</pre>",
"HTML comment: <!-- no comments -->" => "<p>HTML comment: &lt;!-- no comments --&gt;</p>", "HTML comment: <!-- no comments -->" => "<p>HTML comment: &lt;!-- no comments --&gt;</p>",
"<!-- opening comment" => "<p>&lt;!-- opening comment</p>", "<!-- opening comment" => "<p>&lt;!-- opening comment</p>",
# remove attributes # remove attributes except class
"<pre class='foo'>some text</pre>" => "<pre>some text</pre>", "<pre class='foo'>some text</pre>" => "<pre class='foo'>some text</pre>",
"<pre onmouseover='alert(1)'>some text</pre>" => "<pre>some text</pre>",
} }
to_test.each { |text, result| assert_equal result, textilizable(text) } to_test.each { |text, result| assert_equal result, textilizable(text) }
end end
@ -207,6 +208,21 @@ class ApplicationHelperTest < HelperTestCase
to_test.each { |text, result| assert_equal result, textilizable(text) } to_test.each { |text, result| assert_equal result, textilizable(text) }
end end
def syntax_highlight
raw = <<-RAW
<pre><code class="ruby">
# Some ruby code here
</pre></code>
RAW
expected = <<-EXPECTED
<pre><code class="ruby CodeRay"><span class="no">1</span> <span class="c"># Some ruby code here</span>
</pre></code>
EXPECTED
assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
end
def test_wiki_links_in_tables def test_wiki_links_in_tables
to_test = {"|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" => to_test = {"|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
'<tr><td><a href="/wiki/ecookbook/Page" class="wiki-page new">Link title</a></td>' + '<tr><td><a href="/wiki/ecookbook/Page" class="wiki-page new">Link title</a></td>' +