Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions lib/httpoison/base.ex
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,11 @@ defmodule HTTPoison.Base do
@spec request(atom, binary, body, headers, Keyword.t) :: {:ok, Response.t | AsyncResponse.t}
| {:error, Error.t}
def request(method, url, body \\ "", headers \\ [], options \\ []) do
if Keyword.has_key?(options, :params) do
url = url <> "?" <> URI.encode_query(options[:params])
end
url = process_url(to_string(url))
url =
url
|> to_string()
|> HTTPoison.Base.append_query(options[:params])
|> process_url()
body = process_request_body(body)
headers = process_request_headers(headers)
HTTPoison.Base.request(__MODULE__, method, url, body, headers, options, &process_status_code/1, &process_headers/1, &process_response_body/1)
Expand Down Expand Up @@ -362,6 +363,15 @@ defmodule HTTPoison.Base do
end
end

@doc false
def append_query(url, nil), do: url
def append_query(url, query) when is_binary(query) do
url <> "?" <> query
end
def append_query(url, query) do
append_query(url, URI.encode_query(query))
end

defp build_hackney_options(module, options) do
timeout = Keyword.get options, :timeout
recv_timeout = Keyword.get options, :recv_timeout
Expand Down
10 changes: 10 additions & 0 deletions test/httpoison_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ defmodule HTTPoisonTest do
end
end

test "get with serialized params" do
resp = HTTPoison.get("localhost:8080/get", [], params: URI.encode_query(%{foo: "bar", baz: "bong"}))
assert_response resp, fn(response) ->
args = JSX.decode!(response.body)["args"]
assert args["foo"] == "bar"
assert args["baz"] == "bong"
assert (args |> Map.keys |> length) == 2
end
end

test "head" do
assert_response HTTPoison.head("localhost:8080/get"), fn(response) ->
assert response.body == ""
Expand Down