Merge pull request #2 from panesofglass/who-needs-assemblies

Allow direct specification of controller types

Author: glennblock

README.md

@@ -36,14 +36,23 @@ server.OpenAsync().Wait();
 
 Console.WriteLine("Listening...");
 Console.ReadKey();
+server.CloseAsync().Wait();
 ```
 * Running as admin type ```scriptcs start.csx``` to launch the app.
 * Open a browser to "http://localhost:8080/test";
 * That's it, your API is up!
 
 ## Customizing
-You can customize the host by modifying the configuration object. Or if you would like to pass your own you can use the CreateServer overload.
-If you pass your own, the ControllerHttpResolver will be replaced with a script friendly one.
+You can customize the host by modifying the configuration object.
+Or if you would like to pass your own you can use the `CreateServer` overload.
+Additional `CreateServer` overloads allow you to explicitly specify assemblies or `IHttpController` types you want to expose in your api:
+
+```csharp
+// Use a custom configuration and specify controller types.
+var config = new HttpSelfHostConfiguration("http://localhost:8080");
+var controllers = new List<Type> { typeof(TestController) };
+var server = webApi.CreateServer(config, controllers)
+```
 
 ## What's next
 * Create a nuget package.

src/ScriptCs.WebApi/ControllerResolver.cs

@@ -1,27 +1,41 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Web.Http.Dispatcher;
 
 namespace ScriptCs.WebApi
 {
-    public class ControllerResolver : DefaultHttpControllerTypeResolver
+    internal class ControllerResolver : DefaultHttpControllerTypeResolver
     {
-        private Assembly _scriptAssembly;
+        private ICollection<Type> _controllerTypes;
 
-        public ControllerResolver(Assembly scriptAssembly)
+        internal ControllerResolver(ICollection<Type> controllerTypes)
         {
-            _scriptAssembly = scriptAssembly;
+            Contract.Requires(AllAssignableToIHttpController(controllerTypes));
+
+            _controllerTypes = controllerTypes;
         }
 
         public override ICollection<Type> GetControllerTypes(IAssembliesResolver assembliesResolver)
         {
-            var types = _scriptAssembly.GetTypes().ToList();
-            var controllers = types.Where(x => typeof(System.Web.Http.Controllers.IHttpController).IsAssignableFrom(x)).ToList();
-            return controllers;
+            Contract.Invariant(_controllerTypes != null);
+
+            return _controllerTypes;
+        }
+
+        internal static IEnumerable<Type> WhereControllerType(IEnumerable<Type> types)
+        {
+            Contract.Requires(types != null);
+
+            return types.Where(x => typeof(System.Web.Http.Controllers.IHttpController).IsAssignableFrom(x));
+        }
+
+        internal static bool AllAssignableToIHttpController(IEnumerable<Type> types)
+        {
+            Contract.Requires(types != null);
+
+            return types.All(x => typeof(System.Web.Http.Controllers.IHttpController).IsAssignableFrom(x));
         }
     }
 }

src/ScriptCs.WebApi/WebApi.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
 using System.Reflection;
 using System.Web.Http;
 using System.Web.Http.Dispatcher;
@@ -9,27 +12,36 @@ namespace ScriptCs.WebApi
 {
     public class WebApi : IScriptPackContext
     {
-
-        public HttpSelfHostServer CreateServer(HttpSelfHostConfiguration config, Assembly caller = null)
+        public HttpSelfHostServer CreateServer(HttpSelfHostConfiguration config, ICollection<Type> controllerTypes)
         {
-            if (caller == null)
-            {
-                caller = Assembly.GetCallingAssembly();
-            }
+            Contract.Requires(controllerTypes != null);
+            Contract.Requires(ControllerResolver.AllAssignableToIHttpController(controllerTypes));
 
-            config.Services.Replace(typeof(IHttpControllerTypeResolver), new ControllerResolver(caller));
+            config.Services.Replace(typeof(IHttpControllerTypeResolver), new ControllerResolver(controllerTypes));
 
             config.Routes.MapHttpRoute(name: "DefaultApi",
                 routeTemplate: "{controller}/{id}",
                 defaults: new { id = RouteParameter.Optional }
             );
+
             return new HttpSelfHostServer(config);
         }
 
+        public HttpSelfHostServer CreateServer(HttpSelfHostConfiguration config, params Assembly[] assemblies)
+        {
+            var types = assemblies.Length == 0 ?
+                Assembly.GetCallingAssembly().GetTypes() :
+                assemblies.SelectMany(a => a.GetTypes()).ToArray();
+
+            var controllerTypes = ControllerResolver.WhereControllerType(types).ToList();
+            return CreateServer(config, controllerTypes);
+        }
+
         public HttpSelfHostServer CreateServer(string baseAddress)
         {
-            var caller = Assembly.GetCallingAssembly();
-            return CreateServer(new HttpSelfHostConfiguration(baseAddress), caller);
+            var types = Assembly.GetCallingAssembly().GetTypes();
+            var controllerTypes = ControllerResolver.WhereControllerType(types).ToList();
+            return CreateServer(new HttpSelfHostConfiguration(baseAddress), controllerTypes);
         }
     }
 }