Yet more to be unifed

Author: Kaliumhexacyanoferrat

Modules/Placeholders/Providers/PageProvider.cs

@@ -24,18 +24,21 @@ public sealed class PageProvider : IHandler
 
         public PageAdditions? Additions { get; }
 
+        public ResponseModifications? Modifications { get; }
+
         public IResource Content { get; }
 
         #endregion
 
         #region Initialization
 
-        public PageProvider(IHandler parent, ContentInfo pageInfo, PageAdditions? additions, IResource content)
+        public PageProvider(IHandler parent, ContentInfo pageInfo, PageAdditions? additions, ResponseModifications? modifications, IResource content)
         {
             Parent = parent;
 
             PageInfo = pageInfo;
             Additions = additions;
+            Modifications = modifications;
 
             Content = content;
         }
@@ -49,6 +52,8 @@ public PageProvider(IHandler parent, ContentInfo pageInfo, PageAdditions? additi
             var templateModel = new TemplateModel(request, this, PageInfo, Additions, await Content.GetResourceAsStringAsync().ConfigureAwait(false));
 
             var page = await this.GetPageAsync(request, templateModel).ConfigureAwait(false);
+
+            Modifications?.Apply(page);
 
             return page.Build();
         }

Modules/Placeholders/Providers/PageProviderBuilder.cs

@@ -3,18 +3,26 @@
 using GenHTTP.Api.Infrastructure;
 using GenHTTP.Api.Content;
 using GenHTTP.Api.Content.IO;
+using GenHTTP.Api.Protocol;
+using System;
 
 namespace GenHTTP.Modules.Placeholders.Providers
 {
 
-    public sealed class PageProviderBuilder : IHandlerBuilder<PageProviderBuilder>, IContentInfoBuilder<PageProviderBuilder>, IPageAdditionBuilder<PageProviderBuilder>
+    public sealed class PageProviderBuilder : 
+        IHandlerBuilder<PageProviderBuilder>, 
+        IContentInfoBuilder<PageProviderBuilder>, 
+        IPageAdditionBuilder<PageProviderBuilder>,
+        IResponseModification<PageProviderBuilder>
     {
         private IResource? _Content;
 
         private readonly ContentInfoBuilder _Info = new();
 
         private readonly PageAdditionBuilder _Additions = new();
 
+        private readonly ResponseModificationBuilder _Modifications = new();
+
         private readonly List<IConcernBuilder> _Concerns = new();
 
         #region Functionality
@@ -49,6 +57,54 @@ public PageProviderBuilder AddStyle(string path)
             return this;
         }
 
+        public PageProviderBuilder Status(ResponseStatus status)
+        {
+            _Modifications.Status(status);
+            return this;
+        }
+
+        public PageProviderBuilder Status(int status, string reason)
+        {
+            _Modifications.Status(status, reason);
+            return this;
+        }
+
+        public PageProviderBuilder Header(string key, string value)
+        {
+            _Modifications.Header(key, value);
+            return this;
+        }
+
+        public PageProviderBuilder Expires(DateTime expiryDate)
+        {
+            _Modifications.Expires(expiryDate);
+            return this;
+        }
+
+        public PageProviderBuilder Modified(DateTime modificationDate)
+        {
+            _Modifications.Modified(modificationDate);
+            return this;
+        }
+
+        public PageProviderBuilder Cookie(Cookie cookie)
+        {
+            _Modifications.Cookie(cookie);
+            return this;
+        }
+
+        public PageProviderBuilder Type(FlexibleContentType contentType)
+        {
+            _Modifications.Type(contentType);
+            return this;
+        }
+
+        public PageProviderBuilder Encoding(string encoding)
+        {
+            _Modifications.Encoding(encoding);
+            return this;
+        }
+
         public PageProviderBuilder Add(IConcernBuilder concern)
         {
             _Concerns.Add(concern);
@@ -62,10 +118,11 @@ public IHandler Build(IHandler parent)
                 throw new BuilderMissingPropertyException("Content");
             }
 
-            return Concerns.Chain(parent, _Concerns, (p) => new PageProvider(p, _Info.Build(), _Additions.Build(), _Content));
+            return Concerns.Chain(parent, _Concerns, (p) => new PageProvider(p, _Info.Build(), _Additions.Build(), _Modifications.Build(), _Content)); ;
         }
 
         #endregion
+
     }
 
 }

Testing/Acceptance/Modules/PageTests.cs

@@ -225,7 +225,8 @@ public async Task TestAdditions()
                 ModRazor.Page(Resource.FromString("Razor")).AddScript("./myscript.js").AddStyle("./mystyle.css"),
                 Placeholders.Page(Resource.FromString("Placeholders")).AddScript("http://myserver/myscript.js").AddStyle("http://myserver/mystyle.css"),
                 CombinedPage.Create().AddMarkdown(Resource.FromString("Scriban")).AddScript("myscript.js").AddStyle("mystyle.css"),
-                ModMarkdown.Page(Resource.FromString("Markdown")).AddScript("myscript.js").AddStyle("mystyle.css")
+                ModMarkdown.Page(Resource.FromString("Markdown")).AddScript("myscript.js").AddStyle("mystyle.css"),
+                Page.From(Resource.FromString("Page")).AddScript("myscript.js").AddStyle("mystyle.css")
             };
 
             foreach (var provider in providers)
@@ -252,7 +253,8 @@ public async Task TestModifications()
                 ModRazor.Page(Resource.FromString("Razor")).Status(ResponseStatus.Locked).Header("H", "V").Expires(DateTime.Now).Modified(DateTime.Now).Type(new(ContentType.FontOpenTypeFont)).Encoding("my-encoding").Cookie(cookie),
                 Placeholders.Page(Resource.FromString("Placeholders")).Status(ResponseStatus.Locked).Header("H", "V").Expires(DateTime.Now).Modified(DateTime.Now).Type(new(ContentType.FontOpenTypeFont)).Encoding("my-encoding").Cookie(cookie),
                 ModMarkdown.Page(Resource.FromString("Markdown")).Status(ResponseStatus.Locked).Header("H", "V").Expires(DateTime.Now).Modified(DateTime.Now).Type(new(ContentType.FontOpenTypeFont)).Encoding("my-encoding").Cookie(cookie),
-                CombinedPage.Create().Add("Combined").Status(ResponseStatus.Locked).Header("H", "V").Expires(DateTime.Now).Modified(DateTime.Now).Type(new(ContentType.FontOpenTypeFont)).Encoding("my-encoding").Cookie(cookie)
+                CombinedPage.Create().Add("Combined").Status(ResponseStatus.Locked).Header("H", "V").Expires(DateTime.Now).Modified(DateTime.Now).Type(new(ContentType.FontOpenTypeFont)).Encoding("my-encoding").Cookie(cookie),
+                Page.From(Resource.FromString("Page")).Status(ResponseStatus.Locked).Header("H", "V").Expires(DateTime.Now).Modified(DateTime.Now).Type(new(ContentType.FontOpenTypeFont)).Encoding("my-encoding").Cookie(cookie)
             };
 
             foreach (var provider in providers)