@@ -149,8 +149,8 @@ module BBRuby "Maybe try looking on [url]http://google.com[/url]", :link], 'Link (Automatic)' => [ - /\s(https?:\/\/.*?(?=\s))/, - ' <a href="\1">\1</a>', + /(\A|\s)((https?:\/\/|www\.)[^\s<]+)/, + ' <a href="\2">\2</a>', 'Hyperlink (automatic)', 'Maybe try looking on http://www.google.com', :link], lib/bb-ruby.rb @@ -143,6 +143,10 @@ class TestBBRuby < Test::Unit::TestCase def test_auto_link assert_equal %Q(previous text <a href="http://www.google.com">http://www.google.com</a> post text), 'previous text http://www.google.com post text'.bbcode_to_html + assert_equal %Q( <a href="http://google.com">http://google.com</a> is my favorite search engine), 'http://google.com is my favorite search engine'.bbcode_to_html + assert_equal %Q(Try using google <a href="http://google.com">http://google.com</a>), 'Try using google http://google.com'.bbcode_to_html + assert_equal %Q(Try using googlehttp://google.com), 'Try using googlehttp://google.com'.bbcode_to_html + assert_equal %Q( <a href="http://google.com">http://google.com</a>), 'http://google.com'.bbcode_to_html end def test_html_escaping test/test_bb-ruby.rb ca5bca6742cc6027faed53ad8566491a229eafe2 Craig P Jolicoeur cpjolicoeur@gmail.com http://github.com/cpjolicoeur/bb-ruby/commit/b11f42d68a79ac61bb260c3dabd437af04bd53df b11f42d68a79ac61bb260c3dabd437af04bd53df 2009-06-11T09:31:48-07:00 2009-06-11T09:31:48-07:00 better auto-link support 810e7780488a8a7b8539c6d5dfe603c91642dc4d Craig P Jolicoeur cpjolicoeur@gmail.com