use async for allowed handlers

README.md

@@ -17,7 +17,7 @@ bower i -S guard
 npm i -S guard-bit
 ```
 ### File
-Save [guard.min.js](https://raw.githubusercontent.com/iofjuupasli/guard/v1.0.3/guard.min.js) or [guard.js](https://raw.githubusercontent.com/iofjuupasli/guard/v1.0.3/guard.js) to your assets folder
+Save [guard.min.js](https://raw.githubusercontent.com/iofjuupasli/guard/v1.0.4/guard.min.js) or [guard.js](https://raw.githubusercontent.com/iofjuupasli/guard/v1.0.4/guard.js) to your assets folder
 
 Examples
 =============
@@ -151,7 +151,7 @@ guard(function (message) {
 // level === 1
 guard('@:profile:read', function () {
     console.log('My Profile');
-})(); // 'My Profile' immediately
+})(); // 'My Profile' immediately (but async)
 
 guard('adminFeature', function () {
     console.log('called!');

bower.json

@@ -2,7 +2,7 @@
   "name": "guard",
   "description": "Utility to split opportunities by the account level (free\\pro\\enterprise\\etc.) for frontend and node",
   "main": "guard.js",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "homepage": "https://github.com/iofjuupasli/guard",
   "authors": [
     "iofjuupasli <[email protected]>"

guard.js

@@ -52,32 +52,38 @@
 
         function reqThenCallback(feature, callback) {
             return function () {
-                if (!config[level].request) {
+                var args = arguments;
+                if (checkAccess(feature)) {
+                    setTimeout(function () {
+                        callback.apply(null, args);
+                    }, 0);
                     return;
                 }
-                var args = arguments;
                 requestQueue.push(callback);
                 if (isRequesting) {
                     return;
-                } else {
-                    isRequesting = true;
                 }
-                config[level].request(function (err) {
+                isRequesting = true;
+                if (config[level].request) {
+                    config[level].request(requestHandler);
+                }
+
+                function requestHandler(err) {
                     isRequesting = false;
                     if (err) {
                         requestQueue = [];
                         return;
                     }
                     guard.setLevel(level + 1);
                     while (requestQueue.length) {
-                        if (feature) {
-                            guard(feature, requestQueue.shift())
-                                .apply(null, args);
+                        var nextRequest = requestQueue.shift();
+                        if (feature != null) {
+                            guard(feature, nextRequest).apply(null, args);
                         } else {
-                            guard(requestQueue.shift()).apply(null, args);
+                            guard(nextRequest).apply(null, args);
                         }
                     }
-                });
+                }
             };
         }
 
@@ -87,23 +93,15 @@
             }
             if (arguments.length === 1) {
                 if (_.isFunction(arguments[0])) {
-                    if (checkAccess()) {
-                        return arguments[0];
-                    } else {
-                        return reqThenCallback(null, arguments[0]);
-                    }
+                    return reqThenCallback(null, arguments[0]);
                 } else {
                     return checkAccess(arguments[0]);
                 }
             }
             if (!_.isFunction(arguments[1])) {
                 throw new TypeError();
             }
-            if (checkAccess(arguments[0])) {
-                return arguments[1];
-            } else {
-                return reqThenCallback(arguments[0], arguments[1]);
-            }
+            return reqThenCallback(arguments[0], arguments[1]);
         };
 
         guard.request = function (callback) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "guard-bit",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Utility to split opportunities by the account level (free\\pro\\enterprise\\etc.) for frontend and node",
   "main": "guard.js",
   "keywords": [