Merge branch 'master' of github.com:trailsjs/trails

Author: tjwebb

.eslintignore

@@ -1,2 +1 @@
-node_modules
 coverage

README.md

@@ -131,7 +131,7 @@ information on how our projects are organized and how to get started.
 
 <img src="http://i.imgur.com/dCjNisP.png">
 
-[trails-image]: http://i.imgur.com/zfT2NEv.png
+[trails-image]: http://i.imgur.com/0iVVRxi.png
 [trails-url]: http://trailsjs.io
 [npm-image]: https://img.shields.io/npm/v/trails.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/trails

archetype/package.json

@@ -6,10 +6,10 @@
   ],
   "main": "index.js",
   "dependencies": {
-    "trailpack-core": "^1.0.0",
-    "trailpack-repl": "^1.0.8",
-    "trailpack-router": "^1.0.2",
-    "trails": "^1.0.4",
+    "trailpack-core": "^1.0.1",
+    "trailpack-repl": "^1.1.0",
+    "trailpack-router": "^1.0.8",
+    "trails": "^1.1.0",
     "trails-controller": "^1.0.0-beta-2",
     "trails-model": "^1.0.0-beta-2",
     "trails-policy": "^1.0.1",

index.js

@@ -164,13 +164,15 @@ module.exports = class TrailsApp extends events.EventEmitter {
    * Extend the once emiter reader for accept multi valid events
    */
   onceAny (events, handler) {
+    const self = this
+
     if (!events)
       return
-    if (!(events instanceof Array))
+    if (!Array.isArray(events))
       events = [events]
 
-    const cb = (e) => {
-      this.removeListener(e, cb)
+    function cb (e) {
+      self.removeListener(e, cb)
       handler.apply(this, Array.prototype.slice.call(arguments, 0))
     }
 

package.json

@@ -24,6 +24,9 @@
     "coverage": "istanbul cover _mocha",
     "ci": "cd .. && ci"
   },
+  "pre-commit": [
+  "test"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/trailsjs/trails.git"
@@ -67,6 +70,7 @@
     "eslint-config-trails": "^1.0",
     "istanbul": "^0.4.2",
     "mocha": "^2.3.4",
+    "pre-commit": "^1.1.3",
     "smokesignals": "^1.2.0",
     "trailpack": "^1.0.1",
     "winston": "^2.1.1"

test/index.js

@@ -214,6 +214,17 @@ describe('Trails', () => {
 
         return eventPromise
       })
+      it('should pass event parameters to callbacks added using `onceAny`', done => {
+        const sent = { test: true }
+
+        app.onceAny('test', received => {
+          assert.equal(received, sent)
+
+          return done()
+        })
+
+        app.emit('test', sent)
+      })
     })
   })
 })