add add_middleware helper

example_uvloop.py

@@ -29,4 +29,4 @@ async def app(scope, receive, send):
     })
 
 if __name__ == '__main__':
-    tremolo.run(app, host='0.0.0.0', port=8000, debug=True)
+    tremolo.run(app, host='0.0.0.0', port=8000, debug=True, reload=True)

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='tremolo',
-    version='0.0.302',
+    version='0.0.303',
     license='MIT',
     author='nggit',
     author_email='[email protected]',

tests/test_tremolo_objects.py

@@ -118,6 +118,10 @@ def test_middleware(self):
             self.assertEqual(func(), b'Halt!')
             self.assertEqual(options, {})
 
+    def test_invalidmiddleware(self):
+        with self.assertRaises(ValueError):
+            app.add_middleware(middlewares.on_request, 'invalid')
+
     @function
     async def test_handler(self):
         for handler in app.routes[1]:

tremolo/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.302'
+__version__ = '0.0.303'
 
 from .tremolo import Tremolo  # noqa: E402
 from . import exceptions  # noqa: E402,F401

tremolo/tremolo.py

@@ -83,7 +83,7 @@
             def wrapper(**kwargs):
                 return func(**kwargs)
 
-            self.add_route(path, wrapper, self.getoptions(func))
+            self.add_route(wrapper, path, self.getoptions(func))
             return wrapper
 
         return decorator
@@ -134,7 +134,7 @@
             def wrapper(**kwargs):
                 return func(**kwargs)
 
-            self.middlewares[name].append((wrapper, self.getoptions(func)))
+            self.add_middleware(wrapper, name, self.getoptions(func))
             return wrapper
 
         return decorator
@@ -176,7 +176,17 @@
 
         return options
 
-    def add_route(self, path, func, kwargs={}):
+    def add_middleware(self, func, name='request', kwargs={}):
+        if name not in self.middlewares:
+            raise ValueError('%s is not one of the: %s' %
+                             (name, ', '.join(self.middlewares)))
+
+        self.middlewares[name].append((func, kwargs or self.getoptions(func)))
+
+    def add_route(self, func, path='/', kwargs={}):
+        if not kwargs:
+            kwargs = self.getoptions(func)
+
         if path.startswith('^') or path.endswith('$'):
             pattern = path.encode('latin-1')
             self.routes[-1].append((pattern, func, kwargs))
@@ -281,7 +291,7 @@
             module_name = os.path.splitext(base_name)[0]
 
             if options['app_dir'] == '':
                 options['app_dir'] = os.getcwd()
 
             sys.path.insert(0, options['app_dir'])
 
@@ -397,10 +407,10 @@
                                         break
                                 else:
                                     if not os.path.exists(module.__file__):
                                         if module in modules:
                                             del modules[module]
 
                                         continue
 
                                     _sign = file_signature(module.__file__)
 
@@ -444,17 +454,17 @@
                         context=context,
                         loop=self._loop,
                         logger=self._logger)):
                     break
         else:
             lifespan.shutdown()
             exc = await lifespan.exception()
 
             if exc:
                 self._logger.error(exc)
 
     async def _stop(self, task):
         await task
         self._loop.stop()
 
     def _worker(self, host, port, **kwargs):
         self._logger = logging.getLogger(mp.current_process().name)
@@ -477,16 +487,16 @@
         try:
             self._loop.run_until_complete(task)
         except KeyboardInterrupt:
             self._logger.info('Shutting down')
             self._loop.create_task(self._stop(task))
             self._loop.run_forever()
         finally:
             try:
                 exc = task.exception()
 
                 # to avoid None, SystemExit, etc. for being printed
                 if isinstance(exc, Exception):
                     self._logger.error(exc)
             finally:
                 self._loop.close()
 
@@ -545,7 +555,7 @@
             if sock.family.name == 'AF_UNIX':
                 os.unlink(sock.getsockname())
         except FileNotFoundError:
             pass
         except OSError:
             sock.close()
 
@@ -575,7 +585,7 @@
                     if getattr(__main__, attr_name) == kwargs['app']:
                         break
                 else:
                     attr_name = 'app'
 
                 kwargs['app'] = '%s:%s' % (__main__.__file__, attr_name)
 
@@ -616,7 +626,7 @@
             self.listen(port, host=host, **kwargs)
 
         if worker_num < 1:
             raise ValueError('worker_num must be greater than 0')
 
         try:
             worker_num = min(worker_num, len(os.sched_getaffinity(0)))
@@ -712,12 +722,12 @@
                                     if isinstance(attr, self.__class__):
                                         self.__dict__.update(attr.__dict__)
                         else:
                             print('A worker process died. Restarting...')
 
                         if p.exitcode != 0 or hasattr(socks[args], 'share'):
                             # renew socket
                             # this is a workaround, especially on Windows
                             socks[args] = self.create_sock(
                                 *args, options['reuse_port']
                             )
 
@@ -738,7 +748,7 @@
                         child_pid = parent_conn.recv()
 
                         if hasattr(socks[args], 'share'):
                             parent_conn.send(socks[args].share(child_pid))
                         else:
                             parent_conn.send(socks[args].fileno())
 
@@ -752,8 +762,8 @@
 
                             parent_conn.recv()
                             parent_conn.send(len(processes))
                         except BrokenPipeError:
                             break
 
                     time.sleep(1)
             except KeyboardInterrupt:

websocket_chat.py

@@ -80,5 +80,5 @@ async def ws_handler(websocket=None, request=None, stream=False, **_):
     """
 
 if __name__ == '__main__':
-    # don't forget to disable debug on production!
-    app.run('0.0.0.0', 8000, debug=True)
+    # don't forget to disable debug and reload on production!
+    app.run('0.0.0.0', 8000, debug=True, reload=True)