Fix reserved chars to be based on RFC3986

raku-community-modules · Apr 7, 2018 · b636608 · b636608
1 parent 1a3c819
commit b636608
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/README.pod b/README.pod
@@ -6,7 +6,7 @@ A Perl 6 module for encoding / decoding URIs
 
     use URI::Encode;
 
-    # for encoding whole URIs, ignores reserved chars: #$&+,/:;=?@
+    # for encoding whole URIs, ignores reserved chars: :/?#[]@!$&'()*+,;=
     my $encoded_uri = uri_encode('http://www.example.com/?name=john doe&age=54');
 
     # encode every reserved char

diff --git a/lib/URI/Encode.pm6 b/lib/URI/Encode.pm6
@@ -1,7 +1,7 @@
 module URI::Encode:ver<0.05>
 {
     my $RFC3986_unreserved = rx/<[0..9A..Za..z\-.~_]>/;
-    my $RFC3986_reserved = rx/<[\!\+\#\$\&\+,\/\:;\=\?@]>/;
+    my $RFC3986_reserved = rx/<[:/?#\[\]@!$&'()*+,;=]>/;
 
     my %escapes;
     for (0..255) {

diff --git a/t/Encode.t b/t/Encode.t
@@ -3,13 +3,14 @@ use Test;
 use lib './lib';
 use URI::Encode;
 
-plan 22;
+plan 23;
 
 # encode
 is uri_encode("  "),    "%20%20",       'Encode "   "';
 is uri_encode("|abcå"), "%7Cabc%C3%A5",    'Encode "|abcå"';
+is uri_encode("-.~_"), "-.~_",    'Encode -.~_';
+is uri_encode(":/?#\[\]@!\$\&'()*+,;="), ":/?#\[\]@!\$\&'()*+,;=",    'Encode :/?#\[\]@!$&\'()*+,;=';
 is uri_encode("abc"),   "abc",          'Encode "abc"';
-is uri_encode("~*'()"), "~%2A%27%28%29",'Encode "~*\'()"';
 is uri_encode("<\">"),  "%3C%22%3E",    'Encode "<\"';
 is uri_encode("Hello World!"), "Hello%20World!", 'Encode "Hello World!"';
 is uri_encode("http://perltricks.com/"),  "http://perltricks.com/",