diff piecrust/serving/server.py @ 380:f33712c4cfab

routing: Fix bugs with matching URLs with correct route but missing metadata. When matching a route like `/foo/%slug%` against an URL like `/foo`, the route will (correctly) return a match, but it will be completely missing the `slug` metadata, resulting in problems elsewhere. This change makes it so that any missing route metadata will be filled in with an empty string. And because this means generated URLs may differ from the incoming URL when using trailing slashes (`/foo/` _vs._ `/foo`), we make the assert in the chef server handle those discrepancies.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 10 May 2015 00:34:21 -0700
parents aade4ea57e7f
children 3a184fbc900b
line wrap: on
line diff
--- a/piecrust/serving/server.py	Sat May 09 08:48:58 2015 -0700
+++ b/piecrust/serving/server.py	Sun May 10 00:34:21 2015 -0700
@@ -341,7 +341,7 @@
         # just don't use cached rendered segments for that page (but still
         # use them for pages that are included in it).
         uri = qp.getUri()
-        assert uri == req_path
+        assert uri.rstrip(' /') == req_path.rstrip(' /')
         entry = self._page_record.getEntry(uri, page_num)
         if (taxonomy_info is not None or entry is None or
                 entry.used_source_names):