sproutcore 1.4.5-java → 1.5.0-java

data/lib/frameworks/sproutcore/frameworks/statechart/core.js

@@ -1,11 +1,5 @@
 // ==========================================================================
-// SC Statechart - Buildfile
-// copyright (c) 2009 - Evin Grano, and contributors
-// ==========================================================================
-
-// ..........................................................
-// State Constants
-// 
-
-SC.DEFAULT_TREE = 'default';
-
+// Project:   SC.Statechart - A Statechart Framework for SproutCore
+// Copyright: ©2010, 2011 Michael Cohen, and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================

data/lib/frameworks/sproutcore/frameworks/statechart/debug/monitor.js

@@ -0,0 +1,155 @@
+// ==========================================================================
+// Project:   SC.Statechart - A Statechart Framework for SproutCore
+// Copyright: ©2010, 2011 Michael Cohen, and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*globals SC */
+
+SC.StatechartMonitor = SC.Object.extend({
+  
+  statechart: null,
+  
+  sequence: null,
+  
+  init: function() {
+    sc_super();
+    this.reset();
+  },
+  
+  reset: function() {
+    this.propertyWillChange('length');
+    this.sequence = [];
+    this.propertyDidChange('length');
+  },
+  
+  length: function() {
+    return this.sequence.length;
+  }.property(),
+  
+  pushEnteredState: function(state) {
+    this.propertyWillChange('length');
+    this.sequence.push({ entered: state });
+    this.propertyDidChange('length'); 
+  },
+  
+  pushExitedState: function(state) {
+    this.propertyWillChange('length');
+    this.sequence.push({ exited: state });
+    this.propertyDidChange('length');
+  },
+  
+  matchSequence: function() {
+    return SC.StatechartSequenceMatcher.create({
+      statechartMonitor: this
+    });
+  },
+  
+  matchEnteredStates: function() {
+    var expected = SC.A(arguments.length === 1 ? arguments[0] : arguments),
+        actual = this.getPath('statechart.enteredStates'),
+        matched = 0,
+        statechart = this.get('statechart');
+    
+    if (expected.length !== actual.length) return NO;
+    
+    expected.forEach(function(item) {
+      if (SC.typeOf(item) === SC.T_STRING) item = statechart.getState(item);
+      if (!item) return;
+      if (statechart.stateIsEntered(item) && item.get('isEnteredState')) matched += 1;
+    });
+    
+    return matched === actual.length;
+  },
+  
+  toString: function() {
+    var seq = "",
+        i = 0,
+        len = 0,
+        item = null;
+    
+    seq += "[";    
+
+    len = this.sequence.length;
+    for (i = 0; i < len; i += 1) {
+      item = this.sequence[i];
+      if (item.exited) {
+        seq += "exited %@".fmt(item.exited.get('fullPath'));
+      } 
+      else if (item.entered) {
+        seq += "entered %@".fmt(item.entered.get('fullPath'));
+      } 
+      if (i < len - 1) seq += ", ";
+    }
+
+    seq += "]";
+
+    return seq;
+  }
+  
+});
+
+SC.StatechartSequenceMatcher = SC.Object.extend({
+  
+  statechartMonitor: null,
+  
+  position: 0,
+  
+  match: YES,
+  
+  begin: function() {
+    this.position = -1;
+    this.match = YES;
+    return this;
+  },
+  
+  end: function() {
+    return this.match;
+  },
+  
+  entered: function() {
+    return this._doCheck('entered', arguments);
+  },
+  
+  exited: function() {
+    return this._doCheck('exited', arguments);
+  },
+  
+  _doCheck: function(event, args) {
+    var i = 0,
+        len = args.length,
+        seqItem = null,
+        arg = null,
+        seq = this.statechartMonitor.sequence;
+        
+    for (; i < len; i += 1) {
+      this.position += 1;
+  
+      if (this.position >= seq.length) {
+        this.match = NO;
+        return this;
+      }
+      
+      seqItem = seq[this.position];
+      if (!seqItem[event]) {
+        this.match = NO;
+        return this;
+      }
+      
+      arg = args[i];
+      if (SC.typeOf(arg) === SC.T_OBJECT) {
+        if (seqItem[event] !== arg) {
+          this.match = NO;
+          return this;
+        }
+      } 
+      else if (seqItem[event].get('name') !== arg) {
+        this.match = NO;
+        return this;
+      }
+    }
+  
+    return this;
+  }
+  
+});

data/lib/frameworks/sproutcore/frameworks/statechart/system/state.js

@@ -1,176 +1,1320 @@
 // ==========================================================================
