diff --git a/src/targets/objc/helpers.js b/src/targets/objc/helpers.js index 8d029da1e..0b80f84c5 100644 --- a/src/targets/objc/helpers.js +++ b/src/targets/objc/helpers.js @@ -61,8 +61,10 @@ module.exports = { keyValuePairs.push(util.format('@"%s": %s', k, this.literalRepresentation(value[k]))) } return '@{ ' + keyValuePairs.join(join) + ' }' + case '[object Boolean]': + return value ? '@YES' : '@NO' default: - return '@"' + value.replace(/"/g, '\\"') + '"' + return '@"' + value.toString().replace(/"/g, '\\"') + '"' } } } diff --git a/src/targets/swift/helpers.js b/src/targets/swift/helpers.js index ae735e5ab..af74d8f36 100644 --- a/src/targets/swift/helpers.js +++ b/src/targets/swift/helpers.js @@ -71,8 +71,10 @@ module.exports = { keyValuePairs.push(util.format('"%s": %s', k, this.literalRepresentation(value[k], opts, indentLevel))) } return concatArray(keyValuePairs, opts.pretty && keyValuePairs.length > 1, opts.indent, indentLevel) + case '[object Boolean]': + return value.toString() default: - return '"' + value.replace(/"/g, '\\"') + '"' + return '"' + value.toString().replace(/"/g, '\\"') + '"' } } } diff --git a/test/fixtures/output/c/libcurl/application-json.c b/test/fixtures/output/c/libcurl/application-json.c index e89d52fe9..c48b213ec 100644 --- a/test/fixtures/output/c/libcurl/application-json.c +++ b/test/fixtures/output/c/libcurl/application-json.c @@ -7,6 +7,6 @@ struct curl_slist *headers = NULL; headers = curl_slist_append(headers, "content-type: application/json"); curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers); -curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}"); +curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}"); CURLcode ret = curl_easy_perform(hnd); diff --git a/test/fixtures/output/csharp/restsharp/application-json.cs b/test/fixtures/output/csharp/restsharp/application-json.cs index b7197d25f..bba380298 100644 --- a/test/fixtures/output/csharp/restsharp/application-json.cs +++ b/test/fixtures/output/csharp/restsharp/application-json.cs @@ -1,5 +1,5 @@ var client = new RestClient("http://mockbin.com/har"); var request = new RestRequest(Method.POST); request.AddHeader("content-type", "application/json"); -request.AddParameter("application/json", "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}", ParameterType.RequestBody); +request.AddParameter("application/json", "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}", ParameterType.RequestBody); IRestResponse response = client.Execute(request); diff --git a/test/fixtures/output/go/native/application-json.go b/test/fixtures/output/go/native/application-json.go index b5c61c2ef..fb5aff445 100644 --- a/test/fixtures/output/go/native/application-json.go +++ b/test/fixtures/output/go/native/application-json.go @@ -11,7 +11,7 @@ func main() { url := "http://mockbin.com/har" - payload := strings.NewReader("{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}") + payload := strings.NewReader("{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}") req, _ := http.NewRequest("POST", url, payload) diff --git a/test/fixtures/output/java/okhttp/application-json.java b/test/fixtures/output/java/okhttp/application-json.java index 9b2ae164f..d3f961db4 100644 --- a/test/fixtures/output/java/okhttp/application-json.java +++ b/test/fixtures/output/java/okhttp/application-json.java @@ -1,7 +1,7 @@ OkHttpClient client = new OkHttpClient(); MediaType mediaType = MediaType.parse("application/json"); -RequestBody body = RequestBody.create(mediaType, "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}"); +RequestBody body = RequestBody.create(mediaType, "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}"); Request request = new Request.Builder() .url("http://mockbin.com/har") .post(body) diff --git a/test/fixtures/output/java/unirest/application-json.java b/test/fixtures/output/java/unirest/application-json.java index c8e017ed5..fad50ea27 100644 --- a/test/fixtures/output/java/unirest/application-json.java +++ b/test/fixtures/output/java/unirest/application-json.java @@ -1,4 +1,4 @@ HttpResponse response = Unirest.post("http://mockbin.com/har") .header("content-type", "application/json") - .body("{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}") + .body("{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}") .asString(); diff --git a/test/fixtures/output/javascript/jquery/application-json.js b/test/fixtures/output/javascript/jquery/application-json.js index 100166936..714c88521 100644 --- a/test/fixtures/output/javascript/jquery/application-json.js +++ b/test/fixtures/output/javascript/jquery/application-json.js @@ -7,7 +7,7 @@ var settings = { "content-type": "application/json" }, "processData": false, - "data": "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}" + "data": "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}" } $.ajax(settings).done(function (response) { diff --git a/test/fixtures/output/javascript/xhr/application-json.js b/test/fixtures/output/javascript/xhr/application-json.js index 1a14e1b0a..98508d808 100644 --- a/test/fixtures/output/javascript/xhr/application-json.js +++ b/test/fixtures/output/javascript/xhr/application-json.js @@ -15,7 +15,8 @@ var data = JSON.stringify({ { "arr_mix_nested": {} } - ] + ], + "boolean": false }); var xhr = new XMLHttpRequest(); diff --git a/test/fixtures/output/node/native/application-json.js b/test/fixtures/output/node/native/application-json.js index 766fa3191..5d972636d 100644 --- a/test/fixtures/output/node/native/application-json.js +++ b/test/fixtures/output/node/native/application-json.js @@ -27,5 +27,6 @@ req.write(JSON.stringify({ number: 1, string: 'f"oo', arr: [ 1, 2, 3 ], nested: { a: 'b' }, - arr_mix: [ 1, 'a', { arr_mix_nested: {} } ] })); + arr_mix: [ 1, 'a', { arr_mix_nested: {} } ], + boolean: false })); req.end(); diff --git a/test/fixtures/output/node/request/application-json.js b/test/fixtures/output/node/request/application-json.js index 027084b91..ac6377828 100644 --- a/test/fixtures/output/node/request/application-json.js +++ b/test/fixtures/output/node/request/application-json.js @@ -8,7 +8,8 @@ var options = { method: 'POST', string: 'f"oo', arr: [ 1, 2, 3 ], nested: { a: 'b' }, - arr_mix: [ 1, 'a', { arr_mix_nested: {} } ] }, + arr_mix: [ 1, 'a', { arr_mix_nested: {} } ], + boolean: false }, json: true }; request(options, function (error, response, body) { diff --git a/test/fixtures/output/node/unirest/application-json.js b/test/fixtures/output/node/unirest/application-json.js index cb9d797d0..ba8d8202a 100644 --- a/test/fixtures/output/node/unirest/application-json.js +++ b/test/fixtures/output/node/unirest/application-json.js @@ -24,7 +24,8 @@ req.send({ { "arr_mix_nested": {} } - ] + ], + "boolean": false }); req.end(function (res) { diff --git a/test/fixtures/output/objc/nsurlsession/application-json.m b/test/fixtures/output/objc/nsurlsession/application-json.m index 9856b7d9b..0249be026 100644 --- a/test/fixtures/output/objc/nsurlsession/application-json.m +++ b/test/fixtures/output/objc/nsurlsession/application-json.m @@ -5,7 +5,8 @@ @"string": @"f\"oo", @"arr": @[ @1, @2, @3 ], @"nested": @{ @"a": @"b" }, - @"arr_mix": @[ @1, @"a", @{ @"arr_mix_nested": @{ } } ] }; + @"arr_mix": @[ @1, @"a", @{ @"arr_mix_nested": @{ } } ], + @"boolean": @NO }; NSData *postData = [NSJSONSerialization dataWithJSONObject:parameters options:0 error:nil]; diff --git a/test/fixtures/output/ocaml/cohttp/application-json.ml b/test/fixtures/output/ocaml/cohttp/application-json.ml index 4f0613e21..4890c99f8 100644 --- a/test/fixtures/output/ocaml/cohttp/application-json.ml +++ b/test/fixtures/output/ocaml/cohttp/application-json.ml @@ -4,7 +4,7 @@ open Lwt let uri = Uri.of_string "http://mockbin.com/har" in let headers = Header.add (Header.init ()) "content-type" "application/json" in -let body = Cohttp_lwt_body.of_string "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}" in +let body = Cohttp_lwt_body.of_string "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}" in Client.call ~headers ~body `POST uri >>= fun (res, body_stream) -> diff --git a/test/fixtures/output/php/curl/application-json.php b/test/fixtures/output/php/curl/application-json.php index d284c05f9..7fa1ebec4 100644 --- a/test/fixtures/output/php/curl/application-json.php +++ b/test/fixtures/output/php/curl/application-json.php @@ -10,7 +10,7 @@ CURLOPT_TIMEOUT => 30, CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, CURLOPT_CUSTOMREQUEST => "POST", - CURLOPT_POSTFIELDS => "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}", + CURLOPT_POSTFIELDS => "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}", CURLOPT_HTTPHEADER => array( "content-type: application/json" ), diff --git a/test/fixtures/output/php/http1/application-json.php b/test/fixtures/output/php/http1/application-json.php index 8fc247751..da2765153 100644 --- a/test/fixtures/output/php/http1/application-json.php +++ b/test/fixtures/output/php/http1/application-json.php @@ -8,7 +8,7 @@ 'content-type' => 'application/json' )); -$request->setBody('{"number":1,"string":"f\\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}]}'); +$request->setBody('{"number":1,"string":"f\\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}], "boolean": false}'); try { $response = $request->send(); diff --git a/test/fixtures/output/php/http2/application-json.php b/test/fixtures/output/php/http2/application-json.php index 96cd72396..55a1d55e3 100644 --- a/test/fixtures/output/php/http2/application-json.php +++ b/test/fixtures/output/php/http2/application-json.php @@ -4,7 +4,7 @@ $request = new http\Client\Request; $body = new http\Message\Body; -$body->append('{"number":1,"string":"f\\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}]}'); +$body->append('{"number":1,"string":"f\\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}], "boolean": false}'); $request->setRequestUrl('http://mockbin.com/har'); $request->setRequestMethod('POST'); diff --git a/test/fixtures/output/python/python3/application-json.py b/test/fixtures/output/python/python3/application-json.py index 1c65aec7c..e260ae2b7 100644 --- a/test/fixtures/output/python/python3/application-json.py +++ b/test/fixtures/output/python/python3/application-json.py @@ -2,7 +2,7 @@ conn = http.client.HTTPConnection("mockbin.com") -payload = "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}" +payload = "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}" headers = { 'content-type': "application/json" } diff --git a/test/fixtures/output/python/requests/application-json.py b/test/fixtures/output/python/requests/application-json.py index 6b70a257f..c627a123e 100644 --- a/test/fixtures/output/python/requests/application-json.py +++ b/test/fixtures/output/python/requests/application-json.py @@ -2,7 +2,7 @@ url = "http://mockbin.com/har" -payload = "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}" +payload = "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}" headers = {'content-type': 'application/json'} response = requests.request("POST", url, data=payload, headers=headers) diff --git a/test/fixtures/output/ruby/native/application-json.rb b/test/fixtures/output/ruby/native/application-json.rb index e8612ff4f..466746e7f 100644 --- a/test/fixtures/output/ruby/native/application-json.rb +++ b/test/fixtures/output/ruby/native/application-json.rb @@ -7,7 +7,7 @@ request = Net::HTTP::Post.new(url) request["content-type"] = 'application/json' -request.body = "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}" +request.body = "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}" response = http.request(request) puts response.read_body diff --git a/test/fixtures/output/shell/curl/application-json.sh b/test/fixtures/output/shell/curl/application-json.sh index f9b6e93c2..09c2da35d 100644 --- a/test/fixtures/output/shell/curl/application-json.sh +++ b/test/fixtures/output/shell/curl/application-json.sh @@ -1,4 +1,4 @@ curl --request POST \ --url http://mockbin.com/har \ --header 'content-type: application/json' \ - --data '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}]}' + --data '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}], "boolean": false}' diff --git a/test/fixtures/output/shell/httpie/application-json.sh b/test/fixtures/output/shell/httpie/application-json.sh index 226f953bb..800ceb8d7 100644 --- a/test/fixtures/output/shell/httpie/application-json.sh +++ b/test/fixtures/output/shell/httpie/application-json.sh @@ -1,3 +1,3 @@ -echo '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}]}' | \ +echo '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}], "boolean": false}' | \ http POST http://mockbin.com/har \ content-type:application/json diff --git a/test/fixtures/output/shell/wget/application-json.sh b/test/fixtures/output/shell/wget/application-json.sh index ac535012a..ffa0d472b 100644 --- a/test/fixtures/output/shell/wget/application-json.sh +++ b/test/fixtures/output/shell/wget/application-json.sh @@ -1,6 +1,6 @@ wget --quiet \ --method POST \ --header 'content-type: application/json' \ - --body-data '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}]}' \ + --body-data '{"number":1,"string":"f\"oo","arr":[1,2,3],"nested":{"a":"b"},"arr_mix":[1,"a",{"arr_mix_nested":{}}], "boolean": false}' \ --output-document \ - http://mockbin.com/har diff --git a/test/fixtures/output/swift/nsurlsession/application-json.swift b/test/fixtures/output/swift/nsurlsession/application-json.swift index 7c3ed9ff4..f2b87daf3 100644 --- a/test/fixtures/output/swift/nsurlsession/application-json.swift +++ b/test/fixtures/output/swift/nsurlsession/application-json.swift @@ -6,7 +6,8 @@ let parameters = [ "string": "f\"oo", "arr": [1, 2, 3], "nested": ["a": "b"], - "arr_mix": [1, "a", ["arr_mix_nested": []]] + "arr_mix": [1, "a", ["arr_mix_nested": []]], + "boolean": false ] let postData = NSJSONSerialization.dataWithJSONObject(parameters, options: nil, error: nil) diff --git a/test/fixtures/requests/application-json.json b/test/fixtures/requests/application-json.json index cc50cc585..60acd7c2f 100644 --- a/test/fixtures/requests/application-json.json +++ b/test/fixtures/requests/application-json.json @@ -9,6 +9,6 @@ ], "postData": { "mimeType": "application/json", - "text": "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}]}" + "text": "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}], \"boolean\": false}" } }