Remove before/after aliases

Author: sergeysova

examples/test.js

@@ -77,23 +77,23 @@ const put3 = function put3() {
 }
 
 const routes = createRest(root => {
-  root.before(before1)
-  root.after(after1)
+  root.beforeEach(before1)
+  root.afterEach(after1)
 
 
 
   // root.post('/', post1)
 
   root.scope('demo', demo => {
-  //   demo.before(before2)
-  //   demo.after(after2)
+  //   demo.beforeEach(before2)
+  //   demo.afterEach(after2)
 
   //   demo.get('/', get1)
   //   demo.get('/foo', get2)
 
   //   demo.scope('bar', bar => {
-  //     bar.before(before3)
-  //     bar.after(after3)
+  //     bar.beforeEach(before3)
+  //     bar.afterEach(after3)
 
   //     bar.put('/', put3)
   //   })

lib/index.js

@@ -80,59 +80,25 @@ export class Maker {
    *
    * @example
    * createRest(r => {
-   *   r.before(() => console.log(1))
-   *   r.before(() => console.log(2), () => console.log(3))
-   * })
-   */
-  before(...list) {
-    this.ctx.before = this.ctx.before.concat(list.filter(ln => !!ln))
-  }
-
-  /**
-   * Add middlewares before request handler to current scope.
-   *
-   * Alias for {before}
-   * @param {...function[]} list List of the middlewares
-   * @alias before
-   *
-   * @example
-   * createRest(r => {
-   *   r.before(() => console.log(1))
-   *   r.before(() => console.log(2), () => console.log(3))
+   *   r.beforeEach(() => console.log(1))
+   *   r.beforeEach(() => console.log(2), () => console.log(3))
    * })
    */
   beforeEach(...list) {
-    this.before(...list)
+    this.ctx.before = this.ctx.before.concat(list.filter(ln => !!ln))
   }
 
   /**
    * Add middlewares after request handler to current scope
    * @param {...function[]} list List of the middlewares
    * @example
    * createRest(r => {
-   *   r.after(() => console.log(3))
-   *   r.after(() => console.log(2), () => console.log(1))
-   * })
-   */
-  after(...list) {
-    this.ctx.after = this.ctx.after.concat(list.filter(ln => !!ln))
-  }
-
-  /**
-   * Add middlewares after request handler to current scope.
-   *
-   * Alias for {after}
-   * @param {...function[]} list List of the middlewares
-   * @alias after
-   *
-   * @example
-   * createRest(r => {
-   *   r.after(() => console.log(3))
-   *   r.after(() => console.log(2), () => console.log(1))
+   *   r.afterEach(() => console.log(3))
+   *   r.afterEach(() => console.log(2), () => console.log(1))
    * })
    */
   afterEach(...list) {
-    this.after(...list)
+    this.ctx.after = this.ctx.after.concat(list.filter(ln => !!ln))
   }
 
   /**
@@ -146,12 +112,12 @@ export class Maker {
    * @throws {TypeError}
    * @example
    * createRest(r => {
-   *   r.before(() => console.log(1))
-   *   r.after(() => console.log(4))
+   *   r.beforeEach(() => console.log(1))
+   *   r.afterEach(() => console.log(4))
    *
    *   r.scope('foo', r => {
-   *     r.before(() => console.log(2))
-   *     r.after(() => console.log(5))
+   *     r.beforeEach(() => console.log(2))
+   *     r.afterEach(() => console.log(5))
    *
    *     r.get('bar', () => console.log(3))
    *   })
@@ -430,8 +396,8 @@ export class Maker {
     }
 
     this.scope(name, scope => {
-      scope.before(controller.beforeEach)
-      scope.after(controller.afterEach)
+      scope.beforeEach(controller.beforeEach)
+      scope.afterEach(controller.afterEach)
 
       usedList
         .filter(handler => methodsList.includes(handler))
@@ -531,8 +497,8 @@ export class Maker {
     const memberId = `:${options.memberId}` || `:${pluralize.singular}Id`
 
     this.scope(name, scope => {
-      scope.before(controller.beforeEach)
-      scope.after(controller.afterEach)
+      scope.beforeEach(controller.beforeEach)
+      scope.afterEach(controller.afterEach)
 
       if (checkMethod('index')) {
         scope.get('/', controller.index)

readme.md

@@ -43,21 +43,21 @@ const ExampleController = {
 }
 
 const routes = createRest(root => {
-  root.before(before1)
-  root.after(after1)
+  root.beforeEach(before1)
+  root.afterEach(after1)
 
   root.post('/', post1)
 
   root.scope('demo', demoRoute => {
-    demoRoute.before(before2)
-    demoRoute.after(after2)
+    demoRoute.beforeEach(before2)
+    demoRoute.afterEach(after2)
 
     demoRoute.get('/', get1)
     demoRoute.get('/foo', get2)
 
     demoRoute.scope('bar', barRoute => {
-      barRoute.before(before3)
-      barRoute.after(after3)
+      barRoute.beforeEach(before3)
+      barRoute.afterEach(after3)
 
       barRoute.put('/', put3)
 

test/index.test.js

@@ -60,7 +60,7 @@ avaTest('createRest fails if a function is not passed', test => {
 avaTest('Creates before', test => {
   test.deepEqual(
     createRest(root => {
-      root.before(before)
+      root.beforeEach(before)
     }),
     make([before])
   )
@@ -69,7 +69,7 @@ avaTest('Creates before', test => {
 avaTest('Creates after', test => {
   test.deepEqual(
     createRest(root => {
-      root.after(after)
+      root.afterEach(after)
     }),
     make([], [after])
   )
@@ -97,8 +97,8 @@ avaTest('Creates methods', test => {
 avaTest('Creates methods with before/after', test => {
   test.deepEqual(
     createRest(root => {
-      root.before(before)
-      root.after(after)
+      root.beforeEach(before)
+      root.afterEach(after)
       root.get('/', get)
       root.post('/', post)
       root.put('/', put)

test/printer.test.js

@@ -8,47 +8,47 @@ const post = () => {}
 const put = () => {}
 const patch = () => {}
 const destroy = () => {}
-const before = () => {}
-const after = () => {}
+const beforeEach = () => {}
+const afterEach = () => {}
 
 const make = (method, listeners = []) => ({
   method, listeners,
 })
 
-avaTest('Outputs before/after', test => {
+avaTest('Outputs beforeEach/afterEach', test => {
   test.deepEqual(
     printRoutes(createRest(root => {
-      root.before(before)
-      root.after(after)
+      root.beforeEach(beforeEach)
+      root.afterEach(afterEach)
       root.get(get)
       root.post('foo', post)
     }), false),
     [
-      'GET / -> before(), get(), after()',
-      'POST /foo/ -> before(), post(), after()',
+      'GET / -> beforeEach(), get(), afterEach()',
+      'POST /foo/ -> beforeEach(), post(), afterEach()',
     ]
   )
 })
 
-avaTest('Outputs scoped routes with before/after', test => {
+avaTest('Outputs scoped routes with beforeEach/afterEach', test => {
   test.deepEqual(
     printRoutes(createRest(root => {
-      root.before(before)
-      root.after(after)
+      root.beforeEach(beforeEach)
+      root.afterEach(afterEach)
       root.get(get)
       root.post('foo', post)
       root.scope('bar', bar => {
-        bar.before(before)
-        bar.after(after)
+        bar.beforeEach(beforeEach)
+        bar.afterEach(afterEach)
         bar.put(() => {})
         bar.delete('baz', destroy)
       })
     }), false),
     [
-      'GET / -> before(), get(), after()',
-      'POST /foo/ -> before(), post(), after()',
-      'PUT /bar/ -> before(), before(), <function>(), after(), after()',
-      'DELETE /bar/baz/ -> before(), before(), destroy(), after(), after()'
+      'GET / -> beforeEach(), get(), afterEach()',
+      'POST /foo/ -> beforeEach(), post(), afterEach()',
+      'PUT /bar/ -> beforeEach(), beforeEach(), <function>(), afterEach(), afterEach()',
+      'DELETE /bar/baz/ -> beforeEach(), beforeEach(), destroy(), afterEach(), afterEach()'
     ]
   )
 })
@@ -57,8 +57,8 @@ avaTest.todo('Real print to stdout')
 
 avaTest('Real print to output', test => {
   printRoutes(createRest(root => {
-    root.before(before)
-    root.after(after)
+    root.beforeEach(beforeEach)
+    root.afterEach(afterEach)
     root.get(get)
     root.post('foo', post)
   }))