Merge pull request #144 from vapor/tn-beta-1

beta 1

Author: tanner0101

Package.swift

@@ -3,6 +3,9 @@ import PackageDescription
 
 let package = Package(
     name: "leaf",
+    platforms: [
+       .macOS(.v10_14)
+    ],
     products: [
         .library(name: "Leaf", targets: ["Leaf"]),
     ],

Sources/Leaf/LeafProvider.swift

@@ -3,21 +3,21 @@ import Vapor
 public final class LeafProvider: Provider {
     public init() { }
 
-    public func register(_ s: inout Services) {
-        s.register(LeafRenderer.self) { c in
-            return try LeafRenderer(
-                config: c.make(),
-                threadPool: c.application.threadPool,
-                eventLoop: c.eventLoop
+    public func register(_ app: Application) {
+        app.register(LeafRenderer.self) { app in
+            LeafRenderer(
+                config: app.make(),
+                threadPool: app.make(),
+                eventLoop: app.make()
             )
         }
 
-        s.register(ViewRenderer.self) { c in
-            return try c.make(LeafRenderer.self)
+        app.register(ViewRenderer.self) { app in
+            app.make(LeafRenderer.self)
         }
 
-        s.register(LeafConfig.self) { c in
-            let directory = try c.make(DirectoryConfiguration.self)
+        app.register(LeafConfig.self) { app in
+            let directory = app.make(DirectoryConfiguration.self)
             return LeafConfig(rootDirectory: directory.viewsDirectory)
         }
     }
@@ -38,3 +38,13 @@ extension LeafRenderer: ViewRenderer {
         }
     }
 }
+
+extension Request {
+    public var leaf: LeafRenderer {
+        LeafRenderer(
+            config: self.application.make(),
+            threadPool: self.application.make(),
+            eventLoop: self.eventLoop
+        )
+    }
+}