trac-wiki 0.0.7 → 0.0.8

data/lib/trac-wiki/parser.rb

@@ -53,6 +53,11 @@ module TracWiki
     attr_writer :no_escape
     def no_escape?; @no_escape; end
 
+    # Disable url escaping for local links
+    # [[whatwerver]] stays [[whatwerver]]
+    attr_writer :no_link
+    def no_link?; @no_link; end
+
     # Create a new Parser instance.
     def initialize(text, options = {})
       @allowed_schemes = %w(http https ftp ftps)
@@ -260,17 +265,22 @@ module TracWiki
     end
 
     def make_link(link, content, whole)
-      uri = make_explicit_link(link)
       # specail "link" [[BR]]:
       if link =~ /^br$/i
         @out << '<br/>'
         return
       end
+      uri = make_explicit_link(link)
       if not uri
         @out << escape_html(whole)
         return
       end
 
+      if no_link?
+        @out << escape_html(whole)
+        return
+      end
+
       make_explicit_link(link)
       @out << '<a href="' << escape_html(uri) << '">'
       if content

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/test/parser_test.rb

@@ -11,6 +11,11 @@ class Bacon::Context
 end
 
 describe TracWiki::Parser do
+  it 'should not parse linkd' do
+    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></ul>", "* [[ahoj|bhoj]]", :no_link => true
+  end
   it 'should parse bold' do
     # Bold can be used inside paragraphs
     tc "<p>This <strong>is</strong> bold</p>\n", "This **is** bold"
@@ -443,7 +448,9 @@ describe TracWiki::Parser do
 
     # Image tags should be escape
     tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]")
+    tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]", :no_link=>true)
     tc("<p><img src=\"image.jpg\" alt=\"&quot;tag&quot;\"/></p>\n", "[[Image(image.jpg|\"tag\")]]")
+    tc("<p><img src=\"image.jpg\" alt=\"&quot;tag&quot;\"/></p>\n", "[[Image(image.jpg|\"tag\")]]", :no_link=>true)
 
     # Malicious links should not be converted.
     tc("<p><a href=\"javascript%3Aalert%28%22Boo%21%22%29\">Click</a></p>\n", "[[javascript:alert(\"Boo!\")|Click]]")

metadata

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