Ensure modules are applied to routing action structs when necessary

Author: elpete

system/web/routing/Router.cfc

@@ -22,12 +22,12 @@ component
 	 ****************************************************************/
 
 	property
-		name    ="cachebox"
+		name    ="cachebox"  
 		inject  ="cachebox"
 		delegate="getCache";
 	property
 		name    ="controller"
-		inject  ="coldbox"
+		inject  ="coldbox" 
 		delegate="relocate,runEvent,runRoute";
 	property name="flash"  inject="coldbox:flash";
 	property name="logBox" inject="logbox";

system/web/services/RoutingService.cfc

@@ -295,14 +295,23 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
 		if ( isStruct( routeResults.route.action ) ) {
 			// Verify HTTP method used is valid
 			if ( structKeyExists( routeResults.route.action, httpMethod ) ) {
-				discoveredEvent &= ( discoveredEvent == "" ? "" : "." ) & "#routeResults.route.action[ httpMethod ]#";
+				discoveredEvent &= ( discoveredEvent == "" ? "" : "." );
+				// Do we have a module? If so, prefix it
+				if ( routeResults.route.module.len() ) {
+					discoveredEvent = routeResults.route.module & ":" & discoveredEvent;
+				}
+				discoveredEvent &= "#routeResults.route.action[ httpMethod ]#";
 				// Send for logging in debug mode
 				if ( variables.log.canDebug() ) {
 					variables.log.debug(
 						"Matched HTTP Method (#HTTPMethod#) to routed action: #routeResults.route.action[ httpMethod ]#"
 					);
 				}
 			} else {
+				// Do we have a module? If so, prefix it
+				if ( routeResults.route.module.len() ) {
+					discoveredEvent = routeResults.route.module & ":" & discoveredEvent;
+				}
 				// Mark as invalid HTTP Exception
 				discoveredEvent &= ".onInvalidHTTPMethod";
 				arguments.event.setIsInvalidHTTPMethod( true );
@@ -313,7 +322,12 @@ component extends="coldbox.system.web.services.BaseService" accessors="true" {
 		}
 		// Simple value action
 		else if ( !isStruct( routeREsults.route.action ) && routeResults.route.action.len() ) {
-			discoveredEvent &= ( discoveredEvent == "" ? "" : "." ) & "#routeResults.route.action#";
+			discoveredEvent &= ( discoveredEvent == "" ? "" : "." );
+			// Do we have a module? If so, prefix it
+			if ( routeResults.route.module.len() ) {
+				discoveredEvent = routeResults.route.module & ":" & discoveredEvent;
+			}
+			discoveredEvent &= "#routeResults.route.action#";
 		}
 		// end if action exists
 

tests/specs/web/routing/RoutingServiceTest.cfc

@@ -234,6 +234,53 @@
 
 				expect( discoveredEventPOST ).toBe( "MyHandler.update" );
 			} );
+
+			it( "appends the module to the action struct if needed", function(){
+				var mockEvent = createMock( "coldbox.system.web.context.RequestContext" ).init(
+					controller = getController(),
+					properties = {
+						defaultLayout : "Main.cfm",
+						defaultView   : "",
+						eventName     : "event",
+						modules       : {}
+					}
+				);
+
+				var routeResults = {
+					"route" : initRouteDefinition(
+						overrides = {
+							"handler" : "",
+							"event"   : "",
+							"module"  : "api-v1",
+							"action"  : {
+								"GET"  : "MyHandler.index",
+								"POST" : "MyOtherHandler.create"
+							}
+						}
+					),
+					"params" : {}
+				};
+
+				var discoveredEventGET = variables.routingService.processRoute(
+					routeResults = routeResults,
+					event        = mockEvent,
+					rc           = mockEvent.getCollection(),
+					prc          = mockEvent.getPrivateCollection()
+				);
+
+				expect( discoveredEventGET ).toBe( "api-v1:MyHandler.index" );
+
+				mockEvent.$( "getHTTPMethod", "POST" );
+
+				var discoveredEventPOST = variables.routingService.processRoute(
+					routeResults = routeResults,
+					event        = mockEvent,
+					rc           = mockEvent.getCollection(),
+					prc          = mockEvent.getPrivateCollection()
+				);
+
+				expect( discoveredEventPOST ).toBe( "api-v1:MyOtherHandler.create" );
+			} );
 		} );
 	}