Fixes #9 include all attributes when no roles are specified to get

.travis.yml

@@ -3,7 +3,6 @@ language: node_js
 node_js:
   - "0.10"
   - "0.12"
-  - "iojs"
 
 sudo: false
 

README.md

@@ -26,8 +26,9 @@ User = sequelize.define('user', {
   email: {
     type: Sequelize.STRING,
     roles: {
-      admin: {get: true},
-      self: true
+      default: 'client',
+      system: {get: true},
+      client: true
     }
   },
   password: {
@@ -37,16 +38,17 @@ User = sequelize.define('user', {
   rank: {
     type: Sequelize.STRING,
     roles: {
-      self: {set: false, get: true}
-      admin: true
+      default: 'client',
+      client: {set: false, get: true}
+      system: true
     }
   }
 });
 
-user.get(); // Will never include email or password
-user.get({role: 'admin'}); // Will include email but not password
-user.get({raw: true}); // Ignores roles, will include all
+user.get(); // Applies default roles and include all the rest
+user.get({role: 'system'}); // Will include email and rank but not password
 
-user.set({rank: 'UBER'}, {role: 'self'||undefined}); // Will be ignored
-user.set({rank: 'UBER'}, {role: 'admin'}); // Will be set
+user.set({rank: 'UBER'}, {role: 'client'}); // Will be ignored
+user.set({rank: 'UBER'}, {role: 'system'}); // Will be set
+user.set({rank: 'UBER'}); // Will be ignored, default is client
 ```

lib/index.js

@@ -10,28 +10,44 @@ init = function(target) {
     Object.keys(target.rawAttributes).forEach(function (attr) {
       if (target.rawAttributes[attr].roles !== undefined) {
         if (target.rawAttributes[attr].roles === false) {
-          target.rawAttributes[attr].roles = {};
-          return; 
+          return;
         }
 
-        Object.keys(target.rawAttributes[attr].roles).forEach(function (role) {
-          if (typeof target.rawAttributes[attr].roles[role] === "boolean") {
-            target.rawAttributes[attr].roles[role] = {
-              set: target.rawAttributes[attr].roles[role],
-              get: target.rawAttributes[attr].roles[role]
-            };
+        Object.keys(target.rawAttributes[attr].roles).forEach(function (roleName) {
+          var role = target.rawAttributes[attr].roles[roleName];
+
+          if (roleName === 'default') {
+            if(typeof role === "string"){
+              role = target.rawAttributes[attr].roles.default = target.rawAttributes[attr].roles[role];
+            }
+          }
+
+          if (typeof role === "boolean") {
+            target.rawAttributes[attr].roles[roleName] = { set: role, get: role };
             return;
           }
 
-          if (target.rawAttributes[attr].roles[role].set === undefined) {
-            target.rawAttributes[attr].roles[role].set = false;
+          if (role.set === undefined) {
+            role.set = true;
           }
-          if (target.rawAttributes[attr].roles[role].get === undefined) {
-            target.rawAttributes[attr].roles[role].get = false;
+          if (role.get === undefined) {
+            role.get = true;
           }
         });
       }
     });
+
+    var accessGranted = function(method, attr, options){
+      return !attr 
+        // If no role is given apply default if any
+        || !options.role && (typeof attr.roles !== 'object' || (attr.roles.default||{})[method] !== false)
+        // If no roles defined in attribute or set to true
+        || attr.roles === undefined || attr.roles === true
+        // If role is given but not defined in attribute apply default if any
+        || options.role && (typeof attr.roles === 'object' && attr.roles[options.role] === undefined && (attr.roles.default||{})[method] !== false)
+        // Apply given role if defined in attribute
+        || (attr.roles[options.role]||{})[method] === true;
+    };
 
     target.Instance.prototype.get = function(key, options) {
       if (typeof key === "object" && !options) {
@@ -43,12 +59,11 @@ init = function(target) {
         options = {};
       }
 
-      if (options.raw === true) {
-        return $get.call(this, key, options);
-      }
       if (key !== undefined) {
         var attr = target.rawAttributes[key];
-        if (!attr || !attr.roles || attr.roles && attr.roles[options.role] && attr.roles[options.role].get) {
+
+        if (accessGranted('get', attr, options)) {
+
           return $get.call(this, key, options);
         } else {
           return undefined;
@@ -57,15 +72,16 @@ init = function(target) {
 
       var values = $get.call(this, options)
         , response = {};
-        
+
       Object.keys(values).forEach(function (key) {
         var attr = target.rawAttributes[key];
 
         var val = values[key];
         if(!attr && val instanceof Sequelize.Instance) {
           response[key] = val.get.call(val, options);
         }
-        else if (!attr || !attr.roles || attr.roles && attr.roles[options.role] && attr.roles[options.role].get) {
+        else if ( accessGranted('get', attr, options) ) {
+
           response[key] = val;
         }
       });