Added namespace to Context

This commit is contained in:
shnhrrsn
2016-03-05 23:49:55 -05:00
parent 67d4c52535
commit bdc14ab1e1
2 changed files with 13 additions and 10 deletions

View File

@@ -1,15 +1,17 @@
/// A container for template variables.
public class Context {
var dictionaries: [[String: Any]]
let namespace: Namespace
/// Initialise a Context with a dictionary
public init(dictionary: [String: Any]) {
dictionaries = [dictionary]
}
/// Initialise a Context with an optional dictionary and optional namespace
public init(dictionary: [String: Any]? = nil, namespace: Namespace = Namespace()) {
if let dictionary = dictionary {
dictionaries = [dictionary]
} else {
dictionaries = []
}
/// Initialise an empty Context
public init() {
dictionaries = []
self.namespace = namespace
}
public subscript(key: String) -> Any? {

View File

@@ -36,9 +36,10 @@ public class Template {
}
/// Render the given template
public func render(context: Context? = nil, namespace: Namespace? = nil) throws -> String {
let parser = TokenParser(tokens: tokens, namespace: namespace ?? Namespace())
public func render(context: Context? = nil) throws -> String {
let context = context ?? Context()
let parser = TokenParser(tokens: tokens, namespace: context.namespace)
let nodes = try parser.parse()
return try renderNodes(nodes, context ?? Context())
return try renderNodes(nodes, context)
}
}