diff options
author | iilyak <iilyak@users.noreply.github.com> | 2019-08-19 12:40:44 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-19 12:40:44 -0700 |
commit | 24e9013051076669360f1c2aeebf415f1255b159 (patch) | |
tree | 273e618d8a0ecb79926d55d59ce17cce3cfd8ae5 | |
parent | adc0315ecdb37a30ebb3eeaada70143ebe7dbd70 (diff) | |
parent | ac4d4fcc7d161725196437520e3b5cfee8dc9954 (diff) | |
download | couchdb-24e9013051076669360f1c2aeebf415f1255b159.tar.gz |
Merge pull request #2126 from cloudant/update-httpotion
Update httpotion to 3.1.3
-rw-r--r-- | mix.exs | 2 | ||||
-rw-r--r-- | mix.lock | 2 | ||||
-rw-r--r-- | test/elixir/lib/couch.ex | 147 |
3 files changed, 34 insertions, 117 deletions
@@ -36,7 +36,7 @@ defmodule CouchDBTest.Mixfile do defp deps() do [ {:junit_formatter, "~> 3.0", only: [:dev, :test, :integration]}, - {:httpotion, "~> 3.0", only: [:dev, :test, :integration], runtime: false}, + {:httpotion, ">= 3.1.3", only: [:dev, :test, :integration], runtime: false}, {:jiffy, path: Path.expand("src/jiffy", __DIR__)}, {:ibrowse, path: Path.expand("src/ibrowse", __DIR__), override: true, compile: false}, @@ -1,7 +1,7 @@ %{ "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"}, "credo": {:hex, :credo, "1.0.5", "fdea745579f8845315fe6a3b43e2f9f8866839cfbc8562bb72778e9fdaa94214", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"}, - "httpotion": {:hex, :httpotion, "3.1.2", "50e3e559c2ffe8c8908c97e4ffb01efc1c18e8547cc7ce5dd173c9cf0a573a3b", [:mix], [{:ibrowse, "== 4.4.0", [hex: :ibrowse, repo: "hexpm", optional: false]}], "hexpm"}, + "httpotion": {:hex, :httpotion, "3.1.3", "fdaf1e16b9318dcb722de57e75ac368c93d4c6e3c9125f93e960f953a750fb77", [:mix], [{:ibrowse, "== 4.4.0", [hex: :ibrowse, repo: "hexpm", optional: false]}], "hexpm"}, "ibrowse": {:hex, :ibrowse, "4.4.0", "2d923325efe0d2cb09b9c6a047b2835a5eda69d8a47ed6ff8bc03628b764e991", [:rebar3], [], "hexpm"}, "jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"}, "jiffy": {:hex, :jiffy, "0.15.2", "de266c390111fd4ea28b9302f0bc3d7472468f3b8e0aceabfbefa26d08cd73b7", [:rebar3], [], "hexpm"}, diff --git a/test/elixir/lib/couch.ex b/test/elixir/lib/couch.ex index 3c43ab152..6c7310d56 100644 --- a/test/elixir/lib/couch.ex +++ b/test/elixir/lib/couch.ex @@ -67,7 +67,7 @@ defmodule Couch do base_url <> url end - def process_request_headers(headers, options) do + def process_request_headers(headers, _body, options) do headers = Keyword.put(headers, :"User-Agent", "couch-potion") headers = @@ -87,19 +87,10 @@ defmodule Couch do end def process_options(options) do - if Keyword.get(options, :cookie) == nil do - headers = Keyword.get(options, :headers, []) - - if headers[:basic_auth] != nil or headers[:authorization] != nil do - options - else - username = System.get_env("EX_USERNAME") || "adm" - password = System.get_env("EX_PASSWORD") || "pass" - Keyword.put(options, :basic_auth, {username, password}) - end - else - options - end + options + |> set_auth_options() + |> set_inactivity_timeout() + |> set_request_timeout() end def process_request_body(body) do @@ -120,6 +111,33 @@ defmodule Couch do end end + def set_auth_options(options) do + if Keyword.get(options, :cookie) == nil do + headers = Keyword.get(options, :headers, []) + + if headers[:basic_auth] != nil or headers[:authorization] != nil do + options + else + username = System.get_env("EX_USERNAME") || "adm" + password = System.get_env("EX_PASSWORD") || "pass" + Keyword.put(options, :basic_auth, {username, password}) + end + else + options + end + end + + def set_inactivity_timeout(options) do + Keyword.update(options, :ibrowse, [{:inactivity_timeout, @inactivity_timeout}], fn(ibrowse) -> + Keyword.put_new(ibrowse, :inactivity_timeout, @inactivity_timeout) + end) + end + + def set_request_timeout(options) do + timeout = Application.get_env(:httpotion, :default_timeout, @request_timeout) + Keyword.put_new(options, :timeout, timeout) + end + def login(userinfo) do [user, pass] = String.split(userinfo, ":", parts: 2) login(user, pass) @@ -133,105 +151,4 @@ defmodule Couch do %Couch.Session{cookie: token} end - # HACK: this is here until this commit lands in a release - # https://github.com/myfreeweb/httpotion/commit/f3fa2f0bc3b9b400573942b3ba4628b48bc3c614 - def handle_response(response) do - case response do - {:ok, status_code, headers, body, _} -> - processed_headers = process_response_headers(headers) - - %HTTPotion.Response{ - status_code: process_status_code(status_code), - headers: processed_headers, - body: process_response_body(processed_headers, body) - } - - {:ok, status_code, headers, body} -> - processed_headers = process_response_headers(headers) - - %HTTPotion.Response{ - status_code: process_status_code(status_code), - headers: processed_headers, - body: process_response_body(processed_headers, body) - } - - {:ibrowse_req_id, id} -> - %HTTPotion.AsyncResponse{id: id} - - {:error, {:conn_failed, {:error, reason}}} -> - %HTTPotion.ErrorResponse{message: error_to_string(reason)} - - {:error, :conn_failed} -> - %HTTPotion.ErrorResponse{message: "conn_failed"} - - {:error, reason} -> - %HTTPotion.ErrorResponse{message: error_to_string(reason)} - end - end - - # Anther HACK: Until we can get process_request_headers/2 merged - # upstream. - @spec process_arguments(atom, String.t(), [{atom(), any()}]) :: %{} - defp process_arguments(method, url, options) do - options = process_options(options) - - body = Keyword.get(options, :body, "") - - headers = - Keyword.merge( - Application.get_env(:httpotion, :default_headers, []), - Keyword.get(options, :headers, []) - ) - - timeout = - Keyword.get( - options, - :timeout, - Application.get_env(:httpotion, :default_timeout, @request_timeout) - ) - - ib_options = - Keyword.merge( - Application.get_env(:httpotion, :default_ibrowse, []), - Keyword.get(options, :ibrowse, [{:inactivity_timeout, @inactivity_timeout}]) - ) - - follow_redirects = - Keyword.get( - options, - :follow_redirects, - Application.get_env(:httpotion, :default_follow_redirects, false) - ) - - ib_options = - if stream_to = Keyword.get(options, :stream_to), - do: - Keyword.put( - ib_options, - :stream_to, - spawn(__MODULE__, :transformer, [stream_to, method, url, options]) - ), - else: ib_options - - ib_options = - if user_password = Keyword.get(options, :basic_auth) do - {user, password} = user_password - Keyword.put(ib_options, :basic_auth, {to_charlist(user), to_charlist(password)}) - else - ib_options - end - - %{ - method: method, - url: url |> to_string |> process_url(options) |> to_charlist, - body: body |> process_request_body, - headers: - headers - |> process_request_headers(options) - |> Enum.map(fn {k, v} -> {to_charlist(k), to_charlist(v)} end), - timeout: timeout, - ib_options: ib_options, - follow_redirects: follow_redirects - } - end end |