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

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

actionpack/lib/action_view/helpers/text_helper.rb

@@ -454,7 +454,7 @@ def set_cycle(name, cycle_object)
                         (                          # leading text
                           <\w+.*?>|                # leading HTML tag, or
                           [^=!:'"/]|               # leading punctuation, or
-                          |                        # nothing
+                          ^                        # beginning of line
                         )
                         (
                           (?:https?://)|           # protocol spec, or
@@ -468,7 +468,7 @@ def set_cycle(name, cycle_object)
                           (?:\?[\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

actionpack/test/template/text_helper_test.rb

@@ -264,6 +264,7 @@ def test_auto_linking
     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