trac-wiki 0.2.23 → 0.2.24

data/lib/trac-wiki/env.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module TracWiki
 
   class Env
@@ -207,8 +208,9 @@ module TracWiki
       arg.sub!(/\A\s*\|?/, '')
       env  = { 'arg' => arg , depth: (depth||0) + 1  }
       idx = 1
+      print "arg:#{arg.encoding}\n"
       arg.split(/\|/).each do |val|
-        if val =~ /\A\s*(\w+)\s*=\s*(.*)/s
+        if val =~ /\A\s*(\w+)\s*=\s*(.*)/m
           env[$1] = $2
         else
           env[idx.to_s] = val
@@ -249,7 +251,7 @@ module TracWiki
       end
       #print "text: #{text.nil?}\n"
       #print "ret: #{ret.nil?}\n"
-      return ret + str
+      return ret + str.gsub(/\\\r?\n/, '')
     end
   end
 

data/lib/trac-wiki/parser.rb

@@ -282,6 +282,7 @@ module TracWiki
     # make_local_link("LocalLink") #=> "/LocalLink"
     # make_local_link("Wikipedia:Bread") #=> "http://en.wikipedia.org/wiki/Bread"
     def make_local_link(link) #:doc:
+      # FIXME: xss when no_escape
       link, anch = link.split(/#/, 2)
       if no_escape?
         return "#{@base}#{link}" if ! anch
@@ -478,9 +479,8 @@ module TracWiki
       when str =~ /\A`(.*?)`/                  # inline pre (tt)
         @tree.tag(:tt, $1)
       when math? && str =~ /\A\$(.+?)\$/       # inline math  (tt)
-        @tree.add("\\( #{$1} \\)")
-        #@tree.add("$#{$1}$")
-        #@tree.tag(:span, {class:'math'},  $1)
+        #@tree.add("\\( #{$1} \\)")
+        @tree.tag(:span, {class:'math'},  $1)
         @was_math = true
       when str =~ /\A(\&\w*;)/       # html entity 
         #print "add html ent: #{$1}\n"
@@ -645,7 +645,8 @@ module TracWiki
 
     def do_math(text)
       end_paragraph
-      @tree.add("$$#{text}$$\n")
+      #@tree.add("$$#{text}$$\n")
+      @tree.tag(:div, {class:'math'}, text)
       @was_math = true
     end
     def do_merge(merge_type, who)

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.2.23'
+  VERSION = '0.2.24'
 end

data/test/parser_test.rb

@@ -48,6 +48,7 @@ end
 
 describe TracWiki::Parser do
   it 'should not parse linkd' do
+    tc "<p>[[ahoj]]</p>\n", "[ahoj]", :no_link => true
     tc "<p>[[ahoj]]</p>\n", "[[ahoj]]", :no_link => true
     tc "<p>[[ahoj|bhoj]]</p>\n", "[[ahoj|bhoj]]", :no_link => true
     tc "<ul><li>[[ahoj|bhoj]]</li>\n</ul>\n", "* [[ahoj|bhoj]]", :no_link => true
@@ -162,17 +163,17 @@ describe TracWiki::Parser do
   end
 
   it 'should parse math' do
-    tc "<p>\\( the \\)</p>\n", '$the$', math: true
-    tc "<p>test \\( the \\) west</p>\n", 'test $the$ west', math: true
-    tc "<p>test \\( e^{i\\pi} \\) test</p>\n", 'test $e^{i\pi}$ test', math: true
+    tc "<p><span class=\"math\">the</span></p>\n", '$the$', math: true
+    tc "<p>test <span class=\"math\">the</span> west</p>\n", 'test $the$ west', math: true
+    tc "<p>test <span class=\"math\">e^{i\\pi}</span> test</p>\n", 'test $e^{i\pi}$ test', math: true
     tc "<p>test $ e<sup>{i\\pi} test</sup></p>\n", 'test $ e^{i\pi} test', math: true
     tc "<p>$the$</p>\n", '$the$', math: false
 
-    tc "<p>ahoj</p>\n$$e^{i\\pi}$$\n<p>nazdar</p>\n", "ahoj\n$$e^{i\\pi}$$\nnazdar", math: true
+    tc "<p>ahoj</p>\n<div class=\"math\">e^{i\\pi}</div>\n<p>nazdar</p>\n", "ahoj\n$$e^{i\\pi}$$\nnazdar", math: true
     tc "<p>ahoj $$e<sup>{i\\pi}$$ nazdar</sup></p>\n", "ahoj\n$$e^{i\\pi}$$\nnazdar", math: false
 
-    tc "$$\\\\$$\n", "$$\\\\$$", math: true
-    tc "$$\n^test\n$$\n", "$$\n^test\n$$", math: true
+    tc "<div class=\"math\">\\\\</div>\n", "$$\\\\$$", math: true
+    tc "<div class=\"math\">\n^test\n</div>\n", "$$\n^test\n$$", math: true
 
     tc "<p>$a<sup>b</sup>c$</p>\n", "!$a^b^c$", math: true
     tc "<p>$a<strong>b</strong>c$</p>\n", "!$a**b**c$", math: true
@@ -228,6 +229,10 @@ describe TracWiki::Parser do
   it 'should parse links' do
     #  Links
     tc "<p><a href=\"link\">link</a></p>\n", "[[link]]"
+    tc "<p><a href=\"link\">Flink</a></p>\n", "[[link|Flink]]"
+
+    # FIXME: http://trac.edgewall.org/wiki/TracLinks: this is wrong
+    #tc "<p><a href=\"link\">Flink</a></p>\n", "[link Flink]"
     tc "<p><a href=\"BASE/link\">link</a></p>\n", "[[link]]",  base: 'BASE'
     tc "<p><a href=\"BASE/link\">link</a></p>\n", "[[link]]",  base: 'BASE/'
     tc "<p><a href=\"link#link\">link#link</a></p>\n", "[[link#link]]"
@@ -1007,6 +1012,12 @@ eos
     tc "<p><a href=\"http://example.com/there#i+m\">There</a></p>\n", "[[there#i m|There]]", base: 'http://example.com/'
     tc "<p><a href=\"#here+i+m\">Here</a></p>\n", "[[#here i m|Here]]", base: 'http://example.com/'
   end
+  it 'should parse dnl inside macro' do
+    tc "<p>d<blockquote>e</blockquote></p>\n", "{{!ifeq a|b|c|d\n e}}"
+    tc "<p>d e</p>\n", "{{!ifeq a|b|c|d\\\n e}}"
+    tc "<p>d<strong>e</strong></p>\n", "{{!ifeq a|b|c|d**\\\ne**}}"
+    tc "<p>d<strong>e</strong></p>\n", "{{!ifeq a|b|c|d*\\\n*e**}}"
+  end
 
 end
 # vim: tw=0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon