trac-wiki 0.3.32 → 0.3.33
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/trac-wiki/parser.rb +6 -6
- data/lib/trac-wiki/version.rb +1 -1
- data/test/parser_test.rb +6 -5
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e8bb3c1e9f2eab0e8db5d7c0324681ec9304f274
|
4
|
+
data.tar.gz: a3aab7d22cfe4e67a3876a867ef50f368af75768
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: efa8577220c3ff60f23fdcb377335fbced2ac54640fee072c97b39d7fe37e669c847c035f5b98ab1bce01409905c709b59d9e5eb85320b54109f5f3e47cf7b80
|
7
|
+
data.tar.gz: ccf705d91b9bc8189844d4d831a981ecf16492c8236c51cb24c01944499802dce02f4198f2ffda3799b1d813865edf3ecf1426a5b6f2ddee9d1c7c7ee07362e9
|
data/Gemfile.lock
CHANGED
data/lib/trac-wiki/parser.rb
CHANGED
@@ -443,19 +443,19 @@ module TracWiki
|
|
443
443
|
attrs.strip.split(/\s*,\s*/).each do |opt|
|
444
444
|
case opt
|
445
445
|
when /^\d+[^\d]*$/
|
446
|
-
a['width'] =
|
446
|
+
a['width'] = opt
|
447
447
|
when /^(right|left|center)/i
|
448
|
-
a['align'] =
|
448
|
+
a['align'] = opt
|
449
449
|
when /^(top|bottom|middle)$/i
|
450
|
-
a['valign'] =
|
450
|
+
a['valign'] = opt
|
451
451
|
when /^link=(.*)$/i
|
452
|
-
a['link'] =
|
452
|
+
a['link'] = $1
|
453
453
|
when /^nolink$/i
|
454
454
|
# pass
|
455
455
|
when /^(align|valign|border|width|height|alt|title|longdesc|class|id|usemap)=(.*)$/i
|
456
|
-
a[$1]=
|
456
|
+
a[$1]= $2
|
457
457
|
when /^(margin|margin-(left|right|top|bottom))=(\d+)$/
|
458
|
-
style.push($1 + ':' +
|
458
|
+
style.push($1 + ':' + $3)
|
459
459
|
end
|
460
460
|
end
|
461
461
|
a[:style] = style.join(';') if ! style.empty?
|
data/lib/trac-wiki/version.rb
CHANGED
data/test/parser_test.rb
CHANGED
@@ -607,10 +607,11 @@ describe TracWiki::Parser do
|
|
607
607
|
tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]")
|
608
608
|
tc("<p><img src=\"/ahoj/bhoj/bla/image.jpg\"/></p>\n", "[[Image(bla/image.jpg)]]", :base => "/ahoj/bhoj", :no_escape => true)
|
609
609
|
tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]", :no_link=>true)
|
610
|
-
tc("<p><img alt=\"a
|
611
|
-
tc("<p><img alt=\"a
|
612
|
-
tc("<p><a href=\"ahoj\"><img alt=\"a
|
613
|
-
tc("<p><a href=\"
|
610
|
+
tc("<p><img alt=\"a"tag"\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]")
|
611
|
+
tc("<p><img alt=\"a"tag"\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]", :no_link=>true)
|
612
|
+
tc("<p><a href=\"ahoj\"><img alt=\"a"tag"\" src=\"image.jpg\"/></a></p>\n", "[[Image(image.jpg,alt=a\"tag\",link=ahoj)]]", :no_link=>true)
|
613
|
+
tc("<p><a href=\"ahoj/bhoj\"><img alt=\"a"tag"\" src=\"image.jpg\"/></a></p>\n", "[[Image(image.jpg,alt=a\"tag\",link=ahoj/bhoj)]]", :no_escape => true, :no_link=>true)
|
614
|
+
tc("<p><a href=\"javascript%3Aalert%28666%29\"><img alt=\"a"tag"\" src=\"image.jpg\"/></a></p>\n", "[[Image(image.jpg,alt=a\"tag\",link=javascript:alert(666))]]", :no_link=>true)
|
614
615
|
|
615
616
|
# Malicious links should not be converted.
|
616
617
|
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
|
|
884
885
|
tc("<p><img src=\"image.jpg\" valign=\"middle\"/></p>\n", "[[Image(image.jpg, middle)]]")
|
885
886
|
tc("<p><img src=\"image.jpg\" title=\"houhouhou\"/></p>\n", "[[Image(image.jpg, title=houhouhou)]]")
|
886
887
|
tc("<p><img src=\"image.jpg\" width=\"120px\"/></p>\n", "[[Image(image.jpg,width=120px)]]")
|
887
|
-
tc("<p><img src=\"image.jpg\" width=\"120
|
888
|
+
tc("<p><img src=\"image.jpg\" width=\"120%\"/></p>\n", "[[Image(image.jpg, width=120%)]]")
|
888
889
|
tc("<p><img src=\"image.jpg\" style=\"margin:5\"/></p>\n", "[[Image(image.jpg,margin=5)]]")
|
889
890
|
tc("<p><img src=\"http://example.org/image.jpg\"/></p>\n", "[[Image(http://example.org/image.jpg)]]")
|
890
891
|
end
|