lhttpc -> hackney. fixes #17

.travis.yml

@@ -21,4 +21,5 @@ script:
   - "[[ ${TRAVIS_OTP_RELEASE} == 18.1 ]] && make elvis || true"
   - make .rebar/DEV_MODE
   - make
-  - make test
+  - make .rebar/DEV_MODE deps eunit
+  - "[[ ${TRAVIS_OTP_RELEASE} == 18.1 ]] && make dialyzer || true"

rebar.config

@@ -32,10 +32,10 @@
       , "1a1c913ac80bb45d3de5fbd74d21e96c45e9e844"
       }
     }
-  , { lhttpc
+  , { hackney
     , ".*"
-    , { git, "git://github.com/esl/lhttpc.git"
-      , "6530ef818bf904bf4ef615f384d2fc7bae44a6dc"
+    , { git, "git://github.com/benoitc/hackney.git"
+      , {tag, "1.4.4"}
       }
     }
   , { neotoma
@@ -71,6 +71,10 @@
                     , asn1
                     , public_key
                     , ssl
-                    , lhttpc
+                    , ssl_verify_hostname
+                    , idna
+                    , mimerl
+                    , certifi
+                    , hackney
                     , tdiff
                     ]}.

src/katt.app.src

@@ -15,7 +15,7 @@
                                      , asn1
                                      , public_key
                                      , ssl
-                                     , lhttpc
+                                     , hackney
                                      , tdiff
                                      ]}
                     ]}.

src/katt_callbacks.erl

@@ -250,7 +250,7 @@ http_request( #katt_request{ method = Method
   Hdrs1 = proplists:delete("x-katt-sleep", Hdrs0),
   Hdrs = proplists:delete("x-katt-timeout", Hdrs1),
   timer:sleep(Sleep),
-  lhttpc:request(Url, Method, Hdrs, Body, Timeout, []).
+  katt_util:external_http_request(Url, Method, Hdrs, Body, Timeout, []).
 
 validate_status( #katt_response{status=E}
                , #katt_response{status=A}

src/katt_cli.erl

@@ -84,7 +84,10 @@ katt_run(ScenarioFilename, Params0) ->
   ok = ensure_started(asn1),
   ok = ensure_started(public_key),
   ok = ensure_started(ssl),
-  ok = ensure_started(lhttpc),
+  ok = ensure_started(idna),
+  ok = ensure_started(mimerl),
+  ok = ensure_started(certifi),
+  ok = ensure_started(hackney),
   ok = ensure_started(tdiff),
   ok = ensure_started(katt),
   katt:run( ScenarioFilename

src/katt_util.erl

@@ -39,6 +39,7 @@
         , is_valid/5
         , validate/5
         , enumerate/1
+        , external_http_request/6
         ]).
 
 %%%_* Includes =================================================================
@@ -114,6 +115,29 @@ run_result_to_mochijson3({ PassOrFail
            , {transaction_results, TransactionResults}
            ]}.
 
+external_http_request(Url, Method, Hdrs, Body, Timeout, []) ->
+  BUrl = list_to_binary(Url),
+  BHdrs = lists:map( fun({Name, Value})->
+                         {list_to_binary(Name), list_to_binary(Value)}
+                     end
+                   , Hdrs
+                   ),
+  Options = [{recv_timeout, Timeout}],
+  case hackney:request(Method, BUrl, BHdrs, Body, Options) of
+    {ok, Status, BResHdrs, Client} ->
+      %% lhttpc was the predecesor of hackney
+      %% and we're maintaining a backwards compatible return value
+      {ok, ResBody} = hackney:body(Client),
+      ResHdrs = lists:map( fun({Name, Value})->
+                               {binary_to_list(Name), binary_to_list(Value)}
+                           end
+                         , BResHdrs
+                         ),
+      {ok, {{Status, ""}, ResHdrs, ResBody}};
+    Error ->
+      Error
+  end.
+
 %%%_* Internal =================================================================
 
 my_float_to_list(X) when is_float(X) ->

test/katt_run_tests.erl

@@ -34,15 +34,15 @@ katt_test_() ->
                  , file
                  , fun mock_katt_blueprint_parse_file/1
                  ),
-      meck:new(lhttpc, [passthrough]),
-      meck:expect( lhttpc
-                 , request
+      meck:new(katt_callbacks, [passthrough]),
+      meck:expect( katt_util
+                 , external_http_request
                  , fun mock_lhttpc_request/6
                  )
     end
   , fun(_) ->
       meck:unload(katt_blueprint_parse),
-      meck:unload(lhttpc)
+      meck:unload(katt_callbacks)
     end
   , [ katt_run_basic()
     , katt_run_with_params()
@@ -222,7 +222,7 @@ mock_lhttpc_request( "http://127.0.0.1/step5"
                    , _Timeout
                    , _Options
                    ) ->
-  {ok, {{404, "Not found"}, [{"Content-Type", "text/html"}], <<>>}};
+  {ok, {{404, []}, [{"Content-Type", "text/html"}], <<>>}};
 
 %% Mock response for test-params:
 mock_lhttpc_request( "http://example.com/test-params"

test/katt_run_unexpected_tests.erl

@@ -34,15 +34,15 @@ katt_test_() ->
                  , file
                  , fun mock_katt_blueprint_parse_file/1
                  ),
-      meck:new(lhttpc, [passthrough]),
-      meck:expect( lhttpc
-                 , request
+      meck:new(katt_callbacks, [passthrough]),
+      meck:expect( katt_util
+                 , external_http_request
                  , fun mock_lhttpc_request/6
                  )
     end
   , fun(_) ->
       meck:unload(katt_blueprint_parse),
-      meck:unload(lhttpc)
+      meck:unload(katt_callbacks)
     end
   , [ katt_run_with_unexpected_disallow()
     , katt_run_with_expected_but_undefined()

test/katt_run_validate_type_set_tests.erl

@@ -33,15 +33,15 @@ katt_test_() ->
                  , file
                  , fun mock_katt_blueprint_parse_file/1
                  ),
-      meck:new(lhttpc, [passthrough]),
-      meck:expect( lhttpc
-                 , request
+      meck:new(katt_callbacks, [passthrough]),
+      meck:expect( katt_util
+                 , external_http_request
                  , fun mock_lhttpc_request/6
                  )
     end
   , fun(_) ->
       meck:unload(katt_blueprint_parse),
-      meck:unload(lhttpc)
+      meck:unload(katt_callbacks)
     end
   , [ katt_run_with_set_comparison_strict()
     , katt_run_with_set_comparison_strict_fails()