Skip to content

Implicit dsl names #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2011
Merged

Implicit dsl names #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions system/ioc/dsl/ColdBoxDSL.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ Description :
var DSLNamespace = listFirst(arguments.definition.dsl,":");

switch( DSLNamespace ){
case "ioc" : { return getIOCDSL(arguments.definition,arguments.targetObject);}
case "ocm" : { return getOCMDSL(arguments.definition,arguments.targetObject);}
case "webservice" : { return getWebserviceDSL(arguments.definition,arguments.targetObject);}
case "javaloader" : { return getJavaLoaderDSL(arguments.definition,arguments.targetObject);}
case "entityService" : { return getEntityServiceDSL(arguments.definition,arguments.targetObject);}
case "coldbox" : { return getColdboxDSL(arguments.definition,arguments.targetObject); }
case "ioc" : { return getIOCDSL(argumentCollection=arguments);}
case "ocm" : { return getOCMDSL(argumentCollection=arguments);}
case "webservice" : { return getWebserviceDSL(argumentCollection=arguments);}
case "javaloader" : { return getJavaLoaderDSL(argumentCollection=arguments);}
case "entityService" : { return getEntityServiceDSL(argumentCollection=arguments);}
case "coldbox" : { return getColdboxDSL(argumentCollection=arguments); }
}
</cfscript>
</cffunction>
Expand Down Expand Up @@ -103,11 +103,21 @@ Description :
<cfargument name="definition" required="true" type="any" hint="The dependency definition structure">
<cfargument name="targetObject" required="false" hint="The target object we are building the DSL dependency for. If empty, means we are just requesting building"/>
<cfscript>
var thisName = arguments.definition.name;
var thisType = arguments.definition.dsl;
var thisTypeLen = listLen(thisType,":");
var thisLocationType = "";
var thisLocationKey = "";

// Support shortcut for specifying name in the definition instead of the DSl for supporting namespaces
if( thisTypeLen eq 2
and listFindNoCase("setting,fwSetting,plugin,myplugin,datasource,interceptor",listLast(thisType,":"))
and len(thisName))
{
thisType = thisType & ":" & thisName;
thisTypeLen = 3;
}

// DSL stages
switch(thisTypeLen){
// coldbox only DSL
Expand All @@ -132,7 +142,8 @@ Description :
case "interceptorService" : { return instance.coldbox.getinterceptorService(); }
case "cacheManager" : { return instance.coldbox.getColdboxOCM(); }
case "moduleService" : { return instance.coldbox.getModuleService(); }
}//end of services
} // end of services

break;
}
//coldobx:{key}:{target} Usually for named factories
Expand Down
10 changes: 10 additions & 0 deletions system/ioc/dsl/LogBoxDSL.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,21 @@ Description :
<cfargument name="definition" required="true" hint="The injection dsl definition structure to process. Keys: name, dsl"/>
<cfargument name="targetObject" required="false" hint="The target object we are building the DSL dependency for. If empty, means we are just requesting building"/>
<cfscript>
var thisName = arguments.definition.name;
var thisType = arguments.definition.dsl;
var thisTypeLen = listLen(thisType,":");
var thisLocationType = "";
var thisLocationKey = "";

// Support shortcut for specifying name in the definition instead of the DSl
if( thisTypeLen eq 2
and listLast(thisType,":") eq "logger"
and len(thisName))
{
thisType = thisType & ":" & thisName;
thisTypeLen = 3;
}

// DSL stages
switch(thisTypeLen){
// LogBox
Expand Down