From 3ed663bb6bff0bd12cbfae6766c662ef251580a4 Mon Sep 17 00:00:00 2001
From: iofjuupasli <iofjuupasli@gmail.com>
Date: Thu, 13 Nov 2014 15:09:59 +0300
Subject: [PATCH] use async for allowed handlers

---
 README.md    |   4 +-
 bower.json   |   2 +-
 guard.js     |  38 ++++----
 guard.min.js |   2 +-
 package.json |   2 +-
 test/test.js | 254 +++++++++++++++++----------------------------------
 6 files changed, 108 insertions(+), 194 deletions(-)

diff --git a/README.md b/README.md
index 2bbf78d..34fb32e 100644
--- a/README.md
+++ b/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!');
diff --git a/bower.json b/bower.json
index 67ce4a2..6178b11 100644
--- a/bower.json
+++ b/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 <iofjuupasli@gmail.com>"
diff --git a/guard.js b/guard.js
index 6cb64d2..be90e07 100644
--- a/guard.js
+++ b/guard.js
@@ -52,17 +52,23 @@
 
         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 = [];
@@ -70,14 +76,14 @@
                     }
                     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,11 +93,7 @@
             }
             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]);
                 }
@@ -99,11 +101,7 @@
             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) {
diff --git a/guard.min.js b/guard.min.js
index 2c60268..8cbe91c 100644
--- a/guard.min.js
+++ b/guard.min.js
@@ -1 +1 @@
-(function(root,factory){"use strict";if(typeof define==="function"&&define.amd){define([],factory)}else if(typeof exports==="object"){module.exports=factory()}else{root.Guard=factory()}})(this,function(){"use strict";return function(initConfig){var level=0;var config;var listeners=[];var isRequesting=false;var requestQueue=[];var _={isFunction:function(value){return typeof value=="function"},isArray:function(value){return Array.isArray(value)},isRegExp:function(value){return value instanceof RegExp}};function checkAccess(requestRule){if(!requestRule){return level>0}return function(){for(var i=0;i<=level;i++){var rules=config[i].allowed;for(var j=0;j<rules.length;j++){if(rules[j].test(requestRule)){return true}}}return false}()}function reqThenCallback(feature,callback){return function(){if(!config[level].request){return}var args=arguments;requestQueue.push(callback);if(isRequesting){return}else{isRequesting=true}config[level].request(function(err){isRequesting=false;if(err){requestQueue=[];return}guard.setLevel(level+1);while(requestQueue.length){if(feature){guard(feature,requestQueue.shift()).apply(null,args)}else{guard(requestQueue.shift()).apply(null,args)}}})}}var guard=function guard(){if(arguments.length===0){return checkAccess()}if(arguments.length===1){if(_.isFunction(arguments[0])){if(checkAccess()){return arguments[0]}else{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])}};guard.request=function(callback){if(callback&&!_.isFunction(callback)){throw new TypeError}if(!callback){callback=function(){}}return reqThenCallback(null,callback)()};guard.setup=function(newConfig){if(_.isFunction(newConfig)){config=[{allowed:[],request:newConfig},{allowed:[/.*/]}]}else if(_.isArray(newConfig)){config=newConfig.map(function(val){return{allowed:val.allowed.map(function(rule){if(_.isRegExp(rule)){return rule}var ruleNorm="^"+rule.replace("*",".*")+"$";return new RegExp(ruleNorm)}),request:val.request}})}else{config=[{allowed:[]},{allowed:[/.*/]}]}return config};guard.setLevel=function(newLevel){level=newLevel;listeners.forEach(function(listener){listener(newLevel)})};guard.getLevel=function(){return level};guard.listen=function(listener){listeners.push(listener);return function(){var i=listeners.indexOf(listener);if(i!==-1){listeners.splice(i,1)}listener=null}};guard.setup(initConfig);return guard}});
\ No newline at end of file
+(function(root,factory){"use strict";if(typeof define==="function"&&define.amd){define([],factory)}else if(typeof exports==="object"){module.exports=factory()}else{root.Guard=factory()}})(this,function(){"use strict";return function(initConfig){var level=0;var config;var listeners=[];var isRequesting=false;var requestQueue=[];var _={isFunction:function(value){return typeof value=="function"},isArray:function(value){return Array.isArray(value)},isRegExp:function(value){return value instanceof RegExp}};function checkAccess(requestRule){if(!requestRule){return level>0}return function(){for(var i=0;i<=level;i++){var rules=config[i].allowed;for(var j=0;j<rules.length;j++){if(rules[j].test(requestRule)){return true}}}return false}()}function reqThenCallback(feature,callback){return function(){var args=arguments;if(checkAccess(feature)){setTimeout(function(){callback.apply(null,args)},0);return}requestQueue.push(callback);if(isRequesting){return}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){var nextRequest=requestQueue.shift();if(feature!=null){guard(feature,nextRequest).apply(null,args)}else{guard(nextRequest).apply(null,args)}}}}}var guard=function guard(){if(arguments.length===0){return checkAccess()}if(arguments.length===1){if(_.isFunction(arguments[0])){return reqThenCallback(null,arguments[0])}else{return checkAccess(arguments[0])}}if(!_.isFunction(arguments[1])){throw new TypeError}return reqThenCallback(arguments[0],arguments[1])};guard.request=function(callback){if(callback&&!_.isFunction(callback)){throw new TypeError}if(!callback){callback=function(){}}return reqThenCallback(null,callback)()};guard.setup=function(newConfig){if(_.isFunction(newConfig)){config=[{allowed:[],request:newConfig},{allowed:[/.*/]}]}else if(_.isArray(newConfig)){config=newConfig.map(function(val){return{allowed:val.allowed.map(function(rule){if(_.isRegExp(rule)){return rule}var ruleNorm="^"+rule.replace("*",".*")+"$";return new RegExp(ruleNorm)}),request:val.request}})}else{config=[{allowed:[]},{allowed:[/.*/]}]}return config};guard.setLevel=function(newLevel){level=newLevel;listeners.forEach(function(listener){listener(newLevel)})};guard.getLevel=function(){return level};guard.listen=function(listener){listeners.push(listener);return function(){var i=listeners.indexOf(listener);if(i!==-1){listeners.splice(i,1)}listener=null}};guard.setup(initConfig);return guard}});
\ No newline at end of file
diff --git a/package.json b/package.json
index 0faed99..67fd90a 100644
--- a/package.json
+++ b/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": [
diff --git a/test/test.js b/test/test.js
index ae32b80..80b917b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -13,12 +13,6 @@ function successRequest(done) {
     done();
 }
 
