Container registrations refactored

Collection name Generation
Settings refactored

Author: i4004

src/Simplify.Web.Postman/DefaultPostmanGenerationSettingsFactory.cs

@@ -2,6 +2,7 @@
 using Simplify.Web.Modules;
 using Simplify.Web.Postman.Json;
 using Simplify.Web.Postman.Models;
+using Simplify.Web.Postman.Settings;
 
 namespace Simplify.Web.Postman
 {
@@ -13,15 +14,15 @@ public class FileCollectionExporter : ICollectionExporter
 	{
 		private readonly CollectionModelSerializer _serializer;
 		private readonly IEnvironment _environment;
-		private readonly PostmanGenerationSettings _settings;
+		private readonly IPostmanGenerationSettings _settings;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="FileCollectionExporter"/> class.
 		/// </summary>
 		/// <param name="serializer">The serializer.</param>
 		/// <param name="environment">The environment.</param>
 		/// <param name="settings">The settings.</param>
-		public FileCollectionExporter(CollectionModelSerializer serializer, IEnvironment environment, PostmanGenerationSettings settings)
+		public FileCollectionExporter(CollectionModelSerializer serializer, IEnvironment environment, IPostmanGenerationSettings settings)
 		{
 			_serializer = serializer;
 			_environment = environment;

src/Simplify.Web.Postman/FileCollectionExporter.cs

@@ -5,5 +5,6 @@
 	/// </summary>
 	public class CollectionHeader
 	{
+		public string Name { get; set; }
 	}
 }

src/Simplify.Web.Postman/Models/CollectionHeader.cs

@@ -14,7 +14,8 @@ public class CollectionModel
 		/// <value>
 		/// The header.
 		/// </value>
-		public CollectionHeader? Header { get; set; }
+		[JsonPropertyName("info")]
+		public CollectionHeader Header { get; set; }
 
 		[JsonPropertyName("item")]
 		public IList<CollectionItem> Items { get; set; } = new List<CollectionItem>();

src/Simplify.Web.Postman/Models/CollectionModel.cs

@@ -0,0 +1,23 @@
+using Simplify.Web.Postman.Models;
+using Simplify.Web.Postman.Settings;
+
+namespace Simplify.Web.Postman.PartBuilders
+{
+	public class CollectionHeaderBuilder : ICollectionPartBuilder
+	{
+		private readonly IPostmanGenerationSettings _settings;
+
+		public CollectionHeaderBuilder(IPostmanGenerationSettings settings)
+		{
+			_settings = settings;
+		}
+
+		public void Build(CollectionModel model)
+		{
+			model.Header = new CollectionHeader
+			{
+				Name = _settings.CollectionName
+			};
+		}
+	}
+}

src/Simplify.Web.Postman/PartBuilders/CollectionHeaderBuilder.cs

@@ -0,0 +1,56 @@
+namespace Simplify.Web.Postman.Settings
+{
+	/// <summary>
+	///  Represents postman files generation settings
+	/// </summary>
+	public interface IPostmanGenerationSettings
+	{
+		/// <summary>
+		/// Gets or sets the name of the collection.
+		/// </summary>
+		/// <value>
+		/// The name of the collection.
+		/// </value>
+		string CollectionName { get; }
+
+		/// <summary>
+		/// Gets or sets the name of the collection file.
+		/// </summary>
+		/// <value>
+		/// The name of the collection file.
+		/// </value>
+		string CollectionFileName { get; }
+
+		/// <summary>
+		/// Gets or sets the collection file name postfix.
+		/// </summary>
+		/// <value>
+		/// The collection file name postfix.
+		/// </value>
+		string CollectionFileNamePostfix { get; }
+
+		/// <summary>
+		/// Gets or sets the name of the environment file.
+		/// </summary>
+		/// <value>
+		/// The name of the environment file.
+		/// </value>
+		string? EnvironmentFileName { get; }
+
+		/// <summary>
+		/// Gets or sets the environment file name postfix.
+		/// </summary>
+		/// <value>
+		/// The environment file name postfix.
+		/// </value>
+		string EnvironmentFileNamePostfix { get; }
+
+		/// <summary>
+		/// Gets or sets the generation folder path.
+		/// </summary>
+		/// <value>
+		/// The generation folder path.
+		/// </value>
+		string GenerationFolderPath { get; }
+	}
+}

src/Simplify.Web.Postman/Settings/IPostmanGenerationSettings.cs

@@ -1,9 +1,11 @@
-namespace Simplify.Web.Postman
+using System.Reflection;
+
+namespace Simplify.Web.Postman.Settings
 {
 	/// <summary>
 	/// Provides postman files generation settings
 	/// </summary>
-	public class PostmanGenerationSettings
+	public class PostmanGenerationSettings : IPostmanGenerationSettings
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="PostmanGenerationSettings"/> class.
@@ -13,8 +15,22 @@ public PostmanGenerationSettings()
 			GenerationFolderPath = "postman";
 			CollectionFileNamePostfix = ".postman_collection";
 			EnvironmentFileNamePostfix = ".postman_environment";
+
+			var projectAssemblyName = Assembly.GetEntryAssembly()?.GetName().Name ?? "App";
+
+			CollectionName = projectAssemblyName;
+			CollectionFileName = projectAssemblyName;
+			EnvironmentFileName = projectAssemblyName;
 		}
 
+		/// <summary>
+		/// Gets or sets the name of the collection.
+		/// </summary>
+		/// <value>
+		/// The name of the collection.
+		/// </value>
+		public string? CollectionName { get; set; }
+
 		/// <summary>
 		/// Gets or sets the name of the collection file.
 		/// </summary>

src/Simplify.Web.Postman/PostmanGenerationSettings.cs renamed to src/Simplify.Web.Postman/Settings/PostmanGenerationSettings.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using System.Reflection;
 using Simplify.DI;
 using Simplify.Web.Modules;
 using Simplify.Web.Postman.Json;
 using Simplify.Web.Postman.PartBuilders;
+using Simplify.Web.Postman.Settings;
 
 namespace Simplify.Web.Postman
 {
@@ -18,20 +18,44 @@ public static class SimplifyDIRegistratorExtensions
 		/// <param name="registrator">The registrator.</param>
 		/// <param name="settings">The settings.</param>
 		/// <returns></returns>
-		public static IDIRegistrator RegisterSimplifyWebPostman(this IDIRegistrator registrator, PostmanGenerationSettings? settings = null)
+		public static IDIRegistrator RegisterSimplifyWebPostman(this IDIRegistrator registrator, IPostmanGenerationSettings? settings = null)
 		{
-			settings = DefaultPostmanGenerationSettingsFactory.CreateOrUpdateSettings(settings, Assembly.GetCallingAssembly().GetName().Name);
-
-			registrator.Register(r => new CollectionBuilder(new List<ICollectionPartBuilder>
-				{
-					new CollectionItemsBuilder()
-				}))
-				.Register<ICollectionExporter>(r => new FileCollectionExporter(r.Resolve<CollectionModelSerializer>(), r.Resolve<IEnvironment>(),
-					settings))
-				.Register<CollectionModelSerializer>()
+			registrator.Register(r => settings ??= new PostmanGenerationSettings(), LifetimeType.Singleton);
+
+			registrator.RegisterPartBuilders()
+				.RegisterCollectionBuilder()
+				.RegisterCollectionExporter();
+
+			registrator.Register<CollectionModelSerializer>()
 				.Register<PostmanGenerator>();
 
 			return registrator;
 		}
+
+		private static IDIRegistrator RegisterPartBuilders(this IDIRegistrator registrator)
+		{
+			registrator.Register<CollectionHeaderBuilder>(LifetimeType.Singleton)
+				.Register<CollectionItemsBuilder>(LifetimeType.Singleton);
+
+			return registrator;
+		}
+
+		private static IDIRegistrator RegisterCollectionBuilder(this IDIRegistrator registrator)
+		{
+			return registrator.Register(r => new CollectionBuilder(new List<ICollectionPartBuilder>
+			{
+				r.Resolve<CollectionHeaderBuilder>(),
+				r.Resolve<CollectionItemsBuilder>()
+			}));
+		}
+
+		private static IDIRegistrator RegisterCollectionExporter(this IDIRegistrator registrator)
+		{
+			return registrator.Register<ICollectionExporter>(r =>
+					new FileCollectionExporter(r.Resolve<CollectionModelSerializer>(),
+						r.Resolve<IEnvironment>(),
+						r.Resolve<IPostmanGenerationSettings>()),
+				LifetimeType.Singleton);
+		}
 	}
 }

src/Simplify.Web.Postman/SimplifyDIRegistratorExtensions.cs

@@ -1,4 +1,5 @@
 using Simplify.DI;
+using Simplify.Web.Bootstrapper;
 using Simplify.Web.Postman;
 
 namespace TesterApp.Setup
@@ -7,7 +8,8 @@ public static class IocRegistrations
 	{
 		public static void Register()
 		{
-			DIContainer.Current.RegisterSimplifyWebPostman();
+			DIContainer.Current.RegisterSimplifyWeb()
+				.RegisterSimplifyWebPostman();
 		}
 	}
 }

src/TesterApp/Setup/IocRegistrations.cs

@@ -16,7 +16,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 			if (env.IsDevelopment())
 				app.UseDeveloperExceptionPage();
 
-			app.UseSimplifyWeb();
+			app.UseSimplifyWebWithoutRegistrations();
 
 			DIContainer.Current.Verify();
 
@@ -27,6 +27,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 		public void ConfigureServices(IServiceCollection services)
 		{
 			IocRegistrations.Register();
+
+			DIContainer.Current.Verify();
 		}
 	}
 }