added unit test to ensure event arguments are passed correctly to ALL hooks.

Author: jakesgordon

README.md

@@ -77,6 +77,8 @@ along with the following members:
 Hooks
 =====
 
+>> _NOTE: I'm using the word 'hook' to avoid overloading the word 'event'._
+
 4 hooks are available if your object has methods using the following naming conventions:
 
  * onbefore**event** - fired before an event

state-machine.js

@@ -68,7 +68,7 @@ StateMachine = {
     var changeState = function(from, to, args) {
       var func = this['onchangestate'];
       if (func)
-        func.call(this, from, to);
+        func.apply(this, [from,to].concat(args));
     };
 
     var afterEvent = function(name, args) {
@@ -80,7 +80,7 @@ StateMachine = {
     var transition = function(from, to, args) {
       this.current = to;
       enterState.call(this, to, args);
-      changeState.call(this, from, to);
+      changeState.call(this, from, to, args);
     };
 
     return function() {
@@ -91,14 +91,15 @@ StateMachine = {
       var from  = this.current;
       var to    = map[from].to;
       var async = map[from].async;
+      var self  = this;
+      var args  = Array.prototype.slice.call(arguments);
 
-      if (beforeEvent.call(this, name) === false)
+      if (beforeEvent.call(this, name, args) === false)
         return;
 
       if (this.current != to) {
 
-        var self = this;
-        this.transition = function() { transition.call(self, from, to, arguments); self.transition = null; };
+        this.transition = function() { transition.call(self, from, to, args); self.transition = null; };
 
         exitState.call(this, this.current, arguments);
 

test/test_basics.js

@@ -224,4 +224,55 @@ test("hooks are called when appropriate", function() {
 
 //-----------------------------------------------------------------------------
 
+test("arguments are passed correctly to all hooks", function() {
+
+  var fsm = StateMachine.create({
+    initial: 'green',
+    events: [
+      { name: 'warn',  from: 'green',  to: 'yellow' },
+      { name: 'panic', from: 'yellow', to: 'red'    },
+      { name: 'calm',  from: 'red',    to: 'yellow' },
+      { name: 'clear', from: 'yellow', to: 'green'  },
+  ]});
+
+  var called = [];
+
+  // generic state hook
+  fsm.onchangestate = function(from,to,a,b,c) { called.push('onchange from ' + from + ' to ' + to + ' ' + (a+b+c)); };
+
+  // state hooks
+  fsm.onentergreen    = function(a,b,c) { called.push('onentergreen '  + (a+b+c)); };
+  fsm.onleavegreen    = function(a,b,c) { called.push('onleavegreen '  + (a+b+c)); };
+  fsm.onenteryellow   = function(a,b,c) { called.push('onenteryellow ' + (a+b+c)); };
+  fsm.onleaveyellow   = function(a,b,c) { called.push('onleaveyellow ' + (a+b+c)); };
+  fsm.onenterred      = function(a,b,c) { called.push('onenterred '    + (a+b+c)); };
+  fsm.onleavered      = function(a,b,c) { called.push('onleavered '    + (a+b+c)); };
+
+  // event hooks
+  fsm.onbeforewarn    = function(a,b,c) { called.push('onbeforewarn '  + (a+b+c)); };
+  fsm.onafterwarn     = function(a,b,c) { called.push('onafterwarn '   + (a+b+c)); };
+  fsm.onbeforepanic   = function(a,b,c) { called.push('onbeforepanic ' + (a+b+c)); };
+  fsm.onafterpanic    = function(a,b,c) { called.push('onafterpanic '  + (a+b+c)); };
+  fsm.onbeforecalm    = function(a,b,c) { called.push('onbeforecalm '  + (a+b+c)); };
+  fsm.onaftercalm     = function(a,b,c) { called.push('onaftercalm '   + (a+b+c)); };
+  fsm.onbeforeclear   = function(a,b,c) { called.push('onbeforeclear ' + (a+b+c)); };
+  fsm.onafterclear    = function(a,b,c) { called.push('onafterclear '  + (a+b+c)); };
+
+  called = [];
+  fsm.warn(1,2,3);
+  deepEqual(called, ['onbeforewarn 6', 'onleavegreen 6', 'onenteryellow 6', 'onchange from green to yellow 6', 'onafterwarn 6']);
+
+  called = [];
+  fsm.panic(4,5,6);
+  deepEqual(called, ['onbeforepanic 15', 'onleaveyellow 15', 'onenterred 15', 'onchange from yellow to red 15', 'onafterpanic 15']);
+
+  called = [];
+  fsm.calm(0,0,1);
+  deepEqual(called, ['onbeforecalm 1', 'onleavered 1', 'onenteryellow 1', 'onchange from red to yellow 1', 'onaftercalm 1']);
+
+  called = [];
+  fsm.clear("a", "b", "c");
+  deepEqual(called, ['onbeforeclear abc', 'onleaveyellow abc', 'onentergreen abc', 'onchange from yellow to green abc', 'onafterclear abc']);
+
+});