github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 00:08:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix auto_link helper for already linked urls. [#72 state:resolved]

Browse Source 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
This commit is contained in:
Kevin Glowacz
2008-05-22 14:21:33 -05:00
committed by Pratik Naik
parent cff2291df5
commit 1a73e98660
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actionpack/lib/action_view/helpers/text_helper.rb
View File

@@ -454,7 +454,7 @@ module ActionView
( # leading text
<\w+.*?>| # leading HTML tag, or
[^=!:'"/]| # leading punctuation, or
| # nothing
^ # beginning of line
)
(
(?:https?://)| # protocol spec, or
@@ -468,7 +468,7 @@ module ActionView
(?:\?[\w\+@%&=.;-]+)? # query string
(?:\#[\w\-]*)? # trailing anchor
)
([[:punct:]]|\s|<|$) # trailing text
([[:punct:]]|<|$|) # trailing text
}x unless const_defined?(:AUTO_LINK_RE)
# Turns all urls into clickable links. If a block is given, each url

1
actionpack/test/template/text_helper_test.rb
View File

@@ -264,6 +264,7 @@ class TextHelperTest < ActionView::TestCase
assert_equal '', auto_link(nil)
assert_equal '', auto_link('')
assert_equal "#{link_result} #{link_result} #{link_result}", auto_link("#{link_raw} #{link_raw} #{link_raw}")
assert_equal '<a href="http://www.rubyonrails.com">Ruby On Rails</a>', auto_link('<a href="http://www.rubyonrails.com">Ruby On Rails</a>')
end
def test_auto_link_at_eol