bb-ruby 0.8.5 → 0.9

data/History.txt

@@ -1,3 +1,13 @@
+== 0.9 2009-05-20
+
+* bugfix
+  * BBRuby.to_html was not working due to incorrect passing of splat params
+
+== 0.8.5 2009-05-20
+
+* bugfixes
+  * :disable and :enable were not working properly
+
 == 0.8.4 2009-01-03
 
 * Added YouTube widescreen video support as this is the new YouTube default

data/lib/bb-ruby.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module BBRuby
-  VERSION = '0.8.5'
+  VERSION = '0.9'
 
   # allowable image formats
   @@imageformats = 'png|bmp|jpg|gif|jpeg'
@@ -240,10 +240,10 @@ module BBRuby
     #   BBRuby.to_html(text, {}, true, :enable, :image, :bold, :quote)
     #   BBRuby.to_html(text, {}, true, :disable, :image, :video, :color)
     #
-    def to_html(text, tags_alternative_definition = {}, escape_html=true, method=:disable, *tags)
+    def to_html(text, tags_alternative_definition={}, escape_html=true, method=:disable, *tags)
       text = text.clone
       
-      # escape < and > to remove any html
+      # escape "<, >, &" to remove any html
       if escape_html
         text.gsub!( '&', '&amp;' )
         text.gsub!( '<', '&lt;' )
@@ -254,11 +254,11 @@ module BBRuby
 
       # parse bbcode tags
       case method
-        when :enable
-          tags_definition.each_value { |t| text.gsub!(t[0], t[1]) if tags[0].include?(t[4]) }
-        when :disable
-          # 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[0].include?(t[4]) }
+      when :enable
+        tags_definition.each_value { |t| text.gsub!(t[0], t[1]) if tags.include?(t[4]) }
+      when :disable
+        # 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
 
       # parse spacing
@@ -322,11 +322,11 @@ class String
   #   output = text.bbcode_to_html({}, false)
   #
   def bbcode_to_html(tags_alternative_definition = {}, escape_html=true, method=:disable, *tags)
-    BBRuby.to_html(self, tags_alternative_definition, escape_html, method, tags)
+    BBRuby.to_html(self, tags_alternative_definition, escape_html, method, *tags)
   end
 
   # Replace the string contents with the HTML-converted markup
   def bbcode_to_html!(tags_alternative_definition = {}, escape_html=true, method=:disable, *tags)
-    self.replace(BBRuby.to_html(self, tags_alternative_definition, escape_html, method, tags))
+    self.replace(BBRuby.to_html(self, tags_alternative_definition, escape_html, method, *tags))
   end
 end

data/test/test_bb-ruby.rb

@@ -7,6 +7,7 @@ class TestBBRuby < Test::Unit::TestCase
   def test_strong
     assert_equal '<strong>simple</strong>', '[b]simple[/b]'.bbcode_to_html
     assert_equal '<strong>simple</strong>', '[b:7a9ca2c5c3]simple[/b:7a9ca2c5c3]'.bbcode_to_html
+    assert_equal %Q(<strong>simple</strong>), BBRuby.to_html( %Q([b:7a9ca2c5c3]simple[/b:7a9ca2c5c3]) )
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bb-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  version: "0.9"
 platform: ruby
 authors: 
 - Craig P Jolicoeur