inheritsResource method added

Author: StyleT

dist/acl.js

@@ -297,10 +297,10 @@ angular.module('stylet.acl').service('AclService', ["AclRegistryService", functi
      * the existing Resource from which the newly added Resource will inherit.
      *
      * @param  {string} resource
-     * @param  {string} parent
+     * @param  {string} [parent=null] parent
      * @return {AclService} Provides a fluent interface
      */
-    this.addResource = function (resource, parent /*null*/) {
+    this.addResource = function (resource, parent) {
         parent = typeof parent === 'undefined' ? null : parent;
 
         var resourceId = resource;
@@ -363,6 +363,47 @@ angular.module('stylet.acl').service('AclService', ["AclRegistryService", functi
         return _resources[resource] !== undefined;
     };
 
+    /**
+     * Returns true if and only if $resource inherits from $inherit
+     *
+     * Both parameters may be either a Resource or a Resource identifier. If
+     * $onlyParent is true, then $resource must inherit directly from
+     * $inherit in order to return true. By default, this method looks
+     * through the entire inheritance tree to determine whether $resource
+     * inherits from $inherit through its ancestor Resources.
+     *
+     * @param {(AclResourceInterface|string)} resource
+     * @param {(AclResourceInterface|string)} inherit
+     * @param {boolean} [onlyParent=false] onlyParent
+     * @return {boolean}
+     */
+    this.inheritsResource = function (resource, inherit, onlyParent) {
+        resource = self.getResource(resource);
+        inherit = self.getResource(inherit);
+
+        var parentId = null;
+
+        if (_resources[resource].parent !== null) {
+            parentId = _resources[resource].parent;
+            if (parentId === inherit) {
+                return true;
+            } else if (onlyParent) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+
+        while (_resources[parentId].parent !== null) {
+            parentId = _resources[parentId].parent;
+            if (inherit === parentId) {
+                return true;
+            }
+        }
+
+        return false;
+    };
+
     /**
      * Removes a Resource and all of its children
      *

src/acl-service.js

@@ -296,10 +296,10 @@ angular.module('stylet.acl').service('AclService', function (AclRegistryService)
      * the existing Resource from which the newly added Resource will inherit.
      *
      * @param  {string} resource
-     * @param  {string} parent
+     * @param  {string} [parent=null] parent
      * @return {AclService} Provides a fluent interface
      */
-    this.addResource = function (resource, parent /*null*/) {
+    this.addResource = function (resource, parent) {
         parent = typeof parent === 'undefined' ? null : parent;
 
         var resourceId = resource;
@@ -362,6 +362,47 @@ angular.module('stylet.acl').service('AclService', function (AclRegistryService)
         return _resources[resource] !== undefined;
     };
 
+    /**
+     * Returns true if and only if $resource inherits from $inherit
+     *
+     * Both parameters may be either a Resource or a Resource identifier. If
+     * $onlyParent is true, then $resource must inherit directly from
+     * $inherit in order to return true. By default, this method looks
+     * through the entire inheritance tree to determine whether $resource
+     * inherits from $inherit through its ancestor Resources.
+     *
+     * @param {(AclResourceInterface|string)} resource
+     * @param {(AclResourceInterface|string)} inherit
+     * @param {boolean} [onlyParent=false] onlyParent
+     * @return {boolean}
+     */
+    this.inheritsResource = function (resource, inherit, onlyParent) {
+        resource = self.getResource(resource);
+        inherit = self.getResource(inherit);
+
+        var parentId = null;
+
+        if (_resources[resource].parent !== null) {
+            parentId = _resources[resource].parent;
+            if (parentId === inherit) {
+                return true;
+            } else if (onlyParent) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+
+        while (_resources[parentId].parent !== null) {
+            parentId = _resources[parentId].parent;
+            if (inherit === parentId) {
+                return true;
+            }
+        }
+
+        return false;
+    };
+
     /**
      * Removes a Resource and all of its children
      *

test/acl-service.js

@@ -143,6 +143,35 @@ describe('ncAclService', function () {
             }).toThrow();
         });
 
+        it('ensures that an exception is thrown when a non-existent resource is specified to each parameter of inherits()', function () {
+            AclService.addResource('Animal');
+
+            expect(function() {
+                AclService.inheritsResource('nonexistent', 'Animal');
+            }).toThrow();
+
+            expect(function() {
+                AclService.inheritsResource('Animal', 'nonexistent');
+            }).toThrow();
+        });
+
+        it('tests basic resource inheritance', function () {
+            AclService.addResource('city');
+            AclService.addResource('building', 'city');
+            AclService.addResource('room', 'building');
+
+            expect(AclService.inheritsResource('building', 'city', true)).toBeTruthy();
+            expect(AclService.inheritsResource('room', 'building', true)).toBeTruthy();
+            expect(AclService.inheritsResource('room', 'city')).toBeTruthy();
+            expect(AclService.inheritsResource('room', 'city', true)).toBeFalsy();
+            expect(AclService.inheritsResource('city', 'building')).toBeFalsy();
+            expect(AclService.inheritsResource('building', 'room')).toBeFalsy();
+            expect(AclService.inheritsResource('city', 'room')).toBeFalsy();
+
+            AclService.removeResource('building');
+            expect(AclService.hasResource('room')).toBeFalsy();
+        });
+
     });
 
     describe('can()', function () {