templatekit rc

tanner0101 · tanner0101 · commit 935f134c729d · 2018-02-26T13:36:07.000-05:00
diff --git a/Package.swift b/Package.swift
@@ -7,17 +7,17 @@ let package = Package(
         .library(name: "Leaf", targets: ["Leaf"]),
     ],
     dependencies: [
-        // Swift Promises, Futures, and Streams.
+        // ⏱ Promises and reactive-streams in Swift built for high-performance and scalability.
         .package(url: "https://github.com/vapor/async.git", from: "1.0.0-rc"),
 
-        // Core extensions, type-aliases, and functions that facilitate common tasks.
+        // 🌎 Utility package containing tools for byte manipulation, Codable, OS APIs, and debugging.
         .package(url: "https://github.com/vapor/core.git", from: "3.0.0-rc"),
 
-        // Service container and configuration system.
+        // 📦 Dependency injection / inversion of control framework.
         .package(url: "https://github.com/vapor/service.git", from: "1.0.0-rc"),
 
-        // Easy-to-use foundation for building powerful templating languages in Swift.
-        .package(url: "https://github.com/vapor/template-kit.git", .branch("leaf-rc")),
+        // 📄 Easy-to-use foundation for building powerful templating languages in Swift.
+        .package(url: "https://github.com/vapor/template-kit.git", from: "1.0.0-rc"),
     ],
     targets: [
         .target(name: "Leaf", dependencies: ["Async", "Bits", "CodableKit", "COperatingSystem", "Service", "TemplateKit"]),
diff --git a/Tests/LeafTests/LeafTests.swift b/Tests/LeafTests/LeafTests.swift
@@ -413,6 +413,20 @@ class LeafTests: XCTestCase {
         }
     }
 
+    func testTemplating() throws {
+        let home = """
+        #set("title", "Home")
+        #set("body") {<p>#(foo)</p>}
+        #embed("base")
+        """
+        let expected = """
+        <title>Home</title>
+        <body><p>bar</p></title>
+        """
+        let data = try TemplateDataEncoder().encode(["foo": "bar"])
+        try XCTAssertEqual(renderer.testRender(home, data), expected)
+    }
+
     static var allTests = [
         ("testPrint", testPrint),
         ("testConstant", testConstant),
@@ -440,6 +454,7 @@ class LeafTests: XCTestCase {
         ("testEmptyForLoop", testEmptyForLoop),
         ("testKeyEqual", testKeyEqual),
         ("testInvalidForSyntax", testInvalidForSyntax),
+        ("testTemplating", testTemplating),
     ]
 }
 
diff --git a/Views/base.leaf b/Views/base.leaf
@@ -0,0 +1,2 @@
+<title>#get(title)</title>
+<body>#get(body)</title>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<title>#get(title)</title>`
	`2`	`+<body>#get(body)</title>`