trac-wiki 0.3.32 → 0.3.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 486c2d7cf3dd8fbcb005759e6ef0cd9aa95dfc38
-  data.tar.gz: 25938551d6ec9e52aedfc163f738143476d9b406
+  metadata.gz: e8bb3c1e9f2eab0e8db5d7c0324681ec9304f274
+  data.tar.gz: a3aab7d22cfe4e67a3876a867ef50f368af75768
 SHA512:
-  metadata.gz: f36f872853aa702f736f8d402acf2528ccdd9ff2b203ccbdd7635ae4fa78bf3b6e36e30dbf9e04216be1ae752bcba147ac05e84f4e7d3ede62479a16f7d91aed
-  data.tar.gz: c81847b6bbff57636edd5722165374aa01be69c0a62eee3a3bcdaf2ee2d244fa60f3445ee928dea9bd6c892a86fc7776aff34cdccf846307ec1e58b3c3652896
+  metadata.gz: efa8577220c3ff60f23fdcb377335fbced2ac54640fee072c97b39d7fe37e669c847c035f5b98ab1bce01409905c709b59d9e5eb85320b54109f5f3e47cf7b80
+  data.tar.gz: ccf705d91b9bc8189844d4d831a981ecf16492c8236c51cb24c01944499802dce02f4198f2ffda3799b1d813865edf3ecf1426a5b6f2ddee9d1c7c7ee07362e9

data/Gemfile.lock

@@ -7,7 +7,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     bacon (1.2.0)
-    rake (10.3.2)
+    rake (11.3.0)
     unicode_utils (1.4.0)
 
 PLATFORMS

data/lib/trac-wiki/parser.rb

@@ -443,19 +443,19 @@ module TracWiki
        attrs.strip.split(/\s*,\s*/).each do |opt|
          case opt
            when /^\d+[^\d]*$/
-             a['width'] = escape_url(opt)
+             a['width'] = opt
            when /^(right|left|center)/i
-             a['align'] = escape_url(opt)
+             a['align'] = opt
            when  /^(top|bottom|middle)$/i
-             a['valign'] = escape_url(opt)
+             a['valign'] = opt
            when  /^link=(.*)$/i
-             a['link'] = escape_url($1)
+             a['link'] = $1
            when  /^nolink$/i
              # pass
            when /^(align|valign|border|width|height|alt|title|longdesc|class|id|usemap)=(.*)$/i
-            a[$1]= escape_url($2)
+            a[$1]= $2
            when /^(margin|margin-(left|right|top|bottom))=(\d+)$/
-            style.push($1 + ':' + escape_url($3))
+            style.push($1 + ':' + $3)
          end
        end
        a[:style] = style.join(';') if ! style.empty?

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.3.32'
+  VERSION = '0.3.33'
 end

data/test/parser_test.rb

@@ -607,10 +607,11 @@ describe TracWiki::Parser do
     tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]")
     tc("<p><img src=\"/ahoj/bhoj/bla/image.jpg\"/></p>\n", "[[Image(bla/image.jpg)]]", :base => "/ahoj/bhoj", :no_escape => true)
     tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]", :no_link=>true)
-    tc("<p><img alt=\"a%22tag%22\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]")
-    tc("<p><img alt=\"a%22tag%22\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]", :no_link=>true)
-    tc("<p><a href=\"ahoj\"><img alt=\"a%22tag%22\" src=\"image.jpg\"/></a></p>\n", "[[Image(image.jpg,alt=a\"tag\",link=ahoj)]]", :no_link=>true)
-    tc("<p><a href=\"javascript%253Aalert%2528666%2529\"><img alt=\"a%22tag%22\" src=\"image.jpg\"/></a></p>\n", "[[Image(image.jpg,alt=a\"tag\",link=javascript:alert(666))]]", :no_link=>true)
+    tc("<p><img alt=\"a&quot;tag&quot;\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]")
+    tc("<p><img alt=\"a&quot;tag&quot;\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]", :no_link=>true)
+    tc("<p><a href=\"ahoj\"><img alt=\"a&quot;tag&quot;\" src=\"image.jpg\"/></a></p>\n", "[[Image(image.jpg,alt=a\"tag\",link=ahoj)]]", :no_link=>true)
+    tc("<p><a href=\"ahoj/bhoj\"><img alt=\"a&quot;tag&quot;\" src=\"image.jpg\"/></a></p>\n", "[[Image(image.jpg,alt=a\"tag\",link=ahoj/bhoj)]]", :no_escape => true, :no_link=>true)
+    tc("<p><a href=\"javascript%3Aalert%28666%29\"><img alt=\"a&quot;tag&quot;\" src=\"image.jpg\"/></a></p>\n", "[[Image(image.jpg,alt=a\"tag\",link=javascript:alert(666))]]", :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]]")
@@ -884,7 +885,7 @@ describe TracWiki::Parser do
     tc("<p><img src=\"image.jpg\" valign=\"middle\"/></p>\n", "[[Image(image.jpg, middle)]]")
     tc("<p><img src=\"image.jpg\" title=\"houhouhou\"/></p>\n", "[[Image(image.jpg, title=houhouhou)]]")
     tc("<p><img src=\"image.jpg\" width=\"120px\"/></p>\n", "[[Image(image.jpg,width=120px)]]")
-    tc("<p><img src=\"image.jpg\" width=\"120%25\"/></p>\n", "[[Image(image.jpg, width=120%)]]")
+    tc("<p><img src=\"image.jpg\" width=\"120%\"/></p>\n", "[[Image(image.jpg, width=120%)]]")
     tc("<p><img src=\"image.jpg\" style=\"margin:5\"/></p>\n", "[[Image(image.jpg,margin=5)]]")
     tc("<p><img src=\"http://example.org/image.jpg\"/></p>\n", "[[Image(http://example.org/image.jpg)]]")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.3.32
+  version: 0.3.33
 platform: ruby
 authors:
 - Vitas Stradal