Merge branch 'master' of github.com:ahmadnassri/httpsnippet

Author: ahmadnassri

README.md

@@ -11,6 +11,7 @@ See it in action on companion service: [APIembed](https://apiembed.com/)
 [![Code Climate][codeclimate-quality]][codeclimate-url]
 [![Coverage Status][codeclimate-coverage]][codeclimate-url]
 [![Dependencies][david-image]][david-url]
+[![Gitter][gitter-image]][gitter-url]
 
 ## Install
 
@@ -213,3 +214,6 @@ For more information on SemVer, please visit <http://semver.org/>.
 
 [david-url]: https://david-dm.org/Mashape/httpsnippet
 [david-image]: https://img.shields.io/david/Mashape/httpsnippet.svg?style=flat-square
+
+[gitter-url]: https://gitter.im/Mashape/httpsnippet
+[gitter-image]: https://img.shields.io/badge/Gitter-Join%20Chat-blue.svg?style=flat-square

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.16.0",
+  "version": "1.16.2",
   "name": "httpsnippet",
   "description": "HTTP Request snippet generator for *most* languages",
   "author": "Ahmad Nassri <ahmad@mashape.com> (https://www.mashape.com/)",

src/targets/ocaml/cohttp.js

@@ -30,14 +30,16 @@ module.exports = function (source, options) {
   // Add headers, including the cookies
   var headers = Object.keys(source.allHeaders)
 
-  if (headers.length) {
-    code.push('let headers = Header.init ()')
+  if (headers.length === 1) {
+    code.push('let headers = Header.add (Header.init ()) "%s" "%s" in', headers[0], source.allHeaders[headers[0]])
+  } else if (headers.length > 1) {
+    code.push('let headers = Header.add_list (Header.init ()) [')
 
     headers.map(function (key) {
-      code.push(1, '|> fun h -> Header.add h "%s" "%s"', key, source.allHeaders[key])
+      code.push(1, '("%s", "%s");', key, source.allHeaders[key])
     })
 
-    code.push('in')
+    code.push('] in')
   }
 
   // Add body

test/fixtures/output/ocaml/cohttp/application-form-encoded.ml

@@ -3,9 +3,7 @@ open Cohttp
 open Lwt
 
 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 headers = Header.add (Header.init ()) "content-type" "application/x-www-form-urlencoded" in
 let body = Cohttp_lwt_body.of_string "foo=bar&hello=world" in
 
 Client.call ~headers ~body `POST uri

test/fixtures/output/ocaml/cohttp/application-json.ml

@@ -3,9 +3,7 @@ open Cohttp
 open Lwt
 
 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 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
 
 Client.call ~headers ~body `POST uri

test/fixtures/output/ocaml/cohttp/cookies.ml

@@ -3,9 +3,7 @@ open Cohttp
 open Lwt
 
 let uri = Uri.of_string "http://mockbin.com/har" in
-let headers = Header.init ()
-  |> fun h -> Header.add h "cookie" "foo=bar; bar=baz"
-in
+let headers = Header.add (Header.init ()) "cookie" "foo=bar; bar=baz" in
 
 Client.call ~headers `POST uri
 >>= fun (res, body_stream) ->

test/fixtures/output/ocaml/cohttp/full.ml

@@ -3,11 +3,11 @@ open Cohttp
 open Lwt
 
 let uri = Uri.of_string "http://mockbin.com/har?foo=bar&foo=baz&baz=abc&key=value" in
-let headers = Header.init ()
-  |> fun h -> Header.add h "cookie" "foo=bar; bar=baz"
-  |> fun h -> Header.add h "accept" "application/json"
-  |> fun h -> Header.add h "content-type" "application/x-www-form-urlencoded"
-in
+let headers = Header.add_list (Header.init ()) [
+  ("cookie", "foo=bar; bar=baz");
+  ("accept", "application/json");
+  ("content-type", "application/x-www-form-urlencoded");
+] in
 let body = Cohttp_lwt_body.of_string "foo=bar" in
 
 Client.call ~headers ~body `POST uri

test/fixtures/output/ocaml/cohttp/headers.ml

@@ -3,10 +3,10 @@ open Cohttp
 open Lwt
 
 let uri = Uri.of_string "http://mockbin.com/har" in
-let headers = Header.init ()
-  |> fun h -> Header.add h "accept" "application/json"
-  |> fun h -> Header.add h "x-foo" "Bar"
-in
+let headers = Header.add_list (Header.init ()) [
+  ("accept", "application/json");
+  ("x-foo", "Bar");
+] in
 
 Client.call ~headers `GET uri
 >>= fun (res, body_stream) ->

test/fixtures/output/ocaml/cohttp/multipart-data.ml

@@ -3,9 +3,7 @@ open Cohttp
 open Lwt
 
 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 headers = Header.add (Header.init ()) "content-type" "multipart/form-data; boundary=---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

test/fixtures/output/ocaml/cohttp/multipart-file.ml

@@ -3,9 +3,7 @@ open Cohttp
 open Lwt
 
 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 headers = Header.add (Header.init ()) "content-type" "multipart/form-data; boundary=---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