chapter 05 updated

Author: tib

Chapter 05/myProject/.gitignore

@@ -0,0 +1,77 @@
+# ================================
+# Build image
+# ================================
+FROM swift:5.7-jammy as build
+
+# Install OS updates and, if needed, sqlite3
+RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
+    && apt-get -q update \
+    && apt-get -q dist-upgrade -y\
+    && rm -rf /var/lib/apt/lists/*
+
+# Set up a build area
+WORKDIR /build
+
+# First just resolve dependencies.
+# This creates a cached layer that can be reused
+# as long as your Package.swift/Package.resolved
+# files do not change.
+COPY ./Package.* ./
+RUN swift package resolve
+
+# Copy entire repo into container
+COPY . .
+
+# Build everything, with optimizations
+RUN swift build -c release --static-swift-stdlib
+
+# Switch to the staging area
+WORKDIR /staging
+
+# Copy main executable to staging area
+RUN cp "$(swift build --package-path /build -c release --show-bin-path)/Run" ./
+
+# Copy resources bundled by SPM to staging area
+RUN find -L "$(swift build --package-path /build -c release --show-bin-path)/" -regex '.*\.resources$' -exec cp -Ra {} ./ \;
+
+# Copy any resources from the public directory and views directory if the directories exist
+# Ensure that by default, neither the directory nor any of its contents are writable.
+RUN [ -d /build/Public ] && { mv /build/Public ./Public && chmod -R a-w ./Public; } || true
+RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w ./Resources; } || true
+
+# ================================
+# Run image
+# ================================
+FROM ubuntu:jammy
+
+# Make sure all system packages are up to date, and install only essential packages.
+RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
+    && apt-get -q update \
+    && apt-get -q dist-upgrade -y \
+    && apt-get -q install -y \
+      ca-certificates \
+      tzdata \
+# If your app or its dependencies import FoundationNetworking, also install `libcurl4`.
+      # libcurl4 \
+# If your app or its dependencies import FoundationXML, also install `libxml2`.
+      # libxml2 \
+    && rm -r /var/lib/apt/lists/*
+
+# Create a vapor user and group with /app as its home directory
+RUN useradd --user-group --create-home --system --skel /dev/null --home-dir /app vapor
+
+# Switch to the new home directory
+WORKDIR /app
+
+# Copy built executable and any staged resources from builder
+COPY --from=build --chown=vapor:vapor /staging /app
+
+# Ensure all further commands run as the vapor user
+USER vapor:vapor
+
+# Let Docker bind to port 8080
+EXPOSE 8080
+
+# Start the Vapor service when the image is run, default to listening on 8080 in production environment
+ENTRYPOINT ["./Run"]
+CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]

Chapter 05/myProject/Dockerfile

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 import PackageDescription
 
 let package = Package(
@@ -7,10 +7,22 @@ let package = Package(
        .macOS(.v12)
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/vapor", from: "4.54.0"),
-        .package(url: "https://github.com/vapor/fluent", from: "4.4.0"),
-        .package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.1.0"),
-        .package(url: "https://github.com/binarybirds/swift-html", from: "1.2.0"),
+        .package(
+            url: "https://github.com/vapor/vapor",
+            from: "4.70.0"
+        ),
+        .package(
+            url: "https://github.com/vapor/fluent",
+            from: "4.4.0"
+        ),
+        .package(
+            url: "https://github.com/vapor/fluent-sqlite-driver",
+            from: "4.1.0"
+        ),
+        .package(
+            url: "https://github.com/binarybirds/swift-html",
+            from: "1.2.0"
+        ),
     ],
     targets: [
         .target(name: "App", dependencies: [

Chapter 05/myProject/Makefile

@@ -1,17 +1,14 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2021. 12. 31..
-//
-
 import Vapor
 
 public struct AuthenticatedUser {
+
     public let id: UUID
     public let email: String
 
-    public init(id: UUID, email: String) {
+    public init(
+        id: UUID,
+        email: String
+    ) {
         self.id = id
         self.email = email
     }
@@ -20,4 +17,3 @@ public struct AuthenticatedUser {
 extension AuthenticatedUser: SessionAuthenticatable {
     public var sessionID: UUID { id }
 }
-

Chapter 05/myProject/Package.swift

@@ -1,25 +1,24 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2021. 12. 31..
-//
-
 import Vapor
 import Fluent
 
-public protocol DatabaseModelInterface: Fluent.Model where Self.IDValue == UUID {
-    
+public protocol DatabaseModelInterface: Fluent.Model
+    where Self.IDValue == UUID
+{    
     associatedtype Module: ModuleInterface
 
     static var identifier: String { get }
 }
 
 public extension DatabaseModelInterface {
 
-    static var schema: String { Module.identifier + "_" + identifier }
+    static var schema: String {
+        Module.identifier + "_" + identifier
+    }
 
     static var identifier: String {
-        String(describing: self).dropFirst(Module.identifier.count).dropLast(5).lowercased() + "s"
+        String(describing: self)
+            .dropFirst(Module.identifier.count)
+            .dropLast(5)
+            .lowercased() + "s"
     }
 }

Chapter 05/myProject/Sources/App/Controllers/.gitkeep

@@ -1,10 +1,3 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2021. 12. 31..
-//
-
 import Vapor
 
 public protocol ModuleInterface {
@@ -15,8 +8,10 @@ public protocol ModuleInterface {
 }
 
 public extension ModuleInterface {
+
     func boot(_ app: Application) throws {}
 
-    static var identifier: String { String(describing: self).dropLast(6).lowercased() }
-    
+    static var identifier: String {
+        String(describing: self).dropLast(6).lowercased()
+    }
 }

Chapter 05/myProject/Sources/App/Framework/AuthenticatedUser.swift

@@ -1,18 +1,19 @@
-//
-//  File.swift
-//
-//
-//  Created by Tibor Bodecs on 2021. 12. 25..
-//
-
 import Vapor
 
 struct ExtendPathMiddleware: AsyncMiddleware {
 
-    func respond(to req: Request, chainingTo next: AsyncResponder) async throws -> Response {
+    func respond(
+        to req: Request,
+        chainingTo next: AsyncResponder
+    ) async throws -> Response {
         if !req.url.path.hasSuffix("/") && !req.url.path.contains(".") {
-            return req.redirect(to: req.url.path + "/", type: .permanent)
+            return req.redirect(
+                to: req.url.path + "/",
+                redirectType: .permanent
+            )
         }
-        return try await next.respond(to: req)
+        return try await next.respond(
+            to: req
+        )
     }
 }

Chapter 05/myProject/Sources/App/Framework/DatabaseModelInterface.swift

@@ -1,10 +1,3 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2021. 12. 31..
-//
-
 import Vapor
 
 struct BlogModule: ModuleInterface {

Chapter 05/myProject/Sources/App/Framework/ModuleInterface.swift

@@ -1,17 +1,12 @@
-//
-//  BlogRouter.swift
-//
-//
-//  Created by Tibor Bodecs on 2021. 12. 25..
-//
-
 import Vapor
 
 struct BlogRouter: RouteCollection {
 
     let controller = BlogFrontendController()
 
-    func boot(routes: RoutesBuilder) throws {
+    func boot(
+        routes: RoutesBuilder
+    ) throws {
         routes.get("blog", use: controller.blogView)
         routes.get(.anything, use: controller.postView)
     }

Chapter 05/myProject/Sources/App/Middlewares/ExtendPathMiddleware.swift

@@ -1,10 +1,3 @@
-//
-//  BlogFrontendController.swift
-//
-//
-//  Created by Tibor Bodecs on 2021. 12. 25..
-//
-
 import Vapor
 import Fluent
 
@@ -16,22 +9,32 @@ struct BlogFrontendController {
             .sort(\.$date, .descending)
             .all()
 
-        let posts = postModels.map { Blog.Post.List(id: $0.id!,
-                                                    title: $0.title,
-                                                    slug: $0.slug,
-                                                    image: $0.imageKey,
-                                                    excerpt: $0.excerpt,
-                                                    date: $0.date)
+        let posts = try postModels.map {
+            Blog.Post.List(
+                id: try $0.requireID(),
+                title: $0.title,
+                slug: $0.slug,
+                image: $0.imageKey,
+                excerpt: $0.excerpt,
+                date: $0.date
+            )
         }
-        let ctx = BlogPostsContext(icon: "🔥",
-                                   title: "Blog",
-                                   message: "Hot news and stories about everything.",
-                                   posts: posts)
-        return req.templates.renderHtml(BlogPostsTemplate(ctx))
+
+        let ctx = BlogPostsContext(
+            icon: "🔥",
+            title: "Blog",
+            message: "Hot news and stories about everything.",
+            posts: posts)
+
+        return req.templates.renderHtml(
+            BlogPostsTemplate(ctx)
+        )
     }
 
     func postView(req: Request) async throws -> Response {
-        let slug = req.url.path.trimmingCharacters(in: .init(charactersIn: "/"))
+        let slug = req.url.path.trimmingCharacters(
+            in: .init(charactersIn: "/")
+        )
         guard
             let post = try await BlogPostModel
                 .query(on: req.db)
@@ -41,15 +44,24 @@ struct BlogFrontendController {
         else {
             return req.redirect(to: "/")
         }
-        let ctx = BlogPostContext(post: Blog.Post.Detail(id: post.id!,
-                                                         title: post.title,
-                                                         slug: post.slug,
-                                                         image: post.imageKey,
-                                                         excerpt: post.excerpt,
-                                                         date: post.date,
-                                                         category: .init(id: post.category.id!,
-                                                                         title: post.category.title),
-                                                         content: post.content))
-        return req.templates.renderHtml(BlogPostTemplate(ctx))
+        let ctx = BlogPostContext(
+            post: Blog.Post.Detail(
+                id: post.id!,
+                title: post.title,
+                slug: post.slug,
+                image: post.imageKey,
+                excerpt: post.excerpt,
+                date: post.date,
+                category: .init(
+                    id: post.category.id!,
+                    title: post.category.title
+                ),
+                content: post.content
+            )
+        )
+
+        return req.templates.renderHtml(
+            BlogPostTemplate(ctx)
+        )
     }
 }