diff --git a/Sources/HummingbirdMustache/Method.swift b/Sources/HummingbirdMustache/Method.swift index 29b3f39..c59efe0 100644 --- a/Sources/HummingbirdMustache/Method.swift +++ b/Sources/HummingbirdMustache/Method.swift @@ -22,6 +22,32 @@ extension String: HBMustacheBaseMethods { switch name { case "lowercased": return self.lowercased() + case "uppercased": + return self.uppercased() + default: + return nil + } + } +} + +extension Array: HBMustacheBaseMethods { + func runMethod(_ name: String) -> Any? { + switch name { + case "reversed": + return self.reversed() + case "enumerated": + return self.enumerated() + default: + return nil + } + } +} + +extension Dictionary: HBMustacheBaseMethods { + func runMethod(_ name: String) -> Any? { + switch name { + case "enumerated": + return self.enumerated() default: return nil } diff --git a/Sources/HummingbirdMustache/Template+Parser.swift b/Sources/HummingbirdMustache/Template+Parser.swift index ef1ade5..c97a73a 100644 --- a/Sources/HummingbirdMustache/Template+Parser.swift +++ b/Sources/HummingbirdMustache/Template+Parser.swift @@ -24,21 +24,21 @@ extension HBMustacheTemplate { switch parser.current() { case "#": parser.unsafeAdvance() - let (name, _) = try parseName(&parser) + let (name, method) = try parseName(&parser) if parser.current() == "\n" { parser.unsafeAdvance() } let sectionTokens = try parse(&parser, sectionName: name) - tokens.append(.section(name, HBMustacheTemplate(sectionTokens))) + tokens.append(.section(name: name, method: method, template: HBMustacheTemplate(sectionTokens))) case "^": parser.unsafeAdvance() - let (name, _) = try parseName(&parser) + let (name, method) = try parseName(&parser) if parser.current() == "\n" { parser.unsafeAdvance() } let sectionTokens = try parse(&parser, sectionName: name) - tokens.append(.invertedSection(name, HBMustacheTemplate(sectionTokens))) + tokens.append(.invertedSection(name: name, method: method, template: HBMustacheTemplate(sectionTokens))) case "/": parser.unsafeAdvance() @@ -53,9 +53,9 @@ extension HBMustacheTemplate { case "{": parser.unsafeAdvance() - let (name, _) = try parseName(&parser) + let (name, method) = try parseName(&parser) guard try parser.read("}") else { throw Error.unfinishedName } - tokens.append(.unescapedVariable(name)) + tokens.append(.unescapedVariable(name: name, method: method)) case "!": parser.unsafeAdvance() @@ -68,7 +68,7 @@ extension HBMustacheTemplate { default: let (name, method) = try parseName(&parser) - tokens.append(.variable(name, method)) + tokens.append(.variable(name: name, method: method)) } } // should never get here if reading section diff --git a/Sources/HummingbirdMustache/Template+Render.swift b/Sources/HummingbirdMustache/Template+Render.swift index cf703cf..23da08d 100644 --- a/Sources/HummingbirdMustache/Template+Render.swift +++ b/Sources/HummingbirdMustache/Template+Render.swift @@ -7,29 +7,23 @@ extension HBMustacheTemplate { case .text(let text): string += text case .variable(let variable, let method): - if var child = getChild(named: variable, from: object) { - if let method = method, - let runnable = child as? HBMustacheBaseMethods { - if let result = runnable.runMethod(method) { - child = result - } - } + if let child = getChild(named: variable, from: object, method: method) { if let template = child as? HBMustacheTemplate { string += template.render(object, library: library) } else { string += htmlEscape(String(describing: child)) } } - case .unescapedVariable(let variable): - if let child = getChild(named: variable, from: object) { + case .unescapedVariable(let variable, let method): + if let child = getChild(named: variable, from: object, method: method) { string += String(describing: child) } - case .section(let variable, let template): - let child = getChild(named: variable, from: object) + case .section(let variable, let method, let template): + let child = getChild(named: variable, from: object, method: method) string += renderSection(child, parent: object, with: template, library: library) - case .invertedSection(let variable, let template): - let child = getChild(named: variable, from: object) + case .invertedSection(let variable, let method, let template): + let child = getChild(named: variable, from: object, method: method) string += renderInvertedSection(child, parent: object, with: template, library: library) case .partial(let name): @@ -67,7 +61,7 @@ extension HBMustacheTemplate { } } - func getChild(named name: String, from object: Any) -> Any? { + func getChild(named name: String, from object: Any, method: String?) -> Any? { func _getChild(named names: ArraySlice, from object: Any) -> Any? { guard let name = names.first else { return object } let childObject: Any? @@ -82,9 +76,20 @@ extension HBMustacheTemplate { return _getChild(named: names2, from: childObject!) } - if name == "." { return object } - let nameSplit = name.split(separator: ".").map { String($0) } - return _getChild(named: nameSplit[...], from: object) + let child: Any? + if name == "." { + child = object + } else { + let nameSplit = name.split(separator: ".").map { String($0) } + child = _getChild(named: nameSplit[...], from: object) + } + if let method = method, + let runnable = child as? HBMustacheBaseMethods { + if let result = runnable.runMethod(method) { + return result + } + } + return child } private static let htmlEscapedCharacters: [Character: String] = [ @@ -140,3 +145,37 @@ extension Array: HBSequence { return "" } } + +extension ReversedCollection: HBSequence { + func renderSection(with template: HBMustacheTemplate, library: HBMustacheLibrary?) -> String { + var string = "" + for obj in self { + string += template.render(obj, library: library) + } + return string + } + + func renderInvertedSection(with template: HBMustacheTemplate, library: HBMustacheLibrary?) -> String { + if count == 0 { + return template.render(self, library: library) + } + return "" + } +} + +extension EnumeratedSequence: HBSequence { + func renderSection(with template: HBMustacheTemplate, library: HBMustacheLibrary?) -> String { + var string = "" + for obj in self { + string += template.render(obj, library: library) + } + return string + } + + func renderInvertedSection(with template: HBMustacheTemplate, library: HBMustacheLibrary?) -> String { + if self.underestimatedCount == 0 { + return template.render(self, library: library) + } + return "" + } +} diff --git a/Sources/HummingbirdMustache/Template.swift b/Sources/HummingbirdMustache/Template.swift index cc75280..49eb80e 100644 --- a/Sources/HummingbirdMustache/Template.swift +++ b/Sources/HummingbirdMustache/Template.swift @@ -10,10 +10,10 @@ public class HBMustacheTemplate { enum Token { case text(String) - case variable(String, String? = nil) - case unescapedVariable(String) - case section(String, HBMustacheTemplate) - case invertedSection(String, HBMustacheTemplate) + case variable(name: String, method: String? = nil) + case unescapedVariable(name: String, method: String? = nil) + case section(name: String, method: String? = nil, template: HBMustacheTemplate) + case invertedSection(name: String, method: String? = nil, template: HBMustacheTemplate) case partial(String) } diff --git a/Tests/HummingbirdMustacheTests/MethodTests.swift b/Tests/HummingbirdMustacheTests/MethodTests.swift new file mode 100644 index 0000000..9255ffd --- /dev/null +++ b/Tests/HummingbirdMustacheTests/MethodTests.swift @@ -0,0 +1,60 @@ +import XCTest +@testable import HummingbirdMustache + +final class MethodTests: XCTestCase { + func testLowercased() throws { + let template = try HBMustacheTemplate(string: """ + {{ lowercased(name) }} + """) + let object: [String: Any] = ["name": "Test"] + XCTAssertEqual(template.render(object), "test") + } + + func testUppercased() throws { + let template = try HBMustacheTemplate(string: """ + {{ uppercased(name) }} + """) + let object: [String: Any] = ["name": "Test"] + XCTAssertEqual(template.render(object), "TEST") + } + + func testReversed() throws { + let template = try HBMustacheTemplate(string: """ + {{#reversed(repo)}} + {{ name }} + {{/repo}} + """) + let object: [String: Any] = ["repo": [["name": "resque"], ["name": "hub"], ["name": "rip"]]] + XCTAssertEqual(template.render(object), """ + rip + hub + resque + + """) + } + + func testArrayEnumerated() throws { + let template = try HBMustacheTemplate(string: """ + {{#enumerated(repo)}} + {{ offset }}) {{ element.name }} + {{/repo}} + """) + let object: [String: Any] = ["repo": [["name": "resque"], ["name": "hub"], ["name": "rip"]]] + XCTAssertEqual(template.render(object), """ + 0) resque + 1) hub + 2) rip + + """) + } + + func testDictionaryEnumerated() throws { + let template = try HBMustacheTemplate(string: """ + {{#enumerated(.)}}{{ element.key }} = {{ element.value }}{{/.}} + """) + let object: [String: Any] = ["one": 1, "two": 2] + let result = template.render(object) + XCTAssertTrue(result == "one = 1two = 2" || result == "two = 2one = 1") + } + +} diff --git a/Tests/HummingbirdMustacheTests/TemplateParserTests.swift b/Tests/HummingbirdMustacheTests/TemplateParserTests.swift index 5c48580..410d0b5 100644 --- a/Tests/HummingbirdMustacheTests/TemplateParserTests.swift +++ b/Tests/HummingbirdMustacheTests/TemplateParserTests.swift @@ -9,17 +9,17 @@ final class TemplateParserTests: XCTestCase { func testVariable() throws { let template = try HBMustacheTemplate(string: "test {{variable}}") - XCTAssertEqual(template.tokens, [.text("test "), .variable("variable")]) + XCTAssertEqual(template.tokens, [.text("test "), .variable(name: "variable")]) } func testSection() throws { let template = try HBMustacheTemplate(string: "test {{#section}}text{{/section}}") - XCTAssertEqual(template.tokens, [.text("test "), .section("section", .init([.text("text")]))]) + XCTAssertEqual(template.tokens, [.text("test "), .section(name: "section", template: .init([.text("text")]))]) } func testInvertedSection() throws { let template = try HBMustacheTemplate(string: "test {{^section}}text{{/section}}") - XCTAssertEqual(template.tokens, [.text("test "), .invertedSection("section", .init([.text("text")]))]) + XCTAssertEqual(template.tokens, [.text("test "), .invertedSection(name: "section", template: .init([.text("text")]))]) } func testComment() throws { @@ -29,7 +29,7 @@ final class TemplateParserTests: XCTestCase { func testWhitespace() throws { let template = try HBMustacheTemplate(string: "{{ section }}") - XCTAssertEqual(template.tokens, [.variable("section")]) + XCTAssertEqual(template.tokens, [.variable(name: "section")]) } func testSectionEndError() throws { @@ -79,10 +79,12 @@ extension HBMustacheTemplate.Token: Equatable { return lhs == rhs case (.variable(let lhs, let lhs2), .variable(let rhs, let rhs2)): return lhs == rhs && lhs2 == rhs2 - case (.section(let lhs1, let lhs2), .section(let rhs1, let rhs2)): - return lhs1 == rhs1 && lhs2 == rhs2 - case (.invertedSection(let lhs1, let lhs2), .invertedSection(let rhs1, let rhs2)): - return lhs1 == rhs1 && lhs2 == rhs2 + case (.section(let lhs1, let lhs2, let lhs3), .section(let rhs1, let rhs2, let rhs3)): + return lhs1 == rhs1 && lhs2 == rhs2 && lhs3 == rhs3 + case (.invertedSection(let lhs1, let lhs2, let lhs3), .invertedSection(let rhs1, let rhs2, let rhs3)): + return lhs1 == rhs1 && lhs2 == rhs2 && lhs3 == rhs3 + case (.partial(let name1), .partial(let name2)): + return name1 == name2 default: return false } diff --git a/Tests/HummingbirdMustacheTests/TemplateRendererTests.swift b/Tests/HummingbirdMustacheTests/TemplateRendererTests.swift index d985496..187fcad 100644 --- a/Tests/HummingbirdMustacheTests/TemplateRendererTests.swift +++ b/Tests/HummingbirdMustacheTests/TemplateRendererTests.swift @@ -192,20 +192,6 @@ final class TemplateRendererTests: XCTestCase { """) } - func testLowercased() throws { - let template = try HBMustacheTemplate(string: """ - {{#repo}} - {{ lowercased(name) }} - {{/repo}} - """) - let object: [String: Any] = ["repo": [["name": "Resque"], ["name": "Hub"], ["name": "RIP"]]] - XCTAssertEqual(template.render(object), """ - resque - hub - rip - - """) - } func testPerformance() throws { let template = try HBMustacheTemplate(string: """ {{#repo}}