From 7a60106a1b2c2b3f6002395916dafff1e31c23f5 Mon Sep 17 00:00:00 2001 From: Kevin Cantu Date: Sat, 26 Mar 2016 14:03:50 -0700 Subject: [PATCH 1/2] use raw_request --- lib/tentacat.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tentacat.ex b/lib/tentacat.ex index cd2cfc9..ba11d04 100644 --- a/lib/tentacat.ex +++ b/lib/tentacat.ex @@ -39,7 +39,7 @@ defmodule Tentacat do end def json_request(method, url, body \\ "", headers \\ [], options \\ []) do - request!(method, url, JSX.encode!(body), headers, options) |> process_response + raw_request(method, url, JSX.encode!(body), headers, options) end def raw_request(method, url, body \\ "", headers \\ [], options \\ []) do From 65e8c9fae81e65beb2627ab6cabf6785e705753e Mon Sep 17 00:00:00 2001 From: Kevin Cantu Date: Sat, 26 Mar 2016 14:05:43 -0700 Subject: [PATCH 2/2] read and use additional :request_options on request!/5 This allows overriding the default options in configuration, like so: ```elixir config :tentacat, request_options: [ {:ssl, [ {:cacertfile, "/etc/mysvc/mycert.pem"} ]} ] ``` --- lib/tentacat.ex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/tentacat.ex b/lib/tentacat.ex index ba11d04..a46d247 100644 --- a/lib/tentacat.ex +++ b/lib/tentacat.ex @@ -43,7 +43,8 @@ defmodule Tentacat do end def raw_request(method, url, body \\ "", headers \\ [], options \\ []) do - request!(method, url, body, headers, options) |> process_response + extra_options = Application.get_env(:tentacat, :request_options, []) + request!(method, url, body, headers, extra_options ++ options) |> process_response end @spec url(client :: Client.t, path :: binary) :: binary