From 85f57f38769bca10ffabec477ae8e9adb2547dae Mon Sep 17 00:00:00 2001
From: SharpEdgeMarshall <fbregist@gmail.com>
Date: Thu, 11 Dec 2014 20:44:54 +0100
Subject: [PATCH] Implementation of Named Command Payload

---
 .../commandCenter/api/CommandPayload.as       | 35 +++++++++++++++++--
 .../commandCenter/impl/CommandExecutor.as     |  4 +--
 .../commandCenter/impl/CommandExecutorTest.as | 12 ++++++-
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/robotlegs/bender/extensions/commandCenter/api/CommandPayload.as b/src/robotlegs/bender/extensions/commandCenter/api/CommandPayload.as
index 2d499f7d..932403c6 100644
--- a/src/robotlegs/bender/extensions/commandCenter/api/CommandPayload.as
+++ b/src/robotlegs/bender/extensions/commandCenter/api/CommandPayload.as
@@ -37,6 +37,16 @@ package robotlegs.bender.extensions.commandCenter.api
 		{
 			return _classes;
 		}
+		
+		private var _names:Array;
+		
+		/**
+		 * Ordered list of value names
+		 */
+		public function get names():Array
+		{
+			return _names;
+		}
 
 		/**
 		 * The number of payload items
@@ -54,11 +64,23 @@ package robotlegs.bender.extensions.commandCenter.api
 		 * Creates a command payload
 		 * @param values Optional values
 		 * @param classes Optional classes
+		 * @param names Optional names
 		 */
-		public function CommandPayload(values:Array = null, classes:Array = null)
+		public function CommandPayload(values:Array = null, classes:Array = null, names:Array = null)
 		{
 			_values = values;
 			_classes = classes;
+			
+			if(names)
+			{
+				_names = names;
+			}
+			else if(classes)
+			{
+				_names = new Array();
+				for(var i:int = 0; i<classes.length; i++)
+					_names[i] = '';
+			}
 		}
 
 		/*============================================================================*/
@@ -71,7 +93,7 @@ package robotlegs.bender.extensions.commandCenter.api
 		 * @param payloadClass The class of the value
 		 * @return Self
 		 */
-		public function addPayload(payloadValue:Object, payloadClass:Class):CommandPayload
+		public function addPayload(payloadValue:Object, payloadClass:Class, payloadName:String = ''):CommandPayload
 		{
 			if (_values)
 			{
@@ -89,6 +111,15 @@ package robotlegs.bender.extensions.commandCenter.api
 			{
 				_classes = [payloadClass];
 			}
+			if (_names)
+			{
+				_names.push(payloadName);
+			}
+			else
+			{
+				_names = [payloadName];
+			}
+			
 
 			return this;
 		}
diff --git a/src/robotlegs/bender/extensions/commandCenter/impl/CommandExecutor.as b/src/robotlegs/bender/extensions/commandCenter/impl/CommandExecutor.as
index f25efa83..54f54b5f 100644
--- a/src/robotlegs/bender/extensions/commandCenter/impl/CommandExecutor.as
+++ b/src/robotlegs/bender/extensions/commandCenter/impl/CommandExecutor.as
@@ -111,7 +111,7 @@ package robotlegs.bender.extensions.commandCenter.impl
 			var i:uint = payload.length;
 			while (i--)
 			{
-				_injector.map(payload.classes[i]).toValue(payload.values[i]);
+				_injector.map(payload.classes[i], payload.names[i]).toValue(payload.values[i]);
 			}
 		}
 
@@ -120,7 +120,7 @@ package robotlegs.bender.extensions.commandCenter.impl
 			var i:uint = payload.length;
 			while (i--)
 			{
-				_injector.unmap(payload.classes[i]);
+				_injector.unmap(payload.classes[i], payload.names[i]);
 			}
 		}
 	}
diff --git a/test/robotlegs/bender/extensions/commandCenter/impl/CommandExecutorTest.as b/test/robotlegs/bender/extensions/commandCenter/impl/CommandExecutorTest.as
index 8521dd78..14b42b1b 100644
--- a/test/robotlegs/bender/extensions/commandCenter/impl/CommandExecutorTest.as
+++ b/test/robotlegs/bender/extensions/commandCenter/impl/CommandExecutorTest.as
@@ -203,7 +203,9 @@ package robotlegs.bender.extensions.commandCenter.impl
 		public function payload_is_injected_into_command():void
 		{
 			addMapping(PayloadInjectionPointsCommand);
-			const payload:CommandPayload = new CommandPayload(['message', 1], [String, int]);
+			const payload:CommandPayload = new CommandPayload(['message', 1, 'messageNamed', 2], 
+																[String, int, String, int], 
+																['', '', 'named', 'named']);
 			executeCommands(payload);
 			assertThat(reported, array(payload.values));
 		}
@@ -392,6 +394,12 @@ class PayloadInjectionPointsCommand
 
 	[Inject]
 	public var code:int;
+	
+	[Inject(name="named")]
+	public var messageNamed:String;
+	
+	[Inject(name="named")]
+	public var codeNamed:int;
 
 	[Inject(name="reportingFunction")]
 	public var reportingFunc:Function;
@@ -404,6 +412,8 @@ class PayloadInjectionPointsCommand
 	{
 		reportingFunc(message);
 		reportingFunc(code);
+		reportingFunc(messageNamed);
+		reportingFunc(codeNamed);
 	}
 }