Merge pull request #50 from hadpro24/develop

[DM] Redirect #22

Author: hadpro24

nimba/http/__init__.py

@@ -1,4 +1,5 @@
 from .utils import router, render, reverse
+from .utils import redirect
 from .utils import ROUTES
 
 all = [

nimba/http/utils.py

@@ -39,8 +39,28 @@
 REVERSE_ROUTE_INFO = {}
 PROJECT_MASK = 'PROJECT_MASK_PATH'
 
-def reverse(name_path:str, *args, **kwargs) -> str:
-	if not isinstance(name_path, str) or not re.match(r"^[^\d\W][\w-]*\Z", name_path):
+def reverse(name_path, *args, **kwargs):
+	"""
+		Reverse path using name or function name str
+		Example:
+			@router('/', name='home')
+			def home(request):
+				return 'welcom home'
+
+			@router('/article/<int:id>', name='article')
+			def home(request, id):
+				return 'welcom article'
+
+			@router('/about')
+			def home(request):
+				return 'welcom about'
+
+			reverse('name') ==> '/'
+			reverse('article', id=5) ==> '/article/5'
+			reverse('about') ==> '/about'
+	"""
+	if (not isinstance(name_path, str) or
+		 not re.match(r"^[^\d\W][\w-]*\Z", name_path)):
 			raise ValueError("Name path must but a valid identifier name.")
 
 	args = kwargs.get('args') or args or {}
@@ -50,7 +70,7 @@ def reverse(name_path:str, *args, **kwargs) -> str:
 	if args and kwargs:
 		raise ValueError(("You can't mix *args and **kwargs."))
 	if not isinstance(args, Iterable) or not isinstance(kwargs, dict):
-	    raise ValueError("*args or ** kwargs must be list and dict respectively")
+	    raise ValueError("*args or **kwargs must be list and dict respectively")
 
 	path, view = REVERSE_ROUTE_INFO.get(name_path) or (None, None)
 	original_path = path
@@ -83,6 +103,22 @@ def reverse(name_path:str, *args, **kwargs) -> str:
 			)
 	return path
 
+def redirect(to, partial=False):
+	"""
+		redirect http
+	"""
+	status = '302 Found' if partial else '301 Moved Permanently'
+	path = reverse(to)
+	headers = Headers()
+	headers.add_header('Location', path)
+	response = {
+		'status': status,
+		'content': [b''],
+		'headers': headers,
+	}
+	print('kkkkkkkkkkkkkkkkkkk', response)
+	return response
+
 def load_static(value):
 	return os.path.join('/staticfiles/', value)
 
@@ -204,6 +240,8 @@ def application(environ, start_response):
 							'content': content_response,
 							'headers': headers,
 						}
+					# check if redirect
+					# check if serializer
 			else:
 				response = render(*error_404(request, route, ROUTES))
 			start_response(response['status'], response['headers'].items())

nimba/test/client.py

@@ -46,9 +46,9 @@ def _run(self):
             self.host, self.port, self.app
         )
         # Don't to log
-        log_request = httpd.RequestHandlerClass.log_request
-        no_logging = lambda *args, **kwargs: None
-        httpd.RequestHandlerClass.log_request = no_logging
+        # log_request = httpd.RequestHandlerClass.log_request
+        # no_logging = lambda *args, **kwargs: None
+        # httpd.RequestHandlerClass.log_request = no_logging
 
         self.ready.set()
         while True:
@@ -60,7 +60,7 @@ def _run(self):
 
             if self.stop_read in ready:
                 os.read(self.stop_read, len(self.__stop_marker))
-                httpd.RequestHandlerClass.log_request = log_request
+                # httpd.RequestHandlerClass.log_request = log_request
                 break
 
 
@@ -121,7 +121,7 @@ def get(self, path, data=None, secure=False):
             url = path+'?'+query_string
         else:
             url = urllib.parse.quote(path)
-            
+
         url = self.base_url+url
         res = {}
         f = open(os.devnull, 'w')

tests/test_router.py

@@ -8,7 +8,7 @@
 import shutil
 from unittest.mock import patch
 
-from nimba.http import router, render, reverse
+from nimba.http import router, render, reverse, redirect
 from nimba.core.server import Application
 from nimba.core.exceptions import NoReverseFound
 
@@ -39,6 +39,18 @@ def info(request):
 def me(request):
 	return render('awesome_app/me.html')
 
+@router('/to-redirect')
+def redirect_to(request):
+	return 'Test direct'
+
+@router('/move-partial')
+def move_partial(request):
+	return redirect('redirect_to', partial=True)
+
+@router('/move', name='move')
+def move(request):
+	return redirect('redirect_to')
+
 class TestRouterRender(TestCase):
 	def setUp(self):
 		os.environ['PROJECT_MASK_PATH'] = str(pathlib.Path(
@@ -134,6 +146,16 @@ def test_reverse_with_args(self):
 		self.assertEqual(200, response['status_code'])
 		self.assertEqual(name, response['text'])
 
+	def test_redirect_partial(self):
+		response = self.get(reverse('move_partial'))
+		self.assertEqual(200, response['status_code'])
+		self.assertEqual('Test direct', response['text'])
+
+	def test_redirect_permanente(self):
+		response = self.get(reverse('move'))
+		self.assertEqual(200, response['status_code'])
+		self.assertEqual('Test direct', response['text'])
+
 	def tearDown(self):
 		try:
 			shutil.rmtree('tests/templates')