trac-wiki 0.0.5 → 0.0.6

data/lib/trac-wiki/parser.rb

@@ -227,7 +227,7 @@ module TracWiki
       until str.empty?
         case str
         # raw url
-        when /\A(\~)?((https?|ftps?):\/\/\S+?)(?=([\,.?!:;"'\)]+)?(\s|$))/
+        when /\A(!)?((https?|ftps?):\/\/\S+?)(?=([\]\,.?!:;"'\)]+)?(\s|$))/
           str = $'
           if $1
             @out << escape_html($2)
@@ -243,7 +243,12 @@ module TracWiki
           str = $'
           @out << make_image($1, $3)
         # [[link]]
-        when /\A\[\[\s*([^|]*?)\s*(\|\s*(.*?))?\s*\]\]/m
+        #          [     link1          | text2          ]
+        when /\A \[ \s* ([^\[|]*?) \s* (\|\s*(.*?))? \s* \] /mx
+          str = $'
+          link, content, whole= $1, $3, $&
+          make_link(link, content, whole)
+        when /\A \[\[ \s* ([^|]*?) \s* (\|\s*(.*?))? \s* \]\] /mx
           str = $'
           link, content, whole= $1, $3, $&
           make_link(link, content, whole)
@@ -257,7 +262,7 @@ module TracWiki
     def make_link(link, content, whole)
       uri = make_explicit_link(link)
       # specail "link" [[BR]]:
-      if link =~ /br/i
+      if link =~ /^br$/i
         @out << '<br/>'
         return
       end

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/test/parser_test.rb

@@ -46,6 +46,11 @@ describe TracWiki::Parser do
     tc "<p>This <strong>is bold</strong></p>\n", "This **is\nbold**"
   end
 
+  it 'should be toc' do
+    tc "<p>{{toc}}</p>\n", "{{toc}}"
+    tc "<h2>ahoj</h2><p>{{toc}}</p>\n<h2>ahoj</h2>", "==ahoj==\n{{toc}}\n\n==ahoj==\n"
+  end
+
   it 'should parse bolditalic' do
     tc "<p>This is <strong><em>bolditallic</em></strong>.</p>\n", "This is '''''bolditallic'''''."
     tc "<p>This is <strong> <em>bolditallic</em> </strong>.</p>\n", "This is ''' ''bolditallic'' '''."
@@ -388,6 +393,9 @@ describe TracWiki::Parser do
     tc("<p>How about <em>a link, like <a href=\"http://example.org\">http://example.org</a>, in italic</em> text?</p>\n",
        "How about ''a link, like http://example.org, in italic'' text?")
 
+    tc("<p>How about <em>a link, like <a href=\"http://example.org\">http://example.org</a>, in italic</em> text?</p>\n",
+       "How about ''a link, like [http://example.org], in italic'' text?")
+
     # Another test 
     tc("<p>Formatted fruits, for example:<em>apples</em>, oranges, <strong>pears</strong> ...</p>\n",
        "Formatted fruits, for example:''apples'', oranges, **pears** ...")
@@ -451,9 +459,12 @@ describe TracWiki::Parser do
     tc "<p>Hello ! world</p>\n", "Hello !\nworld\n"
     # Not escaping inside URLs 
     tc "<p><a href=\"http://example.org/~user/\">http://example.org/~user/</a></p>\n", "http://example.org/~user/"
+    tc "<p><a href=\"http://example.org/~user/\">http://example.org/~user/</a></p>\n", "[http://example.org/~user/]"
 
     # Escaping links
-    tc "<p>http://www.example.org/</p>\n", "~http://www.example.org/"
+    tc "<p>http://www.example.org/</p>\n", "!http://www.example.org/"
+    tc "<p>[http://www.example.org/]</p>\n", "![!http://www.example.org/]"
+    tc "<p>[<a href=\"http://www.example.org/\">http://www.example.org/</a>]</p>\n", "![http://www.example.org/]"
   end
 
   it 'should parse horizontal rule' do
@@ -510,6 +521,7 @@ describe TracWiki::Parser do
     tc "<table><tr><th>Header</th></tr></table>", "||=Header=||"
 
     tc "<table><tr><td>c1</td><td><a href=\"Link\">Link text</a></td><td><img src=\"Image\"/></td></tr></table>", "||c1||[[Link|Link text]]||[[Image(Image)]]||"
+    tc "<table><tr><td>c1</td><td><a href=\"Link\">Link text</a></td><td><img src=\"Image\"/></td></tr></table>", "||c1||[Link|Link text]||[[Image(Image)]]||"
   end
 
   it 'should parse following table' do
@@ -715,6 +727,7 @@ describe TracWiki::Parser do
 
   it 'should support no_escape' do
     tc("<p><a href=\"a%2Fb%2Fc\">a/b/c</a></p>\n", "[[a/b/c]]")
+    tc("<p><a href=\"a%2Fb%2Fc\">a/b/c</a></p>\n", "[a/b/c]")
     tc("<p><a href=\"a/b/c\">a/b/c</a></p>\n", "[[a/b/c]]", :no_escape => true)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon