dtext_rb 1.0.14 → 1.2.0

data/ext/dtext/dtext.rl

@@ -133,11 +133,14 @@ internal_url = '/' utf8graph+;
 basic_textile_link = '"' nonquote+ >mark_a1 '"' >mark_a2 ':' (url | internal_url) >mark_b1 %mark_b2;
 bracketed_textile_link = '"' nonquote+ >mark_a1 '"' >mark_a2 ':[' (url | internal_url) >mark_b1 %mark_b2 :>> ']';
 
-basic_wiki_link = '[[' nonpipebracket+ >mark_a1 %mark_a2 ']]';
-aliased_wiki_link = '[[' nonpipebracket+ >mark_a1 %mark_a2 '|' nonbracket+ >mark_b1 %mark_b2 ']]';
+basic_wiki_link = '[[' (nonbracket nonpipebracket*) >mark_a1 %mark_a2 ']]';
+aliased_wiki_link = '[[' nonpipebracket+ >mark_a1 %mark_a2 '|' nonpipebracket+ >mark_b1 %mark_b2 ']]';
 
 post_link = '{{' noncurly+ >mark_a1 %mark_a2 '}}';
 
+spoilers_open = '[spoiler'i 's'i? ']';
+spoilers_close = '[/spoiler'i 's'i? ']';
+
 post_id = 'post #'i digit+ >mark_a1 %mark_a2;
 forum_post_id = 'forum #'i digit+ >mark_a1 %mark_a2;
 forum_topic_id = 'topic #'i digit+ >mark_a1 %mark_a2;
@@ -531,14 +534,14 @@ inline := |*
     }
   };
 
-  '[spoiler]'i => {
+  spoilers_open => {
     g_debug("inline [spoiler]");
     g_debug("  push <span>");
     dstack_push(sm, &INLINE_SPOILER);
     append(sm, true, "<span class=\"spoiler\">");
   };
 
-  '[/spoiler]'i => {
+  spoilers_close => {
     g_debug("inline [/spoiler]");
     dstack_close_before_block(sm);
 
@@ -933,7 +936,7 @@ main := |*
     append_block(sm, "<blockquote>");
   };
 
-  '[spoiler]'i space* => {
+  spoilers_open space* => {
     g_debug("block [spoiler]");
     g_debug("  push spoiler");
     g_debug("  print <div>");
@@ -942,7 +945,7 @@ main := |*
     append_block(sm, "<div class=\"spoiler\">");
   };
 
-  '[/spoiler]'i => {
+  spoilers_close => {
     g_debug("block [/spoiler]");
     dstack_close_before_block(sm);
     if (dstack_check(sm, BLOCK_SPOILER)) {

data/test/dtext_test.rb

@@ -39,6 +39,11 @@ class DTextTest < Minitest::Test
     assert_parse("<p>a <a href=\"/wiki_pages/show_or_new?title=spoiler\">spoiler</a> c</p>", "a [[spoiler]] c")
   end
 
+  def test_wiki_links_edge
+    assert_parse("<p>[[|_|]]</p>", "[[|_|]]")
+    assert_parse("<p>[[||_||]]</p>", "[[||_||]]")
+  end
+
   def test_wiki_links_nested_b
     assert_parse("<p><strong>[[</strong>tag<strong>]]</strong></p>", "[b][[[/b]tag[b]]][/b]")
   end
@@ -47,10 +52,18 @@ class DTextTest < Minitest::Test
     assert_parse("<p>this is <span class=\"spoiler\">an inline spoiler</span>.</p>", "this is [spoiler]an inline spoiler[/spoiler].")
   end
 
+  def test_spoilers_inline_plural
+    assert_parse("<p>this is <span class=\"spoiler\">an inline spoiler</span>.</p>", "this is [SPOILERS]an inline spoiler[/SPOILERS].")
+  end
+
   def test_spoilers_block
     assert_parse("<p>this is</p><div class=\"spoiler\"><p>a block spoiler</p></div><p>.</p>", "this is\n\n[spoiler]\na block spoiler\n[/spoiler].")
   end
 
+  def test_spoilers_block_plural
+    assert_parse("<p>this is</p><div class=\"spoiler\"><p>a block spoiler</p></div><p>.</p>", "this is\n\n[SPOILERS]\na block spoiler\n[/SPOILERS].")
+  end
+
   def test_spoilers_with_no_closing_tag_1
     assert_parse("<div class=\"spoiler\"><p>this is a spoiler with no closing tag</p><p>new text</p></div>", "[spoiler]this is a spoiler with no closing tag\n\nnew text")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtext_rb
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.2.0
 platform: ruby
 authors:
 - r888888888
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -59,7 +59,7 @@ extensions:
 - ext/dtext/extconf.rb
 extra_rdoc_files: []
 files:
-- ".rbenv-version"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Compiled DText parser

data/.rbenv-version

@@ -1 +0,0 @@
-2.1.5