Merge pull request #10 from PlayNetwork/v0.2.8

V0.2.8

history.md

@@ -1,3 +1,7 @@
+# 0.2.8 / 2014-08-26
+
+* Modifying how Mongoose `#where` method is used in filters to be compliant with Mongoose 3.x
+
 # 0.2.7 / 2014-06-28
 
 * Removing testing on Node v0.8 from Travis CI

lib/filter.js

@@ -6,7 +6,6 @@ module.exports = function(mongoose) {
 		return str.replace(/\W\s/ig, '\\$&');
 	}
 
-
 	mongoose.Query.prototype.filter = function (options) {
 		if (!options || !options.filters) {
 			return this;
@@ -22,13 +21,9 @@ module.exports = function(mongoose) {
 		var applyWhere = function (spec, buildRegex) {
 			for (var key in spec) {
 				if (spec.hasOwnProperty(key)) {
-					var val = spec[key];
+					var val = buildRegex(spec[key]);
 
-					if (typeof val === 'string') {
-						self.where(key).regex(buildRegex(val));
-					} else {
-						self.where(key).equals(buildRegex(val));
-					}
+					self.where(key, val);
 				}
 			}
 		};
@@ -47,9 +42,11 @@ module.exports = function(mongoose) {
 						item[key] = buildRegex(val);
 						items.push(item);
 					});
+
 					return items;
 				} else {
 					item[key] = buildRegex(value);
+
 					return item;
 				}
 			};
@@ -97,15 +94,21 @@ module.exports = function(mongoose) {
 		};
 
 		var regexContains = function (val) {
-			return (typeof val)==='string' ? new RegExp(sanitize(val), 'i'):val;
+			return (typeof val === 'string' ?
+				new RegExp(sanitize(val), 'i') :
+				val);
 		};
 
 		var regexStartsWith = function (val) {
-			return (typeof val)==='string' ? new RegExp('^' + sanitize(val), 'i'): val;
+			return (typeof val === 'string' ?
+				new RegExp('^' + sanitize(val), 'i') :
+				val);
 		};
 
 		var regexExact = function (val) {
-			return (typeof val)==='string' ?new RegExp('^' + sanitize(val) + '$', 'i'): val;
+			return (typeof val === 'string' ?
+				new RegExp('^' + sanitize(val) + '$', 'i') :
+				val);
 		};
 
 		// MANDATORY

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose-middleware",
   "description": "Middleware for mongoose that makes filtering, sorting, pagination and projection chainable and simple to apply",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "scripts": {
     "pretest": "rm -rf lib-cov ; jshint lib/*.js ; jscoverage lib lib-cov",
     "test": "mocha --check-leaks -R spec -r ./test/common.js -u bdd ./test/lib/*.js",

test/lib/filter.js

@@ -13,15 +13,8 @@ describe('filter', function () {
 			}
 		};
 
-		mongoose.Query.prototype.where = function (key) {
-			return {
-				regex : function (value) {
-					whereClause[key] = value;
-				},
-				equals : function (value) {
-					whereClause[key] = value;
-				}
-			}
+		mongoose.Query.prototype.where = function (key, val) {
+			whereClause[key] = val;
 		};
 	});