From dd774e2abf2bbf3a73bac6c61740e86e66a5d92d Mon Sep 17 00:00:00 2001 From: David Jennes Date: Tue, 14 Feb 2017 16:19:38 +0100 Subject: [PATCH] Parse parameters without values as booleans with a value of `true` --- Sources/Parameters.swift | 17 +++++++++++------ .../StencilSwiftKitTests/ParametersTests.swift | 5 +++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Sources/Parameters.swift b/Sources/Parameters.swift index 391da473..2cabb6e2 100644 --- a/Sources/Parameters.swift +++ b/Sources/Parameters.swift @@ -7,20 +7,25 @@ import Foundation public enum ParametersError: Error { - case invalidSyntax(value: String) - case invalidKey(key: String, value: String) + case invalidSyntax(value: Any) + case invalidKey(key: String, value: Any) case invalidStructure(key: String, oldValue: Any, newValue: Any) } public enum Parameters { - typealias Parameter = (key: String, value: String) + typealias Parameter = (key: String, value: Any) public typealias StringDict = [String: Any] public static func parse(items: [String]) throws -> StringDict { let parameters: [Parameter] = try items.map { item in let parts = item.components(separatedBy: "=") - guard parts.count == 2 else { throw ParametersError.invalidSyntax(value: item) } - return (key: parts[0], value: parts[1]) + if parts.count == 2 { + return (key: parts[0], value: parts[1]) + } else if let part = parts.first, parts.count == 1 && validate(key: part) { + return (key: part, value: true) + } else { + throw ParametersError.invalidSyntax(value: item) + } } return try parameters.reduce(StringDict()) { @@ -38,7 +43,7 @@ public enum Parameters { // no sub keys, may need to convert to array if repeat key if possible if parts.count == 1 { - if let current = result[key] as? [String] { + if let current = result[key] as? [Any] { result[key] = current + [parameter.value] } else if let current = result[key] as? String { result[key] = [current, parameter.value] diff --git a/Tests/StencilSwiftKitTests/ParametersTests.swift b/Tests/StencilSwiftKitTests/ParametersTests.swift index 55b1813f..d08308d9 100644 --- a/Tests/StencilSwiftKitTests/ParametersTests.swift +++ b/Tests/StencilSwiftKitTests/ParametersTests.swift @@ -9,12 +9,13 @@ import StencilSwiftKit class ParametersTests: XCTestCase { func testBasic() { - let items = ["a=1", "b=hello"] + let items = ["a=1", "b=hello", "c"] let result = try! Parameters.parse(items: items) - XCTAssertEqual(result.count, 2, "2 parameters should have been parsed") + XCTAssertEqual(result.count, 3, "3 parameters should have been parsed") XCTAssertEqual(result["a"] as? String, "1") XCTAssertEqual(result["b"] as? String, "hello") + XCTAssertEqual(result["c"] as? Bool, true) } func testStructured() {