nested factories fully working

index.js

@@ -16,7 +16,7 @@ module.exports = function(sails){
         },
 
         parsePolicies: parsePolicies,
-        parsePolicy: parsePolicy,
+        parseEsprima: parseEsprima,
     };
 }
 
@@ -37,37 +37,52 @@ function parsePolicies(input){
 
 
     if(type === 'string'){
+        var parsedString = esprima.parse(input).body[0].expression;
+        return this.parseEsprima(parsedString);
+    }
 
-        var functionMatches = input.match(/^(.*)\((.*)\)$/);
 
+    return input;
+}
 
-        // the policy is a function
-        if(functionMatches !== null){
 
-            var parsed = esprima.parse(functionMatches[0]);
+/*
+    input [Esprima Object]
+*/
+function parseEsprima(input){
+
+    var type = input.type;
 
-            var functionName = parsed.body[0].expression.callee.name;
-            var args = parsed.body[0].expression.arguments.map(function(arg){
-                return arg.value;
-            });
+    if(type === esprimaType.value){
+        return input.value;
+    }
 
 
-            var policyFactory = require(sails.config.paths.policiesFactories + '/' + functionName);
+    if(type === esprimaType.policy){
 
-            var policy = policyFactory.apply(this, args);
+        var policyName = input.name;
 
-            return policy;
-        }
+        return require(sails.config.paths.policies + '/' + policyName);
     }
 
 
-    return input;
-}
+    if(type === esprimaType.factory){
 
+        var factoryName = input.callee.name;
+
+        var factory = require(sails.config.paths.policiesFactories + '/' + factoryName);
+        var args = input.arguments.map(this.parseEsprima, this);
+
+        return factory.apply(this, args);
+    }
+
+
+    throw new Error('esprima type unhandled: ' + type);
+}
 
-/*
-    input [Esprima Object]
-*/
-function parsePolicy(input){
 
+var esprimaType = {
+    value: 'Literal',
+    policy: 'Identifier',
+    factory: 'CallExpression',
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sails-hook-parametized-policies",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "",
   "main": "index.js",
   "directories": {

test/nestedSpec.js

@@ -33,9 +33,9 @@ describe('parametized policies hook - nested factories', function(){
             },
             policies: {
                 'NestedController': {
-                    'policiesArgs': ['or(isAdmin, accept)'],
-                    'mixedArgs': 'or(isAdmin, is(\'User\'))',
-                    'factoriesArgs': 'or(is(\'Admin\'), is(\'User\'))',
+                    'policiesArgs': ['and(isAdmin, accept)'],
+                    'mixedArgs': 'and(isAdmin, is(\'User\'))',
+                    'factoriesArgs': 'and(is(\'Admin\'), is(\'User\'))',
                 }
             }
         }, function(err, _sails){

test/policiesFactories/and.js

@@ -0,0 +1,11 @@
+
+module.exports = function(firstFn, secondFn){
+
+    return function(req, res, next){
+
+        firstFn(req, res, function(){
+
+            secondFn(req, res, next);
+        });
+    };
+};