Bug fixes

Add missing encodings
improve decoder
ensure input type
Add characters to test strings

Author: luke3butler

index.js

@@ -1,14 +1,19 @@
 "use strict";
-function encode(str) {
-  return encodeURIComponent(str)
+const encode = str => {
+  return encodeURIComponent(str + '')
     .replace(/[!'()]/g, escape)
     .replace(/\*/g, "%2A")
-    .replace(/\%20/g, "+");
-}
+    .replace(/\%20/g, "+")
+    .replace(/~/g, '%7E');
+};
 
-function decode(str) {
-  return decodeURIComponent(str.replace(/\+/g, " ").replace(/\%2A/g, "*"));
-}
+const decode = str => {
+  return decodeURIComponent(
+    (str + '')
+    .replace(/%(?![\da-f]{2})/gi, () => '%25')
+    .replace(/\+/g, '%20')
+  );
+};
 
 module.exports = encode;
 module.exports.encode = encode;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "phpurlencode",
   "description": "Functionally similar to PHP urlencode and urldecode functions",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "index.js",
   "license": "MIT",
   "devDependencies": {
@@ -13,5 +13,6 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/luke3butler/node-phpurlencode.git"
-  }
+  },
+  "dependencies": {}
 }

test/test.js

@@ -8,8 +8,8 @@ describe("urlencode", function() {
       "should encode special characters similar to php's urlencode",
       function() {
         assert.equal(
-          "%21%40%23%24%25%5E%26%2A%28%29%2B%27",
-          urlencode("!@#$%^&*()+'")
+          "%21%40%23%24%25%5E%26%2A%28%29%2B%27%7E%22%3C%3E%2C.",
+          urlencode("!@#$%^&*()+'~\"<>,.")
         );
       }
     );
@@ -28,8 +28,8 @@ describe("urlencode", function() {
       "should decode special characters similar to php's urldecode",
       function() {
         assert.equal(
-          "!@#$%^&*()+'",
-          urlencode.decode("%21%40%23%24%25%5E%26%2A%28%29%2B%27")
+          "!@#$%^&*()+'~\"<>,.",
+          urlencode.decode("%21%40%23%24%25%5E%26%2A%28%29%2B%27%7E%22%3C%3E%2C.")
         );
       }
     );