Issue 47 - Improve error handling on result

This commit is contained in:
Steven Bazyl authored and Bob Aman committed 2012-08-01 00:28:39 +03:00
1 parent 9e55284329
commit 1ff1a8e355
3 files changed
+70 -20

No files matched your search

+11 -20
View File
@@ -778,27 +778,18 @@ module Google
# @see Google::APIClient#execute
def execute!(*params)
result = self.execute(*params)
if result.data?
if result.data.respond_to?(:error) &&
result.data.error.respond_to?(:message)
# You're going to get a terrible error message if the response isn't
# parsed successfully as an error.
error_message = result.data.error.message
elsif result.data['error'] && result.data['error']['message']
error_message = result.data['error']['message']
end
end
if result.response.status >= 400
if result.error?
error_message = result.error_message
case result.response.status
when 400...500
exception_type = ClientError
error_message ||= "A client error has occurred."
when 500...600
exception_type = ServerError
error_message ||= "A server error has occurred."
else
exception_type = TransmissionError
error_message ||= "A transmission error has occurred."
when 400...500
exception_type = ClientError
error_message ||= "A client error has occurred."
when 500...600
exception_type = ServerError
error_message ||= "A server error has occurred."
else
exception_type = TransmissionError
error_message ||= "A transmission error has occurred."
end
raise exception_type, error_message
end
+22
View File
@@ -53,6 +53,28 @@ module Google
content_type[/^([^;]*);?.*$/, 1].strip.downcase
end
def error?
return self.response.status >= 400
end
def success?
return !self.error?
end
def error_message
if self.data?
if self.data.respond_to?(:error) &&
self.data.error.respond_to?(:message)
# You're going to get a terrible error message if the response isn't
# parsed successfully as an error.
return self.data.error.message
elsif self.data['error'] && self.data['error']['message']
return self.data['error']['message']
end
end
return self.body
end
def data?
self.media_type == 'application/json'
end