Raise an error if there are too many redirects

Author: greysteil

lib/excon/connection.rb

@@ -440,7 +440,7 @@ def response(datum={})
       datum[:stack].response_call(datum)
     rescue => error
       case error
-      when Excon::Errors::HTTPStatusError, Excon::Errors::Timeout
+      when Excon::Errors::HTTPStatusError, Excon::Errors::Timeout, Excon::Errors::TooManyRedirects
         raise(error)
       else
         raise_socket_error(error)

lib/excon/error.rb

@@ -51,6 +51,7 @@ class InvalidHeaderValue < Error; end
     class Timeout < Error; end
     class ResponseParse < Error; end
     class ProxyParse < Error; end
+    class TooManyRedirects < Error; end
 
     # Base class for HTTP Error classes
     class HTTPStatus < Error

lib/excon/middlewares/redirect_follower.rb

@@ -23,13 +23,13 @@ def get_header(datum, header)
       end
 
       def response_call(datum)
-        if datum[:redirects_remaining] <= 0
-          return @stack.response_call(datum)
-        end
-
         if datum.has_key?(:response)
           case datum[:response][:status]
           when 301, 302, 303, 307, 308
+            if datum[:redirects_remaining] <= 0
+              raise Excon::Errors::TooManyRedirects
+            end
+
             datum[:redirects_remaining] -= 1
 
             uri_parser = datum[:uri_parser] || Excon.defaults[:uri_parser]

tests/middlewares/redirect_follower_tests.rb

@@ -33,18 +33,9 @@
 Shindo.tests('Excon redirector support with redirect loop') do
   env_init
 
-  tests("request(:method => :get, :path => '/old').body").returns('redirecting') do
+  tests("request(:method => :get, :path => '/old')").raises(Excon::Errors::TooManyRedirects) do
     Excon.stub(
       { :path => '/old' },
-      {
-        :headers  => { 'Location' => 'http://127.0.0.1:9292/new' },
-        :body     => 'redirecting',
-        :status   => 301
-      }
-    )
-
-    Excon.stub(
-      { :path => '/new' },
       {
         :headers  => { 'Location' => 'http://127.0.0.1:9292/old' },
         :body     => 'redirecting',
@@ -57,7 +48,7 @@
       :path         => '/old',
       :middlewares  => Excon.defaults[:middlewares] + [Excon::Middleware::RedirectFollower],
       :mock         => true
-    ).body
+    )
   end
 
   env_restore