-// SC.State
+// Project:   SC.Statechart - A Statechart Framework for SproutCore
+// Copyright: ©2010, 2011 Michael Cohen, and contributors.
+//            Portions @2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
+/*globals SC */
+
 /**
-  @class
-  This defines a state for use with the SC.Statechart state machine
+
+  Represents a state within a statechart. 
   
+  The statechart actively manages all states belonging to it. When a state is created, 
+  it immediately registers itself with it parent states. 
   
-  @author: Mike Ball
-  @author: Michael Cohen
-  @author: Evin Grano
-  @version: 0.1
-  @since: 0.1
+  You do not create an instance of a state itself. The statechart manager will go through its 
+  state heirarchy and create the states itself.
+
+  @author Michael Cohen
+
 */
 SC.State = SC.Object.extend({
   
-  
   /**
-    Called when the state chart is started up.  Use this method to init
-    your state
+    The name of the state
+    
+    @property {String}
+  */
+  name: null,
+   
+  /**
+    This state's parent state. Managed by the statechart
     
-    @returns {void}
+    @property {State}
   */
-  initState: function(){},
+  parentState: null,
   
   /**
-    Called when this state, or one of its children is becoming the current
-    state.  Do any state setup in this method
+    This state's history state. Can be null. Managed by the statechart.
     
-    @param {Object} context optional additonal context info
-    @returns {void}
+    @property {State}
   */
-  enterState: function(context){},
+  historyState: null,
   
   /**
-    Called when this state, or one of its children is losing its status as the 
-    current state.  Do any state teardown in this method
+    Used to indicate the initial substate of this state to enter into. 
+    
+    You assign the value with the name of the state. Upon creation of 
+    the state, the statechart will automatically change the property 
+    to be a corresponding state object
     
-    @param {Object} context optional additonal context info
-    @returns {void}
+    The substate is only to be this state's immediate substates. If
+    no initial substate is assigned then this states initial substate
+    will be an instance of an empty state (SC.EmptyState).
+    
+    Note that a statechart's root state must always have an explicity
+    initial substate value assigned else an error will be thrown.
+    
+    @property {String|State}
   */
-  exitState: function(context){},
+  initialSubstate: null,
   
   /**
-    the parallel statechart this state is a member of.  Defaults to 'default'
-    @property {String}
+    Used to indicates if this state's immediate substates are to be
+    concurrent (orthogonal) to each other. 
+    
+    @property {Boolean}
   */
-  parallelStatechart: SC.DEFAULT_STATE,
+  substatesAreConcurrent: NO,
+  
   /**
-    The parent state.  Null if none
+    The immediate substates of this state. Managed by the statechart.
     
-    @property {String}
+    @property {Array}
   */
-  parentState: null,
+  substates: null,
   
   /**
-   * The history state. Null if no substates
-   * @property {String}
-   */
-  history: null,
+    The statechart that this state belongs to. Assigned by the owning
+    statechart.
+  
+    @property {Statechart}
+  */
+  statechart: null,
   
   /**
-    Identifies the optional substate that should be entered on the 
-    statechart start up.
-    if null it is assumed this state is a leaf on the response tree
-
-    @property {String}
+    Indicates if this state has been initialized by the statechart
+    
+    @propety {Boolean}
   */
-  initialSubState: null,
+  stateIsInitialized: NO,
   
   /**
-    the name of the state.  Set by the statemanager
-
-    @property {String}
+    An array of this state's current substates. Managed by the statechart
+    
+    @propety {Array}
   */
-  name: null,
+  currentSubstates: null,
+  
+  /** 
+    An array of this state's substates that are currently entered. Managed by
+    the statechart.
+    
+    @property {Array}
+  */
+  enteredSubstates: null,
+  
+  /** 
+    Indicates if this state should trace actions. Useful for debugging
+    purposes. Managed by the statechart.
+  
+    @see SC.StatechartManager#trace
   
+    @property {Boolean}
+  */
+  trace: function() {
+    var key = this.getPath('statechart.statechartTraceKey');
+    return this.getPath('statechart.%@'.fmt(key));
+  }.property().cacheable(),
+  
+  /** 
+    Indicates who the owner is of this state. If not set on the statechart
+    then the owner is the statechart, otherwise it is the assigned
+    object. Managed by the statechart.
+    
+    @see SC.StatechartManager#owner
+  
+    @property {SC.Object}
+  */
+  owner: function() {
+    var sc = this.get('statechart'),
+        key = sc ? sc.get('statechartOwnerKey') : null,
+        owner = sc ? sc.get(key) : null;
+    return owner ? owner : sc;
+  }.property().cacheable(),
+  
+  init: function() {
+    sc_super();
+
+    this._registeredEventHandlers = {};
+    this._registeredStringEventHandlers = {};
+    this._registeredRegExpEventHandlers = [];
+    this._registeredStateObserveHandlers = {};
+
+    // Setting up observes this way is faster then using .observes,
+    // which adds a noticable increase in initialization time.
+    var sc = this.get('statechart'),
+        ownerKey = sc ? sc.get('statechartOwnerKey') : null,
+        traceKey = sc ? sc.get('statechartTraceKey') : null;
+
+    if (sc) {
+      sc.addObserver(ownerKey, this, '_statechartOwnerDidChange');
+      sc.addObserver(traceKey, this, '_statechartTraceDidChange');
+    }
+  },
+  
+  destroy: function() {
+    var sc = this.get('statechart'),
+        ownerKey = sc ? sc.get('statechartOwnerKey') : null,
+        traceKey = sc ? sc.get('statechartTraceKey') : null;
+
+    if (sc) {
+      sc.removeObserver(ownerKey, this, '_statechartOwnerDidChange');
+      sc.removeObserver(traceKey, this, '_statechartTraceDidChange');
+    }
+
+    var substates = this.get('substates');
+    if (substates) {
+      substates.forEach(function(state) {
+        state.destroy();
+      });
+    }
+    
+    this._teardownAllStateObserveHandlers();
+
+    this.set('substates', null);
+    this.set('currentSubstates', null);
+    this.set('enteredSubstates', null);
+    this.set('parentState', null);
+    this.set('historyState', null);
+    this.set('initialSubstate', null);
+    this.set('statechart', null);
+
+    this.notifyPropertyChange('trace');
+    this.notifyPropertyChange('owner');
+    
+    this._registeredEventHandlers = null;
+    this._registeredStringEventHandlers = null;
+    this._registeredRegExpEventHandlers = null;
+    this._registeredStateObserveHandlers = null;
+
+    sc_super();
+  },
+
   /**
-    returns the current state for the parallel statechart this state is in.
+    Used to initialize this state. To only be called by the owning statechart.
+  */
+  initState: function() {
+    if (this.get('stateIsInitialized')) return;
+    
+    this._registerWithParentStates();
+    
+    var key = null, 
+        value = null,
+        state = null,
+        substates = [],
+        matchedInitialSubstate = NO,
+        initialSubstate = this.get('initialSubstate'),
+        substatesAreConcurrent = this.get('substatesAreConcurrent'),
+        statechart = this.get('statechart'),
+        i = 0,
+        len = 0,
+        valueIsFunc = NO,
+        historyState = null;
+            
+    if (SC.kindOf(initialSubstate, SC.HistoryState) && initialSubstate.isClass) {
+      historyState = this.createHistoryState(initialSubstate, { parentState: this, statechart: statechart });
+      this.set('initialSubstate', historyState);
+      
+      if (SC.none(historyState.get('defaultState'))) {
+        this.stateLogError("Initial substate is invalid. History state requires the name of a default state to be set");
+        this.set('initialSubstate', null);
+        historyState = null;
+      }
+    }
+    
+    // Iterate through all this state's substates, if any, create them, and then initialize
+    // them. This causes a recursive process.
+    for (key in this) {
+      value = this[key];
+      valueIsFunc = SC.typeOf(value) === SC.T_FUNCTION;
+      
+      if (valueIsFunc && value.isEventHandler) {
+        this._registerEventHandler(key, value);
+        continue;
+      }
+      
+      if (valueIsFunc && value.isStateObserveHandler) {
+        this._registerStateObserveHandler(key, value);
+        continue;
+      }
+      
+      if (valueIsFunc && value.statePlugin) {
+        value = value.apply(this);
+      }
+      
+      if (SC.kindOf(value, SC.State) && value.isClass && this[key] !== this.constructor) {
+        state = this.createSubstate(value, { name: key, parentState: this, statechart: statechart });
+        substates.push(state);
+        this[key] = state;
+        state.initState();
+        if (key === initialSubstate) {
+          this.set('initialSubstate', state);
+          matchedInitialSubstate = YES;
+        } else if (historyState && historyState.get('defaultState') === key) {
+          historyState.set('defaultState', state);
+          matchedInitialSubstate = YES;
+        }
+      }
+    }
     
-    use this method in your events to determin if specific behavior is needed
+    if (!SC.none(initialSubstate) && !matchedInitialSubstate) {
+      this.stateLogError("Unable to set initial substate %@ since it did not match any of state's %@ substates".fmt(initialSubstate, this));
+    }
+    
+    if (substates.length === 0) {
+      if (!SC.none(initialSubstate)) {
+        this.stateLogWarning("Unable to make %@ an initial substate since state %@ has no substates".fmt(initialSubstate, this));
+      }
+    } 
+    else if (substates.length > 0) {
+      if (SC.none(initialSubstate) && !substatesAreConcurrent) {
+        state = this.createEmptyState({ parentState: this, statechart: statechart });
+        this.set('initialSubstate', state);
+        substates.push(state);
+        this[state.get('name')] = state;
+        state.initState();
+        this.stateLogWarning("state %@ has no initial substate defined. Will default to using an empty state as initial substate".fmt(this));
+      } 
+      else if (!SC.none(initialSubstate) && substatesAreConcurrent) {
+        this.set('initialSubstate', null);
+        this.stateLogWarning("Can not use %@ as initial substate since substates are all concurrent for state %@".fmt(initialSubstate, this));
+      }
+    }
     
-    @returns {SC.State}
+    this.set('substates', substates);
+    this.set('currentSubstates', []);
+    this.set('enteredSubstates', []);
+    this.set('stateIsInitialized', YES);
+  },
+  
+  /**
+    creates a substate for this state
   */
-  state: function(){
-    var sm = this.get('stateManager');
-    if(!sm) throw 'Cannot access the current state because state does not have a state manager';
-    return sm.currentState(this.get('parallelStatechart'));
+  createSubstate: function(state, attrs) {
+    return state.create(attrs);
   },
   
   /**
-    transitions the current parallel statechart to the passed state
+    Create a history state for this state
+  */
+  createHistoryState: function(state, attrs) {
+    return state.create(attrs);
+  },
+  
+  /**
+    Create an empty state for this state's initial substate
+  */
+  createEmptyState: function(attrs) {
+    return SC.EmptyState.create(attrs);
+  },
+  
+  /** @private 
+  
+    Registers event handlers with this state. Event handlers are special
+    functions on the state that are intended to handle more than one event. This
+    compared to basic functions that only respond to a single event that reflects
+    the name of the method.
+  */
+  _registerEventHandler: function(name, handler) {
+    var events = handler.events,
+        event = null,
+        len = events.length,
+        i = 0;
+        
+    this._registeredEventHandlers[name] = handler;
+    
+    for (; i < len; i += 1) {
+      event = events[i];
+      
+      if (SC.typeOf(event) === SC.T_STRING) {
+        this._registeredStringEventHandlers[event] = {
+          name: name,
+          handler: handler
+        };
+        continue;
+      }
+      
+      if (event instanceof RegExp) {
+        this._registeredRegExpEventHandlers.push({
+          name: name,
+          handler: handler,
+          regexp: event
+        });
+        continue;
+      }
+      
+      this.stateLogError("Invalid event %@ for event handler %@ in state %@".fmt(event, name, this));
+    }
+  },
+  
+  /** @private 
+  
+    Registers state observe handlers with this state. State observe handlers behave just like
+    when you apply observes() on a method but will only be active when the state is currently 
+    entered, otherwise the handlers are inactive until the next time the state is entered
+  */
+  _registerStateObserveHandler: function(name, handler) {
+    var i = 0, 
+        args = handler.args, 
+        len = args.length, 
+        arg, validHandlers = YES;
+    
+    for (; i < len; i += 1) {
+      arg = args[i];
+      if (SC.typeOf(arg) !== SC.T_STRING || SC.empty(arg)) { 
+        this.stateLogError("Invalid argument %@ for state observe handler %@ in state %@".fmt(arg, name, this));
+        validHandlers = NO;
+      }
+    }
+    
+    if (!validHandlers) return;
+    
+    this._registeredStateObserveHandlers[name] = handler.args;
+  },
+  
+  /** @private
+    Will traverse up through this state's parent states to register
+    this state with them.
+  */
+  _registerWithParentStates: function() {
+    this._registerSubstate(this);
+    var parent = this.get('parentState');
+    while (!SC.none(parent)) {
+      parent._registerSubstate(this);
+      parent = parent.get('parentState');
+    }
+  },
+  
+  /** @private
+    Will register a given state as a substate of this state
+  */
+  _registerSubstate: function(state) {
+    var path = state.pathRelativeTo(this);
+    if (SC.none(path)) return; 
     
+    // Create special private member variables to help
+    // keep track of substates and access them.
+    if (SC.none(this._registeredSubstatePaths)) {
+      this._registeredSubstatePaths = {};
+      this._registeredSubstates = [];
+    }
+    
+    this._registeredSubstates.push(state);
+    
+    // Keep track of states based on their relative path
+    // to this state. 
+    var regPaths = this._registeredSubstatePaths;
+    if (regPaths[state.get('name')] === undefined) {
+      regPaths[state.get('name')] = { __ki_paths__: [] };
+    }
+    
+    var paths = regPaths[state.get('name')];
+    paths[path] = state;
+    paths.__ki_paths__.push(path);
+  },
+  
+  /**
+    Will generate path for a given state that is relative to this state. It is
+    required that the given state is a substate of this state.
     
-    @param {String}
-    @returns {void}
+    If the heirarchy of the given state to this state is the following:
+    A > B > C, where A is this state and C is the given state, then the 
+    relative path generated will be "B.C"
   */
-  goState: function(name){
-    var sm = this.get('stateManager');
-    if(sm){
-      sm.goState(name, this.get('parallelStatechart'));
+  pathRelativeTo: function(state) {
+    var path = this.get('name'),
+        parent = this.get('parentState');
+    
+    while (!SC.none(parent) && parent !== state) {
+      path = "%@.%@".fmt(parent.get('name'), path);
+      parent = parent.get('parentState');
     }
-    else{
-      throw 'Cannot goState cause state does not have a stateManager!';
+    
+    if (parent !== state && state !== this) {
+      this.stateLogError('Can not generate relative path from %@ since it not a parent state of %@'.fmt(state, this));
+      return null;
     }
+    
+    return path;
   },
   
   /**
-    transitions the current parallel statechart to the passed historystate
+    Used to get a substate of this state that matches a given value. 
+    
+    If the value is a state object, then the value will be returned if it is indeed 
+    a substate of this state, otherwise null is returned. 
     
+    If the given value is a string, then the string is assumed to be a path to a substate. 
+    The value is then parsed to find the closes match. If there is no match then null 
+    is returned. If there is more than one match then null is return and an error 
+    is generated indicating ambiguity of the given value. 
     
-    @param {String}
-    @param {Bool}
-    @returns {void}
+    Note that when the value is a string, it is assumed to be a path relative to this 
+    state; not the root state of the statechart.
   */
-  goHistoryState: function(name, isRecursive){
-    var sm = this.get('stateManager');
-    if(sm){
-      sm.goHistoryState(name, this.get('parallelStatechart'), isRecursive);
+  getSubstate: function(value) {
+    var valueType = SC.typeOf(value);
+    
+    // If the value is an object then just check if the value is 
+    // a registered substate of this state, and if so return it. 
+    if (valueType === SC.T_OBJECT) {
+      return this._registeredSubstates.indexOf(value) > -1 ? value : null;
     }
-    else{
-      throw 'Cannot goState cause state does not have a stateManager!';
+    
+    if (valueType !== SC.T_STRING) {
+      this.stateLogError("Can not find matching subtype. value must be an object or string: %@".fmt(value));
+      return null;
     }
+    
+    // The value is a string. Therefore treat the value as a relative path to 
+    // a substate of this state.
+    
+    // Extract that last part of the string. Ex. 'foo' => 'foo', 'foo.bar' => 'bar'
+    var matches = value.match(/(^|\.)(\w+)$/);
+    if (!matches) return null;
+
+    // Get all the paths related to the matched value. If no paths then return null.
+    var paths = this._registeredSubstatePaths[matches[2]];
+    if (SC.none(paths)) return null;
+    
+    // Do a quick check to see if there is a path that exactly matches the given
+    // value, and if so return the corresponding state
+    var state = paths[value];
+    if (!SC.none(state)) return state;
+    
+    // No exact match found. If the value given is a basic string with no ".", then check
+    // if there is only one path containing that string. If so, return it. If there is
+    // more than one path then it is ambiguous as to what state is trying to be reached.
+    if (matches[1] === "") {
+      if (paths.__ki_paths__.length === 1) return paths[paths.__ki_paths__[0]];
+      if (paths.__ki_paths__.length > 1) {
+        var msg = 'Can not find substate matching %@ in state %@. Ambiguous with the following: %@';
+        this.stateLogError(msg.fmt(value, this, paths.__ki_paths__));
+      }
+    } 
+    
+    return null;
   },
   
-  enterInitialSubState: function(tree) {
-    var initialSubState = this.get('initialSubState');
-    if (initialSubState) {
-      if(!tree[initialSubState]) throw 'Cannot find initial sub state: %@ defined on state: %@'.fmt(initialSubState, this.get('name'));
-      this.set('history', initialSubState);
-      var subState = tree[initialSubState];
-      return this.goState(initialSubState, tree);
+  /**
+    Used to go to a state in the statechart either directly from this state if it is a current state,
+    or from one of this state's current substates.
+    
+    Note that if the value given is a string, it will be assumed to be a path to a state. The path
+    will be relative to the statechart's root state; not relative to this state.
+    
+    Method can be called in the following ways: 
+    
+    {{{
+    
+      // With one argument
+      gotoState(<state>)
+      
+      // With two arguments
+      gotoState(<state>, <hash>)
+    
+    }}}
+    
+    Where <state> is either a string or a SC.State object and <hash> is a regular JS hash object.
+    
+    @param state {SC.State|String} the state to go to
+    @param context {Hash} Optional. context object that will be supplied to all states that are
+           exited and entered during the state transition process
+  */
+  gotoState: function(state, context) {
+    var fromState = null;
+    
+    if (this.get('isCurrentState')) {
+      fromState = this;
+    } else if (this.get('hasCurrentSubstates')) {
+      fromState = this.get('currentSubstates')[0];
     }
-    return this;
+    
+    this.get('statechart').gotoState(state, fromState, context);
+  },
+  
+  /**
+    Used to go to a given state's history state in the statechart either directly from this state if it
+    is a current state or from one of this state's current substates. 
+    
+    Note that if the value given is a string, it will be assumed to be a path to a state. The path
+    will be relative to the statechart's root state; not relative to this state.
+    
+    Method can be called in the following ways:
+    
+    {{{
+    
+      // With one argument
+      gotoHistoryState(<state>)
+      
+      // With two arguments
+      gotoHistoryState(<state>, <boolean | hash>)
+      
+      // With three arguments
+      gotoHistoryState(<state>, <boolean>, <hash>)
+    
+    }}}
+    
+    Where <state> is either a string or a SC.State object and <hash> is a regular JS hash object.
+    
+    @param state {SC.State|String} the state whose history state to go to
+    @param recusive {Boolean} Optional. Indicates whether to follow history states recusively starting
+           from the given state
+    @param context {Hash} Optional. context object that will be supplied to all states that are exited
+           entered during the state transition process
+  */
+  gotoHistoryState: function(state, recursive, context) {
+    var fromState = null;
+    
+    if (this.get('isCurrentState')) {
+      fromState = this;
+    } else if (this.get('hasCurrentSubstates')) {
+      fromState = this.get('currentSubstates')[0];
+    }
+    
+    this.get('statechart').gotoHistoryState(state, fromState, recursive, context);
+  },
+  
+  /**
+    Resumes an active goto state transition process that has been suspended.
+  */
+  resumeGotoState: function() {
+    this.get('statechart').resumeGotoState();
   },
   
   /**
-    pretty printing
+    Used to check if a given state is a current substate of this state. Mainly used in cases
+    when this state is a concurrent state.
+    
+    @param state {State|String} either a state object or the name of a state
+    @returns {Boolean} true is the given state is a current substate, otherwise false is returned
+  */
+  stateIsCurrentSubstate: function(state) {
+    if (SC.typeOf(state) === SC.T_STRING) state = this.get('statechart').getState(state);
+    var current = this.get('currentSubstates');
+    return !!current && current.indexOf(state) >= 0;
+  }, 
+  
+  /**
+    Used to check if a given state is a substate of this state that is currently entered. 
+    
+    @param state {State|String} either a state object of the name of a state
+    @returns {Boolean} true if the given state is a entered substate, otherwise false is returned
   */
-  toString: function(){
-    return this.get('name');
+  stateIsEnteredSubstate: function(state) {
+    if (SC.typeOf(state) === SC.T_STRING) state = this.get('statechart').getState(state);
+    var entered = this.get('enteredSubstates');
+    return !!entered && entered.indexOf(state) >= 0;
   },
   
   /**
-    returns the parent states object
-    @returns {SC.State}
+    Indicates if this state is the root state of the statechart.
+    
+    @property {Boolean}
+  */
+  isRootState: function() {
+    return this.getPath('statechart.rootState') === this;
+  }.property(),
+  
+  /**
+    Indicates if this state is a current state of the statechart.
+    
+    @property {Boolean} 
+  */
+  isCurrentState: function() {
+    return this.stateIsCurrentSubstate(this);
+  }.property('currentSubstates').cacheable(),
+  
+  /**
+    Indicates if this state is a concurrent state
+    
+    @property {Boolean}
+  */
+  isConcurrentState: function() {
+    return this.getPath('parentState.substatesAreConcurrent');
+  }.property(),
+  
+  /**
+    Indicates if this state is a currently entered state. 
+    
+    A state is currently entered if during a state transition process the
+    state's enterState method was invoked, but only after its exitState method 
+    was called, if at all.
+  */
+  isEnteredState: function() {
+    return this.stateIsEnteredSubstate(this);
+  }.property('enteredSubstates').cacheable(),
+  
+  /**
+    Indicate if this state has any substates
+    
+    @propety {Boolean}
   */
-  parentStateObject: function(){
-    var sm = this.get('stateManager');
-    if(sm){
-      return sm.parentStateObject(this.get('parentState'), this.get('parallelStatechart'));
+  hasSubstates: function() {
+    return this.getPath('substates.length') > 0;
+  }.property('substates'),
+  
+  /**
+    Indicates if this state has any current substates
+  */
+  hasCurrentSubstates: function() {
+    var current = this.get('currentSubstates');
+    return !!current && current.get('length') > 0;
+  }.property('currentSubstates').cacheable(),
+  
+  /**
+    Indicates if this state has any currently entered substates
+  */
+  hasEnteredSubstates: function() {
+    var entered = this.get('enteredSubstates');
+    return !!entered  && entered.get('length') > 0;
+  }.property('enteredSubstates').cacheable(),
+  
+  /**
+    Used to re-enter this state. Call this only when the state a current state of
+    the statechart.  
+  */
+  reenter: function() {
+    var statechart = this.get('statechart');
+    if (this.get('isCurrentState')) {
+      statechart.gotoState(this);
+    } else {
+       SC.Logger.error('Can not re-enter state %@ since it is not a current state in the statechart'.fmt(this));
+    }
+  },
+  
+  /**
+    Called by the statechart to allow a state to try and handle the given event. If the
+    event is handled by the state then YES is returned, otherwise NO.
+    
+    There is a particular order in how an event is handled by a state:
+    
+      1) Basic function whose name matches the event
+      2) Registered event handler that is associated with an event represented as a string
+      3) Registered event handler that is associated with events matching a regular expression
+      4) The unknownEvent function
+      
+    Use of event handlers that are associated with events matching a regular expression may
+    incur a performance hit, so they should be used sparingly.
+    
+    The unknownEvent function is only invoked if the state has it, otherwise it is skipped. Note that
+    you should be careful when using unknownEvent since it can be either abused or cause unexpected
+    behavior.
+    
+    Example of a state using all four event handling techniques:
+    
+    {{{
+    
+      SC.State.extend({
+      
+        // Basic function handling event 'foo'
+        foo: function(arg1, arg2) { ... },
+        
+        // event handler that handles 'frozen' and 'canuck'
+        eventHandlerA: function(event, arg1, arg2) {
+          ...
+        }.handleEvent('frozen', 'canuck'),
+        
+        // event handler that handles events matching the regular expression /num\d/
+        //   ex. num1, num2
+        eventHandlerB: function(event, arg1, arg2) {
+          ...
+        }.handleEvent(/num\d/),
+        
+        // Handle any event that was not handled by some other
+        // method on the state
+        unknownEvent: function(event, arg1, arg2) {
+        
+        }
+      
+      })
+    
+    }}}
+  */
+  tryToHandleEvent: function(event, arg1, arg2) {
+
+    var trace = this.get('trace');
+
+    // First check if the name of the event is the same as a registered event handler. If so,
+    // then do not handle the event.
+    if (this._registeredEventHandlers[event]) {
+      this.stateLogWarning("state %@ can not handle event %@ since it is a registered event handler".fmt(this, event));
+      return NO;
+    }    
+    
+    if (this._registeredStateObserveHandlers[event]) {
+      this.stateLogWarning("state %@ can not handle event %@ since it is a registered state observe handler".fmt(this, event));
+      return NO;
+    }
+    
+    // Now begin by trying a basic method on the state to respond to the event
+    if (SC.typeOf(this[event]) === SC.T_FUNCTION) {
+      if (trace) this.stateLogTrace("will handle event %@".fmt(event));
+      return (this[event](arg1, arg2) !== NO);
+    }
+    
+    // Try an event handler that is associated with an event represented as a string
+    var handler = this._registeredStringEventHandlers[event];
+    if (handler) {
+      if (trace) this.stateLogTrace("%@ will handle event %@".fmt(handler.name, event));
+      return (handler.handler.call(this, event, arg1, arg2) !== NO);
+    }
+    
+    // Try an event handler that is associated with events matching a regular expression
+    
+    var len = this._registeredRegExpEventHandlers.length,
+        i = 0;
+        
+    for (; i < len; i += 1) {
+      handler = this._registeredRegExpEventHandlers[i];
+      if (event.match(handler.regexp)) {
+        if (trace) this.stateLogTrace("%@ will handle event %@".fmt(handler.name, event));
+        return (handler.handler.call(this, event, arg1, arg2) !== NO);
+      }
     }
-    else{
-      throw 'Cannot access parentState cause state does not have a stateManager!';
+    
+    // Final attempt. If the state has an unknownEvent function then invoke it to 
+    // handle the event
+    if (SC.typeOf(this['unknownEvent']) === SC.T_FUNCTION) {
+      if (trace) this.stateLogTrace("unknownEvent will handle event %@".fmt(event));
+      return (this.unknownEvent(event, arg1, arg2) !== NO);
     }
-  }.property('parentState').cacheable(),
+    
+    // Nothing was able to handle the given event for this state
+    return NO;
+  },
+  
+  /**
+    Called whenever this state is to be entered during a state transition process. This 
+    is useful when you want the state to perform some initial set up procedures. 
+    
+    If when entering the state you want to perform some kind of asynchronous action, such
+    as an animation or fetching remote data, then you need to return an asynchronous 
+    action, which is done like so:
+    
+    {{{
+    
+      enterState: function() {
+        return this.performAsync('foo');
+      }
+    
+    }}}
+    
+    After returning an action to be performed asynchronously, the statechart will suspend
+    the active state transition process. In order to resume the process, you must call
+    this state's resumeGotoState method or the statechart's resumeGotoState. If no asynchronous 
+    action is to be perform, then nothing needs to be returned.
+    
+    When the enterState method is called, an optional context value may be supplied if
+    one was provided to the gotoState method.
+    
+    @param context {Hash} Optional value if one was supplied to gotoState when invoked
+  */
+  enterState: function(context) { },
+  
+  /**
+    Notification called just before enterState is invoked. 
+    
+    Note: This is intended to be used by the owning statechart but it can be overridden if 
+    you need to do something special.
+    
+    @see #enterState
+  */
+  stateWillBecomeEntered: function() { },
+  
+  /**
+    Notification called just after enterState is invoked. 
+    
+    Note: This is intended to be used by the owning statechart but it can be overridden if 
+    you need to do something special.
+    
+    @see #enterState
+  */
+  stateDidBecomeEntered: function() { 
+    this._setupAllStateObserveHandlers();
+  },
+  
+  /**
+    Called whenever this state is to be exited during a state transition process. This is 
+    useful when you want the state to peform some clean up procedures.
+    
+    If when exiting the state you want to perform some kind of asynchronous action, such
+    as an animation or fetching remote data, then you need to return an asynchronous 
+    action, which is done like so:
+    
+    {{{
+    
+      exitState: function() {
+        return this.performAsync('foo');
+      }
+    
+    }}}
+    
+    After returning an action to be performed asynchronously, the statechart will suspend
+    the active state transition process. In order to resume the process, you must call
+    this state's resumeGotoState method or the statechart's resumeGotoState. If no asynchronous 
+    action is to be perform, then nothing needs to be returned.
+    
+    When the exitState method is called, an optional context value may be supplied if
+    one was provided to the gotoState method.
+    
+    @param context {Hash} Optional value if one was supplied to gotoState when invoked
+  */
+  exitState: function(context) { },
+  
+  /**
+    Notification called just before exitState is invoked. 
+    
+    Note: This is intended to be used by the owning statechart but it can be overridden 
+    if you need to do something special.
+    
+    @see #exitState
+  */
+  stateWillBecomeExited: function() { 
+    this._teardownAllStateObserveHandlers();
+  },
   
   /**
-    returns an array of parent states if any
+    Notification called just after exitState is invoked. 
+    
+    Note: This is intended to be used by the owning statechart but it can be overridden 
+    if you need to do something special.
     
-    @returns {SC.Array}
+    @see #exitState
+  */
+  stateDidBecomeExited: function() { },
+  
+  /** @private 
+  
+    Used to setup all the state observer handlers. Should be done when
+    the state has been entered.
+  */
+  _setupAllStateObserveHandlers: function() {
+    this._configureAllStateObserveHandlers('addObserver');
+  },
+  
+  /** @private 
+  
+    Used to teardown all the state observer handlers. Should be done when
+    the state is being exited.
+  */
+  _teardownAllStateObserveHandlers: function() {
+    this._configureAllStateObserveHandlers('removeObserver');
+  },
+  
+  /** @private 
+  
+    Primary method used to either add or remove this state as an observer
+    based on all the state observe handlers that have been registered with
+    this state.
     
+    Note: The code to add and remove the state as an observer has been
+    taken from the observerable mixin and made slightly more generic. However,
+    having this code in two different places is not ideal, but for now this
+    will have to do. In the future the code should be refactored so that
+    there is one common function that both the observerable mixin and the 
+    statechart framework use.  
   */
-  trace: function(){
-    var sm = this.get('stateManager');
-    if(sm){
-      return sm._parentStates(this);
+  _configureAllStateObserveHandlers: function(action) {
+    var key, values, value, dotIndex, path, observer, i, root;
+
+    for (key in this._registeredStateObserveHandlers) {
+      values = this._registeredStateObserveHandlers[key];
+      for (i = 0; i < values.length; i += 1) {
+        path = values[i]; observer = key;
+  
+        // Use the dot index in the path to determine how the state
+        // should add itself as an observer.
+  
+        dotIndex = path.indexOf('.');
+
+        if (dotIndex < 0) {
+          this[action](path, this, observer);
+        } else if (path.indexOf('*') === 0) {
+          this[action](path.slice(1), this, observer);
+        } else {
+          root = null;
+
+          if (dotIndex === 0) {
+            root = this; path = path.slice(1);
+          } else if (dotIndex === 4 && path.slice(0, 5) === 'this.') {
+            root = this; path = path.slice(5);
+          } else if (dotIndex < 0 && path.length === 4 && path === 'this') {
+            root = this; path = '';
+          }
+
+          SC.Observers[action](path, this, observer, root);
+        }
+      }
     }
-    else{
-      throw 'Cannot trace cause state does not have a stateManager!';
+  },
+  
+  /**
+    Call when an asynchronous action need to be performed when either entering or exiting
+    a state.
+    
+    @see enterState
+    @see exitState
+  */
+  performAsync: function(func, arg1, arg2) {
+    return SC.Async.perform(func, arg1, arg2);
+  },
+  
+  /** @override
+  
+    Returns YES if this state can respond to the given event, otherwise
+    NO is returned
+  
+    @param event {String} the value to check
+    @returns {Boolean}
+  */
+  respondsToEvent: function(event) {
+    if (this._registeredEventHandlers[event]) return false;
+    if (SC.typeOf(this[event]) === SC.T_FUNCTION) return true;
+    if (this._registeredStringEventHandlers[event]) return true;
+    if (this._registeredStateObserveHandlers[event]) return false;
+    
+    var len = this._registeredRegExpEventHandlers.length,
+        i = 0,
+        handler;
+        
+    for (; i < len; i += 1) {
+      handler = this._registeredRegExpEventHandlers[i];
+      if (event.match(handler.regexp)) return true;
     }
+    
+    return SC.typeOf(this['unknownEvent']) === SC.T_FUNCTION;
+  },
+  
+  /**
+    Returns the path for this state relative to the statechart's
+    root state. 
+    
+    The path is a dot-notation string representing the path from
+    this state to the statechart's root state, but without including
+    the root state in the path. For instance, if the name of this
+    state if "foo" and the parent state's name is "bar" where bar's
+    parent state is the root state, then the full path is "bar.foo"
+  
+    @property {String}
+  */
+  fullPath: function() {
+    var root = this.getPath('statechart.rootState');
+    if (!root) return this.get('name');
+    return this.pathRelativeTo(root);
+  }.property('name', 'parentState').cacheable(),
+  
+  toString: function() {
+    var className = SC._object_className(this.constructor);
+    return "%@<%@, %@>".fmt(className, this.get('fullPath'), SC.guidFor(this));
+  },
+  
+  /** @private */
+  _statechartTraceDidChange: function() {
+    this.notifyPropertyChange('trace');
+  },
+  
+  /** @private */
+  _statechartOwnerDidChange: function() {
+    this.notifyPropertyChange('owner');
+  },
+  
+  /** 
+    Used to log a state trace message
+  */
+  stateLogTrace: function(msg) {
+    var sc = this.get('statechart');
+    sc.statechartLogTrace("%@: %@".fmt(this, msg));
+  },
+
+  /** 
+    Used to log a state warning message
+  */
+  stateLogWarning: function(msg) {
+    var sc = this.get('statechart');
+    sc.statechartLogWarning(msg);
+  },
+  
+  /** 
+    Used to log a state error message
+  */
+  stateLogError: function(msg) {
+    var sc = this.get('statechart');
+    sc.statechartLogError(msg);
   }
+  
+});
+
+/**
+  Use this when you want to plug-in a state into a statechart. This is beneficial
+  in cases where you split your statechart's states up into multiple files and
+  don't want to fuss with the sc_require construct.
+  
+  Example:
+  
+    {{{
+    
+      MyApp.statechart = SC.Statechart.create({
+      
+        rootState: SC.State.design({
+        
+          initialSubstate: 'a',
+          
+          a: SC.State.plugin('path.to.a.state.class'),
+          
+          b: SC.State.plugin('path.to.another.state.class')
+        
+        })
+      
+      })
+    
+    }}}
+    
+  You can also supply hashes the plugin feature in order to enhance a state or
+  implement required functionality:
+  
+    {{{
+    
+      SomeMixin = { ... };
+    
+      stateA: SC.State.plugin('path.to.state', SomeMixin, { ... })
+    
+    }}}
+  
+  @param value {String} property path to a state class
+  @param args {Hash,...} Optional. Hash objects to be added to the created state
+*/
+SC.State.plugin = function(value) {
+  var args = SC.A(arguments); args.shift();
+  var func = function() {
+    var klass = SC.objectForPropertyPath(value);
+    return klass.extend.apply(klass, args);
+  };
+  func.statePlugin = YES;
+  return func;
+};
+
+SC.State.design = SC.State.extend;
+
+/**
+  Extends the JS Function object with the handleEvents method that
+  will provide more advanced event handling capabilities when constructing
+  your statechart's states.
+  
+  By default, when you add a method to a state, the state will react to 
+  events that matches a method's name, like so:
+  
+  {{{
+  
+    state = SC.State.extend({
+    
+      // Will be invoked when a event named "foo" is sent to this state
+      foo: function(event, sender, context) { ... }
+    
+    })
+  
+  }}}
+  
+  In some situations, it may be advantageous to use one method that can react to 
+  multiple events instead of having multiple methods that essentially all do the
+  same thing. In order to set a method to handle more than one event you use
+  the handleEvents method which can be supplied a list of string and/or regular
+  expressions. The following example demonstrates the use of handleEvents:
+  
+  {{{
+  
+    state = SC.State.extend({
+    
+      eventHandlerA: function(event, sender, context) {
+      
+      }.handleEvents('foo', 'bar'),
+      
+      eventHandlerB: function(event, sender, context) {
+      
+      }.handleEvents(/num\d/, 'decimal')
+    
+    })
+  
+  }}}
+  
+  Whenever events 'foo' and 'bar' are sent to the state, the method eventHandlerA
+  will be invoked. When there is an event that matches the regular expression
+  /num\d/ or the event is 'decimal' then eventHandlerB is invoked. In both 
+  cases, the name of the event will be supplied to the event handler. 
+  
+  It should be noted that the use of regular expressions may impact performance
+  since that statechart will not be able to fully optimize the event handling logic based
+  on its use. Therefore the use of regular expression should be used sparingly. 
+  
+  @param {(String|RegExp)...} args
+*/
+Function.prototype.handleEvents = function() {
+  this.isEventHandler = YES;
+  this.events = arguments;
+  return this;
+};
+
+/**
+  Extends the JS Function object with the stateObserves method that will
+  create a state observe handler on a given state object. 
+  
+  Use a stateObserves() instead of the common observes() method when you want a 
+  state to observer changes to some property on the state itself or some other 
+  object. 
+  
+  Any method on the state that has stateObserves is considered a state observe
+  handler and behaves just like when you use observes() on a method, but with an
+  important difference. When you apply stateObserves to a method on a state, those
+  methods will be active *only* when the state is entered, otherwise those methods
+  will be inactive. This removes the need for you having to explicitly call
+  addObserver and removeObserver. As an example:
+  
+  {{{
+  
+    state = SC.State.extend({
+    
+      foo: null,
+      
+      user: null,
+    
+      observeHandlerA: function(target, key) {
+        
+      }.stateObserves('MyApp.someController.status'),
+      
+      observeHandlerB: function(target, key) {
+      
+      }.stateObserves('foo'),
+      
+      observeHandlerC: function(target, key) {
+      
+      }.stateObserves('.user.name', '.user.salary')
+    
+    })
+  
+  }}}
+  
+  Above, state has three state observe handlers: observeHandlerA, observeHandlerB, and
+  observeHandlerC. When state is entered, the state will automatically add itself as
+  an observer for all of its registered state observe handlers. Therefore when
+  foo changes, observeHandlerB will be invoked, and when MyApp.someController's status
+  changes then observeHandlerA will be invoked. The moment that state is exited then
+  the state will automatically remove itself as an observer for all of its registered
+  state observe handlers. Therefore none of the state observe handlers will be
+  invoked until the next time the state is entered. 
+  
+  @param {String...} args
+*/
+Function.prototype.stateObserves = function() {
+  this.isStateObserveHandler = YES;
+  this.args = SC.A(arguments);
+  return this;
+};
+
+/**
+  Represents a history state that can be assigned to a SC.State object's
+  initialSubstate property. 
+  
+  If a SC.HistoryState object is assigned to a state's initial substate, 
+  then after a state is entered the statechart will refer to the history 
+  state object to determine the next course of action. If the state has 
+  its historyState property assigned then the that state will be entered, 
+  otherwise the default state assigned to history state object will be entered.
+  
+  An example of how to use:
+  
+  {{{
+  
+    stateA: SC.State.design({
+    
+      initialSubstate: SC.HistoryState({
+        defaultState: 'stateB'
+      }),
+      
+      stateB: SC.State.design({ ... }),
+      
+      stateC: SC.State.design({ ... })
+    
+    })
+  
+  }}}
+  
+  
+*/
+SC.HistoryState = SC.Object.extend({
 
+  /**
+    Used to indicate if the statechart should recurse the 
+    history states after entering the this object's parent state
+    
+    @property {Boolean}
+  */
+  isRecursive: NO,
+  
+  /**
+    The default state to enter if the parent state does not
+    yet have its historyState property assigned to something 
+    other than null.
+    
+    The value assigned to this property must be the name of an
+    immediate substate that belongs to the parent state. The
+    statechart will manage the property upon initialization.
+    
+    @property {String}
+  */
+  defaultState: null,
+  
+  /** @private
+    Managed by the statechart 
+    
+    The statechart that owns this object.
+  */
+  statechart: null,
+  
+  /** @private
+    Managed by the statechart 
+  
+    The state that owns this object
+  */
+  parentState: null,
+  
+  /**
+    Used by the statechart during a state transition process. 
+    
+    Returns a state to enter based on whether the parent state has
+    its historyState property assigned. If not then this object's
+    assigned default state is returned.
+  */
+  state: function() {
+    var defaultState = this.get('defaultState'),
+        historyState = this.getPath('parentState.historyState');
+    return !!historyState ? historyState : defaultState;
+  }.property().cacheable(),
+  
+  /** @private */
+  parentHistoryStateDidChange: function() {
+    this.notifyPropertyChange('state');
+  }.observes('*parentState.historyState')
+  
 });
 
+/** 
+  The default name given to an empty state
+*/
+SC.EMPTY_STATE_NAME = "__EMPTY_STATE__";
+
+/**
+  Represents an empty state that gets assigned as a state's initial substate 
+  if the state does not have an initial substate defined.
+*/
+SC.EmptyState = SC.State.extend({
+  
+  name: SC.EMPTY_STATE_NAME,
+  
+  enterState: function() {
+    this.stateLogWarning("No initial substate was defined for state %@. Entering default empty state".fmt(this.get('parentState')));
+  }
+  
+});