use more stringent version of encodeURIComponent

Author: go-oleg

index.js

@@ -1,5 +1,13 @@
 'use strict';
 
+// more stringent version of encodeURIComponent
+// (from  https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent)
+function fixedEncodeURIComponent(str) {
+	return encodeURIComponent(str).replace(/[!'()*]/g, function(c) {
+		return '%' + c.charCodeAt(0).toString(16);
+	});
+}
+
 exports.extract = function (maybeUrl) {
 	return maybeUrl.split('?')[1] || '';
 };
@@ -43,10 +51,10 @@ exports.stringify = function (obj) {
 
 		if (Array.isArray(val)) {
 			return val.sort().map(function (val2) {
-				return encodeURIComponent(key) + '=' + encodeURIComponent(val2);
+				return fixedEncodeURIComponent(key) + '=' + fixedEncodeURIComponent(val2);
 			}).join('&');
 		}
 
-		return encodeURIComponent(key) + '=' + encodeURIComponent(val);
+		return fixedEncodeURIComponent(key) + '=' + fixedEncodeURIComponent(val);
 	}).join('&') : '';
 };

test.js

@@ -62,6 +62,7 @@ describe('.stringify()', function () {
 
 	it('URI encode', function () {
 		assert.strictEqual(qs.stringify({'foo bar': 'baz faz'}), 'foo%20bar=baz%20faz');
+		assert.strictEqual(qs.stringify({'foo bar': "baz'faz"}), 'foo%20bar=baz%27faz');
 	});
 
 	it('handle array value', function () {
@@ -88,4 +89,4 @@ describe('.extract()', function () {
 			qs.extract(undefined);
 		}, TypeError);
 	});
-});
+});