Fix multiple registration of 'init' event

Refs #211.

skygear/transmitter/common.py

@@ -61,6 +61,10 @@ def handle_exception(exc):
     return exc
 
 
+def handle_init_event(**data):
+    return get_registry().func_list()
+
+
 def encode_base64_json(data):
     """
     Encode dict-like data into a base64 encoded JSON string.
@@ -87,13 +91,6 @@ def dict_from_base64_environ(name):
 class CommonTransport:
     def __init__(self, registry=None):
         self._registry = registry or get_registry()
-        self.register_init_event()
-
-    def init_event_handler(self, **data):
-        return self._registry.func_list()
-
-    def register_init_event(self):
-        self._registry.register_event('init', self.init_event_handler)
 
     @_wrap_result
     def call_func(self, ctx, kind, name, param):
@@ -204,4 +201,6 @@ def run(self):
         raise NotImplemented()
 
 
-get_registry().register_exception_handler(Exception, handle_exception)
+_registry = get_registry()
+_registry.register_exception_handler(Exception, handle_exception)
+_registry.register_event('init', handle_init_event)

skygear/transmitter/console.py

@@ -43,9 +43,6 @@ def __init__(self, args, stdin=sys.stdin, stdout=sys.stdout,
         self.input = stdin
         self.output = stdout
 
-    def init_event_handler(self, **data):
-        return self._registry.func_list()
-
     def run(self):
         self.args = self.args
         target = self.args[0]

skygear/transmitter/tests/test_common.py

@@ -202,3 +202,12 @@ def testHandleException(self):
     def testHandleSkygearException(self):
         exc = SkygearException('Error occurred', 1, {'data': 'hello'})
         assert common.handle_exception(exc) is exc
+
+
+class TestHandleInitEvent(unittest.TestCase):
+    @patch('skygear.registry.Registry.func_list')
+    def testHandleInitEvent(self, mocker):
+        mocker.return_value = {'data': 'hello'}
+        output = common.handle_init_event(hello='world')
+        mocker.assert_called_once_with()
+        assert output == mocker.return_value

skygear/transmitter/tests/test_console.py

@@ -77,13 +77,6 @@ def testEvent(self, mocker):
         mocker.assert_called_once_with('okay', {'data': 'haha'})
         assert output == mocker.return_value
 
-    @patch('skygear.transmitter.console.ConsoleTransport.init_event_handler')
-    def testInitEvent(self, mocker):
-        mocker.return_value = {'data': 'hello'}
-        output = self.exec(['event', 'init'], {'config': {'hello': 'world'}})
-        mocker.assert_called_once_with(config={'hello': 'world'})
-        assert output.get('result') == mocker.return_value
-
     @patch('skygear.transmitter.console.ConsoleTransport.call_func')
     def testHook(self, mocker):
         mocker.return_value = {}

skygear/transmitter/tests/test_http.py

@@ -87,26 +87,6 @@ def testEvent(self, mocker):
         assert resp.status_code == 200
         mocker.assert_called_once_with('funny', ANY)
 
-    @patch('skygear.transmitter.http.HttpTransport.init_event_handler')
-    def testInitEvent(self, mocker):
-        mocker.return_value = {'data': 'hello'}
-        data = {
-            'kind': 'event',
-            'name': 'init',
-            'param': {
-                'config': {'hello': 'world'}
-            }
-        }
-        transport = HttpTransport('127.0.0.1:8888', Registry())
-        client = self.get_client(transport.dispatch)
-        resp = client.post('/', data=json.dumps(data))
-
-        assert resp.status_code == 200
-        mocker.assert_called_once_with(config={'hello': 'world'})
-
-        resp_data = json.loads(resp.get_data(as_text=True))
-        assert resp_data.get('result') == mocker.return_value
-
     @patch('skygear.transmitter.http.HttpTransport.call_func')
     def testHook(self, mocker):
         mocker.return_value = {}