allow custom event error handling

cboone · cboone · commit cdea1f1e8636 · 2011-11-26T19:46:33.000-08:00
diff --git a/state-machine.js b/state-machine.js
@@ -31,7 +31,7 @@ StateMachine = {
 
     for(var name in map) {
       if (map.hasOwnProperty(name))
-        fsm[name] = StateMachine.buildEvent(name, map[name]);
+        fsm[name] = StateMachine.buildEvent(name, map[name], cfg.error);
     }
 
     for(var name in callbacks) {
@@ -83,14 +83,19 @@ StateMachine = {
       return func.apply(this, [name, from, to].concat(args));
   },
 
-  buildEvent: function(name, map) {
+  buildEvent: function(name, map, errorHandler) {
     return function() {
 
       if (this.transition)
         throw "event " + name + " innapropriate because previous transition did not complete"
 
-      if (this.cannot(name))
-        throw "event " + name + " innapropriate in current state " + this.current;
+      if (this.cannot(name)) {
+        if (errorHandler) {
+          return errorHandler.call(this, name);
+        } else {
+          throw "event " + name + " innapropriate in current state " + this.current;
+        }
+      }
 
       var from  = this.current;
       var to    = map[from];
diff --git a/test/test_basics.js b/test/test_basics.js
@@ -148,6 +148,38 @@ test("innapropriate events", function() {
 
 //-----------------------------------------------------------------------------
 
+test("inappropriate event handling can be customized", function() {
+
+  var fsm = StateMachine.create({
+    error: function(eventName) {
+      return 'event ' + eventName + ' inappropriate in current state ' + this.current;
+    },
+    initial: 'green',
+    events: [
+      { name: 'warn',  from: 'green',  to: 'yellow' },
+      { name: 'panic', from: 'yellow', to: 'red'    },
+      { name: 'calm',  from: 'red',    to: 'yellow' }
+  ]});
+
+  equals(fsm.current, 'green', "initial state should be green");
+
+  equals(fsm.panic(), 'event panic inappropriate in current state green');
+  equals(fsm.calm(),  'event calm inappropriate in current state green');
+
+  fsm.warn();
+  equals(fsm.current, 'yellow', "current state should be yellow");
+  equals(fsm.warn(), 'event warn inappropriate in current state yellow');
+  equals(fsm.calm(), 'event calm inappropriate in current state yellow');
+  
+  fsm.panic();
+  equals(fsm.current, 'red', "current state should be red");
+  equals(fsm.warn(),  'event warn inappropriate in current state red');
+  equals(fsm.panic(), 'event panic inappropriate in current state red');
+
+});
+
+//-----------------------------------------------------------------------------
+
 test("event is cancelable", function() {
 
   var fsm = StateMachine.create({
