Switch to Swift 2.0

Stencil/Template.swift

@@ -6,12 +6,12 @@ public class Template {
   public let parser:TokenParser
 
   /// Create a template with the given name inside the main bundle
-  public convenience init?(named:String) {
-    self.init(named:named, inBundle:nil)
+  public convenience init?(named:String) throws {
+    try self.init(named:named, inBundle:nil)
   }
 
   /// Create a template with the given name inside the given bundle
-  public convenience init?(named:String, inBundle bundle:NSBundle?) {
+  public convenience init?(named:String, inBundle bundle:NSBundle?) throws {
     var url:NSURL?
 
     if let bundle = bundle {
@@ -20,31 +20,18 @@ public class Template {
       url = NSBundle.mainBundle().URLForResource(named, withExtension: nil)
     }
 
-    self.init(URL:url!)
+    try self.init(URL:url!)
   }
 
   /// Create a template with a file found at the given URL
-  public convenience init?(URL:NSURL) {
-    var error:NSError?
-    let maybeTemplateString = NSString(contentsOfURL: URL, encoding: NSUTF8StringEncoding, error: &error)
-    if let templateString = maybeTemplateString {
-      self.init(templateString:templateString as String)
-    } else {
-      self.init(templateString:"")
-      return nil
-    }
+  public convenience init(URL:NSURL) throws {
+    let templateString = try NSString(contentsOfURL: URL, encoding: NSUTF8StringEncoding)
+    self.init(templateString: templateString as String)
   }
 
   /// Create a template with a file found at the given path
-  public convenience init?(path:Path) {
-    var error:NSError?
-
-    if let string:String = path.read() {
-      self.init(templateString:string)
-    } else {
-      self.init(templateString:"")
-      return nil
-    }
+  public convenience init?(path:Path) throws {
+    self.init(templateString: path.read() ?? "")
   }
 
   /// Create a template with a template string
@@ -58,7 +45,7 @@ public class Template {
   public func render(context:Context) -> Result {
     switch parser.parse() {
     case .Success(let nodes):
-      return renderNodes(nodes, context)
+      return renderNodes(nodes, context: context)
 
     case .Error(let error):
       return .Error(error)