Merge branch 'develop'

Author: dualyticalchemy

darrt/actions.js

@@ -58,16 +58,15 @@ function create (req) {
   return new Promise(function (resolve, reject) {
     if (req.body) {
       var body = req.body;
-      var action = {
+      resolve(component({
         name: object,
         action: 'add',
         item: body,
         props: data.props,
         reqd: data.reqd,
         enums: data.enums,
         defs: data.defs
-      };
-      resolve(component(action));
+      }));
     } else {
       reject({ error: "invalid body" });
     }
@@ -80,11 +79,10 @@ function create (req) {
  */
 function list () {
   return new Promise(function (resolve) {
-    var action = {
+    resolve(component({
       name: object,
       action: 'list'
-    };
-    resolve(component(action));
+    }));
   });
 }
 
@@ -96,12 +94,11 @@ function list () {
 function filter (req) {
   return new Promise(function (resolve, reject) {
     if (req.query && req.query.length !== 0) {
-      var action = {
+      resolve(component({
         name: object,
         action: 'filter',
         filter: req.query
-      };
-      resolve(component(action));
+      }));
     } else {
       reject({ error:"invalid query string" });
     }
@@ -117,12 +114,11 @@ function read (req) {
   return new Promise(function (resolve, reject) {
     if (req.params.id && req.params.id !== null) {
       var id = req.params.id;
-      var action = {
+      resolve(component({
         name: object,
         action: 'item',
         id: id
-      };
-      resolve(component(action));
+      }));
     } else {
       reject({ error:"missing id" });
     }
@@ -140,16 +136,15 @@ function update (req) {
     id = req.params.id || null;
     body = req.body || null;
     if (id !== null && body !== null) {
-      var action = {
+      resolve(component({
         name: object,
         action: 'update',
         id: id,
         item: body,
         props: data.props,
         reqd: data.reqd,
         enums: data.enums
-      };
-      resolve(component(action));
+      }));
     } else {
       reject({ error:"missing id and/or body" });
     }
@@ -167,16 +162,15 @@ function status (req) {
     id = req.params.id || null;
     body = req.body || null;
     if (id !== null && body !== null) {
-      var action = {
+      resolve(component({
         name: object,
         action: 'update',
         id: id,
         item: body,
         props: data.props,
         reqd: data.data,
         enums: data.enums
-      };
-      resolve(component(action));
+      }));
     } else {
       reject({ error: "missing id and/or body" });
     }
@@ -192,12 +186,11 @@ function remove (req) {
   return new Promise(function (resolve, reject) {
     if (req.params.id && req.params.id !== null) {
       var id = req.params.id;
-      var action = {
+      resolve(component({
         name: object,
         action: 'delete',
         id: id
-      };
-      resolve(component(action));
+      }));
     } else {
       reject({ error:"invalid id" });
     }