fix leanQuery with flat option (#21)

* fix leanQuery with flat option
* several smaller fixes and promise tests
* boolean conversion allows numbers (0=false, !0 = true) and undefined (=true)
* fix: count promise resolves now same count object than callback
* add promise tests which validate same thing than callback tests
* disconnect mongoose after tests

README.md

@@ -21,6 +21,7 @@ model.find({group: "users"}).select("name").skip(1).limit(5).populate('name')
 
 |versio|Changes|
 |------|-------|
+|0.4.0|Fix lean query with flatten + couple other and add promise tests|
 |0.3.0|Big refactoring, see more from release note.. e.g. mongoose 4.x support|
 |0.2.1|added oid support, fixed aggregate and support mongoose => 3.8.1
 |0.2.0|replace underscore with lodash, possible to return promise when no callback in use|

lib/index.js

@@ -45,7 +45,7 @@ module.exports = function QueryPlugin (schema, options) {
           break;
       case('count'):
           if (!callback) {
-            return this.count(q.q);
+            return this.count(q.q).exec().then(count => ({count}));
           }
           this.count(q.q, (error,count) => {
             if(error) callback(error);
@@ -107,28 +107,28 @@ module.exports = function QueryPlugin (schema, options) {
           return query.findOne(callback);
         }
       } else {
-        if( q.fl ) {
+        if (q.fl) {
           if (callback) {
             query.find((error, docs) => {
-              if(error) callback(error);
+              if (error) callback(error);
               else {
-                let arr = [];
+                const arr = [];
                 docs.forEach((doc) => {
-                  let json = doc.toJSON({virtuals: true});
-                  arr.push( flatten(json));
+                  const json = opt.lean ? doc : doc.toJSON({virtuals: true});
+                  arr.push(flatten(json));
                 });
                 callback(error, arr);
               }
             });
           } else {
             return new Promise((resolve, reject) => {
               query.find((error, docs) => {
-                if(error) reject(error);
+                if (error) reject(error);
                 else {
-                  let arr = [];
+                  const arr = [];
                   docs.forEach((doc) => {
-                    let json = doc.toJSON({virtuals: true});
-                    arr.push( flatten(json));
+                    const json = opt.lean ? doc : doc.toJSON({virtuals: true});
+                    arr.push(flatten(json));
                   });
                   resolve(arr);
                 }

lib/tools.js

@@ -1,4 +1,5 @@
 const util = require('util')
+  , _ = require('lodash')
   , logger = require('./logger');
 
 module.exports.toJSON = function(str){
@@ -10,8 +11,13 @@ module.exports.toJSON = function(str){
     json = {};
   }
   return json;
-}
+};
 module.exports.toBool = function (str) {
+  if (_.isUndefined(str))
+    return true;
+  if (_.isNumber(str)) {
+    return str === 0 ? false : true;
+  }
   if (str.toLowerCase() === "true" ||
       str.toLowerCase() === "yes" ){
     return true;
@@ -22,7 +28,7 @@ module.exports.toBool = function (str) {
   } else {
     return -1;
   }
-}
+};
 function parseDate(str) {
   //31/2/2010
   var m = str.match(/^(\d{1,2})[\/\s\.\-\,](\d{1,2})[\/\s\.\-\,](\d{4})$/);
@@ -41,4 +47,4 @@ module.exports.isStringValidDate = function(str){
   if(isDate(parseDate(str)))return true;
   if(isDate(parseDate2(str)))return true;
   return false;
-}
+};

package.json

@@ -1,33 +1,37 @@
 {
   "name": "mongoose-query",
   "description": "mongoose Query lib",
-  "keywords": ["mongoose", "query", "mongodb"],
-  "version": "0.3.0",
+  "keywords": [
+    "mongoose",
+    "query",
+    "mongodb"
+  ],
+  "version": "0.4.0",
   "homepage": "https://github.com/jupe/mongoose-query",
   "author": "Jussi Vatjus-Anttila <jussiva@gmail.com>)",
   "main": "lib/index",
-  "bugs" : {
-    "url" : "https://github.com/jupe/mongoose-query/issues"
+  "bugs": {
+    "url": "https://github.com/jupe/mongoose-query/issues"
   },
   "repository": {
-        "type": "git",
-        "url": "https://github.com/jupe/mongoose-query"
+    "type": "git",
+    "url": "https://github.com/jupe/mongoose-query"
   },
-  "licenses" : "MIT",
+  "license": "MIT",
   "dependencies": {
     "mongoose": "^4.11.4",
     "flat": "*",
     "lodash": "*"
   },
   "devDependencies": {
-      "mocha": "3.5.3",
-      "chai": "*",
-      "request": "*"
+    "chai": "*",
+    "mocha": "^4.0.1",
+    "request": "*"
   },
   "contributors": [
     "Jussi Vatjus-Anttila <jussiva@gmail.com>"
   ],
   "scripts": {
-   "test": "mocha -R list"
+    "test": "mocha -R list"
   }
 }