diff options
| author | Lance Ivy <lance@cainlevy.net> | 2009-04-15 16:46:30 -0700 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-17 18:56:06 +0200 |
| commit | 11bac700784efe232083f94e3d28d171957e667e (patch) | |
| tree | 9e9fbda32a8602af8da770fe1840b9d987d9f4a6 /actionpack/lib/action_view/helpers/text_helper.rb | |
| parent | 53dda29f8b34073a4b135ee224c1d09c1f10de02 (diff) | |
| download | rails-11bac700784efe232083f94e3d28d171957e667e.tar.gz rails-11bac700784efe232083f94e3d28d171957e667e.tar.bz2 rails-11bac700784efe232083f94e3d28d171957e667e.zip | |
Ensure auto_link does not ignore multiple trailing punctuations [#2504 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'actionpack/lib/action_view/helpers/text_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 573b99b96e..8136a1cb13 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -535,7 +535,7 @@ module ActionView link_attributes = html_options.stringify_keys text.gsub(AUTO_LINK_RE) do href = $& - punctuation = '' + punctuation = [] left, right = $`, $' # detect already linked URLs and URLs in the middle of a tag if left =~ /<[^>]+$/ && right =~ /^[^>]*>/ @@ -543,17 +543,18 @@ module ActionView href else # don't include trailing punctuation character as part of the URL - if href.sub!(/[^\w\/-]$/, '') and punctuation = $& and opening = BRACKETS[punctuation] - if href.scan(opening).size > href.scan(punctuation).size - href << punctuation - punctuation = '' + while href.sub!(/[^\w\/-]$/, '') + punctuation.push $& + if opening = BRACKETS[punctuation.last] and href.scan(opening).size > href.scan(punctuation.last).size + href << punctuation.pop + break end end link_text = block_given?? yield(href) : href href = 'http://' + href unless href.index('http') == 0 - content_tag(:a, h(link_text), link_attributes.merge('href' => href)) + punctuation + content_tag(:a, h(link_text), link_attributes.merge('href' => href)) + punctuation.reverse.join('') end end end |