Refactored ErrorHandler Methods

Looks neater now!

Also fixed some bugs in output.

Author: bmschwartz

blockscore/http_client/__init__.py

@@ -87,7 +87,7 @@ def request(self, path, body, method, options):
 		if method != 'get':
 			kwargs = self.set_body(kwargs)
 
-		kwargs['hooks'] = dict(response=ErrorHandler.check_error)
+		kwargs['hooks'] = dict(response=ErrorHandler().check_error)
 
 		kwargs = self.auth.set(kwargs)
 
@@ -130,4 +130,4 @@ def dict_key_lower(self, dic):
 
 	# Make a function for lowercase
 	def key_lower(self, key):
-		return key.lower()
+		return key.lower()

blockscore/http_client/error_handler.py

@@ -1,73 +1,71 @@
 from ..error import BlockscoreError, AuthorizationError, \
-			InternalServerError, ValidationError, ParameterError, NotFoundError
+            InternalServerError, ValidationError, ParameterError, NotFoundError
 from .response_handler import ResponseHandler
-
+ 
 # ErrorHanlder takes care of selecting the error message from response body
 class ErrorHandler():
-
-	@staticmethod
-	def check_error(response, *args, **kwargs):
-		code = response.status_code
-		typ = response.headers.get('content-type')
-
-		# No error found
-		if (200 <= code < 300):
-			return
-
-		body = ResponseHandler.get_body(response)
-		message = ''
-		error_type = None
-		error_code = None
-		param = None
-
-		# If HTML, whole body is taken
-		if isinstance(body, str):
-			message = body
-
-		# If JSON, a particular field is taken and used
-		if typ.find('json') != -1 and isinstance(body, dict):
-
-			if 'error' in body:
-				error = body['error']
-
-				message = error['message']
-				error_type = error['type']
-
-				if 'code' in error.keys():
-					error_code = error['code']
-				if 'param' in error.keys():
-					param = error['param']
-
-			else:
-				message = 'Unable to select error message from json returned by request responsible for error'
-
-		if message == '':
-			message = 'Unable to understand the content type of response returned by request responsible for error'
-
-
-		if code == 400:
-			# Inputs could not be validated
-			if param is not None:
-				raise ValidationError(message, body, param, error_type, error_code)
-
-			# Required parameter missing
-			else:
-				raise ParameterError(message, body, error_type)
-
-		# Trying to access nonexistent endpoint
-		elif code == 404:
-			raise NotFoundError(message, body, error_type)
-
-		# Error with an API Key
-		elif code == 401:
-			raise AuthorizationError(message, body, error_type)
-		
-		# Internal API Error
-		elif code == 500:
-			raise InternalServerError(message, body, error_type)
-		
-		# Generic BlockscoreError (fallback)
-		else:
-			raise BlockscoreError(message, body)
-
-
+    def check_error(self, response, *args, **kwargs):
+        code = response.status_code
+        typ = response.headers.get('content-type')
+ 
+        # No error found
+        if (200 <= code < 300):
+            return
+        self.body = ResponseHandler.get_body(response)
+        self.message = self.get_message(self.body)
+        self.error_type = self.error_code = self.param = None
+       
+        # determines if an error is in the response's body
+        if 'error' in self.body.keys():
+            error = self.body['error']
+            self.error_type = self.get_value(error, 'type')
+            self.error_code = self.get_value(error, 'code')
+            self.param = self.get_value(error, 'param') 
+ 
+        # raises the appropriate error if necessary
+        self.process_code(code)
+ 
+    def process_code(self, code):
+ 
+        if code == 400:
+            # Inputs could not be validated
+            if self.param is not None:
+                raise ValidationError(self.message, self.body, self.param, \
+                                    self.error_type, self.error_code)
+            # Required parameter missing
+            else:
+                raise ParameterError(self.message, self.body, self.error_type)
+        # Trying to access nonexistent endpoint
+        elif code == 404:
+            raise NotFoundError(self.message, self.body, self.error_type)
+        # Error with an API Key
+        elif code == 401:
+            raise AuthorizationError(self.message, self.body, self.error_type)        
+        # Internal API Error
+        elif code == 500:
+            raise InternalServerError(self.message, self.body, self.error_type)        
+        # Generic BlockscoreError (fallback)
+        else:
+            raise BlockscoreError(self.message, self.body)
+ 
+    @staticmethod
+    def get_message(body):
+        message = ''
+        # If HTML, whole body is taken
+        if isinstance(body, str):
+            message = body
+        elif isinstance(body, dict): # body not str
+            if 'error' in body.keys():
+                message = body['error']['message']
+            else:
+                message = 'Unable to select error message from json returned by request responsible for error'
+            
+        else: # body not str or dict
+            message = 'Unable to understand the content type of response returned by request responsible for error'
+        return message
+ 
+    @staticmethod
+    def get_value(obj, key):
+        if key in obj.keys():
+            return obj[key]
+        return None