beta.2

Author: tanner0101

.github/workflows/test.yml

@@ -8,15 +8,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - run: swift test --enable-test-discovery
+    - run: swift test --enable-test-discovery --sanitize=thread
   bionic:
-    container: 
-      image: vapor/swift:5.1-bionic
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: swift test --enable-test-discovery
-  thread:
     container: 
       image: vapor/swift:5.1-bionic
     runs-on: ubuntu-latest

Package.swift

@@ -10,11 +10,11 @@ let package = Package(
         .library(name: "Leaf", targets: ["Leaf"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/leaf-kit.git", .branch("master")),
-        .package(url: "https://github.com/vapor/vapor.git", .branch("master")),
+        .package(url: "https://github.com/vapor/leaf-kit.git", from: "1.0.0-beta.2"),
+        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-beta.2"),
     ],
     targets: [
         .target(name: "Leaf", dependencies: ["LeafKit", "Vapor"]),
-        .testTarget(name: "LeafTests", dependencies: ["Leaf"]),
+        .testTarget(name: "LeafTests", dependencies: ["Leaf", "XCTVapor"]),
     ]
 )

Sources/Leaf/LeafProvider.swift

@@ -1,30 +1,53 @@
 import Vapor
 
-public final class Leaf: Provider {
-    public let application: Application
-    public var cache: LeafCache
-    
-    public var renderer: LeafRenderer {
-        .init(
-            configuration: .init(
-                rootDirectory: self.application.directory.viewsDirectory
-            ),
-            cache: self.cache,
-            fileio: self.application.fileio,
-            eventLoop: self.application.eventLoopGroup.next()
-        )
-    }
-    
-    public init(_ application: Application) {
-        self.application = application
-        self.cache = DefaultLeafCache()
+extension Application {
+    public var leaf: Leaf {
+        .init(application: self)
     }
-    
-    public func register(_ app: Application) {
-        app.views.use { self.renderer }
+
+    public struct Leaf {
+        final class Storage {
+            var cache: LeafCache
+
+            init() {
+                self.cache = DefaultLeafCache()
+            }
+        }
+
+        struct Key: StorageKey {
+            typealias Value = Storage
+        }
+
+        public var renderer: LeafRenderer {
+            .init(
+                configuration: .init(
+                    rootDirectory: self.application.directory.viewsDirectory
+                ),
+                cache: self.cache,
+                fileio: self.application.fileio,
+                eventLoop: self.application.eventLoopGroup.next()
+            )
+        }
+
+        public var cache: LeafCache {
+            self.storage.cache
+        }
+
+        var storage: Storage {
+            if let existing = self.application.storage[Key.self] {
+                return existing
+            } else {
+                let new = Storage()
+                self.application.storage[Key.self] = new
+                return new
+            }
+        }
+
+        public let application: Application
     }
 }
 
+
 extension Request {
     var leaf: LeafRenderer {
         .init(
@@ -36,12 +59,6 @@ extension Request {
     }
 }
 
-extension Application {
-    public var leaf: Leaf {
-        self.providers.require(Leaf.self)
-    }
-}
-
 extension LeafRenderer: ViewRenderer {
     public func `for`(_ request: Request) -> ViewRenderer {
         LeafRenderer(
@@ -66,3 +83,13 @@ extension LeafRenderer: ViewRenderer {
         }
     }
 }
+
+extension Application.Views.Provider {
+    public static var leaf: Self {
+        .init {
+            $0.views.use {
+                $0.leaf.renderer
+            }
+        }
+    }
+}

Tests/LeafTests/LeafTests.swift

@@ -1,8 +1,22 @@
 import Leaf
-import XCTest
+import XCTVapor
 
 class LeafTests: XCTestCase {
-    func testStub() throws {
-        
+    func testApplication() throws {
+        let app = Application(.testing)
+        defer { app.shutdown() }
+
+        app.views.use(.leaf)
+
+        app.get("test-file") { req in
+            req.view.render(#file, ["foo": "bar"])
+        }
+
+        try app.test(.GET, "test-file") { res in
+            XCTAssertEqual(res.status, .ok)
+            XCTAssertEqual(res.headers.contentType, .html)
+            // test: #(foo)
+            XCTAssertContains(res.body.string, "test: bar")
+        }
     }
 }