kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Make auto_link match urls with a port number specified.

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3351 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Marcel Molina 2005-12-26 19:31:40 +00:00
parent eb53467bdf
commit 839f03b7d0
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/CHANGELOG
View file

@ -1,5 +1,7 @@
*SVN* *SVN*
* Make auto_link match urls with a port number specified. [Marcel Molina Jr.]
* Added support for toggling visual effects to ScriptaculousHelper::visual_effect, #3323. [Thomas Fuchs] * Added support for toggling visual effects to ScriptaculousHelper::visual_effect, #3323. [Thomas Fuchs]
* Update to script.aculo.us to 1.5.0 rev. 3343 [Thomas Fuchs] * Update to script.aculo.us to 1.5.0 rev. 3343 [Thomas Fuchs]

2
actionpack/lib/action_view/helpers/text_helper.rb
View file

@ -324,7 +324,7 @@ module ActionView
(?:www\.) # www.* (?:www\.) # www.*
) )
( (
([\w]+[=?&\/.-]?)* # url segment ([\w]+:?[=?&\/.-]?)* # url segment
\w+[\/]? # url tail \w+[\/]? # url tail
(?:\#\w*)? # trailing anchor (?:\#\w*)? # trailing anchor
) )

3
actionpack/test/template/text_helper_test.rb
View file

@ -128,6 +128,8 @@ class TextHelperTest < Test::Unit::TestCase
link3_result = %{<a href="#{link3_raw}">#{link3_raw}</a>} link3_result = %{<a href="#{link3_raw}">#{link3_raw}</a>}
link4_raw = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor123' link4_raw = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor123'
link4_result = %{<a href="#{link4_raw}">#{link4_raw}</a>} link4_result = %{<a href="#{link4_raw}">#{link4_raw}</a>}
link5_raw = 'http://foo.example.com:3000/controller/action'
link5_result = %{<a href="#{link5_raw}">#{link5_raw}</a>}
assert_equal %(hello #{email_result}), auto_link("hello #{email_raw}", :email_addresses) assert_equal %(hello #{email_result}), auto_link("hello #{email_raw}", :email_addresses)
assert_equal %(Go to #{link_result}), auto_link("Go to #{link_raw}", :urls) assert_equal %(Go to #{link_result}), auto_link("Go to #{link_raw}", :urls)
@ -152,6 +154,7 @@ class TextHelperTest < Test::Unit::TestCase
assert_equal %(<p>Go to #{link3_result}. seriously, #{link3_result}? i think I'll say hello to #{email_result}. instead.</p>), auto_link(%(<p>Go to #{link3_raw}. seriously, #{link3_raw}? i think I'll say hello to #{email_raw}. instead.</p>)) assert_equal %(<p>Go to #{link3_result}. seriously, #{link3_result}? i think I'll say hello to #{email_result}. instead.</p>), auto_link(%(<p>Go to #{link3_raw}. seriously, #{link3_raw}? i think I'll say hello to #{email_raw}. instead.</p>))
assert_equal %(<p>Link #{link4_result}</p>), auto_link("<p>Link #{link4_raw}</p>") assert_equal %(<p>Link #{link4_result}</p>), auto_link("<p>Link #{link4_raw}</p>")
assert_equal %(<p>#{link4_result} Link</p>), auto_link("<p>#{link4_raw} Link</p>") assert_equal %(<p>#{link4_result} Link</p>), auto_link("<p>#{link4_raw} Link</p>")
assert_equal %(<p>#{link5_result} Link</p>), auto_link("<p>#{link5_raw} Link</p>")
end end
def test_auto_link_at_eol def test_auto_link_at_eol