bb-ruby 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzBkYjZmZTMzM2RmOWIwODBlNjlhZjdkOWRhMzc3M2I1MTM0ZDIwZg==
-  data.tar.gz: !binary |-
-    MThhM2Y4ODRhMjZjNTNiMzFjZmI5YzgyOTllZGY3YzEwOTQ1NzA1OQ==
+SHA1:
+  metadata.gz: 890a3b596d2881b1e153b7517156830f7825d927
+  data.tar.gz: 22584247d6b69600a05bea1f975cef76dd4e93f2
 SHA512:
-  metadata.gz: !binary |-
-    Njc2ZDcxNzVlY2I5NTZlOTk0MzM2ZWJlM2IyM2E2ZDlhNjA2MDUwNmRkNjk1
-    M2NiMjg1NDg5ODEwNzc3OGQwOTkwZjNkMzViZjJiOTIwNDQ2NmRjYzE3OTQ3
-    YjBhNTZjMjcxMWExNWY1YWFhNTY3YjE1YzUzMjMzZTkzOTIxNGE=
-  data.tar.gz: !binary |-
-    NTE3NWJlMmQyYzM1NzQ3Y2YxMGEwMTVhOTNjOWU4OTUzOTVmOTAzODVmZGRk
-    Mjk3YzkyOTlmZTg5MjRjOTVkNzBkODYyMWUzMTk5MTgyOTYxMGZlNzM1Yzhi
-    YTE0NmQ2MjI1Y2MyZmM5MmFjNDRkN2ZiYzg2YjI3NmUxMGQ3Mzc=
+  metadata.gz: 05ced520bf0cf1c2c980541c4a561d3f014ad53f143c92397c4e53d1dd19ab6d84d6f994159cdfb44c87448465ab36283efb94e3486fb36a8b1332c3568af310
+  data.tar.gz: e4e10c20c73427e80561aac51a4e8bc491e209198d3bbc2b23353affa8c4dcd59aec07936c58d5c7878e8c32a905472eb26f52de9a705110839cd0a0b54539a5

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 1.0.4 2014-01-17
+
+* Fix handling of nested tags
+
 == 1.0.3 2013-10-18
 
 * Fix but with auto-detection of links without protocol

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bb-ruby (1.0.2)
+    bb-ruby (1.0.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/bb-ruby.rb

@@ -257,13 +257,6 @@ module BBRuby
       # parse spacing
       text.gsub!( /\r\n?/, "\n" )
 
-      # Special [quote] tag handling
-      if :enable == method && tags.include?(:quote)
-        text.gsub!(/\[quote\]/, '<fieldset><legend>Quote:</legend><blockquote>')
-        text.gsub!(/\[quote(:.*)?="?(.*?)"?\]/, '<fieldset><legend>Quote: \2</legend><blockquote>')
-        text.gsub!(/\[\/quote\]/, '</blockquote></fieldset>')
-      end
-
       # return markup
       text
     end
@@ -306,32 +299,30 @@ module BBRuby
       case method
       when :enable
         tags_definition.each_value do |t|
-          if tags.include?( t[4] )
-            if t[1].class == String
-              text.gsub!( t[0], t[1] ) # just replace if replacement is String
-            else
-              text.gsub!( t[0] ){ t[1].call($~) } # call replacement
-              # It may be Proc or lambda with one argument
-              # Argument is MatchData. See 'Bold' tag name for example.
-            end
-          end
+          gsub!(text, t[0], t[1]) if tags.include?( t[4] )
         end
       when :disable
         # this works nicely because the default is disable and the default set of tags is [] (so none disabled) :)
         tags_definition.each_value do |t|
-          unless tags.include?( t[4] )
-            if t[1].class == String
-              text.gsub!( t[0], t[1] )
-            else
-              text.gsub!( t[0] ){ t[1].call($~) }
-            end
-          end
+          gsub!(text, t[0], t[1]) unless tags.include?( t[4] )
         end
       end
 
       text
     end
 
+    def gsub!(text, pattern, replacement)
+      if replacement.class == String
+        # just replace if replacement is String
+        while text.gsub!( pattern, replacement ); end
+      else
+        # call replacement
+        # It may be Proc or lambda with one argument
+        # Argument is MatchData. See 'Bold' tag name for example.
+        while text.gsub!( pattern ){ replacement.call($~) }; end
+      end
+    end
+
     # extracted from Rails ActionPack
     def simple_format( text )
       start_tag = '<p>'

data/lib/bb-ruby/version.rb

@@ -1,3 +1,3 @@
 module BBRuby
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/bb-ruby_test.rb

@@ -112,12 +112,6 @@ class TestBBRuby < Test::Unit::TestCase
     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
 
-  # FIXME: failing test
-  # def test_double_quote
-  #  assert_equal '<fieldset><legend>Kitten</legend><blockquote><fieldset><legend>Quote: &quot;creatiu&quot;</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
@@ -323,4 +317,11 @@ class TestBBRuby < Test::Unit::TestCase
     assert_equal '<span class="copy">&copy; 2913-3013 The Company, Ltd.</span>', '[copy/]'.bbcode_to_html(mydef)
   end
 
+  def test_nested_tags
+    assert_equal '<span style="color: red;">Red Text<span style="color: green;">Green Text</span>Red Again</span>', '[color=red]Red Text[color=green]Green Text[/color]Red Again[/color]'.bbcode_to_html
+    assert_equal '<fieldset><blockquote>first<fieldset><blockquote>second</blockquote></fieldset>first again</blockquote></fieldset>', '[quote]first[quote]second[/quote]first again[/quote]'.bbcode_to_html
+    assert_equal '<fieldset><legend>first author</legend><blockquote>first<fieldset><legend>second author</legend><blockquote>second</blockquote></fieldset>first again</blockquote></fieldset>', '[quote="first author"]first[quote="second author"]second[/quote]first again[/quote]'.bbcode_to_html
+    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
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bb-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Craig P. Jolicoeur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies: []
 description: BBCode for Ruby
 email:
@@ -17,8 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -40,17 +40,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: BBRuby is a BBCode implementation for Ruby. It will convert strings with