Add options for configuring redirect handling

lib/httpoison/base.ex

@@ -131,6 +131,8 @@ defmodule HTTPoison.Base do
           or a `{Host, Proxy}` tuple
         * `:proxy_auth` - proxy authentication `{User, Password}` tuple
         * `:ssl` - SSL options supported by the `ssl` erlang module
+        * `:follow_redirect` - a boolean that causes redirects to be followed
+        * `:max_redirect` - an integer denoting the maximum number of redirects to follow
 
       Timeouts can be an integer or `:infinity`
 
@@ -365,6 +367,8 @@ defmodule HTTPoison.Base do
     proxy = Keyword.get options, :proxy
     proxy_auth = Keyword.get options, :proxy_auth
     ssl = Keyword.get options, :ssl
+    follow_redirect = Keyword.get options, :follow_redirect
+    max_redirect = Keyword.get options, :max_redirect
 
     hn_options = Keyword.get options, :hackney, []
 
@@ -373,6 +377,8 @@ defmodule HTTPoison.Base do
     if proxy, do: hn_options = [{:proxy, proxy} | hn_options]
     if proxy_auth, do: hn_options = [{:proxy_auth, proxy_auth} | hn_options]
     if ssl, do: hn_options = [{:ssl_options, ssl} | hn_options]
+    if follow_redirect, do: hn_options = [{:follow_redirect, follow_redirect} | hn_options]
+    if max_redirect, do: hn_options = [{:max_redirect, max_redirect} | hn_options]
 
     if stream_to do
       hn_options = [:async, {:stream_to, spawn(module, :transformer, [stream_to])} | hn_options]

test/httpoison_base_test.exs

@@ -131,4 +131,30 @@ defmodule HTTPoisonBaseTest do
 
     assert validate :hackney
   end
+
+  test "passing follow_redirect option" do
+    expect(:hackney, :request, [{[:post, "http://localhost", [], "body", [follow_redirect: true]],
+                                 {:ok, 200, "headers", :client}}])
+    expect(:hackney, :body, 1, {:ok, "response"})
+
+    assert HTTPoison.post!("localhost", "body", [], follow_redirect: true) ==
+    %HTTPoison.Response{ status_code: 200,
+                         headers: "headers",
+                         body: "response" }
+
+    assert validate :hackney
+  end
+
+  test "passing max_redirect option" do
+    expect(:hackney, :request, [{[:post, "http://localhost", [], "body", [max_redirect: 2]],
+                                 {:ok, 200, "headers", :client}}])
+    expect(:hackney, :body, 1, {:ok, "response"})
+
+    assert HTTPoison.post!("localhost", "body", [], max_redirect: 2) ==
+    %HTTPoison.Response{ status_code: 200,
+                         headers: "headers",
+                         body: "response" }
+
+    assert validate :hackney
+  end
 end

test/httpoison_test.exs

@@ -64,14 +64,12 @@ defmodule HTTPoisonTest do
     end
   end
 
-  test "hackney option follow redirect absolute url" do
-    hackney = [follow_redirect: true]
-    assert_response HTTPoison.get("http://localhost:8080/redirect-to?url=http%3A%2F%2Flocalhost:8080%2Fget", [], [ hackney: hackney ])
+  test "option follow redirect absolute url" do
+    assert_response HTTPoison.get("http://localhost:8080/redirect-to?url=http%3A%2F%2Flocalhost:8080%2Fget", [], [follow_redirect: true])
   end
 
-  test "hackney option follow redirect relative url" do
-    hackney = [follow_redirect: true]
-    assert_response HTTPoison.get("http://localhost:8080/relative-redirect/1", [], [ hackney: hackney ])
+  test "option follow redirect relative url" do
+    assert_response HTTPoison.get("http://localhost:8080/relative-redirect/1", [], [follow_redirect: true])
   end
 
   test "basic_auth hackney option" do