deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Avoid autolinking Markdown URIs (ticket:177)

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-06-09 20:24:14 +00:00
parent ebe0af1dfc
commit 79eb882a31
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/chunks/uri.rb
View file

@ -71,7 +71,7 @@ class URIChunk < Chunk::Abstract
'(?=\.?(?:\s|\)|\z))' # ends only with optional dot + space or ")" '(?=\.?(?:\s|\)|\z))' # ends only with optional dot + space or ")"
# or end of the string # or end of the string
SUSPICIOUS_PRECEDING_CHARACTER = '(!|\"\:|\"|\\\')?' # any of !, ":, ", ' SUSPICIOUS_PRECEDING_CHARACTER = '(!|\"\:|\"|\\\'|\]\()?' # any of !, ":, ", ', ](
INTERNET_URI_REGEXP = INTERNET_URI_REGEXP =
Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + INTERNET_URI, Regexp::EXTENDED, 'N') Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + INTERNET_URI, Regexp::EXTENDED, 'N')

4
app/models/wiki_content.rb
View file

@ -141,7 +141,9 @@ class WikiContent < String
@options[:engine] = Engines::MAP[@web.markup] @options[:engine] = Engines::MAP[@web.markup]
@options[:engine_opts] = [:filter_html, :filter_styles] if @web.safe_mode @options[:engine_opts] = [:filter_html, :filter_styles] if @web.safe_mode
@options[:active_chunks] = (ACTIVE_CHUNKS - [WikiChunk::Word] ) if @web.brackets_only @options[:active_chunks] = (ACTIVE_CHUNKS - [WikiChunk::Word] ) if @web.brackets_only
@not_rendered = @pre_rendered = nil
super(@revision.content) super(@revision.content)
init_chunk_manager init_chunk_manager
build_chunks build_chunks

9
test/unit/revision_test.rb
View file

@ -72,6 +72,15 @@ class RevisionTest < Test::Unit::TestCase
%{return ThatWay\n</code></pre>\n\n<p>Nice!</p>}, %{return ThatWay\n</code></pre>\n\n<p>Nice!</p>},
code_block) code_block)
end end
def test_markdown_hyperlink_with_slash
# in response to a bug, see http://dev.instiki.org/attachment/ticket/177
@web.markup = :markdown
assert_markup_parsed_as(
'<p><a href="http://example/with/slash">text</a></p>',
'[text](http://example/with/slash)')
end
def test_mixed_formatting def test_mixed_formatting