-function asyncSuccess(done) {
-    setTimeout(function () {
-        done();
-    }, 0);
-}
-
 function failRequest(done) {
     done('error');
 }
@@ -52,59 +46,77 @@ describe('guard', function () {
                 it('allows any rule', function () {
                     guard('anyRule').should.be.true;
                 });
-                it('returns same handler', function () {
-                    guard(noop).should.equal(noop);
+                it('allows handler calling', function (done) {
+                    guard(done)();
                 });
-                it('returns same handler for any rule', function () {
-                    guard('anyRule', noop).should.equal(noop);
+                it('allows handler calling for any rule', function (done) {
+                    guard('anyRule', done)();
                 });
-                it('returns handler with same signature', function () {
-                    var spy = chai.spy(noop);
+                it('returns handler with same signature', function (done) {
                     var arg = 'smth';
+                    var spy = chai.spy(function (arg1) {
+                        arg1.should.equal(arg);
+                        done();
+                    });
                     guard(spy)(arg);
-                    spy.should.have.been.called.with(arg);
                 });
             });
         }
         describe('w/o config', function () {
             asWithoutConfig();
+            it('ignores forbiden handlers', function (done) {
+                var guard = Guard();
+                var spy = chai.spy(noop);
+                guard('anyRule', spy)();
+                setTimeout(function () {
+                    spy.should.have.not.been.called();
+                    done();
+                }, 0);
+            });
         });
         describe('with request fn config', function () {
             describe('with success request', function () {
-                var guard, spy, requestSpy;
+                var guard, requestSpy;
                 beforeEach(function () {
                     requestSpy = chai.spy(successRequest);
                     guard = Guard(requestSpy);
-                    spy = chai.spy(noop);
                 });
                 asWithoutConfig(successRequest);
                 it('allows and level increase when handler provided',
-                    function () {
+                    function (done) {
+                        var spy = chai.spy(function () {
+                            guard.getLevel().should.equal(1);
+                            requestSpy.should.have.been.called.once;
+                            done();
+                        });
                         guard(spy)();
-                        guard.getLevel().should.equal(1);
-                        spy.should.have.been.called.once;
-                        requestSpy.should.have.been.called.once;
                     });
                 it('returns handler that accept args as provided handler',
-                    function () {
+                    function (done) {
                         var arg = 'smth';
+                        var spy = chai.spy(function (arg1) {
+                            arg1.should.equal(arg);
+                            done();
+                        });
                         guard(spy)(arg);
-                        spy.should.have.been.called.with(arg);
                     });
             });
             describe('with fail request', function () {
-                var guard, spy, requestSpy;
+                var guard, requestSpy;
                 beforeEach(function () {
                     requestSpy = chai.spy(failRequest);
                     guard = Guard(requestSpy);
-                    spy = chai.spy(noop);
                 });
                 asWithoutConfig(failRequest);
-                it('forbid with handler provided', function () {
+                it('forbid with handler provided', function (done) {
+                    var spy = chai.spy(noop);
                     guard(spy)();
-                    guard.getLevel().should.equal(0);
-                    spy.should.have.not.been.called();
-                    requestSpy.should.have.been.called.once;
+                    setTimeout(function () {
+                        guard.getLevel().should.equal(0);
+                        spy.should.have.not.been.called();
+                        requestSpy.should.have.been.called.once;
+                        done();
+                    }, 0);
                 });
             });
             describe('with async success request', function () {
@@ -114,7 +126,9 @@ describe('guard', function () {
                         requestSpy = chai.spy(function (requestDone) {
                             setTimeout(function () {
                                 requestDone();
-                                done();
+                                setTimeout(function () {
+                                    done();
+                                }, 0);
                             }, 0);
                         });
                         guard = Guard(requestSpy);
@@ -134,7 +148,7 @@ describe('guard', function () {
             });
         });
         describe('with 2 levels config', function () {
-            var guard, levelZeroReqSpy, levelOneReqSpy, spy;
+            var guard, levelZeroReqSpy, levelOneReqSpy;
             beforeEach(function () {
                 levelZeroReqSpy = chai.spy(successRequest);
                 levelOneReqSpy = chai.spy(successRequest);
@@ -147,25 +161,30 @@ describe('guard', function () {
                 }, {
                     allowed: ['*']
                 }]);
-                spy = chai.spy(noop);
             });
             describe('when on 0 level', function () {
                 it('allows rules on 0 level', function () {
                     guard('zero').should.be.true;
                 });
                 it('request for 1 level when request for 1 level rule',
-                    function () {
+                    function (done) {
+                        var spy = chai.spy(function () {
+                            levelZeroReqSpy.should.have.been.called.once;
+                            spy.should.have.been.called.once;
+                            levelOneReqSpy.should.not.have.been.called();
+                            done();
+                        });
                         guard('one', spy)();
-                        levelZeroReqSpy.should.have.been.called.once;
-                        spy.should.have.been.called.once;
-                        levelOneReqSpy.should.not.have.been.called();
                     });
-                it('request for 1 then 2 level when request for 2 level rule',
-                    function () {
+                it('request for 1 then 2 level when request 2 level rule',
+                    function (done) {
+                        var spy = chai.spy(function () {
+                            levelZeroReqSpy.should.have.been.called.once;
+                            levelOneReqSpy.should.have.been.called.once;
+                            spy.should.have.been.called.once;
+                            done();
+                        });
                         guard('two', spy)();
-                        levelZeroReqSpy.should.have.been.called.once;
-                        levelOneReqSpy.should.have.been.called.once;
-                        spy.should.have.been.called.once;
                     });
                 it('forbids rules on >0 level', function () {
                     guard('one').should.be.false;
@@ -181,11 +200,14 @@ describe('guard', function () {
                     guard('one').should.be.true;
                 });
                 it('request for 2 level when request for 2 level rule',
-                    function () {
+                    function (done) {
+                        var spy = chai.spy(function () {
+                            levelZeroReqSpy.should.not.have.been.called();
+                            levelOneReqSpy.should.have.been.called.once;
+                            spy.should.have.been.called.once;
+                            done();
+                        });
                         guard('two', spy)();
-                        levelZeroReqSpy.should.not.have.been.called();
-                        levelOneReqSpy.should.have.been.called.once;
-                        spy.should.have.been.called.once;
                     });
                 it('forbids rules on >1 level', function () {
                     guard('two').should.be.false;
@@ -198,131 +220,15 @@ describe('guard', function () {
                 guard.bind(null, 'rule', 'invalidType').should.throw(TypeError);
             });
         });
-
-        /// OLD TESTS
-        it('should forbid on 0 level w/o feature specified', function () {
-            var guard = Guard();
-            guard().should.be.false;
-        });
-        it('should allow on > 0 level w/o feature specified', function () {
-            var guard = Guard();
-            guard.setLevel(1);
-            guard().should.be.true;
-        });
-        it('with any rule should forbidden by default', function () {
-            var guard = Guard();
-            guard('anyRule').should.be.false;
-        });
-        it('with any rule should be allowed when authorized', function () {
-            var guard = Guard();
-            guard.setLevel(1);
-            guard('anyRule').should.be.true;
-        });
-        it('should ignore callback on 0 level', function () {
-            var guard = Guard();
-            var spy = chai.spy(noop);
-            guard(spy)();
-            spy.should.have.not.been.called();
-        });
-        it('should call callback on > 0 level', function () {
-            var guard = Guard();
-            var spy = chai.spy(noop);
-            guard.setLevel(1);
-            guard(spy)();
-            spy.should.have.been.called.once;
-        });
-        it('should increase level when next level request success',
-            function () {
-                var requestSpy = chai.spy(successRequest);
-                var guard = Guard(requestSpy);
-                guard.getLevel().should.equal(0);
-                guard.request();
-                requestSpy.should.have.been.called();
-                guard.getLevel().should.equal(1);
-            });
-        it('should save level when next level request fails', function () {
-            var requestSpy = chai.spy(failRequest);
-            var guard = Guard(requestSpy);
-            guard.getLevel().should.equal(0);
-            guard.request();
-            requestSpy.should.have.been.called();
-            guard.getLevel().should.equal(0);
-        });
-        it('should return private callback if authorized', function () {
-            var requestSpy = chai.spy(successRequest);
-            var guard = Guard(requestSpy);
-            guard.request();
-            requestSpy.should.have.been.called();
-            guard(noop).should.equal(noop);
-        });
-        it('should calls private callback after request', function () {
-            var requestSpy = chai.spy(successRequest);
-            var guard = Guard(requestSpy);
-            var spy = chai.spy(noop);
-            guard(spy)();
-            requestSpy.should.have.been.called.once;
-            spy.should.have.been.called.once;
-        });
-        it('shouldn\'t call request when already requesting', function (done) {
-            var requestSpy = chai.spy(asyncSuccess);
-            var guard = Guard(requestSpy);
-            var spy = chai.spy(function () {
-                spy.should.have.been.called.once;
-            });
-            guard(spy)();
-            requestSpy.should.have.been.called.once;
-            var secondCallbackSpy = chai.spy(function () {
-                spy.should.have.been.called.once;
-                requestSpy.should.have.been.called.once;
-                secondCallbackSpy.should.have.been.called.once;
-                done();
-            });
-            guard(secondCallbackSpy)();
-        });
-        it('should call request and then callback if feature not allowed',
-            function () {
-                var requestSpy = chai.spy(successRequest);
-                var guard = Guard(requestSpy);
-                var spy = chai.spy(noop);
-                guard('check', spy)();
-                spy.should.have.been.called.once;
-                requestSpy.should.have.been.called.once;
-            });
-        it('should throw when args invalid', function () {
-            var guard = Guard();
-            guard.bind(null, 'anyRule', 'invalidType').should.throw(TypeError);
-        });
-        it('should ignore rest args', function () {
-            Guard(successRequest)
-                .bind(null, 'anyRule', noop, 'else').should.not.throw();
-        });
-        it('should call all request on path to private feature', function () {
-            var firstRequest = chai.spy(successRequest);
-            var secondRequest = chai.spy(successRequest);
-            var guard = Guard([{
-                allowed: [],
-                request: firstRequest
-            }, {
-                allowed: [],
-                request: secondRequest
-            }, {
-                allowed: ['*']
-            }]);
-            var spy = chai.spy(noop);
-            guard('private', spy)();
-            firstRequest.should.have.been.called.once;
-            secondRequest.should.have.been.called.once;
-            spy.should.have.been.called.once;
-        });
     });
     describe('constructor', function () {
-        it('should use "*" rule as any regexp', function () {
+        it('uses "*" rule as any regexp', function () {
             var guard = Guard([{
                 allowed: ['one.*.three']
             }]);
             guard('one.two.three').should.be.true;
         });
-        it('should use regexp for rules', function () {
+        it('uses regexp for rules', function () {
             var guard = Guard([{
                 allowed: [/(one|two)/]
             }]);
@@ -332,14 +238,14 @@ describe('guard', function () {
         });
     });
     describe('listen', function () {
-        it('should call listeners on level change', function () {
+        it('calls listeners on level change', function () {
             var guard = Guard();
             var spy = chai.spy(noop);
             guard.listen(spy);
             guard.setLevel(1);
             spy.should.have.been.called.once;
         });
-        it('shouldn\'t call listeners after unsubscribe', function () {
+        it('doesn\'t call listeners after unsubscribe', function () {
             var guard = Guard();
             var spy = chai.spy(noop);
             var unsubscribe = guard.listen(spy);
@@ -347,7 +253,7 @@ describe('guard', function () {
             guard.setLevel(1);
             spy.should.have.not.been.called;
         });
-        it('should unsubscribe only once', function () {
+        it('unsubscribes only once', function () {
             var guard = Guard();
             var spy = chai.spy(noop);
             var unsubscribe = guard.listen(spy);
@@ -358,16 +264,26 @@ describe('guard', function () {
         });
     });
     describe('request', function () {
-        it('should throw when invalid args', function () {
+        it('throws when invalid args', function () {
             Guard().request
                 .bind(null, 'shouldBeAFunction').should.throw(TypeError);
         });
-        it('should request then call callback', function () {
+        it('requests then call callback', function (done) {
             var guard = Guard(successRequest);
-            var spy = chai.spy(noop);
+            var spy = chai.spy(function () {
+                spy.should.have.been.called.once;
+                guard.getLevel().should.equal(1);
+                done();
+            });
             guard.request(spy);
-            spy.should.have.been.called.once;
-            guard.getLevel().should.equal(1);
+        });
+        it('requests w/o callback', function (done) {
+            var guard = Guard(successRequest);
+            guard.request();
+            setTimeout(function () {
+                guard.getLevel().should.equal(1);
+                done();
+            }, 0);
         });
     });
 });