bb-ruby 0.9.5 → 0.9.8

data/.gitignore

@@ -0,0 +1,9 @@
+coverage/*
+doc
+log
+tmp
+pkg
+debug.log
+config
+script
+.DS_Store

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in bb-ruby.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,14 @@
+PATH
+  remote: .
+  specs:
+    bb-ruby (0.9.8)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bb-ruby!

data/History.txt

@@ -1,3 +1,20 @@
+== 0.9.8 2012-10-03
+
+* replace deprecated html <u> tag
+* added align tag for floating images
+* fixed nested quotes
+
+== 0.9.7 2012-08-20
+
+* merged with marcandre's fork:
+* Simplify dev setup using bundler
+* Allow quotes in URL
+
+== 0.9.6 2012-08-17
+
+* added align tag for floating images and other things
+* fixed nested quotes
+
 == 0.9.5 2010-02-26
 
 * added to_html_with_formatting(!) methods

data/Rakefile

@@ -1,31 +1,11 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen hoe].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/bb-ruby'
-
-Hoe.plugin :newgem
-Hoe.plugin :website
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.spec('bb-ruby') do |p|
-  p.version = BBRuby::VERSION
-  p.developer('Craig P Jolicoeur', 'cpjolicoeur@gmail.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  p.rubyforge_name       = p.name # TODO this is default value
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
-  
-  p.readme_file = "README.rdoc"
-end
-
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+

data/bb-ruby.gemspec

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/bb-ruby/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Craig P. Jolicoeur"]
+  gem.email         = ["cpjolicoeur@gmail.com"]
+  gem.description   = %q{BBCode for Ruby}
+  gem.summary       = %q{BBRuby is a BBCode implementation for Ruby. It will convert strings with BBCode markup to their HTML equivalent}
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "bb-ruby"
+  gem.require_paths = ["lib"]
+  gem.version       = BBRuby::VERSION
+end

data/lib/bb-ruby.rb

@@ -1,11 +1,9 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require "bb-ruby/version"
 
 module BBRuby
-  VERSION = '0.9.5'
-
   # allowable image formats
   @@imageformats = 'png|bmp|jpg|gif|jpeg'
+  @@quote_matcher = '("|'|)'
 
   # built-in BBCode tabs that will be processed
   @@tags = {
@@ -24,7 +22,7 @@ module BBRuby
       :italics],
     'Underline' => [
       /\[u(:.+)?\](.*?)\[\/u\1?\]/mi,
-      '<u>\2</u>',
+      '<span style="text-decoration:underline;">\2</span>',
       'Underline',
       'Use it for [u]important[/u] things or something',
       :underline],
@@ -53,14 +51,14 @@ module BBRuby
       '[code]some code[/code]',
       :code],
     'Size' => [
-      /\[size=['"]?(.*?)['"]?\](.*?)\[\/size\]/im,
-      '<span style="font-size: \1px;">\2</span>',
+      /\[size=#{@@quote_matcher}(.*?)\1\](.*?)\[\/size\]/im,
+      '<span style="font-size: \2px;">\3</span>',
       'Change text size',
       '[size=20]Here is some larger text[/size]',
       :size],
     'Color' => [
-      /\[color=['"]?(\w+|\#\w{6})['"]?(:.+)?\](.*?)\[\/color\2?\]/im,
-      '<span style="color: \1;">\3</span>',
+      /\[color=#{@@quote_matcher}(\w+|\#\w{6})\1(:.+)?\](.*?)\[\/color\3?\]/im,
+      '<span style="color: \2;">\4</span>',
       'Change text color',
       '[color=red]This is red text[/color]',
       :color],
@@ -89,7 +87,7 @@ module BBRuby
       '[*]list item',
       :listitem],
     'Unordered list (alternative)' => [
-      /\[list(:.*)?\]((?:(?!list).)*)\[\/list(:.)?\1?\]/mi,
+      /\[list(:.*)?\]((?:(?!\[list(:.*)?\]).)*)\[\/list(:.)?\1?\]/mi,
       '<ul>\2</ul>',
       'Unordered list item',
       '[list][*]item 1[*] item2[/list]',
@@ -125,7 +123,7 @@ module BBRuby
       '[dd]my definition[/dd',
       :definition],
     'Quote' => [
-      /\[quote(:.*)?="?(.*?)"?\](.*?)\[\/quote\1?\]/mi,
+      /\[quote(:.*)?=(?:&quot;)?(.*?)(?:&quot;)?\](.*?)\[\/quote\1?\]/mi,
       '<fieldset><legend>\2</legend><blockquote>\3</blockquote></fieldset>',
       'Quote with citation',
       "[quote=mike]Now is the time...[/quote]",
@@ -137,7 +135,7 @@ module BBRuby
       "[quote]Now is the time...[/quote]",
       :quote],
     'Link' => [
-      /\[url=(.*?)\](.*?)\[\/url\]/mi,
+      /\[url=(?:&quot;)?(.*?)(?:&quot;)?\](.*?)\[\/url\]/mi,
       '<a href="\1">\2</a>',
       'Hyperlink to somewhere else',
       'Maybe try looking on [url=http://google.com]Google[/url]?',
@@ -153,17 +151,17 @@ module BBRuby
       ' <a href="\2">\2</a>',
       'Hyperlink (automatic)',
       'Maybe try looking on http://www.google.com',
-      :link],  
+      :link],
     'Image (Resized)' => [
-      /\[img(:.+)? size=(['"]?)(\d+)x(\d+)\2\](.*?)\[\/img\1?\]/im,
+      /\[img(:.+)? size=#{@@quote_matcher}(\d+)x(\d+)\2\](.*?)\[\/img\1?\]/im,
       '<img src="\5" style="width: \3px; height: \4px;" />',
-      'Display an image with a set width and height', 
+      'Display an image with a set width and height',
       '[img size=96x96]http://www.google.com/intl/en_ALL/images/logo.gif[/img]',
       :image],
     'Image (Alternative)' => [
       /\[img=([^\[\]].*?)\.(#{@@imageformats})\]/im,
       '<img src="\1.\2" alt="" />',
-      'Display an image (alternative format)', 
+      'Display an image (alternative format)',
       '[img=http://myimage.com/logo.gif]',
       :image],
     'Image' => [
@@ -171,31 +169,31 @@ module BBRuby
       '<img src="\2.\3" alt="" />',
       'Display an image',
       'Check out this crazy cat: [img]http://catsweekly.com/crazycat.jpg[/img]',
-      :image],   
+      :image],
     'YouTube' => [
       /\[youtube\](.*?)\?v=([\w\d\-]+).*\[\/youtube\]/im,
       # '<object width="400" height="330"><param name="movie" value="http://www.youtube.com/v/\2"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/\2" type="application/x-shockwave-flash" wmode="transparent" width="400" height="330"></embed></object>',
       '<object width="320" height="265"><param name="movie" value="http://www.youtube.com/v/\2"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/\2" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="320" height="265"></embed></object>',
-      'Display a video from YouTube.com', 
+      'Display a video from YouTube.com',
       '[youtube]http://youtube.com/watch?v=E4Fbk52Mk1w[/youtube]',
       :video],
     'YouTube (Alternative)' => [
       /\[youtube\](.*?)\/v\/([\w\d\-]+)\[\/youtube\]/im,
       # '<object width="400" height="330"><param name="movie" value="http://www.youtube.com/v/\2"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/\2" type="application/x-shockwave-flash" wmode="transparent" width="400" height="330"></embed></object>',
       '<object width="320" height="265"><param name="movie" value="http://www.youtube.com/v/\2"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/\2" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="320" height="265"></embed></object>',
-      'Display a video from YouTube.com (alternative format)', 
+      'Display a video from YouTube.com (alternative format)',
       '[youtube]http://youtube.com/watch/v/E4Fbk52Mk1w[/youtube]',
       :video],
     'Vimeo' => [
       /\[vimeo\](.*?)\/(\d+)\[\/vimeo\]/im,
       '<object type="application/x-shockwave-flash" width="500" height="350" data="http://www.vimeo.com/moogaloop.swf?clip_id=\2"><param name="quality" value="best" /><param name="allowfullscreen" value="true" /><param name="scale" value="showAll" /><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=\2" /></object>',
-      'Display a video from Vimeo', 
+      'Display a video from Vimeo',
       '[vimeo]http://www.vimeo.com/3485239[/vimeo]',
       :video],
     'Google Video' => [
       /\[gvideo\](.*?)\?docid=([-]{0,1}\d+).*\[\/gvideo\]/mi,
       '<embed style="width:400px; height:326px;" id="VideoPlayback" type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docId=\2" flashvars=""> </embed>',
-      'Display a video from Google Video', 
+      'Display a video from Google Video',
       '[gvideo]http://video.google.com/videoplay?docid=-2200109535941088987[/gvideo]',
       :video],
     'Email' => [
@@ -203,7 +201,13 @@ module BBRuby
       '<a href="mailto:\2">\2</a>',
       'Link to email address',
       '[email]wadus@wadus.com[/email]',
-      :email]
+      :email],
+    'Align' => [
+      /\[align=(.*?)\](.*?)\[\/align\]/mi,
+      "<span class=\"bb-ruby_align_\\1\" style=\"float:\\1;\">\\2</span>",
+      'Align this object using float',
+      'Here\'s a wrapped image: [align=right][img]image.png[/img][/align]',
+      :align]
   }
 
   class << self
@@ -245,24 +249,27 @@ module BBRuby
     #
     def to_html(text, tags_alternative_definition={}, escape_html=true, method=:disable, *tags)
       text = process_tags(text, tags_alternative_definition, escape_html, method, *tags)
-      
+
       # parse spacing
       text.gsub!( /\r\n?/, "\n" )
       text.gsub!( /\n/, "<br />\n" )
+			text.gsub!(/\[quote\]/, '<fieldset><legend>Quote:</legend><blockquote>')
+			text.gsub!(/\[quote(:.*)?="?(.*?)"?\]/, '<fieldset><legend>Quote: \2</legend><blockquote>')
+			text.gsub!(/\[\/quote\]/, '</blockquote></fieldset>')
 
       # return markup
       text
     end
-    
+
     # The same as BBRuby.to_html except the output is passed through simple_format first
     #
-    # Returns text transformed into HTML using simple formatting rules. Two or more consecutive newlines(\n\n) 
-    # are considered as a paragraph and wrapped in <p> tags. One newline (\n) is considered as a linebreak and 
+    # Returns text transformed into HTML using simple formatting rules. Two or more consecutive newlines(\n\n)
+    # are considered as a paragraph and wrapped in <p> tags. One newline (\n) is considered as a linebreak and
     # a <br /> tag is appended. This method does not remove the newlines from the text.
     #
     def to_html_with_formatting(text, tags_alternative_definition={}, escape_html=true, method=:disable, *tags)
       text = process_tags(text, tags_alternative_definition, escape_html, method, *tags)
-      
+
       # parse spacing
       simple_format( text )
     end
@@ -271,19 +278,21 @@ module BBRuby
     def tag_list
       @@tags
     end
-    
+
     private
-    
+
     def process_tags(text, tags_alternative_definition={}, escape_html=true, method=:disable, *tags)
       text = text.dup
-      
-      # escape "<, >, &" to remove any html
+
+      # escape "<, >, &" and quotes to remove any html
       if escape_html
         text.gsub!( '&', '&amp;' )
         text.gsub!( '<', '&lt;' )
         text.gsub!( '>', '&gt;' )
+        text.gsub!( '"', '&quot;' )
+        text.gsub!( "'", '&apos;' )
       end
-      
+
       tags_definition = @@tags.merge(tags_alternative_definition)
 
       # parse bbcode tags
@@ -294,10 +303,10 @@ module BBRuby
         # this works nicely because the default is disable and the default set of tags is [] (so none disabled) :)
         tags_definition.each_value { |t| text.gsub!(t[0], t[1]) unless tags.include?(t[4]) }
       end
-      
+
       text
     end
-    
+
     # extracted from Rails ActionPack
     def simple_format( text )
       start_tag = '<p>'
@@ -310,7 +319,8 @@ module BBRuby
     end
   end # class << self
 
-end # class BBRuby
+end
+
 
 class String
   # Convert a string with BBCode markup into its corresponding HTML markup

data/lib/bb-ruby/version.rb

@@ -0,0 +1,3 @@
+module BBRuby
+  VERSION = "0.9.8"
+end

data/test/{test_bb-ruby.rb → bb-ruby_test.rb}

@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby
+#coding: utf-8
 
 require File.dirname(__FILE__) + '/test_helper.rb'
 
@@ -11,47 +12,51 @@ class TestBBRuby < Test::Unit::TestCase
     assert_equal "<strong>line 1<br />\nline 2</strong>", "[b:7a9ca2c5c3]line 1\nline 2[/b:7a9ca2c5c3]".bbcode_to_html
     assert_equal "<strong>1. text 1:</strong> text 2<br />\n<strong>2. text 3</strong>", "[b:post_uid0]1. text 1:[/b:post_uid0] text 2\n[b:post_uid0]2. text 3[/b:post_uid0]".bbcode_to_html
   end
-  
+
   def test_em
     assert_equal '<em>simple</em>', '[i]simple[/i]'.bbcode_to_html
     assert_equal '<em>simple</em>', '[i:7a9ca2c5c3]simple[/i:7a9ca2c5c3]'.bbcode_to_html
     assert_equal "<em>line 1<br />\nline 2</em>", "[i:7a9ca2c5c3]line 1\nline 2[/i:7a9ca2c5c3]".bbcode_to_html
   end
-  
+
   def test_u
-    assert_equal '<u>simple</u>', '[u]simple[/u]'.bbcode_to_html
-    assert_equal '<u>simple</u>', '[u:7a9ca2c5c3]simple[/u:7a9ca2c5c3]'.bbcode_to_html
-    assert_equal "<u>line 1<br />\nline 2</u>", "[u:7a9ca2c5c3]line 1\nline 2[/u:7a9ca2c5c3]".bbcode_to_html
+    assert_equal '<span style="text-decoration:underline;">simple</span>', '[u]simple[/u]'.bbcode_to_html
+    assert_equal '<span style="text-decoration:underline;">simple</span>', '[u:7a9ca2c5c3]simple[/u:7a9ca2c5c3]'.bbcode_to_html
+    assert_equal '<span style="text-decoration:underline;">line 1<br />\nline 2</span>', "[u:7a9ca2c5c3]line 1\nline 2[/u:7a9ca2c5c3]".bbcode_to_html
   end
-  
+
   def test_del
     assert_equal '<del>simple</del>', '[del]simple[/del]'.bbcode_to_html
     assert_equal '<del>simple</del>', '[del:7a9ca2c5c3]simple[/del:7a9ca2c5c3]'.bbcode_to_html
     assert_equal '<del>simple</del>', '[s]simple[/s]'.bbcode_to_html
     assert_equal '<del>simple</del>', '[s:7a9ca2c5c3]simple[/s:7a9ca2c5c3]'.bbcode_to_html
   end
-    
+
   def test_ins
     assert_equal '<ins>simple</ins>', '[ins]simple[/ins]'.bbcode_to_html
     assert_equal '<ins>simple</ins>', '[ins:7a9ca2c5c3]simple[/ins:7a9ca2c5c3]'.bbcode_to_html
-  end  
-  
+  end
+
   def test_code
     assert_equal '<code>simple</code>', '[code]simple[/code]'.bbcode_to_html
     assert_equal '<code>simple</code>', '[code:7a9ca2c5c3]simple[/code:7a9ca2c5c3]'.bbcode_to_html
     assert_equal "<code>var bxi = 0;<br />\n//Holds current speed of scrolling menu</code>", "[code:1:91cbdd72b7]var bxi = 0;\n//Holds current speed of scrolling menu[/code:1:91cbdd72b7]".bbcode_to_html
-  end  
-  
+  end
+
   def test_size
     assert_equal '<span style="font-size: 32px;">12px Text</span>', '[size=32]12px Text[/size]'.bbcode_to_html
+    assert_equal '<span style="font-size: 32px;">12px Text</span>', '[size="32"]12px Text[/size]'.bbcode_to_html
+    assert_equal '<span style="font-size: 32px;">12px Text</span>', '[size=\'32\']12px Text[/size]'.bbcode_to_html
   end
-  
+
   def test_color
     assert_equal '<span style="color: red;">Red Text</span>', '[color=red]Red Text[/color]'.bbcode_to_html
+    assert_equal '<span style="color: red;">Red Text</span>', '[color="red"]Red Text[/color]'.bbcode_to_html
+    assert_equal '<span style="color: red;">Red Text</span>', '[color=\'red\']Red Text[/color]'.bbcode_to_html
     assert_equal '<span style="color: #ff0023;">Hex Color Text</span>', '[color=#ff0023]Hex Color Text[/color]'.bbcode_to_html
     assert_equal '<span style="color: #B23803;">text</span>', '[color=#B23803:05d7c56429]text[/color:05d7c56429]'.bbcode_to_html
   end
-  
+
   def test_ordered_list
     assert_equal '<ol><li>item 1</li><li>item 2</li></ol>', '[ol][li]item 1[/li][li]item 2[/li][/ol]'.bbcode_to_html
     assert_equal '<ol><li>item 1</li><li>item 2</li></ol>', '[ol][*]item 1[*]item 2[/ol]'.bbcode_to_html
@@ -61,16 +66,18 @@ class TestBBRuby < Test::Unit::TestCase
     assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[ul][li]item 1[/li][li]item 2[/li][/ul]'.bbcode_to_html
     assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[ul][*]item 1[*]item 2[/ul]'.bbcode_to_html
   end
-  
+
   def test_list_unordered
     assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[list][li]item 1[/li][li]item 2[/li][/list]'.bbcode_to_html
+    #Added this test which raising an error because of the "list" word in list items.
+    assert_equal '<ul><li>list item 1</li><li>list item 2</li></ul>', '[list][li]list item 1[/li][li]list item 2[/li][/list]'.bbcode_to_html
     assert_equal '<ul><li>item 1</li><li>item 2</li></ul>', '[list:7a9ca2c5c3][li]item 1[/li][li]item 2[/li][/list:o:7a9ca2c5c3]'.bbcode_to_html
-    assert_equal '<ul><li>item 1</li><li>item 2</li></ul><ul><li>item 3</li><li>item 4</li></ul>', 
+    assert_equal '<ul><li>item 1</li><li>item 2</li></ul><ul><li>item 3</li><li>item 4</li></ul>',
                  '[list:7a9ca2c5c3][li]item 1[/li][li]item 2[/li][/list:o:7a9ca2c5c3][list:7a9ca2c5c3][li]item 3[/li][li]item 4[/li][/list:o:7a9ca2c5c3]'.bbcode_to_html
-    assert_equal '<ul><li>item 1</li><li>item 2</li></ul><ul><li>item 3</li><li>item 4</li></ul><ul><li>item 5</li><li>item 6</li></ul><ul><li>item 7</li><li>item 8</li></ul>', 
+    assert_equal '<ul><li>item 1</li><li>item 2</li></ul><ul><li>item 3</li><li>item 4</li></ul><ul><li>item 5</li><li>item 6</li></ul><ul><li>item 7</li><li>item 8</li></ul>',
                  '[list:7a9ca2c5c3][li]item 1[/li][li]item 2[/li][/list:o:7a9ca2c5c3][list:7a9ca2c5c3][li]item 3[/li][li]item 4[/li][/list:o:7a9ca2c5c3][list:7a9ca2c5c3][li]item 5[/li][li]item 6[/li][/list:o:7a9ca2c5c3][list:7a9ca2c5c3][li]item 7[/li][li]item 8[/li][/list:o:7a9ca2c5c3]'.bbcode_to_html
   end
-  
+
   def test_list_unordered_alternative
     assert_equal '<li>item1</li><li>item2</li>', '[*:asdf]item1[*:asdf]item2'.bbcode_to_html
     assert_equal '<ul><li>item1</li><li>item2</li></ul>', '[list:5d7cf5560a][*]item1[*]item2[/list:u:5d7cf5560a]'.bbcode_to_html
@@ -86,61 +93,65 @@ class TestBBRuby < Test::Unit::TestCase
     assert_equal '<ol sytle="list-style-type: lower-alpha;"><li>item 1</li><li>item 2</li></ol>', '[list=a][li]item 1[/li][li]item 2[/li][/list]'.bbcode_to_html
     assert_equal '<ol sytle="list-style-type: lower-alpha;"><li>item 1</li><li>item 2</li></ol>', '[list=a:7a9ca2c5c3][li]item 1[/li][li]item 2[/li][/list:o:7a9ca2c5c3]'.bbcode_to_html
   end
-  
+
   def test_two_lists
-    assert_equal '<ul><li>item1</li><li>item2</li></ul><ul><li>item1</li><li>item2</li></ul>', 
+    assert_equal '<ul><li>item1</li><li>item2</li></ul><ul><li>item1</li><li>item2</li></ul>',
                  '[list:5d7cf5560a][*:5d7cf5560a]item1[*:5d7cf5560a]item2[/list:u:5d7cf5560a][list:5d7cf5560a][*:5d7cf5560a]item1[*:5d7cf5560a]item2[/list:u:5d7cf5560a]'.bbcode_to_html
   end
-  
+
   def test_definition_list_term_definition
     assert_equal '<dl><dt>term 1</dt><dd>definition 1</dd><dt>term 2</dt><dd>definition 2</dd></dl>', '[dl][dt]term 1[/dt][dd]definition 1[/dd][dt]term 2[/dt][dd]definition 2[/dd][/dl]'.bbcode_to_html
   end
-  
+
   def test_quote
     assert_equal '<fieldset><blockquote>quoting</blockquote></fieldset>', '[quote]quoting[/quote]'.bbcode_to_html
     assert_equal '<fieldset><blockquote>quoting</blockquote></fieldset>', '[quote]quoting[/quote]'.bbcode_to_html.bbcode_to_html({}, false, :disable)
-    assert_equal '<fieldset><legend>black</legend><blockquote>si el niño hubiera sido de "penalty" le hubieran llamado <strong>system Error</strong>!!! :)</blockquote></fieldset>', "[quote:7a9ca2c5c3=\"black\"]si el niño hubiera sido de \"penalty\" le hubieran llamado [b:7a9ca2c5c3]system Error[/b:7a9ca2c5c3]!!! :)[/quote:7a9ca2c5c3]".bbcode_to_html
-    assert_equal '<fieldset><legend>black</legend><blockquote>si el niño hubiera sido de "penalty" le hubieran llamado <strong>system Error</strong>!!! :)</blockquote></fieldset>', "[quote:7a9ca2c5c3=\"black\"]si el niño hubiera sido de \"penalty\" le hubieran llamado [b:7a9ca2c5c3]system Error[/b:7a9ca2c5c3]!!! :)[/quote:7a9ca2c5c3]".bbcode_to_html.bbcode_to_html({}, false, :disable)
+    assert_equal '<fieldset><legend>black</legend><blockquote>si el niño hubiera sido de &quot;penalty&quot; le hubieran llamado <strong>system Error</strong>!!! :)</blockquote></fieldset>', "[quote:7a9ca2c5c3=\"black\"]si el niño hubiera sido de \"penalty\" le hubieran llamado [b:7a9ca2c5c3]system Error[/b:7a9ca2c5c3]!!! :)[/quote:7a9ca2c5c3]".bbcode_to_html
+    assert_equal '<fieldset><legend>black</legend><blockquote>si el niño hubiera sido de &quot;penalty&quot; le hubieran llamado <strong>system Error</strong>!!! :)</blockquote></fieldset>', "[quote:7a9ca2c5c3=\"black\"]si el niño hubiera sido de \"penalty\" le hubieran llamado [b:7a9ca2c5c3]system Error[/b:7a9ca2c5c3]!!! :)[/quote:7a9ca2c5c3]".bbcode_to_html.bbcode_to_html({}, false, :disable)
     assert_equal '<fieldset><legend>Who</legend><blockquote>said that</blockquote></fieldset>', '[quote=Who]said that[/quote]'.bbcode_to_html
     assert_equal '<fieldset><legend>Who</legend><blockquote>said that</blockquote></fieldset>', '[quote=Who]said that[/quote]'.bbcode_to_html.bbcode_to_html({}, false, :disable)
   end
-  
+
   def test_double_quote
    assert_equal '<fieldset><legend>Kitten</legend><blockquote><fieldset><legend>creatiu</legend><blockquote>f1</blockquote></fieldset>f2</blockquote></fieldset>',
                 '[quote:26fe26a6a9="Kitten"][quote:26fe26a6a93="creatiu"]f1[/quote:26fe26a6a93]f2[/quote:26fe26a6a9]'.bbcode_to_html.bbcode_to_html({}, false, :disable)
   end
-  
+
   def test_link
     assert_equal '<a href="http://google.com">Google</a>', '[url=http://google.com]Google[/url]'.bbcode_to_html
     assert_equal '<a href="http://google.com">http://google.com</a>', '[url]http://google.com[/url]'.bbcode_to_html
     assert_equal '<a href="http://www.altctrlsupr.com/dmstk/kdd070803/00.html"> ABRIR ALBUM </a>','[URL=http://www.altctrlsupr.com/dmstk/kdd070803/00.html] ABRIR ALBUM [/URL]'.bbcode_to_html
     assert_equal %Q(<a href="http://www.altctrlsupr.com/dmstk/kdd070803/00.html"> ABRIR<br />\nALBUM </a>),"[URL=http://www.altctrlsupr.com/dmstk/kdd070803/00.html] ABRIR\nALBUM [/URL]".bbcode_to_html
     assert_equal '<a href="http://www.urimalet.com/cadaverex.mp3">aha</a>', "[URL=http://www.urimalet.com/cadaverex.mp3]aha[/URL]".bbcode_to_html
+    # allow quoted urls:
+    assert_equal '<a href="http://www.apple.com">aha</a>', '[URL="http://www.apple.com"]aha[/URL]'.bbcode_to_html
   end
-  
+
   def test_image
     assert_equal '<img src="http://zoople/hochzeit.png" alt="" />', '[img]http://zoople/hochzeit.png[/img]'.bbcode_to_html
     assert_equal '<img src="http://zoople/hochzeit.png" alt="" />', '[img=http://zoople/hochzeit.png]'.bbcode_to_html
     assert_equal '<img src="http://zoople/hochzeit.png" style="width: 95px; height: 96px;" />', '[img size=95x96]http://zoople/hochzeit.png[/img]'.bbcode_to_html
     assert_equal '<img src="http://zoople/hochzeit.png" alt="" />', '[img:7a9ca2c5c3]http://zoople/hochzeit.png[/img:7a9ca2c5c3]'.bbcode_to_html
     assert_equal '<img src="http://zoople/hochzeit.png" style="width: 95px; height: 96px;" />', '[img:7a9ca2c5c3 size=95x96]http://zoople/hochzeit.png[/img:7a9ca2c5c3]'.bbcode_to_html
+    assert_equal '<img src="http://zoople/hochzeit.png" style="width: 95px; height: 96px;" />', '[img:7a9ca2c5c3 size="95x96"]http://zoople/hochzeit.png[/img:7a9ca2c5c3]'.bbcode_to_html
+    assert_equal '<img src="http://zoople/hochzeit.png" style="width: 95px; height: 96px;" />', '[img:7a9ca2c5c3 size=\'95x96\']http://zoople/hochzeit.png[/img:7a9ca2c5c3]'.bbcode_to_html
     assert_equal '<img src="http://www.marcodigital.com/sitanddie/sitanddiepequeño.jpg" alt="" />', '[img:post_uid0]http://www.marcodigital.com/sitanddie/sitanddiepequeño.jpg[/img:post_uid0]'.bbcode_to_html
   end
-  
+
   def test_youtube
     # Uncomment below if using 4:3 format youtube video embed
     # assert_equal '<object width="320" height="265"><param name="movie" value="http://www.youtube.com/v/E4Fbk52Mk1w"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/E4Fbk52Mk1w" type="application/x-shockwave-flash" wmode="transparent" width="320" height="265"></embed></object>','[youtube]http://youtube.com/watch?v=E4Fbk52Mk1w[/youtube]'.bbcode_to_html
     assert_equal '<object width="320" height="265"><param name="movie" value="http://www.youtube.com/v/E4Fbk52Mk1w"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/E4Fbk52Mk1w" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="320" height="265"></embed></object>', '[youtube]http://youtube.com/watch?v=E4Fbk52Mk1w[/youtube]'.bbcode_to_html
   end
-  
+
   def test_vimeo
     assert_equal '<object type="application/x-shockwave-flash" width="500" height="350" data="http://www.vimeo.com/moogaloop.swf?clip_id=3485239"><param name="quality" value="best" /><param name="allowfullscreen" value="true" /><param name="scale" value="showAll" /><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=3485239" /></object>', '[vimeo]http://www.vimeo.com/3485239[/vimeo]'.bbcode_to_html
   end
-  
+
   def test_google_video
     assert_equal '<embed style="width:400px; height:326px;" id="VideoPlayback" type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docId=-2200109535941088987" flashvars=""> </embed>', '[gvideo]http://video.google.com/videoplay?docid=-2200109535941088987[/gvideo]'.bbcode_to_html
   end
-  
+
   def test_email
     assert_equal '<a href="mailto:wadus@wadus.com">wadus@wadus.com</a>', '[email]wadus@wadus.com[/email]'.bbcode_to_html
   end
@@ -160,6 +171,8 @@ class TestBBRuby < Test::Unit::TestCase
     assert_equal "1 is < 2", '1 is < 2'.bbcode_to_html({}, false)
     assert_equal "2 is &gt; 1", '2 is > 1'.bbcode_to_html
     assert_equal "2 is > 1", '2 is > 1'.bbcode_to_html({}, false)
+    assert_equal %Q{&quot;double quotes&quot; and &apos;single quotes&apos;}, %Q{"double quotes" and 'single quotes'}.bbcode_to_html
+    assert_equal %Q{"double quotes" and 'single quotes'}, %Q{"double quotes" and 'single quotes'}.bbcode_to_html({}, false)
   end
 
   def test_disable_tags
@@ -179,12 +192,12 @@ class TestBBRuby < Test::Unit::TestCase
     assert_equal "<strong>foobar</strong>", foo.bbcode_to_html!
     assert_equal "<strong>foobar</strong>", foo
   end
-  
+
   def test_to_html_with_no_markup
     foo = "first paragraph\n\nsecond paragraph\nwith a linebreak"
     assert_equal "first paragraph<br />\n<br />\nsecond paragraph<br />\nwith a linebreak", foo.bbcode_to_html
   end
-  
+
   def test_to_html_with_formatting
     foo = "first paragraph\n\nsecond paragraph\nwith a linebreak"
     assert_equal %Q(<p>first paragraph</p>\n\n<p>second paragraph\n<br />with a linebreak</p>), foo.bbcode_to_html_with_formatting
@@ -193,11 +206,11 @@ class TestBBRuby < Test::Unit::TestCase
   def test_self_tag_list
     assert_equal 32, BBRuby.tag_list.size
   end
-  
+
   def test_redefinition_of_tag_html
     mydef = {
       'Quote' => [
-        /\[quote(:.*)?="?(.*?)"?\](.*?)\[\/quote\1?\]/mi,
+        /\[quote(:.*)?=(?:&quot;)?(.*?)(?:&quot;)?\](.*?)\[\/quote\1?\]/mi,
         '<div class="quote"><p><cite>\2</cite></p><blockquote>\3</blockquote></div>',
         'Quote with citation',
         nil, nil,
@@ -205,13 +218,13 @@ class TestBBRuby < Test::Unit::TestCase
       'Image (Resized)' => [
         /\[img(:.+)? size=(['"]?)(\d+)x(\d+)\2\](.*?)\[\/img\1?\]/im,
         '<div class="post_image"><img src="\5" style="width: \3px; height: \4px;" /></div>',
-        'Display an image with a set width and height', 
+        'Display an image with a set width and height',
         '[img size=96x96]http://www.google.com/intl/en_ALL/images/logo.gif[/img]',
         :image],
       'Image (Alternative)' => [
         /\[img=([^\[\]].*?)\.(png|bmp|jpg|gif|jpeg)\]/im,
         '<div class="post_image"><img src="\1.\2" alt="" /></div>',
-        'Display an image (alternative format)', 
+        'Display an image (alternative format)',
         '[img=http://myimage.com/logo.gif]',
         :image],
       'Image' => [
@@ -219,7 +232,7 @@ class TestBBRuby < Test::Unit::TestCase
         '<div class="post_image"><img src="\2.\3" alt="" /></div>',
         'Display an image',
         'Check out this crazy cat: [img]http://catsweekly.com/crazycat.jpg[/img]',
-        :image],      
+        :image],
     }
     assert_equal '<div class="quote"><p><cite>Who</cite></p><blockquote>said that</blockquote></div>', '[quote=Who]said that[/quote]'.bbcode_to_html(mydef)
     assert_equal '<div class="quote"><p><cite>flandepan</cite></p><blockquote>hola</blockquote></div>', '[quote:0fc8a224d2="flandepan"]hola[/quote:0fc8a224d2]'.bbcode_to_html(mydef)
@@ -227,12 +240,12 @@ class TestBBRuby < Test::Unit::TestCase
   end
 
   def test_multiple_tag_test
-    assert_equal "<strong>bold</strong><em>italic</em><u>underline</u><fieldset><blockquote>quote</blockquote></fieldset><a href=\"foobar\">link</a>", "[b]bold[/b][i]italic[/i][u]underline[/u][quote]quote[/quote][url=foobar]link[/url]".bbcode_to_html
-    assert_equal "<strong>bold</strong><em>italic</em><u>underline</u><fieldset><blockquote>quote</blockquote></fieldset><a href=\"foobar\">link</a>", "[b]bold[/b][i]italic[/i][u]underline[/u][quote]quote[/quote][url=foobar]link[/url]".bbcode_to_html({}, true, :enable, :bold, :italics, :underline, :link, :quote)
+    assert_equal "<strong>bold</strong><em>italic</em><span style=\"text-decoration:underline;\">underline</span><fieldset><blockquote>quote</blockquote></fieldset><a href=\"foobar\">link</a>", "[b]bold[/b][i]italic[/i][u]underline[/u][quote]quote[/quote][url=foobar]link[/url]".bbcode_to_html
+    assert_equal "<strong>bold</strong><em>italic</em><span style=\"text-decoration:underline;\">underline</span><fieldset><blockquote>quote</blockquote></fieldset><a href=\"foobar\">link</a>", "[b]bold[/b][i]italic[/i][u]underline[/u][quote]quote[/quote][url=foobar]link[/url]".bbcode_to_html({}, true, :enable, :bold, :italics, :underline, :link, :quote)
   end
 
   def test_no_ending_tag
-    assert_equal "this [b]should not be bold", "this [b]should not be bold".bbcode_to_html 
+    assert_equal "this [b]should not be bold", "this [b]should not be bold".bbcode_to_html
   end
 
   def test_no_start_tag

metadata

@@ -1,86 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bb-ruby
-version: !ruby/object:Gem::Version 
-  version: 0.9.5
+version: !ruby/object:Gem::Version
+  version: 0.9.8
+  prerelease: 
 platform: ruby
-authors: 
-- Craig P Jolicoeur
+authors:
+- Craig P. Jolicoeur
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-02-26 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.2
-    version: 
-description: BBRuby is a BBCode (http://www.bbcode.org) implementation for Ruby. It will convert strings with BBCode markup to their HTML equivalent.
-email: 
+date: 2012-10-03 00:00:00.000000000 Z
+dependencies: []
+description: BBCode for Ruby
+email:
 - cpjolicoeur@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - History.txt
-- Manifest.txt
-- PostInstall.txt
-files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
 - README.rdoc
 - Rakefile
+- bb-ruby.gemspec
 - lib/bb-ruby.rb
-- test/test_bb-ruby.rb
+- lib/bb-ruby/version.rb
+- test/bb-ruby_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: http://bb-ruby.rubyforge.org
+homepage: ''
 licenses: []
-
-post_install_message: PostInstall.txt
-rdoc_options: 
-- --main
-- README.rdoc
-require_paths: 
+post_install_message: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: bb-ruby
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: BBRuby is a BBCode (http://www.bbcode.org) implementation for Ruby
-test_files: 
-- test/test_bb-ruby.rb
+summary: BBRuby is a BBCode implementation for Ruby. It will convert strings with
+  BBCode markup to their HTML equivalent
+test_files:
+- test/bb-ruby_test.rb
 - test/test_helper.rb

data/Manifest.txt

@@ -1,8 +0,0 @@
-History.txt
-Manifest.txt
-PostInstall.txt
-README.rdoc
-Rakefile
-lib/bb-ruby.rb
-test/test_bb-ruby.rb
-test/test_helper.rb

data/PostInstall.txt

@@ -1,2 +0,0 @@
-
-For more information on bb-ruby, see http://bb-ruby.rubyforge.org