Merge pull request #1784 from khellang/request-container-context

Pass NancyContext to CreateRequestContainer

src/Nancy.Testing/ConfigurableBootstrapper.cs

@@ -321,8 +321,9 @@ protected override void ConfigureApplicationContainer(TinyIoCContainer container
         /// <summary>
         /// Creates a per request child/nested container
         /// </summary>
+        /// <param name="context">Current context</param>
         /// <returns>Request container instance</returns>
-        protected override TinyIoCContainer CreateRequestContainer()
+        protected override TinyIoCContainer CreateRequestContainer(NancyContext context)
         {
             return this.ApplicationContainer.GetChildContainer();
         }

src/Nancy.Tests/Unit/Bootstrapper/NancyBootstrapperWithRequestContainerBaseFixture.cs

@@ -330,7 +330,7 @@ protected override void RegisterCollectionTypes(
                 }
             }
 
-            protected override FakeContainer CreateRequestContainer()
+            protected override FakeContainer CreateRequestContainer(NancyContext context)
             {
                 return new FakeContainer(this.ApplicationContainer);
             }

src/Nancy/Bootstrapper/NancyBootstrapperWithRequestContainerBase.cs

@@ -2,6 +2,7 @@ namespace Nancy.Bootstrapper
 {
     using System;
     using System.Collections.Generic;
+    using System.ComponentModel;
     using System.Linq;
 
     /// <summary>
@@ -153,7 +154,7 @@ protected TContainer GetConfiguredRequestContainer(NancyContext context)
 
             if (requestContainer == null)
             {
-                requestContainer = this.CreateRequestContainer();
+                requestContainer = this.CreateRequestContainer(context);
 
                 context.Items[this.ContextKey] = requestContainer;
 
@@ -188,8 +189,9 @@ protected override sealed void RegisterModules(TContainer container, IEnumerable
         /// <summary>
         /// Creates a per request child/nested container
         /// </summary>
+        /// <param name="context">Current context</param>
         /// <returns>Request container instance</returns>
-        protected abstract TContainer CreateRequestContainer();
+        protected abstract TContainer CreateRequestContainer(NancyContext context);
 
         /// <summary>
         /// Register the given module types into the request container

src/Nancy/DefaultNancyBootstrapper.cs

@@ -176,8 +176,9 @@ protected override void RegisterInstances(TinyIoCContainer container, IEnumerabl
         /// <summary>
         /// Creates a per request child/nested container
         /// </summary>
+        /// <param name="context">Current context</param>
         /// <returns>Request container instance</returns>
-        protected override sealed TinyIoCContainer CreateRequestContainer()
+        protected override TinyIoCContainer CreateRequestContainer(NancyContext context)
         {
             return this.ApplicationContainer.GetChildContainer();
         }