Merge pull request #10 from qutheory/vapor-12

vapor 12

.gitignore

@@ -1,5 +1,3 @@
-Sources/main.swift
 Packages
 .build
-Resources
 *.xcodeproj

.travis.yml

@@ -8,5 +8,9 @@ osx_image: xcode7.3
 install:
   - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
 script:
+  # Build Vapor Mustache
   - swift build
-  # - swift build -c release
+  - swift build -c release
+
+  # Test Vapor Mustache
+  - swift test

Package.swift

@@ -4,6 +4,6 @@ let package = Package(
     name: "VaporMustache",
     dependencies: [
         .Package(url: "https://github.com/Zewo/Mustache.git", majorVersion: 0, minor: 6),
-        .Package(url: "https://github.com/qutheory/vapor.git", majorVersion: 0, minor: 11)
+        .Package(url: "https://github.com/qutheory/vapor.git", majorVersion: 0, minor: 12)
     ]
 )

Resources/Views/Includes/test-include-a.mustache

@@ -0,0 +1 @@
+a

Resources/Views/Includes/test-include-b.mustache

@@ -0,0 +1 @@
+b

Resources/Views/test-view.mustache

@@ -0,0 +1,5 @@
+{{>a}}
+
+Hello, {{name}}
+
+{{>b}}

Sources/MustacheRenderer.swift

@@ -4,9 +4,13 @@ import Mustache
 public class MustacheRenderer: RenderDriver {
     static let currentName = "__current"
 
+    public enum Error: ErrorProtocol {
+        case file(String, ErrorProtocol)
+    }
+
     public var includes: [String: String]
 
-    public init(files: [String: String] = [:]) {
+    public init(files: [String: String] = [:]) throws {
         includes = [:]
 
         for (name, file) in files {
@@ -16,7 +20,7 @@ public class MustacheRenderer: RenderDriver {
 
                 includes[name] = String(validatingUTF8: bytes)
             } catch {
-                Log.warning("Could not open file \(file). Error: \(error)")
+                throw Error.file(file, error)
             }
         }
     }

Sources/Provider.swift

@@ -12,8 +12,12 @@ public class Provider: Vapor.Provider {
 		includeFiles.forEach { (name, file) in
 			files[name] = application.workDir + "Resources/Views/" + file
 		}
-
-		View.renderers[".mustache"] = MustacheRenderer(files: files)
+
+        do {
+            View.renderers[".mustache"] = try MustacheRenderer(files: files)
+        } catch {
+            application.log.error("Could not configure Mustache: \(error)")
+        }
 	}
 
 }

Tests/LinuxMain.swift

@@ -0,0 +1,10 @@
+#if os(Linux)
+
+import XCTest
+@testable import VaporMustacheTestSuite
+
+XCTMain([
+    testCase(ProviderTests.allTests),
+])
+
+#endif

Tests/VaporMustache/ProviderTests.swift

@@ -0,0 +1,39 @@
+import XCTest
+@testable import VaporMustache
+import Vapor
+
+class ProviderTests: XCTestCase {
+    static let allTests = [
+        ("testSaveAndFind", testSaveAndFind)
+    ]
+
+    func testSaveAndFind() {
+        let provider = Provider(withIncludes: [
+            "a": "Includes/test-include-a.mustache",
+            "b": "Includes/test-include-b.mustache",
+        ])
+
+        let app = Application(providers: [provider])
+
+        let name = "abcdefghijklmnopqrstuvwxyz1234567890!@#$%^*()"
+
+        do {
+            let view = try app.view("test-view.mustache", context: ["name": name])
+
+            let response = view.makeResponse()
+
+            switch response.body {
+            case .data(let bytes):
+                let encoded = String(name.characters.split(separator: "&").joined(separator: "&".characters))
+                let expected = "a\n\nHello, \(encoded)\n\nb"
+
+                let string = try bytes.toString()
+                XCTAssertEqual(string, expected, "Template did not render properly")
+            case .chunked(_):
+                XCTFail("Incorrect body type")
+            }
+        } catch {
+            XCTFail("Could not make view: \(error)")
+        }
+    }
+}