bbcodeizer 0.1.4 → 0.1.5

data/lib/bbcodeizer/version.rb

@@ -1,3 +1,3 @@
 module Bbcodeizer
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/bbcodeizer.rb

@@ -50,18 +50,18 @@ module BBCodeizer
       :grooveshark           => [ /\[grooveshark\](.+?)\[\/grooveshark\]/i, '<object width="250" height="40"> <param name="movie" value="http://listen.grooveshark.com/songWidget.swf"></param> <param name="wmode" value="window"></param> <param name="allowScriptAccess" value="always"></param> <param name="flashvars" value="hostname=cowbell.grooveshark.com&widgetID=\1&style=grass&p=0"></param> <embed src="http://listen.grooveshark.com/songWidget.swf" type="application/x-shockwave-flash" width="250" height="40" flashvars="hostname=cowbell.grooveshark.com&widgetID=\1&style=grass&p=0" allowScriptAccess="always" wmode="window"></embed></object>'],
       :sup                   => [ /\[sup\](.+?)\[\/sup\]/im, '<sup>\1</sup>' ],
       :sub                   => [ /\[sub\](.+?)\[\/sub\]/im, '<sub>\1</sub>' ],
-      :auto_link             => [ /(\A|\s)((https?:\/\/|www\.)[^\s<]+)/, '\1<a href="\2">\2</a>' ],
+      :auto_link             => [ /(\A|\s|>)((https?:\/\/|www\.)[^\s<]+)/, '\1<a href="\2">\2</a>' ],
     }
 
     # Tags in this list are invoked. To deactivate a particular tag, call BBCodeizer.deactivate.
     # These names correspond to either names above or methods in this module.
                 # The ':literal' tag MUST be first for it to work correctly
     TagList = [ :literal, :bold, :italic, :underline, :del, :strike, :email_with_name,
-                :email_sans_name, :url_with_title, :url_sans_title, :image, :size, :color,
-                :code, :quote, :youtube, :googlevid, :flash, :spoiler, :nsfw, :hide, :mp3,
-                :superdeluxe, :comedycentral, :revver, :myspacetv, :collegehumor, :hulu,
-                :metacafe, :yahoovid, :flickr, :gametrailers, :slideshare, :funnyordie,
-                :atomfilms, :vimeo, :li, :list, :current, :auto_link ]
+                :email_sans_name, :image, :size, :color, :code, :quote, :youtube, :googlevid,
+                :flash, :spoiler, :nsfw, :hide, :mp3, :superdeluxe, :comedycentral, :revver,
+                :myspacetv, :collegehumor, :hulu, :metacafe, :yahoovid, :flickr, :gametrailers,
+                :slideshare, :funnyordie, :atomfilms, :vimeo, :li, :list, :current, :auto_link,
+                :url_with_title, :url_sans_title ]
 
     TagGroups = { :video => [ :youtube, :googlevid, :flash, :superdeluxe, :comedycentral, :revver,
                             :myspacetv, :collegehumor, :hulu, :metacafe, :yahoovid, :gametrailers,

data/test/bbcodeizer_test.rb

@@ -70,6 +70,15 @@ class BbcodeizerTest < Test::Unit::TestCase
       bbcodeize("My homepage is [url]http://www.example.com[/url]."))
   end
 
+  def test_auto_link
+    assert_equal(
+      "Check out this site: <a href=\"http://google.com\">http://google.com</a>",
+      bbcodeize("Check out this site: http://google.com"))
+    assert_equal(
+      "<b><a href=\"http://google.com\">http://google.com</a></b>",
+      bbcodeize("<b>http://google.com</b>"))
+  end
+
   def test_image
     assert_equal(
       "<img src=\"http://example.com/example.gif\" alt=\"http://example.com/example.gif\" />",
@@ -106,12 +115,6 @@ class BbcodeizerTest < Test::Unit::TestCase
       bbcodeize("[color=red]Red Text[/color]"))
   end
 
-  def test_auto_link
-    assert_equal(
-      "Check out this site: <a href=\"http://google.com\">http://google.com</a>",
-      bbcodeize("Check out this site: http://google.com"))
-  end
-
   def test_disable
     assert_equal(
       "I am [b]really[/b] happy!",

metadata

@@ -2,7 +2,7 @@
 name: bbcodeizer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jonathan Dance