enhanced Ki.State.plugin feature so that it can optionally be provide…

…d hash objects that get added to a plugged-in state upon creation.

frameworks/foundation/system/state.js

@@ -849,7 +849,8 @@ Ki.State = SC.Object.extend({
 
 /**
   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.
+  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:
   
@@ -863,19 +864,33 @@ Ki.State = SC.Object.extend({
           
           a: Ki.State.plugin('path.to.a.state.class'),
           
-          b: Ki.State.pluing('path.to.another.state.class)
+          b: Ki.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: Ki.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
 */
 Ki.State.plugin = function(value) {
+  var args = SC.A(arguments); args.shift();
   var func = function() {
-    return SC.objectForPropertyPath(value);
+    var klass = SC.objectForPropertyPath(value);
+    return klass.extend.apply(klass, args);
   };
   func.statePlugin = YES;
   return func;

frameworks/foundation/tests/state/plugin/mixin.js

@@ -0,0 +1,68 @@
+// ==========================================================================
+// Ki.Statechart Unit Test
+// ==========================================================================
+/*globals Ki TestState */
+
+TestState = null;
+var obj, MixinA, MixinB, stateA, stateB, stateC;
+
+module("Ki.State.plugin: Mixin Tests", {
+  setup: function() {
+
+    MixinA = {
+      isMixinA: YES
+    };
+
+    MixinB = {
+      isMixinB: YES
+    };
+
+    TestState = Ki.State.extend({
+      isTestState: YES
+    });
+
+    obj = SC.Object.create(Ki.StatechartManager, {
+
+      initialState: 'stateA',
+
+      stateA: Ki.State.plugin('TestState'),
+
+      stateB: Ki.State.plugin('TestState', MixinA),
+
+      stateC: Ki.State.plugin('TestState', MixinA, MixinB)
+
+    });
+
+    stateA = obj.getState('stateA');
+    stateB = obj.getState('stateB');
+    stateC = obj.getState('stateC');
+
+  },
+
+  teardown: function() {
+    obj = TestState = MixinA = MixinB = null;
+    stateA = stateB = stateC = null;
+  }
+
+});
+
+test("check plugin state A", function() {
+  ok(SC.kindOf(stateA, TestState));
+  ok(stateA.get('isTestState'));
+  ok(!stateA.get('isMixinA'));
+  ok(!stateA.get('isMixinB'));
+});
+
+test("check plugin state B", function() {
+  ok(SC.kindOf(stateB, TestState));
+  ok(stateB.get('isTestState'));
+  ok(stateB.get('isMixinA'));
+  ok(!stateB.get('isMixinB'));
+});
+
+test("check plugin state C", function() {
+  ok(SC.kindOf(stateC, TestState));
+  ok(stateC.get('isTestState'));
+  ok(stateC.get('isMixinA'));
+  ok(stateC.get('isMixinB'));
+});

frameworks/foundation/tests/state/plugin.js → frameworks/foundation/tests/state/plugin/nesting.js

@@ -7,7 +7,7 @@ var statechart = null;
 externalState1 = null;
 externalState2 = null;
 
-module("Ki.Statechart: Plugin State Tests", {
+module("Ki.State.plugin: Nest States Tests", {
   setup: function() {
 
     externalState1 = Ki.State.extend({