Merge pull request #5 from Kulgar/master

Solving the [list][*]list item[/list] converting issue
cpjolicoeur · Mar 1, 2012 · 7fcffe1 · 7fcffe1
2 parents 314e605 + 71f9124
commit 7fcffe1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/bb-ruby.rb b/lib/bb-ruby.rb
@@ -90,7 +90,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]',

diff --git a/test/test_bb-ruby.rb b/test/test_bb-ruby.rb
@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby
+#coding: utf-8
 
 require File.dirname(__FILE__) + '/test_helper.rb'
 
@@ -68,6 +69,8 @@ def test_unordered_list
 
   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>', 
                  '[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