Merge pull request #2 from feliphebueno/BugCBResolver

Correção de bug monstruoso no CallbackResolverService(Router). - OK

Author: feliphebueno

rinzler/core/main_controller.py

@@ -0,0 +1,12 @@
+"""
+Rinzler's default controller for welcome page
+"""
+
+from django.views.generic import TemplateView
+
+
+class MainController(TemplateView):
+
+    @staticmethod
+    def connect(app):
+        return app

rinzler/core/route_mapping.py

@@ -2,6 +2,9 @@ class RouteMapping(object):
 
     __routes = dict()
 
+    def __init__(self):
+        self.__routes = dict()
+
     def get(self, route: str(), callback: object()):
         """
         Binds a GET route with the given callback 

rinzler/core/router.py

@@ -30,7 +30,7 @@ class Router(TemplateView):
     def __init__(self, route, controller):
         self.__route = route
         self.__callable = controller
-        self.__app['router'] = RouteMapping()
+        self.__app['router'] = object()
 
     @csrf_exempt
     def route(self, request: HttpRequest):
@@ -42,6 +42,8 @@ def route(self, request: HttpRequest):
         self.__request = request
         self.__uri = request.path[1:]
         self.__method = request.method
+        self.__app['router'] = RouteMapping()
+        self.__bound_routes = dict()
 
         routes = self.__callable().connect(self.__app)
 
@@ -107,14 +109,15 @@ def request_matches_route(self, actual_route: str(), expected_route: str()):
         actual_params = self.get_url_params(actual_route)
         i = 0
 
-        for param in expected_params:
-            if param[0] != "{":
-                if (len(actual_params) - 1) >= i:
-                    if param != actual_params[i]:
+        if len(expected_params) == len(actual_params):
+            for param in actual_params:
+                if expected_params[i][0] != "{":
+                    if param != expected_params[i]:
                         return False
-                else:
-                    return False
-            i += 1
+                i += 1
+        else:
+            return False
+
         return True
 
     def authenticate(self, bound_route, actual_params):

setup.py

@@ -23,7 +23,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.13.1',
+    version='1.14.1',
 
     description='Django-based REST API Framework',
     long_description=long_description,