Minor tweaks and comments

src/Nancy.Demo.Authentication.Forms/FormsAuthBootstrapper.cs

@@ -7,21 +7,28 @@ public class FormsAuthBootstrapper : DefaultNancyBootstrapper
     {
         protected override void ConfigureApplicationContainer(TinyIoC.TinyIoCContainer container)
         {
-        }
-
-        protected override void ApplicationStartup(TinyIoC.TinyIoCContainer container, Bootstrapper.IPipelines pipelines)
-        {
+            // We don't call "base" here to prevent auto-discovery of
+            // types/dependencies
         }
 
         protected override void ConfigureRequestContainer(TinyIoC.TinyIoCContainer container)
         {
             base.ConfigureRequestContainer(container);
 
+            // Here we register our user mapper as a per-request singleton.
+            // As this is now per-request we could inject a request scoped
+            // database "context" or other request scoped services.
             container.Register<IUserMapper, UserDatabase>();
         }
 
         protected override void RequestStartup(TinyIoC.TinyIoCContainer requestContainer, Bootstrapper.IPipelines pipelines)
         {
+            // At request startup we modify the request pipelines to
+            // include forms authentication - passing in our now request
+            // scoped user name mapper.
+            //
+            // The pipelines passed in here are specific to this request,
+            // so we can add/remove/update items in them as we please.
             var formsAuthConfiguration =
                 new FormsAuthenticationConfiguration()
                 {

src/Nancy.Demo.Authentication.Forms/Views/secure.cshtml

@@ -8,6 +8,6 @@
 
     <br />
     <br />
-    <a href="/logout">Logout</a>
+    <a href="@Url.Content("~/logout")">Logout</a>
 </body>
 </html>

src/Nancy.Hosting.Aspnet/DefaultNancyAspNetBootstrapper.cs

@@ -42,6 +42,16 @@ public override sealed NancyModule GetModuleByKey(string moduleKey, NancyContext
             return this.ApplicationContainer.Resolve<NancyModule>(moduleKey);
         }
 
+        /// <summary>
+        /// Creates and initializes the request pipelines.
+        /// </summary>
+        /// <param name="context">The <see cref="NancyContext"/> used by the request.</param>
+        /// <returns>An <see cref="IPipelines"/> instance.</returns>
+        protected override sealed IPipelines InitializeRequestPipelines(NancyContext context)
+        {
+            return base.InitializeRequestPipelines(context);
+        }
+
         /// <summary>
         /// Configures the container using AutoRegister followed by registration
         /// of default INancyModuleCatalog and IRouteResolver.

src/Nancy/Bootstrapper/NancyBootstrapperBase.cs

@@ -14,7 +14,7 @@
     /// </summary>
     /// <typeparam name="TContainer">IoC container type</typeparam>
     [SuppressMessage("Microsoft.StyleCop.CSharp.DocumentationRules", "SA1623:PropertySummaryDocumentationMustMatchAccessors", Justification = "Abstract base class - properties are described differently for overriding.")]
-    public abstract class NancyBootstrapperBase<TContainer> : INancyBootstrapper, INancyModuleCatalog, IRequestPipelinesFactory
+    public abstract class NancyBootstrapperBase<TContainer> : INancyBootstrapper, INancyModuleCatalog
         where TContainer : class
     {
         /// <summary>
@@ -28,6 +28,11 @@ public abstract class NancyBootstrapperBase<TContainer> : INancyBootstrapper, IN
         /// </summary>
         private readonly NancyConventions conventions;
 
+        /// <summary>
+        /// Application pipelines.
+        /// Pipelines are "cloned" per request so they can be modified
+        /// at the request level.
+        /// </summary>
         protected IPipelines ApplicationPipelines { get; private set; }
 
         /// <summary>
@@ -297,7 +302,7 @@ public INancyEngine GetEngine()
 
             var engine = this.GetEngineInternal();
 
-            engine.RequestPipelinesFactory = this.CreateRequestPipeline;
+            engine.RequestPipelinesFactory = this.InitializeRequestPipelines;
 
             return engine;
         }
@@ -321,7 +326,12 @@ public override sealed int GetHashCode()
             return base.GetHashCode();
         }
 
-        public virtual IPipelines CreateRequestPipeline(NancyContext context)
+        /// <summary>
+        /// Creates and initializes the request pipelines.
+        /// </summary>
+        /// <param name="context">The <see cref="NancyContext"/> used by the request.</param>
+        /// <returns>An <see cref="IPipelines"/> instance.</returns>
+        protected virtual IPipelines InitializeRequestPipelines(NancyContext context)
         {
             var requestPipelines =
                 new Pipelines(this.ApplicationPipelines);
@@ -440,6 +450,11 @@ private IEnumerable<TypeRegistration> GetAdditionalTypes()
             return new[] { new TypeRegistration(typeof(IRootPathProvider), this.RootPathProvider) };
         }
 
+        /// <summary>
+        /// Gets any additional instance registrations that need to
+        /// be registered into the container
+        /// </summary>
+        /// <returns>Collection of InstanceRegistation types</returns>
         private IEnumerable<InstanceRegistration> GetAdditionalInstances()
         {
             return new[] { new InstanceRegistration(typeof(CryptographyConfiguration), this.CryptographyConfiguration) };

src/Nancy/Bootstrapper/NancyBootstrapperWithRequestContainerBase.cs

@@ -63,11 +63,11 @@ public override sealed NancyModule GetModuleByKey(string moduleKey, NancyContext
         }
 
         /// <summary>
-        /// Creates and initializes a request pipeline.
+        /// Creates and initializes the request pipelines.
         /// </summary>
         /// <param name="context">The <see cref="NancyContext"/> used by the request.</param>
         /// <returns>An <see cref="IPipelines"/> instance.</returns>
-        public override IPipelines CreateRequestPipeline(NancyContext context)
+        protected override sealed IPipelines InitializeRequestPipelines(NancyContext context)
         {
             var requestContainer = 
                 this.GetRequestContainer(context);

src/Nancy/Nancy.csproj

@@ -91,7 +91,6 @@
     <Compile Include="Bootstrapper\CollectionTypeRegistration.cs" />
     <Compile Include="Bootstrapper\IPipelines.cs" />
     <Compile Include="Bootstrapper\InstanceRegistration.cs" />
-    <Compile Include="Bootstrapper\IRequestPipelinesFactory.cs" />
     <Compile Include="Bootstrapper\IStartup.cs" />
     <Compile Include="Bootstrapper\NancyInternalConfiguration.cs" />
     <Compile Include="Bootstrapper\Pipelines.cs" />