Skip to content

Commit 38470f0

Browse files
Vkt0rVkt0r
authored
Merge pull request #393 from edwinveger/feature/response-body-json-dictionary-literals
Change HttpResponseBody.json to take Any
2 parents e531e9d + 9f43162 commit 38470f0

File tree

5 files changed

+89
-16
lines changed

5 files changed

+89
-16
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ All notable changes to this project will be documented in this file. Changes not
3838
- Refactor: Use Foundation API for Base64 encoding. ([#403](https://github.com/httpswift/swifter/pull/403)) by [@mazyod](https://github.com/mazyod)
3939
- Refactor: Use `URLComponents` for `HttpRequest` path and query parameters parsing [#404](https://github.com/httpswift/swifter/pull/404)) by [@mazyod](https://github.com/mazyod)
4040
- `HttpResponse` functions `statusCode()` and `reasonPhrase` changed to computed variables instead of functions, and made public (No impact on existing usage as it was previously internal). ([#410](https://github.com/httpswift/swifter/pull/410)) by [@apocolipse](https://github.com/apocolipse)
41+
- Adjusted the associated type of enum case `HttpResponseBody.json` from `AnyObject` to `Any` to allow Swift dictionaries/arrays without converting to their Objective-C counterparts. ([#393](https://github.com/httpswift/swifter/pull/393)) by [@edwinveger](https://github.com/edwinveger)
4142
- `HttpResponse`: `html` requires now a complete html-string, not only the body-part.
4243
- Include the `CHANGELOG.md` and `README.md` in the Xcode-Project for easy access / changes.
4344

‎XCode/Sources/HttpResponse.swift‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public protocol HttpResponseBodyWriter {
2121
}
2222

2323
public enum HttpResponseBody {
24-
25-
case json(AnyObject)
24+
25+
case json(Any)
2626
case html(String)
2727
case htmlBody(String)
2828
case text(String)
@@ -33,20 +33,13 @@ public enum HttpResponseBody {
3333
do {
3434
switch self {
3535
case .json(let object):
36-
#if os(Linux)
37-
let data = [UInt8]("Not ready for Linux.".utf8)
38-
return (data.count, {
39-
try $0.write(data)
40-
})
41-
#else
42-
guard JSONSerialization.isValidJSONObject(object) else {
43-
throw SerializationError.invalidObject
44-
}
45-
let data = try JSONSerialization.data(withJSONObject: object)
46-
return (data.count, {
47-
try $0.write(data)
48-
})
49-
#endif
36+
guard JSONSerialization.isValidJSONObject(object) else {
37+
throw SerializationError.invalidObject
38+
}
39+
let data = try JSONSerialization.data(withJSONObject: object)
40+
return (data.count, {
41+
try $0.write(data)
42+
})
5043
case .text(let body):
5144
let data = [UInt8](body.utf8)
5245
return (data.count, {

‎XCode/Swifter.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
043660EB21FED52000497989 /* MimeTypesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A0D4511204E9988000A0726 /* MimeTypesTests.swift */; };
2727
047F1F02226AB9AD00909B95 /* XCTestManifests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B912F49220507D00062C360 /* XCTestManifests.swift */; };
2828
0858E7F81D68BC2600491CD1 /* PingServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0858E7F61D68BC2600491CD1 /* PingServer.swift */; };
29+
0C1F3CAD2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C1F3CAC2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift */; };
30+
0C1F3CAE2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C1F3CAC2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift */; };
31+
0C1F3CAF2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C1F3CAC2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift */; };
2932
2659FC1A1DADC077003F3930 /* String+File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C377E161D964B6A009C6148 /* String+File.swift */; };
3033
269B47881D3AAAE20042D137 /* HttpResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C76B6EF1D2C44F30030FC98 /* HttpResponse.swift */; };
3134
269B47891D3AAAE20042D137 /* Scopes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C76B6F41D2C44F30030FC98 /* Scopes.swift */; };
@@ -167,6 +170,7 @@
167170
043660DE21FED3A300497989 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
168171
0858E7F31D68BB2600491CD1 /* IOSafetyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IOSafetyTests.swift; sourceTree = "<group>"; };
169172
0858E7F61D68BC2600491CD1 /* PingServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PingServer.swift; sourceTree = "<group>"; };
173+
0C1F3CAC2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = SwifterTestsHttpResponseBody.swift; sourceTree = "<group>"; tabWidth = 4; };
170174
269B47A11D3AAAE20042D137 /* Swifter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Swifter.framework; sourceTree = BUILT_PRODUCTS_DIR; };
171175
269B47A41D3AAC4F0042D137 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
172176
269B47A51D3AAC4F0042D137 /* SwiftertvOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SwiftertvOS.h; sourceTree = "<group>"; };
@@ -424,6 +428,7 @@
424428
7C4785E81C71D15600A9FE73 /* SwifterTestsWebSocketSession.swift */,
425429
0858E7F31D68BB2600491CD1 /* IOSafetyTests.swift */,
426430
6A0D4511204E9988000A0726 /* MimeTypesTests.swift */,
431+
0C1F3CAC2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift */,
427432
7B55EC94226E0E4F00042D23 /* ServerThreadingTests.swift */,
428433
);
429434
path = Tests;
@@ -777,6 +782,7 @@
777782
047F1F02226AB9AD00909B95 /* XCTestManifests.swift in Sources */,
778783
043660CE21FED35500497989 /* SwifterTestsHttpParser.swift in Sources */,
779784
043660D521FED36C00497989 /* MimeTypesTests.swift in Sources */,
785+
0C1F3CAE2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift in Sources */,
780786
7B55EC96226E0E4F00042D23 /* ServerThreadingTests.swift in Sources */,
781787
);
782788
runOnlyForDeploymentPostprocessing = 0;
@@ -793,6 +799,7 @@
793799
7B55EC97226E0E4F00042D23 /* ServerThreadingTests.swift in Sources */,
794800
043660E621FED51400497989 /* SwifterTestsHttpParser.swift in Sources */,
795801
043660EB21FED52000497989 /* MimeTypesTests.swift in Sources */,
802+
0C1F3CAF2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift in Sources */,
796803
);
797804
runOnlyForDeploymentPostprocessing = 0;
798805
};
@@ -906,6 +913,7 @@
906913
043660D421FED36900497989 /* IOSafetyTests.swift in Sources */,
907914
7CCD87721C660B250068099B /* SwifterTestsStringExtensions.swift in Sources */,
908915
7B11AD4B21C9A8A6002F8820 /* SwifterTestsHttpRouter.swift in Sources */,
916+
0C1F3CAD2265FC470076B6F5 /* SwifterTestsHttpResponseBody.swift in Sources */,
909917
7B55EC95226E0E4F00042D23 /* ServerThreadingTests.swift in Sources */,
910918
);
911919
runOnlyForDeploymentPostprocessing = 0;

