Merge pull request #146 from vapor/tn-beta-2

beta 2 updates

Author: tanner0101

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [tanner0101]
+open_collective: vapor

.github/workflows/test.yml

@@ -0,0 +1,25 @@
+name: test
+on:
+- pull_request
+jobs:
+  xenial:
+    container: 
+      image: vapor/swift:5.1-xenial
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - run: swift test --enable-test-discovery
+  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
+    steps:
+    - uses: actions/checkout@v1
+    - run: swift test --enable-test-discovery --sanitize=thread

Package.swift

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

Sources/Leaf/LeafProvider.swift

@@ -1,29 +1,57 @@
 import Vapor
 
-public final class LeafProvider: Provider {
-    public init() { }
+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()
+    }
 
     public func register(_ app: Application) {
-        app.register(LeafRenderer.self) { app in
-            LeafRenderer(
-                config: app.make(),
-                threadPool: app.make(),
-                eventLoop: app.make()
-            )
-        }
+        app.views.use { self.renderer }
+    }
+}
 
-        app.register(ViewRenderer.self) { app in
-            app.make(LeafRenderer.self)
-        }
+extension Request {
+    var leaf: LeafRenderer {
+        .init(
+            configuration: .init(rootDirectory: self.application.directory.viewsDirectory),
+            cache: self.application.leaf.cache,
+            fileio: self.application.fileio,
+            eventLoop: self.eventLoop
+        )
+    }
+}
 
-        app.register(LeafConfig.self) { app in
-            let directory = app.make(DirectoryConfiguration.self)
-            return LeafConfig(rootDirectory: directory.viewsDirectory)
-        }
+extension Application {
+    public var leaf: Leaf {
+        self.providers.require(Leaf.self)
     }
 }
 
 extension LeafRenderer: ViewRenderer {
+    public func `for`(_ request: Request) -> ViewRenderer {
+        LeafRenderer(
+            configuration: self.configuration,
+            cache: self.cache,
+            fileio: self.fileio,
+            eventLoop: request.eventLoop
+        )
+    }
+    
     public func render<E>(_ name: String, _ context: E) -> EventLoopFuture<View>
         where E: Encodable
     {
@@ -38,13 +66,3 @@ extension LeafRenderer: ViewRenderer {
         }
     }
 }
-
-extension Request {
-    public var leaf: LeafRenderer {
-        LeafRenderer(
-            config: self.application.make(),
-            threadPool: self.application.make(),
-            eventLoop: self.eventLoop
-        )
-    }
-}