rock-n-code/ccn
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

HTML rendering support for the Website service (#5)

Browse Source 
This PR contains the work done to replace the use of static _HTML_ files with type-safe HTML rendered server-side via **Elementary** through **Hummingbird**.

To provide further details about the work done:

* Added the **Elementary** dependencies.
* Added the `IndexPage` and `ErrorPage` pages, ported from the old HTML boilerplate; removed the static files.
* Added the `RootController` controller serving GET / using the `IndexPage` page, wired into the router.
* Reworked the `NotFoundMiddleware` middleare to render `ErrorPage` page directly; non-notFound errors still propagate.
* the `FileMiddleware` middleware no longer searches for any static `index.html` file.
* Simplified the `StaticFile` enumeration, dropped unused constants and now-unnecessary throws.

Reviewed-on: rock-n-code/loud-amsterdam#5
Co-authored-by: Javier Cicchelli <javier@rock-n-code.com>
Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
This commit is contained in:
javier
2026-06-28 05:07:19 +00:00
committed by javier
parent f5f14eb97c
commit a621ada0bf
17 changed files with 460 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Services/Website/Tests/App/AppTests.swift
+21 -37
View File
@@ -27,21 +27,16 @@ struct AppTests {
@Test
func `landing page to be served at root`() async throws {
let file: StaticFile = .indexHTML
let app = try await application(
reader: reader(
staticFilesPath: staticFilesPath
)
)
try await app.test(.router) { client in
try await client.execute(
uri: "/",
method: .get
) { response in
let body = String(buffer: response.body)
#expect(response.status == .ok)
#expect(response.headers[.contentType] == file.contentType)
#expect(response.body == data(of: file))
#expect(response.headers[.contentType]?.hasPrefix("text/html") == true)
#expect(body.contains("Hello world!"))
}
}
}
@@ -50,12 +45,6 @@ struct AppTests {
func `static files to be served`(
staticFile file: StaticFile
) async throws {
let app = try await application(
reader: reader(
staticFilesPath: staticFilesPath
)
)
try await app.test(.router) { client in
try await client.execute(
uri: "/\(file.relativePath)",
@@ -69,21 +58,16 @@ struct AppTests {
@Test
func `error page to be served when not found`() async throws {
let file: StaticFile = .errorHTML
let app = try await application(
reader: reader(
staticFilesPath: staticFilesPath
)
)
try await app.test(.router) { client in
try await client.execute(
uri: "/this-path-does-not-exist",
method: .get
) { response in
let body = String(buffer: response.body)
#expect(response.status == .notFound)
#expect(response.headers[.contentType] == file.contentType)
#expect(response.body == data(of: file))
#expect(response.headers[.contentType]?.hasPrefix("text/html") == true)
#expect(body.contains("Page Not Found"))
}
}
}
@@ -94,28 +78,28 @@ struct AppTests {
private extension AppTests {
// MARK: Methods
// MARK: Computed
func data(
of file: StaticFile
) -> ByteBuffer {
let url = URL(fileURLWithPath: file.path(relativeTo: staticFilesPath))
guard let data = try? Data(contentsOf: url) else {
return ByteBuffer()
var app: some ApplicationProtocol {
get async {
await application(
reader: reader(
staticFilesPath: staticFilesPath
)
)
}
return ByteBuffer(bytes: data)
}
// MARK: Methods
func reader(
staticFilesPath: String
) -> ConfigReader {
ConfigReader(providers: [
InMemoryProvider(values: [
.HTTP.host: .HTTP.host,
.HTTP.port: .HTTP.port,
.Log.level: .Log.level,
.HTTP.host: "127.0.0.1",
.HTTP.port: "0",
.Log.level: "trace",
.Path.staticFiles: .init(stringLiteral: staticFilesPath),
])
])