Merge pull request #150 from leeyeh/fix-149

[feature] Use the default acl for AV.Role if absent.

Author: wangxiao

dist/av-core.js

@@ -5735,16 +5735,23 @@ module.exports = function(AV) {
      * Constructs a new AVRole with the given name and ACL.
      *
      * @param {String} name The name of the Role to create.
-     * @param {AV.ACL} acl The ACL for this role. Roles must have an ACL.
+     * @param {AV.ACL} [acl] The ACL for this role. if absent, the default ACL
+     *    `{'*': { read: true }}` will be used.
      */
     constructor: function(name, acl) {
-      if (_.isString(name) && (acl instanceof AV.ACL)) {
+      if (_.isString(name)) {
         AV.Object.prototype.constructor.call(this, null, null);
         this.setName(name);
-        this.setACL(acl);
-      } else {
-        AV.Object.prototype.constructor.call(this, name, acl);
       }
+      if (acl === undefined) {
+        var defaultAcl = new AV.ACL();
+        defaultAcl.setPublicReadAccess(true);
+        acl = defaultAcl;
+      }
+      if (!(acl instanceof AV.ACL)) {
+        throw new TypeError('acl must be an instance of AV.ACL');
+      }
+      this.setACL(acl);
     },
 
     /**
@@ -8414,7 +8421,9 @@ function drainQueue() {
         currentQueue = queue;
         queue = [];
         while (++queueIndex < len) {
-            currentQueue[queueIndex].run();
+            if (currentQueue) {
+                currentQueue[queueIndex].run();
+            }
         }
         queueIndex = -1;
         len = queue.length;
@@ -8466,7 +8475,6 @@ process.binding = function (name) {
     throw new Error('process.binding is not supported');
 };
 
-// TODO(shtylman)
 process.cwd = function () { return '/' };
 process.chdir = function (dir) {
     throw new Error('process.chdir is not supported');

dist/av.js

@@ -6603,16 +6603,23 @@ module.exports = function(AV) {
      * Constructs a new AVRole with the given name and ACL.
      *
      * @param {String} name The name of the Role to create.
-     * @param {AV.ACL} acl The ACL for this role. Roles must have an ACL.
+     * @param {AV.ACL} [acl] The ACL for this role. if absent, the default ACL
+     *    `{'*': { read: true }}` will be used.
      */
     constructor: function(name, acl) {
-      if (_.isString(name) && (acl instanceof AV.ACL)) {
+      if (_.isString(name)) {
         AV.Object.prototype.constructor.call(this, null, null);
         this.setName(name);
-        this.setACL(acl);
-      } else {
-        AV.Object.prototype.constructor.call(this, name, acl);
       }
+      if (acl === undefined) {
+        var defaultAcl = new AV.ACL();
+        defaultAcl.setPublicReadAccess(true);
+        acl = defaultAcl;
+      }
+      if (!(acl instanceof AV.ACL)) {
+        throw new TypeError('acl must be an instance of AV.ACL');
+      }
+      this.setACL(acl);
     },
 
     /**
@@ -9616,7 +9623,9 @@ function drainQueue() {
         currentQueue = queue;
         queue = [];
         while (++queueIndex < len) {
-            currentQueue[queueIndex].run();
+            if (currentQueue) {
+                currentQueue[queueIndex].run();
+            }
         }
         queueIndex = -1;
         len = queue.length;
@@ -9668,7 +9677,6 @@ process.binding = function (name) {
     throw new Error('process.binding is not supported');
 };
 
-// TODO(shtylman)
 process.cwd = function () { return '/' };
 process.chdir = function (dir) {
     throw new Error('process.chdir is not supported');

gulpfile.js

@@ -120,6 +120,7 @@ gulp.task('test', function() {
       'query.js',
       'geopoint.js',
       'acl.js',
+      'role.js',
       'master_key.js',
       'status.js',
       'sms.js',

lib/role.js

@@ -23,16 +23,23 @@ module.exports = function(AV) {
      * Constructs a new AVRole with the given name and ACL.
      *
      * @param {String} name The name of the Role to create.
-     * @param {AV.ACL} acl The ACL for this role. Roles must have an ACL.
+     * @param {AV.ACL} [acl] The ACL for this role. if absent, the default ACL
+     *    `{'*': { read: true }}` will be used.
      */
     constructor: function(name, acl) {
-      if (_.isString(name) && (acl instanceof AV.ACL)) {
+      if (_.isString(name)) {
         AV.Object.prototype.constructor.call(this, null, null);
         this.setName(name);
-        this.setACL(acl);
-      } else {
-        AV.Object.prototype.constructor.call(this, name, acl);
       }
+      if (acl === undefined) {
+        var defaultAcl = new AV.ACL();
+        defaultAcl.setPublicReadAccess(true);
+        acl = defaultAcl;
+      }
+      if (!(acl instanceof AV.ACL)) {
+        throw new TypeError('acl must be an instance of AV.ACL');
+      }
+      this.setACL(acl);
     },
 
     /**

test/role.js

@@ -0,0 +1,24 @@
+describe("Role", function() {
+  describe("constructor", function() {
+    it("normal usage", function() {
+      var acl = new AV.ACL();
+      var role = new AV.Role('foo', acl);
+      expect(role.getName()).to.be('foo');
+      expect(role.getACL()).to.be(acl);
+    });
+    it("acl is optional", function() {
+      var role = new AV.Role('foo');
+      expect(role.getName()).to.be('foo');
+      expect(role.getACL().toJSON()).to.eql({
+        '*': {
+          read: true
+        }
+      });
+    });
+    it("type check", function() {
+      expect(function() {
+        new AV.Role('foo', {});
+      }).to.throwError();
+    });
+  });
+});

test/test.html

@@ -31,6 +31,7 @@
 	<script src="query.js"></script>
 	<script src="geopoints.js"></script>
 	<script src="acl.js"></script>
+	<script src="role.js"></script>
 	<script src="master_key.js"></script>
 	<script src="status.js"></script>
 	<script src="sms.js"></script>