dtext_rb 1.0.2 → 1.0.3

data/lib/dtext_ruby.rb

@@ -282,7 +282,7 @@ class DTextRuby
       when /\[expand(?:\=([^\]]*))?\](?!\])/
         stack << "expandable"
         expand_html = '<div class="expandable"><div class="expandable-header">'
-        expand_html << "<span>#{h($1)}</span>" if $1.present?
+        expand_html << "<span>#{h($1)}</span>" if $1
         expand_html << '<input type="button" value="Show" class="expandable-button"/></div>'
         expand_html << '<div class="expandable-content">'
         expand_html

data/test/dtext_test.rb

@@ -81,6 +81,11 @@ class DTextTest < Minitest::Test
     assert_parse('<blockquote><p>test</p></blockquote>', "[quote]\ntest\n[/quote]")
   end
 
+  def test_quote_blocks_with_list
+    assert_parse("<blockquote><ul><li>hello</li><li>there<br></li></ul></blockquote><p>abc</p>", "[quote]\n* hello\n* there\n[/quote]\nabc")
+    assert_parse("<blockquote><ul><li>hello</li><li>there</li></ul></blockquote><p>abc</p>", "[quote]\n* hello\n* there\n\n[/quote]\nabc")
+  end
+
   def test_quote_blocks_nested
     assert_parse("<blockquote><p>a</p><blockquote><p>b</p></blockquote><p>c</p></blockquote>", "[quote]\na\n[quote]\nb\n[/quote]\nc\n[/quote]")
   end
@@ -127,7 +132,7 @@ class DTextTest < Minitest::Test
   end
 
   def test_old_style_links_with_special_entities
-    assert_parse('<p>"1" <a href="http://three.com">2 &amp; 3</a></p>', '"1" "2 & 3":http://three.com')
+    assert_parse('<p>&quot;1&quot; <a href="http://three.com">2 &amp; 3</a></p>', '"1" "2 & 3":http://three.com')
   end
 
   def test_new_style_links
@@ -183,10 +188,11 @@ class DTextTest < Minitest::Test
 
   def test_complex_links_1
     assert_parse("<p><a href=\"/wiki_pages/show_or_new?title=1\">2 3</a> | <a href=\"/wiki_pages/show_or_new?title=4\">5 6</a></p>", "[[1|2 3]] | [[4|5 6]]")
+    assert_parse("", "[[chaos_(dff)|Chaos]]")
   end
 
   def test_complex_links_2
-    assert_parse("<p>Tags <strong>(<a href=\"/wiki_pages/show_or_new?title=howto:tag\">Tagging Guidelines</a> | <a href=\"/wiki_pages/show_or_new?title=howto:tag_checklist\">Tag Checklist</a> | <a href=\"/wiki_pages/show_or_new?title=tag_groups\">Tag Groups</a>)</strong></p>", "Tags [b]([[howto:tag|Tagging Guidelines]] | [[howto:tag_checklist|Tag Checklist]] | [[Tag Groups]])[/b]")
+    assert_parse("<p>Tags <strong>(<a href=\"/wiki_pages/show_or_new?title=howto%3Atag\">Tagging Guidelines</a> | <a href=\"/wiki_pages/show_or_new?title=howto%3Atag_checklist\">Tag Checklist</a> | <a href=\"/wiki_pages/show_or_new?title=tag_groups\">Tag Groups</a>)</strong></p>", "Tags [b]([[howto:tag|Tagging Guidelines]] | [[howto:tag_checklist|Tag Checklist]] | [[Tag Groups]])[/b]")
   end
 
   def test_table
@@ -205,6 +211,22 @@ class DTextTest < Minitest::Test
     assert_parse('<p><a rel="nofollow" href="/users?name=mack">@mack</a>&lt;</p>', "@mack<")
   end
 
+  def test_expand
+    assert_parse("<div class=\"expandable\"><div class=\"expandable-header\"><input type=\"button\" value=\"Show\" class=\"expandable-button\"/></div><div class=\"expandable-content\"><p>hello world</p></div></div>", "[expand]hello world[/expand]")
+  end
+
+  def test_aliased_expand
+    assert_parse("<div class=\"expandable\"><div class=\"expandable-header\"><span>hello</span><input type=\"button\" value=\"Show\" class=\"expandable-button\"/></div><div class=\"expandable-content\"><p>blah blah</p></div></div>", "[expand=hello]blah blah[/expand]")
+  end
+
+  def test_expand_with_nested_code
+    assert_parse("<div class=\"expandable\"><div class=\"expandable-header\"><input type=\"button\" value=\"Show\" class=\"expandable-button\"/></div><div class=\"expandable-content\"><pre>hello\n</pre></div></div>", "[expand]\n[code]\nhello\n[/code]\n[/expand]")
+  end
+
+  def test_expand_with_nested_list
+    assert_parse("<div class=\"expandable\"><div class=\"expandable-header\"><input type=\"button\" value=\"Show\" class=\"expandable-button\"/></div><div class=\"expandable-content\"><ul><li>a</li><li>b<br></li></ul></div></div><p>c</p>", "[expand]\n* a\n* b\n[/expand]\nc")
+  end
+
   def test_inline_mode
     assert_equal("hello", DTextRagel.parse_inline("hello").strip)
   end
@@ -212,4 +234,8 @@ class DTextTest < Minitest::Test
   def test_strip
     assert_equal("hellozworld", DTextRagel.parse_strip("h[b]e[/b]llo[quote]z[/quote]wo[expand]rld[/expand]"))
   end
+
+  def test_old_asterisks
+    assert_parse("<p>hello *world* neutral</p>", "hello *world* neutral")
+  end
 end

data/test/test_forum_posts.rb

@@ -0,0 +1,13 @@
+Dir["/dev_exclusions/dtext_bench/forum_posts/*.txt"].slice(80, 10).each do |file|
+  input = File.read(file)
+  o1 = DTextRagel.parse(input).gsub(/\s+<\/p>/, "</p>")
+  o2 = DTextRuby.parse(input).gsub(/\r/, "").gsub(/\s+<\/p>/, "</p>").gsub(/%3A/, ":")
+  if o1.size != o2.size
+    puts input
+    puts "---"
+    puts o1
+    puts "~~~"
+    puts o2
+    puts "==="
+  end
+end

data/test/test_wiki_pages.rb

@@ -0,0 +1,13 @@
+Dir["/dev_exclusions/dtext_bench/wiki_pages/*.txt"].sort.slice(20, 10).each do |file|
+  input = File.read(file)
+  o1 = DTextRagel.parse(input.dup).gsub(/\s+<\/p>/, "</p>")
+  o2 = DTextRuby.parse(input.dup).gsub(/\r/, "").gsub(/\s+<\/p>/, "</p>")
+  if o1.size != o2.size
+    puts input
+    puts "---"
+    puts o1
+    puts "~~~"
+    puts o2
+    puts "==="
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtext_rb
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - r888888888
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -73,6 +73,8 @@ files:
 - lib/dtext_ruby.rb
 - test/dtext_test.rb
 - test/ragel_output.txt
+- test/test_forum_posts.rb
+- test/test_wiki_pages.rb
 - test/wiki.txt
 homepage: http://github.com/r888888888/dtext_rb
 licenses: