Initial refactoring around registrations

src/Nancy.Hosting.Aspnet/DefaultNancyAspNetBootstrapper.cs

@@ -34,10 +34,10 @@ protected override IEnumerable<IApplicationStartup> GetApplicationStartupTasks()
         /// <summary>
         /// Gets all registered application registration tasks
         /// </summary>
-        /// <returns>An <see cref="IEnumerable{T}"/> instance containing <see cref="IApplicationRegistrations"/> instances.</returns>
-        protected override IEnumerable<IApplicationRegistrations> GetApplicationRegistrationTasks()
+        /// <returns>An <see cref="IEnumerable{T}"/> instance containing <see cref="IRegistrations"/> instances.</returns>
+        protected override IEnumerable<IRegistrations> GetApplicationRegistrationTasks()
         {
-            return this.ApplicationContainer.ResolveAll<IApplicationRegistrations>(false);
+            return this.ApplicationContainer.ResolveAll<IRegistrations>(false);
         }
 
         /// <summary>

src/Nancy.Testing/ConfigurableBootstrapper.cs

@@ -387,10 +387,10 @@ protected override IEnumerable<IApplicationStartup> GetApplicationStartupTasks()
         /// <summary>
         /// Gets all registered application registration tasks
         /// </summary>
-        /// <returns>An <see cref="IEnumerable{T}"/> instance containing <see cref="IApplicationRegistrations"/> instances.</returns>
-        protected override IEnumerable<IApplicationRegistrations> GetApplicationRegistrationTasks()
+        /// <returns>An <see cref="IEnumerable{T}"/> instance containing <see cref="IRegistrations"/> instances.</returns>
+        protected override IEnumerable<IRegistrations> GetApplicationRegistrationTasks()
         {
-            return this.ApplicationContainer.ResolveAll<IApplicationRegistrations>(false);
+            return this.ApplicationContainer.ResolveAll<IRegistrations>(false);
         }
 
         /// <summary>

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

@@ -126,8 +126,8 @@ public void Should_invoke_startup_tasks_after_registration_tasks()
             var startup = A.Fake<IApplicationStartup>();
             this.bootstrapper.OverriddenApplicationStartupTasks = new[] { startup };
 
-            var registrations = A.Fake<IApplicationRegistrations>();
-            this.bootstrapper.OverriddenApplicationRegistrationTasks = new[] { registrations };
+            var registrations = A.Fake<IRegistrations>();
+            this.bootstrapper.OverriddenRegistrationTasks = new[] { registrations };
 
             // When
             using(var scope = Fake.CreateScope())
@@ -148,9 +148,9 @@ public void Should_register_application_registration_type_registrations_into_con
         {
             // Given
             var typeRegistrations = new TypeRegistration[] { };
-            var startupStub = A.Fake<IApplicationRegistrations>();
+            var startupStub = A.Fake<IRegistrations>();
             A.CallTo(() => startupStub.TypeRegistrations).Returns(typeRegistrations);
-            this.bootstrapper.OverriddenApplicationRegistrationTasks = new[] { startupStub };
+            this.bootstrapper.OverriddenRegistrationTasks = new[] { startupStub };
 
             // When
             this.bootstrapper.Initialise();
@@ -164,9 +164,9 @@ public void Should_register_application_registration_task_collection_registratio
         {
             // Given
             var collectionTypeRegistrations = new CollectionTypeRegistration[] { };
-            var startupStub = A.Fake<IApplicationRegistrations>();
+            var startupStub = A.Fake<IRegistrations>();
             A.CallTo(() => startupStub.CollectionTypeRegistrations).Returns(collectionTypeRegistrations);
-            this.bootstrapper.OverriddenApplicationRegistrationTasks = new[] { startupStub };
+            this.bootstrapper.OverriddenRegistrationTasks = new[] { startupStub };
 
             // When
             this.bootstrapper.Initialise();
@@ -180,9 +180,9 @@ public void Should_register_application_registration_instance_registrations_into
         {
             // Given
             var instanceRegistrations = new InstanceRegistration[] { };
-            var startupStub = A.Fake<IApplicationRegistrations>();
+            var startupStub = A.Fake<IRegistrations>();
             A.CallTo(() => startupStub.InstanceRegistrations).Returns(instanceRegistrations);
-            this.bootstrapper.OverriddenApplicationRegistrationTasks = new[] { startupStub };
+            this.bootstrapper.OverriddenRegistrationTasks = new[] { startupStub };
 
             // When
             this.bootstrapper.Initialise();
@@ -255,7 +255,7 @@ internal class FakeBootstrapperBaseImplementation : NancyBootstrapperBase<FakeCo
         public IEnumerable<InstanceRegistration> InstanceRegistrations { get; set; }
         public List<ModuleRegistration> PassedModules { get; set; }
         public IApplicationStartup[] OverriddenApplicationStartupTasks { get; set; }
-        public IApplicationRegistrations[] OverriddenApplicationRegistrationTasks { get; set; }
+        public IRegistrations[] OverriddenRegistrationTasks { get; set; }
         public bool ShouldThrowWhenGettingEngine { get; set; }
 
         public FakeBootstrapperBaseImplementation()
@@ -295,10 +295,10 @@ protected override IEnumerable<IApplicationStartup> GetApplicationStartupTasks()
         /// <summary>
         /// Gets all registered application registration tasks
         /// </summary>
-        /// <returns>An <see cref="IEnumerable{T}"/> instance containing <see cref="IApplicationRegistrations"/> instances.</returns>
-        protected override IEnumerable<IApplicationRegistrations> GetApplicationRegistrationTasks()
+        /// <returns>An <see cref="IEnumerable{T}"/> instance containing <see cref="IRegistrations"/> instances.</returns>
+        protected override IEnumerable<IRegistrations> GetApplicationRegistrationTasks()
         {
-            return this.OverriddenApplicationRegistrationTasks ?? new IApplicationRegistrations[] { };
+            return this.OverriddenRegistrationTasks ?? new IRegistrations[] { };
         }
 
         /// <summary>
@@ -428,10 +428,10 @@ protected override IEnumerable<IApplicationStartup> GetApplicationStartupTasks()
         /// <summary>
         /// Gets all registered application registration tasks
         /// </summary>
-        /// <returns>An <see cref="IEnumerable{T}"/> instance containing <see cref="IApplicationRegistrations"/> instances.</returns>
-        protected override IEnumerable<IApplicationRegistrations> GetApplicationRegistrationTasks()
+        /// <returns>An <see cref="IEnumerable{T}"/> instance containing <see cref="IRegistrations"/> instances.</returns>
+        protected override IEnumerable<IRegistrations> GetApplicationRegistrationTasks()
         {
-            return new IApplicationRegistrations[] { };
+            return new IRegistrations[] { };
         }
 
         /// <summary>

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

@@ -30,9 +30,9 @@ public void Should_not_register_request_lifetime_types_into_application_containe
                                         new TypeRegistration(typeof(FakeBootstrapperBaseImplementation), typeof(FakeBootstrapperBaseImplementation), Lifetime.Transient),
                                         new TypeRegistration(typeof(string), typeof(string), Lifetime.PerRequest),
                                     };
-            var startupStub = A.Fake<IApplicationRegistrations>();
+            var startupStub = A.Fake<IRegistrations>();
             A.CallTo(() => startupStub.TypeRegistrations).Returns(typeRegistrations);
-            this.bootstrapper.OverriddenApplicationRegistrationTasks = new[] { startupStub };
+            this.bootstrapper.OverriddenRegistrationTasks = new[] { startupStub };
 
             // When
             this.bootstrapper.Initialise();
@@ -53,9 +53,9 @@ public void Should_register_request_lifetime_types_into_request_container_as_sin
                                         new TypeRegistration(typeof(FakeBootstrapperBaseImplementation), typeof(FakeBootstrapperBaseImplementation), Lifetime.Transient),
                                         new TypeRegistration(typeof(string), typeof(string), Lifetime.PerRequest),
                                     };
-            var startupStub = A.Fake<IApplicationRegistrations>();
+            var startupStub = A.Fake<IRegistrations>();
             A.CallTo(() => startupStub.TypeRegistrations).Returns(typeRegistrations);
-            this.bootstrapper.OverriddenApplicationRegistrationTasks = new[] { startupStub };
+            this.bootstrapper.OverriddenRegistrationTasks = new[] { startupStub };
 
             // When
             this.bootstrapper.Initialise();
@@ -74,9 +74,9 @@ public void Should_not_register_request_lifetime_collectiontypes_into_applicatio
                                         new CollectionTypeRegistration(typeof(FakeBootstrapperBaseImplementation), new[] { typeof(FakeBootstrapperBaseImplementation) }, Lifetime.Transient),
                                         new CollectionTypeRegistration(typeof(string), new[] { typeof(string) }, Lifetime.PerRequest),
                                     };
