trac-wiki 0.3.18 → 0.3.19

data/lib/trac-wiki/parser.rb

@@ -64,6 +64,9 @@ module TracWiki
     # url base for links
     attr_writer :base
 
+    # url base for /links
+    attr_writer :root
+
     # Disable url escaping for local links
     # Escaping: [[/Test]] --> %2FTest
     # No escaping: [[/Test]] --> Test
@@ -140,8 +143,10 @@ module TracWiki
       @macro_commands.merge! macro_commands if ! macro_commands.nil?
       @no_escape = nil
       @base = ''
+      @root = ''
       options.each_pair {|k,v| send("#{k}=", v) }
       @base += '/' if !@base.empty? && @base[-1] != '/'
+      @root += '/' if @root.empty? || @root[-1] != '/'
     end
 
     def text(text)
@@ -316,9 +321,15 @@ module TracWiki
       # FIXME: xss when no_escape
       link, anch = link.split(/#/, 2)
       if no_escape?
-        return "#{@base}#{link}" if ! anch
+        prefix = @base
+        if link =~ /^\/(.*)/
+          link  = $1
+          prefix = @root
+        end
+
+        return "#{prefix}#{link}" if ! anch
         return "##{anch}" if  link == ''
-        return "#{@base}#{link}##{anch}"
+        return "#{prefix}#{link}##{anch}"
       end
       return "#{@base}#{escape_url(link)}" if ! anch
       return "##{escape_url(anch)}" if  link == ''

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.3.18'
+  VERSION = '0.3.19'
 end

data/test/parser_test.rb

@@ -275,6 +275,14 @@ describe TracWiki::Parser do
     tc "<p><a href=\"link#link\">link#link</a></p>\n", "[[link#link]]"
     tc "<p><a href=\"#link\">#link</a></p>\n", "[[#link]]"
 
+    tc "<p><a href=\"BASE/link\">link</a></p>\n", "[[link]]",  base: 'BASE', root: 'ROOT', no_escape: true
+    tc "<p><a href=\"ROOT/link\">/link</a></p>\n", "[[/link]]",  base: 'BASE', root: 'ROOT', no_escape: true
+    tc "<p><a href=\"/link\">/link</a></p>\n", "[[/link]]",  base: 'BASE', no_escape: true
+
+    tc "<p><a href=\"BASE/link\">bla</a></p>\n", "[[link | bla ]]",  base: 'BASE', root: 'ROOT', no_escape: true
+    tc "<p><a href=\"ROOT/link\">bla</a></p>\n", "[[/link | bla ]]",  base: 'BASE', root: 'ROOT', no_escape: true
+    tc "<p><a href=\"/link\">bla</a></p>\n", "[[/link | bla]]",  base: 'BASE', no_escape: true
+
     #  Links can appear in paragraphs (i.e. inline item)
     tc "<p>Hello, <a href=\"world\">world</a></p>\n", "Hello, [[world]]"
 

metadata

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