+ test_parameterized_route

Author: CreatCodeBuild

hyper2web/router.py

@@ -39,18 +39,16 @@ def match(self, path: str):
 		# todo: now the problem is how to implement it
 		# todo: pattern matching should be independent from :method,
 		# todo: but the current implementation doesn't support it. Should improve it later.
-		# GET
-		for route in self._routes['GET'].keys():
-			matched, parameters = self._match(route, path)
-			if matched:
-				return route, parameters
-
-		# POST
-		pass
+		for routes_of_this_method in self._routes.values():
+			for route in routes_of_this_method:
+				matched, parameters = self._match(route, path)
+				if matched:
+					return route, parameters
 
 	@classmethod
 	def _match(cls, route, path):
 		# todo: it seems like that regular expression is not necessary
+		# note: Could it be simpler? Could regex help?
 		route = route.split('/')
 		path = path.split('/')
 		if len(route) != len(path):
@@ -69,8 +67,11 @@ def _match(cls, route, path):
 	async def handle_route(self, http: HTTP, stream: Stream):
 		print('app.App.handle_route')
 
-		route = stream.headers[':path'].lstrip('/')
+		path = stream.headers[':path'].lstrip('/')
 		method = stream.headers[':method']
 
+		route, parameters = self.match(path)
+
 		handler = self._routes[method].get(route, self.method_default[method])
-		await handler(http, stream)
+		if handler is not None:
+			await handler(http, stream, parameters=parameters)

test/test_router.py

@@ -1,24 +1,25 @@
 import unittest
 
-from curio import run
+from curio import Kernel
 
 from hyper2web.http import Stream
 from hyper2web.router import Router
 
 
+k = Kernel()
+
 class TestRouter(unittest.TestCase):
 
-	def test_handle_existing_route_only(self):
+	def test_raise_error_on_non_existing_route(self):
 		"""If a route doesn't exist, should raise error"""
 		router = Router(None, None)
 		stream = Stream(1, {':path': 'x', ':method': 'GET'})
 
 		# should raise a more specific error in the future
 		with self.assertRaises(Exception):
 			coroutine = router.handle_route(None, stream)
-			run(coroutine)
+			k.run(coroutine)
 
-	# todo: this test has some problem
 	def test_get_existing_route(self):
 		router = Router(None, None)
 		stream = Stream(1, {':path': 'x', ':method': 'GET'})
@@ -28,7 +29,7 @@ async def f(http, stream):
 			assert stream.headers[':path'] == 'x'
 		router.get('x', f)
 		coroutine = router.handle_route(None, stream)
-		run(coroutine)
+		k.run(coroutine)
 
 	def test_post_existing_route(self):
 		router = Router(None, None)
@@ -39,7 +40,7 @@ async def f(http, stream):
 			assert stream.headers[':path'] == 'x'
 		router.post('x', f)
 		coroutine = router.handle_route(None, stream)
-		run(coroutine)
+		k.run(coroutine)
 
 	def test_match(self):
 		# match true
@@ -52,4 +53,14 @@ def test_match(self):
 		matched, parameters = Router._match('user/{userId}/name/{name}', 'user/123/nam/John')
 		self.assertFalse(matched)
 
+	def test_parameterized_route(self):
+		router = Router(None, None)
+		async def f(http, stream, parameters):
+			self.assertIsNone(http)
+			self.assertEqual(parameters['userId'], '123')
+			self.assertEqual(parameters['name'], 'John')
+		router.get('user/{userId}/name/{name}', f)
+		c = router.handle_route(None, Stream(1, {':path': 'user/123/name/John', ':method': 'GET'}))
+		k.run(c)
+
 	# will want to test with unicode