@@ -148,15 +148,12 @@ module BBRuby
'Hyperlink (implied)',
"Maybe try looking on [url]http://google.com[/url]",
:link],
- #
- # TODO: fix automatic links
- #
- # 'Link (Automatic)' => [
- # /http:\/\/(.*?)[^<\/a>]/,
- # '<a href="\1">\1</a>',
- # 'Hyperlink (automatic)',
- # nil, nil,
- # :link],
+ 'Link (Automatic)' => [
+ /\s(https?:\/\/.*?(?=\s))/,
+ ' <a href="\1">\1</a>',
+ 'Hyperlink (automatic)',
+ 'Maybe try looking on http://www.google.com',
+ :link],
'Image (Resized)' => [
/\[img(:.+)? size=(['"]?)(\d+)x(\d+)\2\](.*?)\[\/img\1?\]/im,
'<img src="\5" style="width: \3px; height: \4px;" />',
lib/bb-ruby.rb
@@ -141,6 +141,10 @@ class TestBBRuby < Test::Unit::TestCase
assert_equal '<a href="mailto:wadus@wadus.com">wadus@wadus.com</a>', '[email]wadus@wadus.com[/email]'.bbcode_to_html
end
+ 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
+ end
+
def test_html_escaping
assert_equal "<strong><i>foobar</i></strong>", '[b]<i>foobar</i>[/b]'.bbcode_to_html
assert_equal "<strong><i>foobar</i></strong>", '[b]<i>foobar</i>[/b]'.bbcode_to_html({}, false)
@@ -169,7 +173,7 @@ class TestBBRuby < Test::Unit::TestCase
end
def test_self_tag_list
- assert_equal 30, BBRuby.tag_list.size
+ assert_equal 31, BBRuby.tag_list.size
end
def test_redefinition_of_tag_html
test/test_bb-ruby.rb
7b20c80cd86d209db8a3dbf2bb936888968fe26a
Craig P Jolicoeur
cpjolicoeur@gmail.com
http://github.com/cpjolicoeur/bb-ruby/commit/1b8ef99bdbb003e8e75856135699662f8666aa4b
1b8ef99bdbb003e8e75856135699662f8666aa4b
2009-06-10T19:09:23-07:00
2009-06-10T19:09:23-07:00
fix auto_link tags
* still not 100% perfect, but works for most occurances
c1d63db8895ca99e7dd0d8fe3d55ef45ca2dd987
Craig P Jolicoeur
cpjolicoeur@gmail.com