trac-wiki 0.1.2 → 0.1.3

data/lib/trac-wiki/parser.rb

@@ -502,7 +502,7 @@ module TracWiki
         # empty line
         when /\A\s*$(\r?\n)?/
           end_paragraph
-        when /\A([\w\s]*)::\s*/
+        when /\A([:\w\s]+)::(\s+|\r?\n)/
           term = $1
           start_tag('dl')
           start_tag('dt')

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/test/parser_test.rb

@@ -256,6 +256,23 @@ describe TracWiki::Parser do
   it 'should parse definition list' do
     # FIXME: trailing space 
     tc "<dl><dt>Monty Python</dt><dd> definition</dd></dl>", "Monty Python:: \n   definition\n"
+    tc "<dl><dt>Monty Python</dt><dd> definition</dd></dl>", "Monty Python::\ndefinition\n"
+    tc "<dl><dt>Monty Python</dt><dd> definition</dd></dl>", "Monty Python::\r\ndefinition\n"
+    tc "<dl><dt>Monty Python</dt><dd> definition</dd></dl>", "Monty Python::\r\n definition\n"
+    tc "<dl><dt>Monty Python</dt><dd> definition</dd></dl>", "Monty Python:: \r\n definition\n"
+    tc "<dl><dt>Monty Python</dt><dd> definition</dd></dl>", "Monty Python::   definition\n"
+    tc "<dl><dt>Monty Python</dt><dd> definition</dd></dl>", "Monty Python:: definition\n"
+    tc "<dl><dt>Monty::Python</dt><dd> definition</dd></dl>", "Monty::Python:: definition\n"
+    tc "<dl><dt>::Python</dt><dd> definition</dd></dl>", "::Python:: definition\n"
+  end
+  it 'should not parse definition list' do
+    # FIXME: trailing space 
+    tc "<p>Monty::Python::definition</p>\n", "Monty::Python::definition\n"
+    tc "<p>bla Monty::Python bla</p>\n", "bla Monty::Python bla\n"
+    tc "<p>bla Monty::Python</p>\n", "bla Monty::Python\n"
+    tc "<p>Monty::Python bla</p>\n", "Monty::Python bla\n"
+    tc "<p>::Python bla</p>\n", "::Python bla\n"
+    tc "<p>:: Python bla</p>\n", ":: Python bla\n"
   end
   it 'should parse unordered_lists' do
     # List items begin with a * at the beginning of a line.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon