Do NOT use static service location in NancyMiddleware. The will cause…

… all sort of problems if there is more than one Nancy instance / bootstrapper in a owin pipeline.

src/Nancy.Owin.Tests/AppBuilderExtensionsFixture.cs

@@ -21,7 +21,7 @@ public void When_host_Nancy_via_IAppBuilder_then_should_handle_requests()
             // Given
             var bootstrapper = new ConfigurableBootstrapper(config => config.Module<TestModule>());
 
-            using(var server = TestServer.Create(app => app.UseNancy(opts => opts.Bootstrapper = bootstrapper)))
+            using(var server = TestServer.Create(app => app.UseNancy(bootstrapper)))
             {
 
                 // When

src/Nancy.Owin/AppBuilderExtensions.cs

@@ -5,6 +5,7 @@ namespace Owin
     using System;
     using System.Threading;
 
+    using Nancy.Bootstrapper;
     using Nancy.Owin;
 
     /// <summary>
@@ -18,27 +19,40 @@ public static class AppBuilderExtensions
         /// Adds Nancy to the OWIN pipeline.
         /// </summary>
         /// <param name="builder">The application builder.</param>
-        /// <param name="options">The Nancy options.</param>
+        /// <param name="bootstrapper">The Nancy bootstrapper.</param>
         /// <returns>IAppBuilder.</returns>
-        public static IAppBuilder UseNancy(this IAppBuilder builder, NancyOptions options = null)
+        public static IAppBuilder UseNancy(this IAppBuilder builder, INancyBootstrapper bootstrapper)
         {
-            var nancyOptions = options ?? new NancyOptions();
+            var options = new NancyOptions(bootstrapper);
+
+            HookDisposal(builder, options);
+
+            return builder.Use(NancyMiddleware.UseNancy(options));
+        }
 
-            HookDisposal(builder, nancyOptions);
+        /// <summary>
+        /// Adds Nancy to the OWIN pipeline.
+        /// </summary>
+        /// <param name="builder">The application builder.</param>
+        /// <param name="options">The Nancy options.</param>
+        /// <returns>IAppBuilder.</returns>
+        public static IAppBuilder UseNancy(this IAppBuilder builder, NancyOptions options)
+        {
+            HookDisposal(builder, options);
 
-            return builder.Use(NancyMiddleware.UseNancy(nancyOptions));
+            return builder.Use(NancyMiddleware.UseNancy(options));
         }
 
         /// <summary>
         /// Adds Nancy to the OWIN pipeline.
         /// </summary>
         /// <param name="builder">The application builder.</param>
-        /// <param name="configuration">A configuration builder action.</param>
+        /// <param name="configureOptions">A configuration builder action.</param>
         /// <returns>IAppBuilder.</returns>
-        public static IAppBuilder UseNancy(this IAppBuilder builder, Action<NancyOptions> configuration)
+        public static IAppBuilder UseNancy(this IAppBuilder builder, INancyBootstrapper bootstrapper, Action<NancyOptions> configureOptions)
         {
-            var options = new NancyOptions();
-            configuration(options);
+            var options = new NancyOptions(bootstrapper);
+            configureOptions(options);
             return UseNancy(builder, options);
         }
 

src/Nancy.Tests/Unit/NancyMiddlewareFixture.cs

@@ -37,7 +37,7 @@ public NancyMiddlewareFixture()
             this.fakeEngine = A.Fake<INancyEngine>();
             this.fakeBootstrapper = A.Fake<INancyBootstrapper>();
             A.CallTo(() => this.fakeBootstrapper.GetEngine()).Returns(this.fakeEngine);
-            this.host = NancyMiddleware.UseNancy(new NancyOptions {Bootstrapper = this.fakeBootstrapper})(null);
+            this.host = NancyMiddleware.UseNancy(new NancyOptions(this.fakeBootstrapper))(null);
             this.environment = new Dictionary<string, object>
             {
                 {"owin.RequestMethod", "GET"},

src/Nancy.Tests/Unit/NancyOptionsExtensionsFixture.cs

@@ -10,7 +10,7 @@ public class NancyOptionsExtensionsFixture
         public void When_response_status_code_match_then_should_perform_pass_through()
         {
             // Given
-            var options = new NancyOptions();
+            var options = new NancyOptions(new DefaultNancyBootstrapper());
             options.PassThroughWhenStatusCodesAre(HttpStatusCode.NotFound);
             var nancyContext = new NancyContext { Response = new Response {StatusCode = HttpStatusCode.NotFound} };
 

src/Nancy.Tests/Unit/NancyOptionsFixture.cs

@@ -10,7 +10,7 @@ public class NancyOptionsFixture
 
         public NancyOptionsFixture()
         {
-            this.nancyOptions = new NancyOptions();
+            this.nancyOptions = new NancyOptions(new DefaultNancyBootstrapper());
         }
 
         [Fact]

src/Nancy/Owin/DelegateExtensions.cs

@@ -2,6 +2,8 @@
 {
     using System;
 
+    using Nancy.Bootstrapper;
+
     using AppFunc = System.Func<System.Collections.Generic.IDictionary<string, object>,
         System.Threading.Tasks.Task>;
 
@@ -18,13 +20,23 @@ public static class DelegateExtensions
         /// Adds Nancy to the OWIN pipeline.
         /// </summary>
         /// <param name="builder">The application builder delegate.</param>
-        /// <param name="action">A configuration builder action.</param>
+        /// <param name="nancyBootstrapper">A Nancy bootstrapper.</param>
+        /// <param name="configure">A configuration builder action.</param>
         /// <returns>The application builder delegate.</returns>
-        public static Action<MidFunc> UseNancy(this Action<MidFunc> builder, Action<NancyOptions> action)
+        public static Action<MidFunc> UseNancy(this Action<MidFunc> builder, INancyBootstrapper nancyBootstrapper, Action<NancyOptions> configure)
         {
-            var options = new NancyOptions();
+            if (nancyBootstrapper == null)
+            {
+                throw new ArgumentNullException("nancyBootstrapper");
+            }
+            if (configure == null)
+            {
+                throw new ArgumentNullException("configure");
+            }
+
+            var options = new NancyOptions(nancyBootstrapper);
 
-            action(options);
+            configure(options);
 
             return builder.UseNancy(options);
         }
@@ -35,11 +47,14 @@ public static Action<MidFunc> UseNancy(this Action<MidFunc> builder, Action<Nanc
         /// <param name="builder">The application builder delegate.</param>
         /// <param name="options">The Nancy options.</param>
         /// <returns>The application builder delegate.</returns>
-        public static Action<MidFunc> UseNancy(this Action<MidFunc> builder, NancyOptions options = null)
+        public static Action<MidFunc> UseNancy(this Action<MidFunc> builder, NancyOptions options)
         {
-            var nancyOptions = options ?? new NancyOptions();
+            if (options == null)
+            {
+                throw new ArgumentNullException("options");
+            }
 
-            builder(NancyMiddleware.UseNancy(nancyOptions).Invoke);
+            builder(NancyMiddleware.UseNancy(options).Invoke);
 
             return builder;
         }

src/Nancy/Owin/NancyMiddleware.cs

@@ -11,6 +11,7 @@
     using System.Threading;
     using System.Threading.Tasks;
 
+    using Nancy.Bootstrapper;
     using Nancy.Helpers;
     using Nancy.IO;
 
@@ -34,12 +35,23 @@ public static class NancyMiddleware
         /// <summary>
         /// Use Nancy in an OWIN pipeline
         /// </summary>
-        /// <param name="configuration">A delegate to configure the <see cref="NancyOptions"/>.</param>
+        /// <param name="bootstrapper">A Nancy bootstrapper.</param>
+        /// <param name="configure">A delegate to configure the <see cref="NancyOptions"/>.</param>
         /// <returns>An OWIN middleware delegate.</returns>
-        public static MidFunc UseNancy(Action<NancyOptions> configuration)
+        public static MidFunc UseNancy(INancyBootstrapper bootstrapper, Action<NancyOptions> configure)
         {
-            var options = new NancyOptions();
-            configuration(options);
+            if (bootstrapper == null)
+            {
+                throw new ArgumentNullException("bootstrapper");
+            }
+
+            if (configure == null)
+            {
+                throw new ArgumentNullException("configure");
+            }
+
+            var options = new NancyOptions(bootstrapper);
+            configure(options);
             return UseNancy(options);
         }
 
@@ -48,9 +60,13 @@ public static MidFunc UseNancy(Action<NancyOptions> configuration)
         /// </summary>
         /// <param name="options">An <see cref="NancyOptions"/> to configure the Nancy middleware</param>
         /// <returns>An OWIN middleware delegate.</returns>
-        public static MidFunc UseNancy(NancyOptions options = null)
+        public static MidFunc UseNancy(NancyOptions options)
         {
-            options = options ?? new NancyOptions();
+            if (options == null)
+            {
+                throw new ArgumentNullException("options");
+            }
+
             options.Bootstrapper.Initialise();
             var engine = options.Bootstrapper.GetEngine();
 

src/Nancy/Owin/NancyOptions.cs

@@ -9,16 +9,30 @@
     /// </summary>
     public class NancyOptions
     {
-        private INancyBootstrapper bootstrapper;
+        private readonly INancyBootstrapper bootstrapper;
         private Func<NancyContext, bool> performPassThrough;
 
         /// <summary>
-        /// Gets or sets the bootstrapper. If none is set, NancyBootstrapperLocator.Bootstrapper is used.
+        /// Initializes a new instance of the <see cref="NancyOptions"/> class.
+        /// </summary>
+        /// <param name="bootstrapper">A Nancy bootstrapper.</param>
+        /// <exception cref="System.ArgumentNullException">bootstrapper</exception>
+        public NancyOptions(INancyBootstrapper bootstrapper)
+        {
+            if(bootstrapper == null)
+            {
+                throw new ArgumentNullException("bootstrapper");
+            }
+
+            this.bootstrapper = bootstrapper;
+        }
+
+        /// <summary>
+        /// Gets the bootstrapper.
         /// </summary>
         public INancyBootstrapper Bootstrapper
         {
-            get { return this.bootstrapper ?? NancyBootstrapperLocator.Bootstrapper; }
-            set { this.bootstrapper = value; }
+            get { return this.bootstrapper; }
         }
 
         /// <summary>