From 2e82501d745c17d85526549f5678d49859452e4b Mon Sep 17 00:00:00 2001
From: ben hockey <neonstalwart@gmail.com>
Date: Tue, 28 Oct 2014 10:14:10 -0500
Subject: [PATCH] handle uri decoding before finding converters

---
 parser.js     | 10 +++++-----
 test/query.js |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/parser.js b/parser.js
index 4300842..3e0178b 100644
--- a/parser.js
+++ b/parser.js
@@ -179,6 +179,7 @@ exports.commonOperatorMap = {
 	"gt" : ">"
 }
 function stringToValue(string, parameters){
+	string = decodeURIComponent(string);
 	var converter = exports.converters['default'];
 	if(string.charAt(0) === "$"){
 		var param_index = parseInt(string.substring(1)) - 1;
@@ -215,7 +216,6 @@ exports.converters = {
           if (isoDate) {
             date = new Date(Date.UTC(+isoDate[1], +isoDate[2] - 1, +isoDate[3], +isoDate[4], +isoDate[5], +isoDate[6], +isoDate[7] || 0));
           }*/
-			string = decodeURIComponent(string);
 			if(exports.jsonQueryCompatible){
 				if(string.charAt(0) == "'" && string.charAt(string.length-1) == "'"){
 					return JSON.parse('"' + string.substring(1,string.length-1) + '"');
@@ -263,16 +263,16 @@ exports.converters = {
 		return x === "true";
 	},
 	string: function(string){
-		return decodeURIComponent(string);
+		return string;
 	},
 	re: function(x){
-		return new RegExp(decodeURIComponent(x), 'i');
+		return new RegExp(x, 'i');
 	},
 	RE: function(x){
-		return new RegExp(decodeURIComponent(x));
+		return new RegExp(x);
 	},
 	glob: function(x){
-		var s = decodeURIComponent(x).replace(/([\\|\||\(|\)|\[|\{|\^|\$|\*|\+|\?|\.|\<|\>])/g, function(x){return '\\'+x;}).replace(/\\\*/g,'.*').replace(/\\\?/g,'.?');
+		var s = x.replace(/([\\|\||\(|\)|\[|\{|\^|\$|\*|\+|\?|\.|\<|\>])/g, function(x){return '\\'+x;}).replace(/\\\*/g,'.*').replace(/\\\?/g,'.?');
 		if (s.substring(0,2) !== '.*') s = '^'+s; else s = s.substring(2);
 		if (s.substring(s.length-2) !== '.*') s = s+'$'; else s = s.substring(0, s.length-2);
 		return new RegExp(s, 'i');
diff --git a/test/query.js b/test/query.js
index 9c50923..ef493ba 100644
--- a/test/query.js
+++ b/test/query.js
@@ -121,6 +121,9 @@ define(function (require) {
 					{ name: 'or', args: [{ name: 'eq', args: [ 'a', 'b' ]}, { name: 'eq', args: [ 'c', 'd' ]}]},
 					{ name: 'or', args: [{ name: 'eq', args: [ 'e', 'f' ]}, { name: 'eq', args: [ 'g', 1 ]}]}
 				]}
+			},
+			'uri encoding': {
+				'a(number%3A1)': {name: 'and', args: [{ name: 'a', args: [ 1 ]}]}
 			}
 		},
 		testParsing = (function () {