-            var startupStub = A.Fake<IApplicationRegistrations>();
+            var startupStub = A.Fake<IRegistrations>();
             A.CallTo(() => startupStub.CollectionTypeRegistrations).Returns(collectionRegistrations);
-            this.bootstrapper.OverriddenApplicationRegistrationTasks = new[] { startupStub };
+            this.bootstrapper.OverriddenRegistrationTasks = new[] { startupStub };
 
             // When
             this.bootstrapper.Initialise();
@@ -97,9 +97,9 @@ public void Should_register_request_lifetime_collectiontypes_into_request_contai
                                         new CollectionTypeRegistration(typeof(FakeBootstrapperBaseImplementation), new[] { typeof(FakeBootstrapperBaseImplementation) }, Lifetime.Transient),
                                         new CollectionTypeRegistration(typeof(string), new[] { typeof(string) }, Lifetime.PerRequest),
                                     };
-            var startupStub = A.Fake<IApplicationRegistrations>();
+            var startupStub = A.Fake<IRegistrations>();
             A.CallTo(() => startupStub.CollectionTypeRegistrations).Returns(collectionRegistrations);
-            this.bootstrapper.OverriddenApplicationRegistrationTasks = new[] { startupStub };
+            this.bootstrapper.OverriddenRegistrationTasks = new[] { startupStub };
 
             // When
             this.bootstrapper.Initialise();
@@ -131,7 +131,7 @@ internal class FakeBootstrapper : NancyBootstrapperWithRequestContainerBase<Fake
 
             public IApplicationStartup[] OverriddenApplicationStartupTasks { get; set; }
 
-            public IApplicationRegistrations[] OverriddenApplicationRegistrationTasks { get; set; }
+            public IRegistrations[] OverriddenRegistrationTasks { get; set; }
 
             public bool ShouldThrowWhenGettingEngine { get; set; }
 
@@ -172,10 +172,10 @@ protected override IEnumerable<IApplicationStartup> GetApplicationStartupTasks()
             /// <summary>
             /// Gets all registered application registration tasks
             /// </summary>
-            /// <returns>An <see cref="IEnumerable{T}"/> instance containing <see cref="IApplicationRegistrations"/> instances.</returns>
-            protected override IEnumerable<IApplicationRegistrations> GetApplicationRegistrationTasks()
+            /// <returns>An <see cref="IEnumerable{T}"/> instance containing <see cref="IRegistrations"/> instances.</returns>
+            protected override IEnumerable<IRegistrations> GetApplicationRegistrationTasks()
             {
-                return this.OverriddenApplicationRegistrationTasks ?? new IApplicationRegistrations[] { };
+                return this.OverriddenRegistrationTasks ?? new IRegistrations[] { };
             }
 
             protected override void ConfigureApplicationContainer(FakeContainer existingContainer)

src/Nancy.Validation.DataAnnotations/Registrations.cs

@@ -5,7 +5,7 @@ namespace Nancy.Validation.DataAnnotations
     /// <summary>
     /// Application registrations for Data Annotations validation types.
     /// </summary>
