Merge branch 'develop' into master

.jshintrc

@@ -34,6 +34,7 @@
     "sinon",
     "spyOn"
   ],
+  "esnext": "true",
   "quotmark": true,
   "trailing": true,
   "undef": true,

config.json

@@ -6,7 +6,7 @@
       "POST",
       "GET",
       "PUT"
-    ]
-  }],
-  "action": "allow"
+    ],
+    "action": "allow"
+  }]
 }]

examples/routes/index.js

@@ -16,6 +16,7 @@ var acl = require('../../');
 //
 
 acl.config({
+  filename: 'nacl.json',
   baseUrl: 'v1'
 });
 
@@ -62,8 +63,6 @@ module.exports = function(app, express) {
     next();
   });
 
-  console.log('something');
-
   /**
    * lets create our jwt middleware
    */

lib/helpers.js

@@ -4,6 +4,7 @@
   var fs = require('fs');
   var assert = require('assert');
   var log = require('npmlog');
+  var yaml = require('js-yaml');
 
   module.exports = {
     log: log,
@@ -12,7 +13,7 @@
         permissions: 'Policy not set, All traffic will be denied'.yellow
       },
       err: {
-        required: 'group, permissions, resources, and action'.red
+        required: 'group, permissions, resources,'.red
       }
     },
 
@@ -25,6 +26,7 @@
 
     validate: function(config) {
       var self = this;
+      var permissions;
 
       /**
        * Check if config is a array
@@ -46,59 +48,77 @@
        */
 
       config.forEach(function(el) {
-        if (el.group && el.permissions && el.action) {
+        if (el.group && el.permissions) {
 
           /**
            * Assert that they are of the correct type
            */
 
           assert.deepEqual(typeof el.group, 'string');
           assert(Array.isArray(el.permissions), true);
-          assert.deepEqual(typeof el.action, 'string');
 
-        } else {
-
-          /* istanbul ignore next */
+          permissions = el.permissions;
 
-          return log.error('REQUIRED:', self.error.err.required);
+          permissions.forEach(function(policy) {
+            assert(policy.resource, true);
+            assert(policy.methods, true);
+            assert(policy.action, true);
+          });
 
+          return;
         }
+
+        /* istanbul ignore next */
+
+        return log.error('REQUIRED:', self.error.err.required);
+
+
       });
 
       return config;
     },
 
-    readJson: function(newPath, encoding) {
-      var path = 'config.json';
-      var config;
-      if (newPath) {
-        path = newPath;
-      }
-
+    readJson: function(path, encoding, yml) {
+      var config, buffer;
       /**
        * Read the config file with the rules.
+       *
        */
 
-      config = JSON.parse(fs.readFileSync(path, { encoding: encoding }));
+      try {
+
+        buffer = fs.readFileSync(path, { encoding: encoding });
+
+        if (yml) {
+          config = yaml.safeLoad(buffer);
+        } else {
+          config = JSON.parse(buffer);
+        }
+
+
+      } catch (e) {
+        /* istanbul ignore next */
+        throw Error(e);
+      }
 
       return this.validate(config);
     },
 
     /**
-     * [policy Gets the policy from the array
+     * [group Gets the group from the array
      * of rules based on the role of the user]
      * @param  {[Array]} rule
      * @param  {[String]} role
      * @return {[Object]}
      */
 
-    policy: function(res, rules, role) {
-      var policy = rules.find(function(el) {
+    group: function(res, rules, role) {
+      var group = rules.find(function(el) {
         return el.group === role;
       });
 
-      if (policy) {
-        return policy;
+      if (group) {
+        return group;
       } else {
         return res
           .status(403)
@@ -112,18 +132,21 @@
 
 
     /**
-     * [methods Gets the methods from the selected policy]
-     * @param  {[Object]} policy
+     * [methods Gets the methods from the selected group]
+     * @param  {[Object]} group
      * @param  {[String]} resource
      * @return {[Array/String]} Returns an array of methods
      * or a string incase a glob is used;
      */
 
-    methods: function(policy, resource) {
-      var permissions = policy.permissions.find(function(el) {
+    policy: function(group, resource) {
+      var permissions = group.permissions.find(function(el) {
         return el.resource === resource;
       });
-      return (permissions) ? permissions.methods : permissions;
+      return (permissions) ? {
+        methods: permissions.methods,
+        action: permissions.action
+      } : permissions;
     },
 
     role: function(res, decoded, session) {