‎XCode/Tests/SwifterTestsHttpResponseBody.swift‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
//
2+
// SwifterTestsHttpResponseBody.swift
3+
// Swifter
4+
//
5+
6+
import XCTest
7+
@testable import Swifter
8+
9+
class SwifterTestsHttpResponseBody: XCTestCase {
10+
11+
func testDictionaryAsJSONPayload() {
12+
verify(input: ["key": "value"], output: "{\"key\":\"value\"}")
13+
verify(input: ["key": ["value1", "value2", "value3"]], output: "{\"key\":[\"value1\",\"value2\",\"value3\"]}")
14+
}
15+
16+
func testArrayAsJSONPayload() {
17+
verify(input: ["key", "value"], output: "[\"key\",\"value\"]")
18+
verify(input: ["value1", "value2", "value3"], output: "[\"value1\",\"value2\",\"value3\"]")
19+
}
20+
21+
func testNSDictionaryAsJSONPayload() {
22+
verify(input: ["key": "value"] as NSDictionary, output: "{\"key\":\"value\"}")
23+
verify(input: ["key": ["value1", "value2", "value3"]] as NSDictionary, output: "{\"key\":[\"value1\",\"value2\",\"value3\"]}")
24+
}
25+
26+
func testNSArrayAsJSONPayload() {
27+
verify(input: ["key", "value"] as NSArray, output: "[\"key\",\"value\"]")
28+
verify(input: ["value1", "value2", "value3"] as NSArray, output: "[\"value1\",\"value2\",\"value3\"]")
29+
}
30+
31+
private func verify(input: Any, output expectedOutput: String, line: UInt = #line) {
32+
let response: HttpResponseBody = .json(input)
33+
34+
guard let writer = response.content().1 else {
35+
XCTFail(line: line)
36+
return
37+
}
38+
39+
do {
40+
let mockWriter = MockWriter()
41+
try writer(mockWriter)
42+
let output = String(decoding: mockWriter.data, as: UTF8.self)
43+
XCTAssertEqual(output, expectedOutput, line: line)
44+
} catch {
45+
XCTFail(line: line)
46+
}
47+
}
48+
}
49+
50+
private class MockWriter: HttpResponseBodyWriter {
51+
var data = Data()
52+
53+
func write(_ file: String.File) throws { }
54+
func write(_ data: [UInt8]) throws { }
55+
func write(_ data: ArraySlice<UInt8>) throws { }
56+
func write(_ data: NSData) throws { }
57+
func write(_ data: Data) throws { self.data = data }
58+
}

‎XCode/Tests/XCTestManifests.swift‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,18 @@ extension SwifterTestsHttpParser {
4141
]
4242
}
4343

44+
extension SwifterTestsHttpResponseBody {
45+
// DO NOT MODIFY: This is autogenerated, use:
46+
// `swift test --generate-linuxmain`
47+
// to regenerate.
48+
static let __allTests__SwifterTestsHttpResponseBody = [
49+
("testArrayAsJSONPayload", testArrayAsJSONPayload),
50+
("testDictionaryAsJSONPayload", testDictionaryAsJSONPayload),
51+
("testNSArrayAsJSONPayload", testNSArrayAsJSONPayload),
52+
("testNSDictionaryAsJSONPayload", testNSDictionaryAsJSONPayload),
53+
]
54+
}
55+
4456
extension SwifterTestsHttpRouter {
4557
// DO NOT MODIFY: This is autogenerated, use:
4658
// `swift test --generate-linuxmain`
@@ -88,6 +100,7 @@ public func __allTests() -> [XCTestCaseEntry] {
88100
testCase(MimeTypeTests.__allTests__MimeTypeTests),
89101
testCase(ServerThreadingTests.__allTests__ServerThreadingTests),
90102
testCase(SwifterTestsHttpParser.__allTests__SwifterTestsHttpParser),
103+
testCase(SwifterTestsHttpResponseBody.__allTests__SwifterTestsHttpResponseBody),
91104
testCase(SwifterTestsHttpRouter.__allTests__SwifterTestsHttpRouter),
92105
testCase(SwifterTestsStringExtensions.__allTests__SwifterTestsStringExtensions),
93106
testCase(SwifterTestsWebSocketSession.__allTests__SwifterTestsWebSocketSession),

0 commit comments

Comments
 (0)