-    public class Registrations : ApplicationRegistrations
+    public class Registrations : Bootstrapper.Registrations
     {
         /// <summary>
         /// Creates a new instance of the <see cref="Registrations"/> class, that performs

src/Nancy.Validation.FluentValidation/Registrations.cs

@@ -7,7 +7,7 @@ namespace Nancy.Validation.FluentValidation
     /// <summary>
     /// Application registrations for Fluent Validation types.
     /// </summary>
-    public class Registrations : ApplicationRegistrations
+    public class Registrations : Bootstrapper.Registrations
     {
         /// <summary>
         /// Creates a new instance of the <see cref="Registrations"/> class, that performs

src/Nancy.ViewEngines.DotLiquid/DotLiquidApplicationRegistrations.cs → src/Nancy.ViewEngines.DotLiquid/DotLiquidRegistrations.cs

@@ -9,12 +9,12 @@
     ///
     /// This can be overridden in a bootstrapper.
     /// </summary>
-    public class DotLiquidApplicationRegistrations : ApplicationRegistrations
+    public class DotLiquidRegistrations : Registrations
     {
         /// <summary>
         /// Register the <c>RubyNamingConvention</c> as the default.
         /// </summary>
-        public DotLiquidApplicationRegistrations()
+        public DotLiquidRegistrations()
         {
             this.RegisterWithDefault<INamingConvention>(typeof(RubyNamingConvention));
         }

src/Nancy.ViewEngines.DotLiquid/Nancy.ViewEngines.DotLiquid.csproj

@@ -111,7 +111,7 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="DefaultFileSystemFactory.cs" />
-    <Compile Include="DotLiquidApplicationRegistrations.cs" />
+    <Compile Include="DotLiquidRegistrations.cs" />
     <Compile Include="DotLiquidViewEngine.cs" />
     <Compile Include="DynamicDrop.cs" />
     <Compile Include="IFileSystemFactory.cs" />

src/Nancy.ViewEngines.Razor/RazorViewEngineApplicationStartupRegistrations.cs

@@ -5,9 +5,9 @@ namespace Nancy.ViewEngines.Razor
     /// <summary>
     /// Default dependency registrations for the <see cref="RazorViewEngine"/> class.
     /// </summary>
-    public class RazorViewEngineApplicationRegistrations : ApplicationRegistrations
+    public class RazorViewEngineRegistrations : Registrations
     {
-        public RazorViewEngineApplicationRegistrations()
+        public RazorViewEngineRegistrations()
         {
             this.RegisterWithDefault<IRazorConfiguration>(typeof(DefaultRazorConfiguration));
         }

src/Nancy/Bootstrapper/IApplicationRegistrations.cs

@@ -1,25 +1,12 @@
 namespace Nancy.Bootstrapper
 {
-    using System.Collections.Generic;
+    using System;
 
     /// <summary>
     /// Provides a hook to perform registrations during application startup.
     /// </summary>
-    public interface IApplicationRegistrations
+    [Obsolete("IApplicationRegistrations is now obsolete, please use IRegistrations instead.")]
+    public interface IApplicationRegistrations : IRegistrations
     {
-        /// <summary>
-        /// Gets the type registrations to register for this startup task
-        /// </summary>
-        IEnumerable<TypeRegistration> TypeRegistrations { get; }
-
-        /// <summary>
-        /// Gets the collection registrations to register for this startup task
-        /// </summary>
-        IEnumerable<CollectionTypeRegistration> CollectionTypeRegistrations { get; }
-
-        /// <summary>
-        /// Gets the instance registrations to register for this startup task
-        /// </summary>
-        IEnumerable<InstanceRegistration> InstanceRegistrations { get; }        
     }
 }

src/Nancy/Bootstrapper/IRegistrations.cs

@@ -0,0 +1,25 @@
+namespace Nancy.Bootstrapper
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Provides a hook to perform registrations during application startup.
+    /// </summary>
+    public interface IRegistrations
+    {
+        /// <summary>
+        /// Gets the type registrations to register for this startup task
+        /// </summary>
+        IEnumerable<TypeRegistration> TypeRegistrations { get; }
+
+        /// <summary>
+        /// Gets the collection registrations to register for this startup task
+        /// </summary>
+        IEnumerable<CollectionTypeRegistration> CollectionTypeRegistrations { get; }
+
+        /// <summary>
+        /// Gets the instance registrations to register for this startup task
+        /// </summary>
+        IEnumerable<InstanceRegistration> InstanceRegistrations { get; }        
+    }
+}