auto_link: avoid recognizing full width chars as a part of URI scheme

fixes regression by http://github.com/rails/rails/commit/133ada6ab0f0cb7bef2bd40dbc18f2d5bc6b964e

[#5503 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 3d276000a1..4f7f5c454f 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -459,7 +459,7 @@ module ActionView
         end
 
         AUTO_LINK_RE = %r{
-            (?: ([\w+.:-]+:)// | www\. )
+            (?: ([0-9A-Za-z+.:-]+:)// | www\. )
             [^\s<]+
           }x
 
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index 9e9ed9120d..d0d4286393 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -1,4 +1,4 @@
-# encoding: us-ascii
+# encoding: utf-8
 require 'abstract_unit'
 require 'testing_sandbox'
 
@@ -415,6 +415,12 @@ class TextHelperTest < ActionView::TestCase
     link10_raw    = 'http://www.mail-archive.com/ruby-talk@ruby-lang.org/'
     link10_result = generate_result(link10_raw)
     assert_equal %(<p>#{link10_result} Link</p>), auto_link("<p>#{link10_raw} Link</p>")
+
+    link11_raw    = 'http://asakusa.rubyist.net/'
+    link11_result = generate_result(link11_raw)
+    with_kcode 'u' do
+      assert_equal %(浅草.rbの公式サイトはこちら#{link11_result}), auto_link("浅草.rbの公式サイトはこちら#{link11_raw}")
+    end
   end
 
   def test_auto_link_should_sanitize_input_when_sanitize_option_is_not_false