Merge remote-tracking branch 'jimherz/activeresource_redirection_patch'

Closes #3302
This commit is contained in:
Jeremy Kemper
2011-10-11 20:43:14 -07:00
3 changed files with 12 additions and 3 deletions

View File

@@ -170,8 +170,8 @@ module ActiveResource
# <tt>404</tt> is just one of the HTTP error response codes that Active Resource will handle with its own exception. The
# following HTTP response codes will also result in these exceptions:
#
# * 200..399 - Valid response, no exception (other than 301, 302)
# * 301, 302 - ActiveResource::Redirection
# * 200..399 - Valid response, no exception (other than 301, 302 and 307)
# * 301, 302, 307 - ActiveResource::Redirection
# * 400 - ActiveResource::BadRequest
# * 401 - ActiveResource::UnauthorizedAccess
# * 403 - ActiveResource::ForbiddenAccess

View File

@@ -122,7 +122,7 @@ module ActiveResource
# Handles response and error codes from the remote service.
def handle_response(response)
case response.code.to_i
when 301,302
when 301,302,307
raise(Redirection.new(response))
when 200...400
response

View File

@@ -38,6 +38,15 @@ class ConnectionTest < Test::Unit::TestCase
assert_equal expected, handle_response(expected)
end
# 301 is moved permanently (redirect)
assert_response_raises ActiveResource::Redirection, 301
# 302 is found (redirect)
assert_response_raises ActiveResource::Redirection, 302
# 307 is temporary redirect
assert_response_raises ActiveResource::Redirection, 307
# 400 is a bad request (e.g. malformed URI or missing request parameter)
assert_response_raises ActiveResource::BadRequest, 400