Mercurial > piecrust2
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 379:d40b744a9d99 | 380:f33712c4cfab |
|---|---|
| 339 | 339 |
| 340 # See if this page is known to use sources. If that's the case, | 340 # See if this page is known to use sources. If that's the case, |
| 341 # just don't use cached rendered segments for that page (but still | 341 # just don't use cached rendered segments for that page (but still |
| 342 # use them for pages that are included in it). | 342 # use them for pages that are included in it). |
| 343 uri = qp.getUri() | 343 uri = qp.getUri() |
| 344 assert uri == req_path | 344 assert uri.rstrip(' /') == req_path.rstrip(' /') |
| 345 entry = self._page_record.getEntry(uri, page_num) | 345 entry = self._page_record.getEntry(uri, page_num) |
| 346 if (taxonomy_info is not None or entry is None or | 346 if (taxonomy_info is not None or entry is None or |
| 347 entry.used_source_names): | 347 entry.used_source_names): |
| 348 cache_key = '%s:%s' % (uri, page_num) | 348 cache_key = '%s:%s' % (uri, page_num) |
| 349 app.env.rendered_segments_repository.invalidate(cache_key) | 349 app.env.rendered_segments_repository.invalidate(cache_key) |