fresco 3.3.0__tar.gz → 3.3.1__tar.gz

{fresco-3.3.0 → fresco-3.3.1}/CHANGELOG.rst

@@ -1,9 +1,17 @@
 Changelog
 =========
 
-3.3.0 (released 2023-05-02)
+3.3.1 (released 2023-05-18)
 ---------------------------
 
+- The ``route_wsgi`` and ``route_all`` methods now only match at a
+  path separator boundary (``'/'``).
+- Bugfix: subrequest now works with views routed via ``RRoute`` (and so expect
+  an initial ``request`` argument)
+
+3.3.0
+-----
+
 - Options: fresco.options.Options can now take a list of paths as its first argument
 - Options: tags can now be specified with environment variable substitutions
   (eg "{FOO}" would load files tagged with the current value of the 'FOO'

{fresco-3.3.0/fresco.egg-info → fresco-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fresco
-Version: 3.3.0
+Version: 3.3.1
 Summary: A Web/WSGI micro-framework
 Home-page: https://ollycope.com/software/fresco/latest/
 Author: Oliver Cope

{fresco-3.3.0 → fresco-3.3.1}/fresco/__init__.py

@@ -12,7 +12,7 @@
 #     See the License for the specific language governing permissions and
 #     limitations under the License.
 #
-__version__ = "3.3.0"
+__version__ = "3.3.1"
 
 DEFAULT_CHARSET = "UTF-8"
 

{fresco-3.3.0 → fresco-3.3.1}/fresco/core.py

@@ -259,7 +259,7 @@ class FrescoApp(RouteCollection):
 
         # Is the URL just missing a trailing '/'?
         if not path or path[-1] != "/":
-            for _ in self.get_methods(request, path + "/"):
+            if self.get_methods(request, path + "/"):
                 return Response.unrestricted_redirect_permanent(path + "/")
 
         return Response.not_found()
@@ -287,7 +287,9 @@ class FrescoApp(RouteCollection):
 
         return response
 
-    def handle_http_error_response(self, request, response):
+    def handle_http_error_response(
+        self, request: Request, response: Response
+    ) -> Response:
         """
         Call any process_http_error_response handlers and return the
         (potentially modified) response object.
@@ -303,8 +305,8 @@ class FrescoApp(RouteCollection):
                 self.log_exception(request)
         return response
 
-    def get_methods(self, request, path):
-        """\
+    def get_methods(self, request: Request, path: str) -> Set[str]:
+        """
         Return the HTTP methods valid in routes to the given path
         """
         methods: Set[str] = set()

{fresco-3.3.0 → fresco-3.3.1}/fresco/routing.py

@@ -370,15 +370,15 @@ class PathConverter(StrConverter):
 
 
 class MatchAllURLsPattern(Pattern):
-    """\
-    A pattern matcher that matches all URLs starting with the given prefix. No
-    arguments are parsed from the URL.
+    """
+    A pattern matcher that matches all paths starting with the given prefix.
+    No arguments are parsed from the URL.
     """
 
     def __init__(self, path):
         self.path = path
 
-    def match(self, path):
+    def match(self, path: str) -> t.Optional[PathMatch]:
         if path.startswith(self.path):
             return PathMatch(self.path, path[len(self.path) :], (), {})
         return None
@@ -400,6 +400,32 @@ class MatchAllURLsPattern(Pattern):
         return "%s*" % (self.path,)
 
 
+class PrefixPattern(MatchAllURLsPattern):
+    """
+    A pattern matcher that matches the given prefix. The prefix will only be
+    matched at a path separator boundary.
+
+    ``PrefixPattern('/foo')`` will match the paths ``/foo`` and ``/foo/bar``,
+    but not ``/foobar``.
+
+    No arguments are parsed from the URL.
+    """
+
+    def __init__(self, path):
+        super().__init__(path)
+        if path[-1] == "/":
+            self.path_with_sep = path
+        else:
+            self.path_with_sep = f"{self.path}/"
+
+    def match(self, path: str) -> t.Optional[PathMatch]:
+        prefix = path[: len(self.path_with_sep)]
+
+        if prefix == self.path or prefix == self.path_with_sep:
+            return PathMatch(self.path, path[len(self.path) :], (), {})
+        return None
+
+
 class ExtensiblePattern(Pattern):
     """\
     An extensible URL pattern matcher.
@@ -547,10 +573,10 @@ class ExtensiblePattern(Pattern):
         """
         return eval("(lambda *args, **kwargs: (args, kwargs))(%s)" % argstr)
 
-    def match(self, path):
+    def match(self, path) -> t.Optional[PathMatch]:
         """
-        Test ``path`` and return a tuple of parsed ``(args, kwargs)``, or
-        ``None`` if there was no match.
+        Test ``path`` and return a PathMatch object or ``None`` if there was no
+        match.
         """
         mo = self.regex_match(path)
         if mo is None:
@@ -1358,13 +1384,18 @@ class RouteCollection(MutableSequence):
                     exc = self.__routed_views__[viewspec] = RouteNotFound(viewspec)
                     raise exc
 
-    def _get_routes(self, key):
+    def _get_routes(
+        self, key: Tuple[t.Optional[str], str]
+    ) -> t.Sequence[t.Tuple[Route, t.Optional[PathMatch]]]:
         method, path = key
         routes = ((r, r.match(path, method)) for r in self.__routes__)
         return [(r, t) for (r, t) in routes if t is not None]
 
     def get_route_traversals(
-        self, path: str, method: Optional[str], request: Optional[Request] = None
+        self,
+        path: str,
+        method: Optional[str],
+        request: Optional[Request] = None,
     ) -> t.Iterator[RouteTraversal]:
         """
         Generate RouteTraversals for routes matching the given path and
@@ -1604,7 +1635,7 @@ class RouteCollection(MutableSequence):
         :param path: the path prefix at which the view will be routed
         """
         return self.route(
-            MatchAllURLsPattern(path),
+            PrefixPattern(path),
             methods,
             view,
             route_class=route_class,

{fresco-3.3.0 → fresco-3.3.1}/fresco/subrequests.py

@@ -272,6 +272,7 @@ def _get_args_for_route(
     route_kwargs = {}
     route_args = list(
         chain(
+            [request] if route.provide_request else [],
             ((a(request) if isinstance(a, RouteArg) else a) for a in route.view_args),
             (
                 mutable_args.pop(0)

{fresco-3.3.0 → fresco-3.3.1}/fresco/tests/test_routing.py

@@ -1092,3 +1092,17 @@ class TestRouteCache(object):
 
         # Check a subsequent call to get_routes doesn't hang onto the exception
         list(rc.get_route_traversals("/bacon", GET))
+
+
+class TestRouteAll:
+
+    def test_route_all_matches_on_separator(self):
+        def view():
+            return Response()
+
+        app = FrescoApp()
+        app.route_all("/x", GET, view)
+
+        assert len(list(app.get_route_traversals("/x", GET))) == 1
+        assert len(list(app.get_route_traversals("/x/y", GET))) == 1
+        assert len(list(app.get_route_traversals("/xy", GET))) == 0

{fresco-3.3.0 → fresco-3.3.1/fresco.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fresco
-Version: 3.3.0
+Version: 3.3.1
 Summary: A Web/WSGI micro-framework
 Home-page: https://ollycope.com/software/fresco/latest/
 Author: Oliver Cope