Expanded resolution of direct route controllers to include the "controller" and "actions" data tokens. Fixes #27 (#28)

Author: commonsensesoftware

src/Microsoft.AspNet.WebApi.Versioning/Dispatcher/ApiVersionControllerAggregator.cs

@@ -104,13 +104,46 @@ private IEnumerable<HttpControllerDescriptor> EnumerateDirectRoutes()
             var template = subroute.Route.RouteTemplate;
             var comparer = StringComparer.OrdinalIgnoreCase;
             var controllers = from route in routes
-                              where comparer.Equals( route.RouteTemplate, template ) &&
-                                    route.DataTokens.ContainsKey( "controller" )
-                              let controller = route.DataTokens["controller"] as HttpControllerDescriptor
-                              where controller != null
+                              where comparer.Equals( route.RouteTemplate, template )
+                              from controller in EnumerateControllersInDataTokens( route.DataTokens )
                               select controller;
 
             return controllers.Distinct();
         }
+
+        private static IEnumerable<HttpControllerDescriptor> EnumerateControllersInDataTokens( IDictionary<string, object> dataTokens )
+        {
+            Contract.Requires( dataTokens != null );
+            Contract.Ensures( Contract.Result<IEnumerable<HttpControllerDescriptor>>() != null );
+
+            var value = default( object );
+
+            if ( dataTokens.TryGetValue( "controller", out value ) )
+            {
+                var controllerDescriptor = value as HttpControllerDescriptor;
+
+                if ( controllerDescriptor != null )
+                {
+                    yield return controllerDescriptor;
+                }
+
+                yield break;
+            }
+
+            if ( dataTokens.TryGetValue( "actions", out value ) )
+            {
+                var actionDescriptors = value as HttpActionDescriptor[];
+
+                if ( actionDescriptors == null )
+                {
+                    yield break;
+                }
+
+                foreach ( var actionDescriptor in actionDescriptors )
+                {
+                    yield return actionDescriptor.ControllerDescriptor;
+                }
+            }
+        }
     }
 }

src/Microsoft.AspNet.WebApi.Versioning/Dispatcher/HttpControllerTypeCache.cs

@@ -32,7 +32,9 @@ private static string GetControllerName( Type type )
             var attribute = type.GetCustomAttributes<ControllerNameAttribute>( false ).SingleOrDefault();
 
             if ( attribute != null )
+            {
                 return attribute.Name;
+            }
 
             // use standard convention for the controller name
             var name = type.Name;
@@ -75,7 +77,9 @@ internal ICollection<Type> GetControllerTypes( string controllerName )
             if ( cache.Value.TryGetValue( controllerName, out lookup ) )
             {
                 foreach ( var grouping in lookup )
+                {
                     set.UnionWith( grouping );
+                }
             }
 
             return set;