From c7dd08b138f32543c6e9431b1ca721f472c428fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20H=C3=A4berle?= <jonathan.haeberle@gmail.com>
Date: Wed, 23 Jul 2014 09:48:37 +0200
Subject: [PATCH] added test for ppromises filter

---
 browser-dist/modelizer-angular.js | 58 ++++++++++++++++++++++---------
 browser-dist/modelizer.js         | 58 ++++++++++++++++++++++---------
 lib/model.js                      | 58 ++++++++++++++++++++++---------
 lib/modelizer.js                  |  6 ++--
 test/orm.spec.js                  |  3 +-
 5 files changed, 131 insertions(+), 52 deletions(-)

diff --git a/browser-dist/modelizer-angular.js b/browser-dist/modelizer-angular.js
index efb2e5e..c778a2a 100644
--- a/browser-dist/modelizer-angular.js
+++ b/browser-dist/modelizer-angular.js
@@ -1034,17 +1034,30 @@ Model.prototype.readFilter = function(fn) {
 // create the filter hash (mongo search string)
 Model.prototype._getReadFilter = function(req) {
   var res = {};
+  var bool_res = null;
+
+  var promises = [];
+
   for (var i=0; i<this.readFilters.length; i++) {  // alle filter
-    var filter = this.readFilters[i](req);
-    if (filter === false) return false;  // deny all filter
-    if (filter === true) continue;  // ignore filter
+    promises.push(Q(this.readFilters[i](req))
+      .then(function(filter) {
+        if (filter === false) bool_res = false;
+        if (filter === true) bool_res = true;
+
+        // copy content
+        for (var j in filter) {
+          res[j] = filter[j];
+        }
 
-    // copy content
-    for (var j in filter) {
-      res[j] = filter[j];
-    }
+      }))
   }
-  return res;
+
+  return Q.all(promises)
+    .then(function() {
+      if (bool_res === null)
+        return res
+      else return bool_res;
+    })
 }
 
 
@@ -1056,17 +1069,30 @@ Model.prototype.writeFilter = function(fn) {
 // create the filter hash (mongo search string)
 Model.prototype._getWriteFilter = function(obj, req) {
   var res = {};
+  var bool_res = null;
+
+  var promises = [];
+
   for (var i=0; i<this.writeFilters.length; i++) {  // alle filter
-    var filter = this.writeFilters[i](obj, req);
-    if (filter === false) return false;  // deny all filter
-    if (filter === true) continue;  // ignore filter
+    promises.push(Q(this.writeFilters[i](req))
+      .then(function (filter) {
+        if (filter === false) bool_res = false;
+        if (filter === true) bool_res = true;
+
+        // copy content
+        for (var j in filter) {
+          res[j] = filter[j];
+        }
 
-    // copy content
-    for (var j in filter) {
-      res[j] = filter[j];
-    }
+      }))
   }
-  return res;
+
+  return Q.all(promises)
+    .then(function() {
+      if (bool_res === null)
+        return res
+      else return bool_res;
+    })
 }
 
 // Using the model (static functions)
diff --git a/browser-dist/modelizer.js b/browser-dist/modelizer.js
index 8311b72..18b6037 100644
--- a/browser-dist/modelizer.js
+++ b/browser-dist/modelizer.js
@@ -834,17 +834,30 @@ Model.prototype.readFilter = function(fn) {
 // create the filter hash (mongo search string)
 Model.prototype._getReadFilter = function(req) {
   var res = {};
+  var bool_res = null;
+
+  var promises = [];
+
   for (var i=0; i<this.readFilters.length; i++) {  // alle filter
-    var filter = this.readFilters[i](req);
-    if (filter === false) return false;  // deny all filter
-    if (filter === true) continue;  // ignore filter
+    promises.push(Q(this.readFilters[i](req))
+      .then(function(filter) {
+        if (filter === false) bool_res = false;
+        if (filter === true) bool_res = true;
+
+        // copy content
+        for (var j in filter) {
+          res[j] = filter[j];
+        }
 
-    // copy content
-    for (var j in filter) {
-      res[j] = filter[j];
-    }
+      }))
   }
-  return res;
+
+  return Q.all(promises)
+    .then(function() {
+      if (bool_res === null)
+        return res
+      else return bool_res;
+    })
 }
 
 
@@ -856,17 +869,30 @@ Model.prototype.writeFilter = function(fn) {
 // create the filter hash (mongo search string)
 Model.prototype._getWriteFilter = function(obj, req) {
   var res = {};
+  var bool_res = null;
+
+  var promises = [];
+
   for (var i=0; i<this.writeFilters.length; i++) {  // alle filter
-    var filter = this.writeFilters[i](obj, req);
-    if (filter === false) return false;  // deny all filter
-    if (filter === true) continue;  // ignore filter
+    promises.push(Q(this.writeFilters[i](req))
+      .then(function (filter) {
+        if (filter === false) bool_res = false;
+        if (filter === true) bool_res = true;
+
+        // copy content
+        for (var j in filter) {
+          res[j] = filter[j];
+        }
 
-    // copy content
-    for (var j in filter) {
-      res[j] = filter[j];
-    }
+      }))
   }
-  return res;
+
+  return Q.all(promises)
+    .then(function() {
+      if (bool_res === null)
+        return res
+      else return bool_res;
+    })
 }
 
 // Using the model (static functions)
diff --git a/lib/model.js b/lib/model.js
index 8ddf114..f3b102b 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -802,17 +802,30 @@ Model.prototype.readFilter = function(fn) {
 // create the filter hash (mongo search string)
 Model.prototype._getReadFilter = function(req) {
   var res = {};
+  var bool_res = null;
+
+  var promises = [];
+
   for (var i=0; i<this.readFilters.length; i++) {  // alle filter
-    var filter = this.readFilters[i](req);
-    if (filter === false) return false;  // deny all filter
-    if (filter === true) continue;  // ignore filter
+    promises.push(Q(this.readFilters[i](req))
+      .then(function(filter) {
+        if (filter === false) bool_res = false;
+        if (filter === true) bool_res = true;
+
+        // copy content
+        for (var j in filter) {
+          res[j] = filter[j];
+        }
 
-    // copy content
-    for (var j in filter) {
-      res[j] = filter[j];
-    }
+      }))
   }
-  return res;
+
+  return Q.all(promises)
+    .then(function() {
+      if (bool_res === null)
+        return res
+      else return bool_res;
+    })
 }
 
 
@@ -824,17 +837,30 @@ Model.prototype.writeFilter = function(fn) {
 // create the filter hash (mongo search string)
 Model.prototype._getWriteFilter = function(obj, req) {
   var res = {};
+  var bool_res = null;
+
+  var promises = [];
+
   for (var i=0; i<this.writeFilters.length; i++) {  // alle filter
-    var filter = this.writeFilters[i](obj, req);
-    if (filter === false) return false;  // deny all filter
-    if (filter === true) continue;  // ignore filter
+    promises.push(Q(this.writeFilters[i](req))
+      .then(function (filter) {
+        if (filter === false) bool_res = false;
+        if (filter === true) bool_res = true;
+
+        // copy content
+        for (var j in filter) {
+          res[j] = filter[j];
+        }
 
-    // copy content
-    for (var j in filter) {
-      res[j] = filter[j];
-    }
+      }))
   }
-  return res;
+
+  return Q.all(promises)
+    .then(function() {
+      if (bool_res === null)
+        return res
+      else return bool_res;
+    })
 }
 
 // Using the model (static functions)
diff --git a/lib/modelizer.js b/lib/modelizer.js
index aa565c5..da06e63 100644
--- a/lib/modelizer.js
+++ b/lib/modelizer.js
@@ -231,7 +231,7 @@ Model.prototype.filtered_getQ = function (id_str, req) {
 Model.prototype.filtered_findQ = function (search, req) {
   var self = this;
 
-  return Q(this._getReadFilter(req))
+  return this._getReadFilter(req)
     .then(function(filter) {
       if (filter === false) {  // deny all
         var deniedError = new Error("Access denied!");
@@ -246,7 +246,7 @@ Model.prototype.filtered_findQ = function (search, req) {
       }
 
       // weiterrichen an die eigentliche Suche
-      //console.log(search);
+      console.log(search);
       return self.findQ(search);
 
     });
@@ -263,7 +263,7 @@ Model.prototype.filtered_saveQ = function (obj, req) {
 
   var self = this;
 
-  return Q(this._getWriteFilter(obj, req))
+  return this._getWriteFilter(obj, req)
     .then(function(filter) {
       if (filter === false) {  // deny all
         var deniedError = new Error("Access denied!");
diff --git a/test/orm.spec.js b/test/orm.spec.js
index 0febcf2..448ca2e 100644
--- a/test/orm.spec.js
+++ b/test/orm.spec.js
@@ -471,7 +471,8 @@ describe('Modelizer', function() {
 
     it('filter for attr1 should be A', function(done) {
       MyModel5.readFilter(function () {
-        return {attr1 : "A"};
+        //return {attr1 : "A"};
+        return Q({attr1 : "A"});
       });
 
       MyModel5.filtered_allQ()