Merge pull request #9 from RubenVerborgh/percentencoding

Correctly encode percent signs in URIs

src/LiteralExpression.js

@@ -9,13 +9,8 @@ var LiteralExpression = (function () {
             index,
             chr = '';
         for (index = 0; index < literal.length; index += chr.length) {
-            chr = pctEncoder.pctCharAt(literal, index);
-            if (chr.length > 0) {
-                result += chr;
-            }
-            else {
-                result += rfcCharHelper.isReserved(chr) || rfcCharHelper.isUnreserved(chr) ? chr : pctEncoder.encodeCharacter(chr);
-            }
+            chr = literal.charAt(index);
+            result += rfcCharHelper.isReserved(chr) || rfcCharHelper.isUnreserved(chr) ? chr : pctEncoder.encodeCharacter(chr);
         }
         return result;
     }

src/encodingHelper.js

@@ -15,13 +15,8 @@ var encodingHelper = (function () {
             text = text.toString();
         }
         for (index = 0; index < text.length; index += chr.length) {
-            chr = pctEncoder.pctCharAt(text, index);
-            if (chr.length > 1) {
-                result += chr;
-            }
-            else {
-                result += rfcCharHelper.isUnreserved(chr) || (passReserved && rfcCharHelper.isReserved(chr)) ? chr : pctEncoder.encodeCharacter(chr);
-            }
+            chr = text.charAt(index);
+            result += rfcCharHelper.isUnreserved(chr) || (passReserved && rfcCharHelper.isReserved(chr)) ? chr : pctEncoder.encodeCharacter(chr);
         }
         return result;
     }

src/rfcCharHelper.js

@@ -23,12 +23,13 @@ var rfcCharHelper = (function () {
 
     /**
      * Returns if chr is an reserved character according 1.5 of rfc 6570
+     * or the percent character mentioned in 3.2.1.
      * @param chr
      * @return {Boolean}
      */
     function isReserved(chr) {
         return chr === ':' || chr === '/' || chr === '?' || chr === '#' || chr === '[' || chr === ']' || chr === '@' || chr === '!' || chr === '$' || chr === '&' || chr === '(' ||
-            chr === ')' || chr === '*' || chr === '+' || chr === ',' || chr === ';' || chr === '=' || chr === "'";
+            chr === ')' || chr === '*' || chr === '+' || chr === ',' || chr === ';' || chr === '=' || chr === "'" || chr === '%';
     }
 
     return {

uritemplate-test @ b317372c

-Subproject commit 6aad87eb6f7763e9806b9345dd90e697be6b1bbf
+Subproject commit b317372c613f1aab82f1e497146b2859144b9308