Skip to content

Update uri decoder for non encoded comma strings #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 19, 2023
Merged

Update uri decoder for non encoded comma strings #52

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfe35de
test: add tests for handling non-percent encoded commas in simple con…
Sep 18, 2023
b8c719c
feat: update single value node to handle comma-separated string value
Sep 18, 2023
605bc3a
Update Sources/OpenAPIRuntime/URICoder/Decoding/URIValueFromNodeDecod…
czechboy0 Sep 18, 2023
ed6e837
swift-formatting
Sep 18, 2023
bdfd0c6
run swift-format 508.00
Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Sources/OpenAPIRuntime/URICoder/Decoding/URIValueFromNodeDecoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,10 @@ extension URIValueFromNodeDecoder {
array = try rootValue(in: values)
}
guard array.count == 1 else {
if style == .simple {
return Substring(array.joined(separator: ","))
}

let reason = array.isEmpty ? "an empty node" : "a node with multiple values"
try throwMismatch("Cannot parse a value from \(reason).")
}
Expand Down
26 changes: 26 additions & 0 deletions Tests/OpenAPIRuntimeTests/URICoder/Decoder/Test_URIDecoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,30 @@ final class Test_URIDecoder: Test_Runtime {
XCTAssertEqual(decodedValue, nil)
}
}

func testDecoding_percentEncodedCommaToString() throws {
let decoder = URIDecoder(configuration: .simpleUnexplode)

do {
let decodedValue = try decoder.decode(
String.self,
forKey: "",
from: "foo%2C%20bar"
)
XCTAssertEqual(decodedValue, "foo, bar")
}
}

func testDecoding_nonPercentEncodedCommaToString() throws {
let decoder = URIDecoder(configuration: .simpleUnexplode)

do {
let decodedValue = try decoder.decode(
String.self,
forKey: "",
from: "foo, bar"
)
XCTAssertEqual(decodedValue, "foo, bar")
}
}
}