Add default hook for beforeRespond

lib/Action.js

@@ -249,7 +249,11 @@ class Action extends EventEmitter {
 
     this.stack = utils.compose(stack, errorHandler);
 
-    this.beforeRespondStack = utils.compose(hooks.beforeRespond || [], errorHandler);
+    // Add default hook for beforeRespond
+    hooks.beforeRespond = hooks.beforeRespond || [];
+    if (hooks.beforeRespond.length === 0) hooks.beforeRespond.push((ctx) => ctx.result);
+
+    this.beforeRespondStack = utils.compose(hooks.beforeRespond, errorHandler);
   }
 }
 

lib/adapters/express.js

@@ -131,33 +131,38 @@ module.exports = class ExpressAdapter extends Adapter {
 
     // Apply all actions
     _.each(this.sortedActions, function(route) {
-      assert(router[route.verb], `Invalid route verb '${route.verb}' detected for action ${route.name}`);
+      // multi request method , example route.verb = 'get,put'
+      const verbArr = route.verb.split(',');
 
-      let args = [route.path];
+      for (const verb of verbArr) {
+        assert(router[verb], `Invalid route verb '${verb}' detected for action ${route.name}`);
 
-      // Set up file upload support
-      if (route.upload) {
-        let uploadOpts = _.assign(app.get('upload') || {}, route.upload);
+        let args = [route.path];
 
-        // Check file upload options
-        assert(
-          uploadOpts.dest || uploadOpts.storage,
-          `Missing upload dest or storage config for action ${route.name}`
-        );
+        // Set up file upload support
+        if (route.upload) {
+          let uploadOpts = _.assign(app.get('upload') || {}, route.upload);
 
-        // Add upload memory support
-        if (uploadOpts.storage === 'memory') {
-          uploadOpts.storage = multer.memoryStorage();
-          delete uploadOpts.dest;
-        }
+          // Check file upload options
+          assert(
+            uploadOpts.dest || uploadOpts.storage,
+            `Missing upload dest or storage config for action ${route.name}`
+          );
 
-        args.push(multer(uploadOpts).fields(uploadOpts.fields || []));
-      }
+          // Add upload memory support
+          if (uploadOpts.storage === 'memory') {
+            uploadOpts.storage = multer.memoryStorage();
+            delete uploadOpts.dest;
+          }
 
-      args.push(route.handler);
+          args.push(multer(uploadOpts).fields(uploadOpts.fields || []));
+        }
 
-      // Add route
-      router[route.verb].apply(router, args);
+        args.push(route.handler);
+
+        // Add route
+        router[verb].apply(router, args);
+      }
     });
 
     // Allow adapter reference from handler

lib/utils/sortRoute.js

@@ -1,24 +1,29 @@
 'use strict';
 
 const logError = require('./logError');
+const _ = require('lodash');
 
 /*!
  * Compare two routes
  * @param {Object} r1 The first route { verb: 'get', path: '/:id' }
  * @param {Object} r2 The second route route: { verb: 'get', path: '/findOne' }
  * @returns {number} 1: r1 comes after r2, -1: r1 comes before r2, 0: equal
  */
-module.exports = function sortRoute(r1, r2) {
+module.exports = exports = function sortRoute(r1, r2) {
   // Normalize the verbs
   let verb1 = r1.verb.toLowerCase();
   let verb2 = r2.verb.toLowerCase();
 
   if (r1.name === r2.name) {
-    logError(`Conflict method '${r1.name}' detected`);
+    exports.logError(`Conflict method '${r1.name}' detected`);
   }
 
-  if (verb1 === verb2 && r1.path === r2.path && verb1 !== 'use') {
-    logError(`Conflict route path and verb detected for method '${r2.name}' and method '${r1.name}'`);
+  // multi request method
+  if (
+    (verb1 === verb2 || _.intersection(verb1.split(','), verb2.split(',')).length > 0)
+    && r1.path === r2.path && verb1 !== 'use'
+  ) {
+    exports.logError(`Conflict route path and verb detected for method '${r2.name}' and method '${r1.name}'`);
   }
 
   if (verb1 === 'use' && verb2 === 'use') {
@@ -78,3 +83,5 @@ module.exports = function sortRoute(r1, r2) {
   // shorter one
   return p2.length - p1.length;
 };
+
+exports.logError = logError;

test/utils/loggerError.js

@@ -0,0 +1,10 @@
+'use strict';
+
+const chalk = require('chalk');
+
+module.exports = function logError(msg) {
+  msg = String(msg || '').valueOf();
+
+  // eslint-disable-next-line no-console
+  throw new Error(msg);
+};

test/utils/sortRoute.test.js

@@ -0,0 +1,48 @@
+'use strict';
+
+const expect = require('chai').expect;
+const sortRoute = require('../../lib/utils/sortRoute');
+sortRoute.logError = require('./loggerError');
+
+describe('SortRoute Rule', function() {
+
+  let r1 = {};
+  let r2 = {};
+
+  beforeEach(function() {
+    r1 = {
+      name: 'index',
+      verb: 'get',
+      path: '/',
+    };
+    r2 = {};
+  });
+
+  it('should throw name duplicate Error', function() {
+    r2 = {
+      name: 'index',
+      verb: 'get',
+      path: '/',
+    };
+    expect(function () {
+      sortRoute(r1, r2);
+    }).to.throw(Error).have.property('message', `Conflict method '${r1.name}' detected`);
+  });
+
+  ['get', 'post,get', 'get,pust'].forEach(verb1 => {
+    r1.verb = verb1;
+    ['get', 'get,post', 'put,get'].forEach(verb2 => {
+      it('should throw Conflict route path Error', function() {
+        r2 = {
+          name: 'index2',
+          path: '/',
+        };
+
+        expect(function () {
+          r2.verb = verb2;
+          sortRoute(r1, r2);
+        }).to.throw(Error).have.property('message', `Conflict route path and verb detected for method '${r2.name}' and method '${r1.name}'`);
+      });
+    });
+  });
+});