swiftstencil/swiftpm-stencil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Template] Throw when initialising with non-existant file

Browse Source
This commit is contained in:
Kyle Fuller
2015-10-18 10:53:10 -07:00
parent 4d76fb4e60
commit f0abd34c32
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Stencil/Template.swift
View File

@@ -8,15 +8,12 @@ public class Template {
/// Create a template with the given name inside the given bundle /// Create a template with the given name inside the given bundle
public convenience init(named:String, inBundle bundle:NSBundle? = nil) throws { public convenience init(named:String, inBundle bundle:NSBundle? = nil) throws {
let url:NSURL let useBundle = bundle ?? NSBundle.mainBundle()
if let url = useBundle.URLForResource(named, withExtension: nil) {
if let bundle = bundle { try self.init(URL:url)
url = bundle.URLForResource(named, withExtension: nil)!
} else { } else {
url = NSBundle.mainBundle().URLForResource(named, withExtension: nil)! throw NSError(domain: NSCocoaErrorDomain, code: NSFileNoSuchFileError, userInfo: nil)
} }
try self.init(URL:url)
} }
/// Create a template with a file found at the given URL /// Create a template with a file found at the given URL

5
StencilTests/TemplateTests.swift
View File

@@ -20,6 +20,11 @@ class TemplateTests: XCTestCase {
XCTAssertEqual(result, "Hello Kyle!") XCTAssertEqual(result, "Hello Kyle!")
} }
func testTemplateNamedInBundleThrowsForUnknownFile() {
let testBundle = NSBundle(forClass: self.dynamicType)
let template = try? Template(named: "test2.html", inBundle: testBundle)
XCTAssertNil(template)
}
func testTemplateWithNSURL() { func testTemplateWithNSURL() {
let testBundle = NSBundle(forClass: self.dynamicType) let testBundle = NSBundle(forClass: self.dynamicType)