Merge pull request #3 from erjanmx/error-handler

Error handler

Author: erjanmx

nambaone/bot.py

@@ -5,14 +5,11 @@
 
 
 class Bot:
-    _response = {
-        'code': 200,
-        'success': True,
-    }
 
     def __init__(self,
                  token,
                  base_url=None,
+                 error_handler=None,
                  user_follow_handler=None,
                  user_unfollow_handler=None,
                  message_new_handler=None,
@@ -25,12 +22,17 @@ def __init__(self,
 
         self.handler = EventHandler(
             self,
+            error_handler,
             user_follow_handler,
             user_unfollow_handler,
             message_new_handler,
             message_update_handler,
             chat_new_handler
         )
+        self._response = {
+            'code': 200,
+            'success': True,
+        }
 
     @property
     def response(self):
@@ -50,6 +52,7 @@ def run(self, request):
             update = getattr(self.handler, 'event_{}'.format(event))(request['data'])
             self.__call_handler(event, update)
         except Exception as e:
+            self.__call_handler('error', {'event': event, 'error': repr(e)})
             self._response['code'] = 520
 
     def __call_handler(self, event, update):

nambaone/event_handler.py

@@ -7,6 +7,7 @@
 class EventHandler:
     def __init__(self,
                  bot,
+                 error_handler,
                  user_follow_handler,
                  user_unfollow_handler,
                  message_new_handler,
@@ -15,6 +16,7 @@ def __init__(self,
 
         self.bot = bot
 
+        self.error = error_handler
         self.user_follow = user_follow_handler
         self.user_unfollow = user_unfollow_handler
         self.message_new = message_new_handler

tests/test_event_handler.py

@@ -103,6 +103,20 @@ def test_run_message_update(self):
 
         self.assertEqual(self.bot.response, self.success_response)
 
+    def test_error(self):
+        self.bot.handler.add('message_new', self.handler_mock)
+        error_handler_mock = MagicMock()
+
+        self.bot.handler.add('error', error_handler_mock)
+
+        self.bot.run({
+            'event': 'message_new',
+        })
+
+        error_handler_mock.assert_called_once_with(self.bot, {'event': 'message_new', 'error': "KeyError('data',)"})
+        self.assertEqual(self.bot.response, {'code': 520, 'success': False})
+
 
 if __name__ == '__main__':
     unittest.main()
+