Merge pull request #83 from for-GET/x-katt-content-type

allow for content-type to be set via 'x-katt-content-type' header

Author: andreineculau

README.md

@@ -194,12 +194,14 @@ bin/katt --json base_url=http://httpbin.org my_name=Joe your_name=Mike -- doc/ex
 
 A request can also be configured via HTTP request headers:
 
+* `x-katt-content-type` would set a request content-type, without sending a `content-type` HTTP header
 * `x-katt-description` would take precedence over the transaction's description
 * `x-katt-request-timeout` would take precedence over the `request_timeout` param
 * `x-katt-request-sleep` would delay the request for a specific amount of milliseconds
 * `x-katt-transform` would call the `tranform` callback with its value as `id`
 
 A response can also be configured via HTTP response headers:
+* `x-katt-content-type` would set a response (expected and actual) content-type, without expecting/receiving a `content-type` HTTP header
 * `x-katt-transform` would call the `tranform` callback with its value as `id`
 
 ### If you would like to convert a HAR file to an APIB file

src/katt.erl

@@ -280,7 +280,17 @@ run_transactions( From
   Request = make_katt_request(Req, Params, Callbacks),
   RequestFun = proplists:get_value(request, Callbacks),
   ValidateFun = proplists:get_value(validate, Callbacks),
-  ActualResponse = RequestFun(Request, Params, Callbacks),
+  ActualResponse0 = RequestFun(Request, Params, Callbacks),
+  ActualResponseHdrs = ActualResponse0#katt_response.headers,
+  {_ActualResponseContentType, _ActualResponseHdrs, ActualResponseHdrsCT} =
+    get_headers_content_type(Res#katt_response.headers, ActualResponseHdrs),
+  ParseFun = proplists:get_value(parse, Callbacks),
+  ActualResponseParsedBody = ParseFun( ActualResponseHdrsCT
+                                     , ActualResponse0#katt_response.body
+                                     , Params
+                                     , Callbacks
+                                     ),
+  ActualResponse = ActualResponse0#katt_response{parsed_body = ActualResponseParsedBody},
   ExpectedResponse = make_katt_response(ActualResponse, Res, Params, Callbacks),
   ValidationResult = ValidateFun( ExpectedResponse
                                 , ActualResponse
@@ -326,8 +336,9 @@ make_katt_request( #katt_request{url=Url0, headers=Hdrs0, body=Body0} = Req0
                     , Callbacks
                     )),
   Url = make_request_url(Url1, Params),
-  Hdrs = RecallFun(headers, Hdrs0, Params, Callbacks),
-  [Hdrs, Body] = RecallFun(body, [Hdrs, Body0], Params, Callbacks),
+  Hdrs1 = RecallFun(headers, Hdrs0, Params, Callbacks),
+  {_ContentType, Hdrs, HdrsCT} = get_headers_content_type(Hdrs1),
+  [HdrsCT, Body] = RecallFun(body, [HdrsCT, Body0], Params, Callbacks),
   Req = Req0#katt_request{ url = Url
                          , headers = Hdrs
                          , body = Body
@@ -341,9 +352,10 @@ make_katt_response( ActualResponse
                   ) ->
   RecallFun = proplists:get_value(recall, Callbacks),
   ParseFun = proplists:get_value(parse, Callbacks),
-  Hdrs = RecallFun(headers, Hdrs0, Params, Callbacks),
-  [Hdrs, Body] = RecallFun(body, [Hdrs, Body0], Params, Callbacks),
-  ParsedBody = ParseFun(Hdrs, Body, Params, Callbacks),
+  Hdrs1 = RecallFun(headers, Hdrs0, Params, Callbacks),
+  {_ContentType, Hdrs, HdrsCT} = get_headers_content_type(Hdrs1),
+  [HdrsCT, Body] = RecallFun(body, [HdrsCT, Body0], Params, Callbacks),
+  ParsedBody = ParseFun(HdrsCT, Body, Params, Callbacks),
   Res = Res0#katt_response{ headers = Hdrs
                           , body = Body
                           , parsed_body = ParsedBody
@@ -395,3 +407,21 @@ maybe_transform_response(Res0, Params, Callbacks, ActualResponse) ->
       Res = Res0#katt_response{headers = Hdrs},
       TransformFun(TransformId, {Res, ActualResponse}, Params, Callbacks)
   end.
+
+get_headers_content_type(Hdrs) ->
+  get_headers_content_type(Hdrs, Hdrs).
+
+get_headers_content_type(HdrsSrc, HdrsTarget0) ->
+  case proplists:get_value("x-katt-content-type", HdrsSrc) of
+    undefined ->
+      {undefined, HdrsTarget0, HdrsTarget0};
+    ContentType ->
+      HdrsTarget = proplists:delete("x-katt-content-type", HdrsTarget0),
+      HdrsTargetCT = case proplists:is_defined("Content-Type", HdrsTarget) of
+                       true ->
+                         katt_util:merge_proplists(HdrsTarget, [{"Content-Type", ContentType}]);
+                       false ->
+                         katt_util:merge_proplists(HdrsTarget, [{"content-type", ContentType}])
+                     end,
+      {ContentType, HdrsTarget, HdrsTargetCT}
+  end.

src/katt_callbacks.erl

@@ -165,14 +165,12 @@ parse(Hdrs, Body, Params, Callbacks) ->
              , params()
              , callbacks()
              ) -> response().
-request(R = #katt_request{}, Params, Callbacks) ->
-  ParseFun = proplists:get_value(parse, Callbacks),
+request(R = #katt_request{}, Params, _Callbacks) ->
   case http_request(R, Params) of
     {ok, {{Code, _}, Hdrs, Body}} ->
       #katt_response{ status = Code
                     , headers = Hdrs
                     , body = Body
-                    , parsed_body = ParseFun(Hdrs, Body, Params, Callbacks)
                     };
     Error = {error, _} ->
       Error