Remove unnessecary uses of Foundation

Stencil.podspec.json

@@ -34,7 +34,7 @@
       "StencilSpecs/Nodes/*.swift"
     ],
     "dependencies": {
-      "Spectre": [ "~> 0.4.1" ],
+      "Spectre": [ "~> 0.5.0" ],
       "PathKit": [ "~> 0.5.0" ]
     }
   }

Stencil/Stencil.h

@@ -1,18 +0,0 @@
-//
-//  Stencil.h
-//  Stencil
-//
-//  Created by Kyle Fuller on 23/10/2014.
-//  Copyright (c) 2014 Cocode. All rights reserved.
-//  See LICENSE for more details.
-//
-
-#import <Foundation/Foundation.h>
-
-//! Project version number for Stencil.
-FOUNDATION_EXPORT double StencilVersionNumber;
-
-//! Project version string for Stencil.
-FOUNDATION_EXPORT const unsigned char StencilVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Stencil/PublicHeader.h>

Stencil/TemplateLoader.swift

@@ -1,25 +1,26 @@
 import Foundation
 import PathKit
 
+
 // A class for loading a template from disk
 public class TemplateLoader {
-  public let paths:[Path]
+  public let paths: [Path]
 
-  public init(paths:[Path]) {
+  public init(paths: [Path]) {
     self.paths = paths
   }
 
-  public init(bundle:[NSBundle]) {
+  public init(bundle: [NSBundle]) {
     self.paths = bundle.map {
       return Path($0.bundlePath)
     }
   }
 
-  public func loadTemplate(templateName:String) -> Template? {
+  public func loadTemplate(templateName: String) -> Template? {
     return loadTemplate([templateName])
   }
 
-  public func loadTemplate(templateNames:[String]) -> Template? {
+  public func loadTemplate(templateNames: [String]) -> Template? {
     for path in paths {
       for templateName in templateNames {
         let templatePath = path + Path(templateName)

Stencil/TemplateLoader/Include.swift

@@ -1,12 +1,11 @@
-import Foundation
 import PathKit
 
 
 public class IncludeNode : NodeType {
-  public let templateName:String
+  public let templateName: String
 
-  public class func parse(parser:TokenParser, token:Token) throws -> NodeType {
-    let bits = token.contents.componentsSeparatedByString("\"")
+  public class func parse(parser: TokenParser, token: Token) throws -> NodeType {
+    let bits = token.contents.characters.split("\"", allowEmptySlices: true).map(String.init)
 
     guard bits.count == 3 else {
       throw TemplateSyntaxError("'include' tag takes one argument, the template file to be included")
@@ -15,7 +14,7 @@ public class IncludeNode : NodeType {
     return IncludeNode(templateName: bits[1])
   }
 
-  public init(templateName:String) {
+  public init(templateName: String) {
     self.templateName = templateName
   }
 

Stencil/TemplateLoader/Inheritence.swift

@@ -1,34 +1,36 @@
-import Foundation
-
 class BlockContext {
-  class var contextKey:String { return "block_context" }
+  class var contextKey: String { return "block_context" }
 
-  var blocks:[String:BlockNode]
+  var blocks: [String:BlockNode]
 
-  init(blocks:[String:BlockNode]) {
+  init(blocks: [String:BlockNode]) {
     self.blocks = blocks
   }
 
-  func pop(blockName:String) -> BlockNode? {
+  func pop(blockName: String) -> BlockNode? {
     return blocks.removeValueForKey(blockName)
   }
 }
 
-func any<Element>(elements:[Element], closure:(Element -> Bool)) -> Element? {
-  for element in elements {
-    if closure(element) {
-      return element
-    }
-  }
 
-  return nil
+extension CollectionType {
+  func any(closure: Generator.Element -> Bool) -> Generator.Element? {
+    for element in self {
+      if closure(element) {
+        return element
+      }
+    }
+
+    return nil
+  }
 }
 
-class ExtendsNode : NodeType {
-  let templateName:String
-  let blocks:[String:BlockNode]
 
-  class func parse(parser:TokenParser, token:Token) throws -> NodeType {
+class ExtendsNode : NodeType {
+  let templateName: String
+  let blocks: [String:BlockNode]
+
+  class func parse(parser: TokenParser, token: Token) throws -> NodeType {
     let bits = token.contents.componentsSeparatedByString("\"")
 
     guard bits.count == 3 else {
@@ -36,23 +38,23 @@ class ExtendsNode : NodeType {
     }
 
     let parsedNodes = try parser.parse()
-    guard (any(parsedNodes) { $0 is ExtendsNode }) == nil else {
+    guard (parsedNodes.any { $0 is ExtendsNode }) == nil else {
       throw TemplateSyntaxError("'extends' cannot appear more than once in the same template")
     }
 
     let blockNodes = parsedNodes.filter { node in node is BlockNode }
 
-    let nodes = blockNodes.reduce([String:BlockNode](), combine: { (accumulator, node:NodeType) -> [String:BlockNode] in
+    let nodes = blockNodes.reduce([String:BlockNode]()) { (accumulator, node:NodeType) -> [String:BlockNode] in
       let node = (node as! BlockNode)
       var dict = accumulator
       dict[node.name] = node
       return dict
-    })
+    }
 
     return ExtendsNode(templateName: bits[1], blocks: nodes)
   }
 
-  init(templateName:String, blocks:[String:BlockNode]) {
+  init(templateName: String, blocks: [String:BlockNode]) {
     self.templateName = templateName
     self.blocks = blocks
   }
@@ -75,11 +77,12 @@ class ExtendsNode : NodeType {
   }
 }
 
-class BlockNode : NodeType {
-  let name:String
-  let nodes:[NodeType]
 
-  class func parse(parser:TokenParser, token:Token) throws -> NodeType {
+class BlockNode : NodeType {
+  let name: String
+  let nodes: [NodeType]
+
+  class func parse(parser: TokenParser, token: Token) throws -> NodeType {
     let bits = token.components()
 
     guard bits.count == 2 else {
@@ -92,7 +95,7 @@ class BlockNode : NodeType {
     return BlockNode(name:blockName, nodes:nodes)
   }
 
-  init(name:String, nodes:[NodeType]) {
+  init(name: String, nodes: [NodeType]) {
     self.name = name
     self.nodes = nodes
   }