Make sure urls are uri_escape'd

Fixes problems with links to operators like % and / being unescaped.
Raku · Aug 8, 2014 · aa56705 · aa56705
1 parent 8093e18
commit aa56705
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/htmlify.p6 b/htmlify.p6
@@ -221,7 +221,7 @@ multi write-type-source($doc) {
         );
         $pod.content.push: pod-link(
             'Full-size type graph image as SVG',
-            "/images/type-graph-$podname.svg",
+            "/images/type-graph-{uri_escape $podname}.svg",
         );
 
         my @mro = $type.mro;
@@ -233,7 +233,7 @@ multi write-type-source($doc) {
                 pod-heading("Methods supplied by role $r"),
                 pod-block(
                     "$podname does role ",
-                    pod-link($r.name, "/type/$r"),
+                    pod-link($r.name, "/type/{uri_escape ~$r}"),
                     ", which provides the following methods:",
                 ),
                 %methods-by-type{$r}.list,
@@ -245,7 +245,7 @@ multi write-type-source($doc) {
                 pod-heading("Methods supplied by class $c"),
                 pod-block(
                     "$podname inherits from class ",
-                    pod-link($c.name, "/type/$c"),
+                    pod-link($c.name, "/type/{uri_escape ~$c}"),
                     ", which provides the following methods:",
                 ),
                 %methods-by-type{$c}.list,
@@ -256,9 +256,9 @@ multi write-type-source($doc) {
                     pod-heading("Methods supplied by role $r"),
                     pod-block(
                         "$podname inherits from class ",
-                        pod-link($c.name, "/type/$c"),
+                        pod-link($c.name, "/type/{uri_escape ~$c}"),
                         ", which does role ",
-                        pod-link($r.name, "/type/$r"),
+                        pod-link($r.name, "/type/{uri_escape ~$r}"),
                         ", which provides the following methods:",
                     ),
                     %methods-by-type{$r}.list,

diff --git a/lib/Perl6/Documentable.pm b/lib/Perl6/Documentable.pm
@@ -35,7 +35,7 @@ class Perl6::Documentable {
     method url() {
         $!url //= $.kind eq 'operator'
             ?? "/language/operators#" ~ uri_escape("@.subkinds[] $.name".subst(/\s+/, '_', :g))
-            !! "/$.kind/$.name"
+            !! ("", $.kind, $.name).map(&uri_escape).join('/')
             ;
     }
     method categories() {