diff --git a/README.md b/README.md index 6763bd4..ab607f4 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ targets: [ To use the LeafErrorMiddleware with the default context passed to templates, register the middleware service in `configure.swift` to your `Application`'s middleware (make sure you `import LeafErrorMiddleware` at the top): ```swift -app.middleware.use(LeafErorrMiddlewareDefaultGenerator.build()) +app.middleware.use(LeafErrorMiddlewareDefaultGenerator.build()) ``` Make sure it appears before all other middleware to catch errors. @@ -58,7 +58,7 @@ let leafMiddleware = LeafErrorMiddleware() { status, error, req -> EventLoopFutu app.middleware.use(leafMiddleware) ``` -The closure recevies three parameters: +The closure receives three parameters: * `HTTPStatus` - the status code of the response returned. * `Error` - the error caught to be handled. diff --git a/Sources/LeafErrorMiddleware/LeafErrorMiddlewareDefaultGenerator.swift b/Sources/LeafErrorMiddleware/LeafErrorMiddlewareDefaultGenerator.swift new file mode 100644 index 0000000..688c843 --- /dev/null +++ b/Sources/LeafErrorMiddleware/LeafErrorMiddlewareDefaultGenerator.swift @@ -0,0 +1,36 @@ +import Vapor + +@available(*, deprecated, renamed: "LeafErrorMiddlewareDefaultGenerator") +public enum LeafErorrMiddlewareDefaultGenerator { + static func generate(_ status: HTTPStatus, _ error: Error, _ req: Request) -> EventLoopFuture { + let reason: String? + if let abortError = error as? AbortError { + reason = abortError.reason + } else { + reason = nil + } + let context = DefaultContext(status: status.code.description, statusMessage: status.reasonPhrase, reason: reason) + return req.eventLoop.future(context ) + } + + public static func build() -> LeafErrorMiddleware { + LeafErrorMiddleware(contextGenerator: generate) + } +} + +public enum LeafErrorMiddlewareDefaultGenerator { + static func generate(_ status: HTTPStatus, _ error: Error, _ req: Request) -> EventLoopFuture { + let reason: String? + if let abortError = error as? AbortError { + reason = abortError.reason + } else { + reason = nil + } + let context = DefaultContext(status: status.code.description, statusMessage: status.reasonPhrase, reason: reason) + return req.eventLoop.future(context ) + } + + public static func build() -> LeafErrorMiddleware { + LeafErrorMiddleware(contextGenerator: generate) + } +} diff --git a/Sources/LeafErrorMiddleware/LeafErrroMiddlewareDefaultGenerator.swift b/Sources/LeafErrorMiddleware/LeafErrroMiddlewareDefaultGenerator.swift deleted file mode 100644 index 99d207e..0000000 --- a/Sources/LeafErrorMiddleware/LeafErrroMiddlewareDefaultGenerator.swift +++ /dev/null @@ -1,18 +0,0 @@ -import Vapor - -public enum LeafErorrMiddlewareDefaultGenerator { - static func generate(_ status: HTTPStatus, _ error: Error, _ req: Request) -> EventLoopFuture { - let reason: String? - if let abortError = error as? AbortError { - reason = abortError.reason - } else { - reason = nil - } - let context = DefaultContext(status: status.code.description, statusMessage: status.reasonPhrase, reason: reason) - return req.eventLoop.future(context ) - } - - public static func build() -> LeafErrorMiddleware { - LeafErrorMiddleware(contextGenerator: generate) - } -} diff --git a/Tests/LeafErrorMiddlewareTests/DefaultLeafErrorMiddlewareTests.swift b/Tests/LeafErrorMiddlewareTests/DefaultLeafErrorMiddlewareTests.swift index c97bebb..658f5d9 100644 --- a/Tests/LeafErrorMiddlewareTests/DefaultLeafErrorMiddlewareTests.swift +++ b/Tests/LeafErrorMiddlewareTests/DefaultLeafErrorMiddlewareTests.swift @@ -73,7 +73,7 @@ class DefaultLeafErrorMiddlewareTests: XCTestCase { try routes(app) - app.middleware.use(LeafErorrMiddlewareDefaultGenerator.build()) + app.middleware.use(LeafErrorMiddlewareDefaultGenerator.build()) } override func tearDownWithError() throws { @@ -180,7 +180,7 @@ class DefaultLeafErrorMiddlewareTests: XCTestCase { app.views.use { _ in return self.viewRenderer } - let middlewareGroup = app.grouped(LeafErorrMiddlewareDefaultGenerator.build()) + let middlewareGroup = app.grouped(LeafErrorMiddlewareDefaultGenerator.build()) middlewareGroup.get("404") { req -> EventLoopFuture in req.eventLoop.makeFailedFuture(Abort(.notFound)) }