OCaml body fix

SGrondin · SGrondin · commit 60470e2082df · 2015-03-11T13:53:58.000-07:00
diff --git a/src/targets/ocaml/cohttp.js b/src/targets/ocaml/cohttp.js
@@ -34,7 +34,7 @@ module.exports = function (source, options) {
   // Add body
   if (source.postData.text) {
     // Just text
-    code.push(util.format('let body = %s in', JSON.stringify(source.postData.text)))
+    code.push(util.format('let body = Cohttp_lwt_body.of_string %s in', JSON.stringify(source.postData.text)))
   }
 
   // Do the request
diff --git a/test/fixtures/output/ocaml/cohttp/application-form-encoded.ml b/test/fixtures/output/ocaml/cohttp/application-form-encoded.ml
@@ -6,7 +6,7 @@ let uri = Uri.of_string "http://mockbin.com/har" in
 let headers = Header.init ()
   |> fun h -> Header.add h "content-type" "application/x-www-form-urlencoded"
 in
-let body = "foo=bar&hello=world" in
+let body = Cohttp_lwt_body.of_string "foo=bar&hello=world" in
 
 Client.call ~headers ~body `POST uri
 >>= fun (res, body_stream) ->
diff --git a/test/fixtures/output/ocaml/cohttp/application-json.ml b/test/fixtures/output/ocaml/cohttp/application-json.ml
@@ -6,7 +6,7 @@ let uri = Uri.of_string "http://mockbin.com/har" in
 let headers = Header.init ()
   |> fun h -> Header.add h "content-type" "application/json"
 in
-let body = "{\"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\": {}}] }" in
 
 Client.call ~headers ~body `POST uri
 >>= fun (res, body_stream) ->
diff --git a/test/fixtures/output/ocaml/cohttp/full.ml b/test/fixtures/output/ocaml/cohttp/full.ml
@@ -8,7 +8,7 @@ let headers = Header.init ()
   |> fun h -> Header.add h "accept" "application/json"
   |> fun h -> Header.add h "content-type" "application/x-www-form-urlencoded"
 in
-let body = "foo=bar" in
+let body = Cohttp_lwt_body.of_string "foo=bar" in
 
 Client.call ~headers ~body `POST uri
 >>= fun (res, body_stream) ->
diff --git a/test/fixtures/output/ocaml/cohttp/multipart-data.ml b/test/fixtures/output/ocaml/cohttp/multipart-data.ml
@@ -6,7 +6,7 @@ let uri = Uri.of_string "http://mockbin.com/har" in
 let headers = Header.init ()
   |> fun h -> Header.add h "content-type" "multipart/form-data; boundary=---011000010111000001101001"
 in
-let body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--" in
+let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--" in
 
 Client.call ~headers ~body `POST uri
 >>= fun (res, body_stream) ->
diff --git a/test/fixtures/output/ocaml/cohttp/multipart-file.ml b/test/fixtures/output/ocaml/cohttp/multipart-file.ml
@@ -6,7 +6,7 @@ let uri = Uri.of_string "http://mockbin.com/har" in
 let headers = Header.init ()
   |> fun h -> Header.add h "content-type" "multipart/form-data; boundary=---011000010111000001101001"
 in
-let body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--" in
+let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--" in
 
 Client.call ~headers ~body `POST uri
 >>= fun (res, body_stream) ->
diff --git a/test/fixtures/output/ocaml/cohttp/multipart-form-data.ml b/test/fixtures/output/ocaml/cohttp/multipart-form-data.ml
@@ -6,7 +6,7 @@ let uri = Uri.of_string "http://mockbin.com/har" in
 let headers = Header.init ()
   |> fun h -> Header.add h "content-type" "multipart/form-data; boundary=---011000010111000001101001"
 in
-let body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--" in
+let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--" in
 
 Client.call ~headers ~body `POST uri
 >>= fun (res, body_stream) ->

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ module.exports = function (source, options) {`
`34`	`34`	`// Add body`
`35`	`35`	`if (source.postData.text) {`
`36`	`36`	`// Just text`
`37`		`- code.push(util.format('let body = %s in', JSON.stringify(source.postData.text)))`
	`37`	`+ code.push(util.format('let body = Cohttp_lwt_body.of_string %s in', JSON.stringify(source.postData.text)))`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// Do the request`