feat: apply string filters to arrays (#190)

This commit is contained in:
Ilya Puchka
2018-01-22 18:20:42 +01:00
committed by Kyle Fuller
parent c30597457f
commit c4a84a6375
3 changed files with 49 additions and 23 deletions

View File

@@ -8,6 +8,7 @@
- The `{% for %}` tag can now iterate over tuples, structures and classes via - The `{% for %}` tag can now iterate over tuples, structures and classes via
their stored properties. their stored properties.
- Added `split` filter - Added `split` filter
- Allow default string filters to be applied to arrays
### Bug Fixes ### Bug Fixes

View File

@@ -1,13 +1,25 @@
func capitalise(_ value: Any?) -> Any? { func capitalise(_ value: Any?) -> Any? {
if let array = value as? [Any?] {
return array.map { stringify($0).capitalized }
} else {
return stringify(value).capitalized return stringify(value).capitalized
}
} }
func uppercase(_ value: Any?) -> Any? { func uppercase(_ value: Any?) -> Any? {
if let array = value as? [Any?] {
return array.map { stringify($0).uppercased() }
} else {
return stringify(value).uppercased() return stringify(value).uppercased()
}
} }
func lowercase(_ value: Any?) -> Any? { func lowercase(_ value: Any?) -> Any? {
if let array = value as? [Any?] {
return array.map { stringify($0).lowercased() }
} else {
return stringify(value).lowercased() return stringify(value).lowercased()
}
} }
func defaultFilter(value: Any?, arguments: [Any?]) -> Any? { func defaultFilter(value: Any?, arguments: [Any?]) -> Any? {

View File

@@ -89,35 +89,48 @@ func testFilter() {
} }
} }
describe("string filters") {
describe("capitalize filter") { $0.context("given string") {
$0.it("transforms a string to be capitalized") {
let template = Template(templateString: "{{ name|capitalize }}") let template = Template(templateString: "{{ name|capitalize }}")
$0.it("capitalizes a string") {
let result = try template.render(Context(dictionary: ["name": "kyle"])) let result = try template.render(Context(dictionary: ["name": "kyle"]))
try expect(result) == "Kyle" try expect(result) == "Kyle"
} }
}
describe("uppercase filter") {
let template = Template(templateString: "{{ name|uppercase }}")
$0.it("transforms a string to be uppercase") { $0.it("transforms a string to be uppercase") {
let template = Template(templateString: "{{ name|uppercase }}")
let result = try template.render(Context(dictionary: ["name": "kyle"])) let result = try template.render(Context(dictionary: ["name": "kyle"]))
try expect(result) == "KYLE" try expect(result) == "KYLE"
} }
}
describe("lowercase filter") {
let template = Template(templateString: "{{ name|lowercase }}")
$0.it("transforms a string to be lowercase") { $0.it("transforms a string to be lowercase") {
let template = Template(templateString: "{{ name|lowercase }}")
let result = try template.render(Context(dictionary: ["name": "Kyle"])) let result = try template.render(Context(dictionary: ["name": "Kyle"]))
try expect(result) == "kyle" try expect(result) == "kyle"
} }
} }
$0.context("given array of strings") {
$0.it("transforms a string to be capitalized") {
let template = Template(templateString: "{{ names|capitalize }}")
let result = try template.render(Context(dictionary: ["names": ["kyle", "kyle"]]))
try expect(result) == "[\"Kyle\", \"Kyle\"]"
}
$0.it("transforms a string to be uppercase") {
let template = Template(templateString: "{{ names|uppercase }}")
let result = try template.render(Context(dictionary: ["names": ["kyle", "kyle"]]))
try expect(result) == "[\"KYLE\", \"KYLE\"]"
}
$0.it("transforms a string to be lowercase") {
let template = Template(templateString: "{{ names|lowercase }}")
let result = try template.render(Context(dictionary: ["names": ["Kyle", "Kyle"]]))
try expect(result) == "[\"kyle\", \"kyle\"]"
}
}
}
describe("default filter") { describe("default filter") {
let template = Template(templateString: "Hello {{ name|default:\"World\" }}") let template = Template(templateString: "Hello {{ name|default:\"World\" }}")