Merge pull request #77 from DoclerLabs/develop

prepare 0.20.2
FrancisBourre · May 15, 2017 · 9bc9e35 · 9bc9e35
2 parents ff8faa2 + 4a9d519
commit 9bc9e35
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/hex/control/trigger/CommandTriggerBuilder.hx b/src/hex/control/trigger/CommandTriggerBuilder.hx
@@ -233,10 +233,21 @@ class CommandTriggerBuilder
 					switch( arg.expr )
 					{
 						case EMeta( s, _.expr => EVars( vars ) ) if ( s.name == "Inject" ):
-
+								var mapName = if ( s.params.length > 0 )
+								{
+									switch( s.params[ 0 ].expr )
+									{
+
+										case EConst(CString(name)): name;
+										case EConst(CIdent(ident)): "";
+										case EField(e, field): "";
+										case _: "";
+									}
+								} else "";
+
 								var varName 	= vars[0].name;
 								var varType 	= vars[0].type;
-								arg.expr 		= (macro var $varName : $varType = this.injector.getInstanceWithClassName( $v{ MacroUtil.getFQCNFromComplexType( varType ) } )).expr;
+								arg.expr 		= (macro var $varName : $varType = this.injector.getInstanceWithClassName( $v{ MacroUtil.getFQCNFromComplexType( varType ) }, $v{mapName} )).expr;
 
 						case _:
 							CommandTriggerBuilder._searchForInjection( arg );

diff --git a/test/hex/module/ModuleTest.hx b/test/hex/module/ModuleTest.hx
@@ -7,7 +7,6 @@ import hex.di.IBasicInjector;
 import hex.di.IDependencyInjector;
 import hex.di.Injector;
 import hex.di.error.MissingMappingException;
-import hex.di.mapping.MappingDefinition;
 import hex.domain.DomainExpert;
 import hex.error.Exception;
 import hex.error.IllegalStateException;
@@ -387,7 +386,7 @@ private class MockModuleForTestingRuntimeDependencies extends Module
 	override function _getRuntimeDependencies() : IRuntimeDependencies 
 	{
 		var rd : RuntimeDependencies = new RuntimeDependencies();
-		rd.addMappedDependencies( [ new MappingDefinition( IService ) ]);
+		rd.addMappedDependencies([ {type: IService } ]);
 		return rd;
 	}
 }
@@ -486,4 +485,4 @@ private class MockService implements IService
 	{
 
 	}
-}
+}