Merge pull request #8 from vapor/alternate-file-types

work with non leaf documents as raw bytes #2

Author: loganwright

Resources/random-file.any

@@ -0,0 +1 @@
+This file #(won't) be #rendered() {}

Sources/Leaf/Stem+Spawn.swift

@@ -12,14 +12,28 @@ extension Stem {
     }
 
     public func spawnLeaf(named name: String) throws -> Leaf {
-        if let existing = cache?[name] { return existing }
+        var name = name
+        if name.hasPrefix("/") {
+            name = String(name.characters.dropFirst())
+        }
 
-        var subpath = name.finished(with: SUFFIX)
-        if subpath.hasPrefix("/") {
-            subpath = String(subpath.characters.dropFirst())
+        // non-leaf document. rendered as pure bytes
+        if name.characters.contains("."), !name.hasSuffix(".leaf") {
+            if let existing = cache?[name] { return existing }
+            let path = workingDirectory + name
+            let bytes = try Bytes.load(path: path)
+            let component = Leaf.Component.raw(bytes)
+            let leaf = Leaf(raw: bytes.string, components: [component])
+            cache(leaf, named: name)
+            return leaf
         }
-        let path = workingDirectory + subpath
 
+        name = name.finished(with: SUFFIX)
+
+        // add suffix if necessary
+        if let existing = cache?[name] { return existing }
+
+        let path = workingDirectory + name
         let raw = try Bytes.load(path: path)
         let leaf = try spawnLeaf(raw: raw)
         cache(leaf, named: name)

Tests/LeafTests/FileLoadTests.swift

@@ -0,0 +1,22 @@
+import Foundation
+import XCTest
+@testable import Leaf
+
+class FileLoadTests: XCTestCase {
+    static let allTests = [
+        ("testLoadRawBytes", testLoadRawBytes),
+    ]
+
+    func testLoadRawBytes() throws {
+        let leaf = try stem.spawnLeaf(named: "random-file.any")
+        XCTAssert(Array(leaf.components).count == 1)
+
+        let rendered = try stem.render(leaf, with: Context([])).string
+        // tags are not parsed in non-leaf document
+        let expectation = "This file #(won't) be #rendered() {}\n"
+        XCTAssertEqual(rendered, expectation)
+
+        // test cache
+        _ = try stem.spawnLeaf(named: "random-file.any")
+    }
+}