# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1420350865 28800
# Node ID d47d9493bb0a573e49204dcc1274c67f04567bf3
# Parent  7aa5f7880f71472bf6d40eef49065f870b3e14ef
routes: When matching URIs, return metadata directly instead of the match object.

diff -r 7aa5f7880f71 -r d47d9493bb0a piecrust/routing.py
--- a/piecrust/routing.py	Sat Jan 03 21:31:38 2015 -0800
+++ b/piecrust/routing.py	Sat Jan 03 21:54:25 2015 -0800
@@ -76,11 +76,11 @@
     def matchUri(self, uri):
         m = self.uri_re.match(uri)
         if m:
-            return m
+            return m.groupdict()
         if self.uri_re_no_path:
             m = self.uri_re_no_path.match(uri)
             if m:
-                return m
+                return m.groupdict()
         return None
 
     def getUri(self, source_metadata, provider=None):
diff -r 7aa5f7880f71 -r d47d9493bb0a piecrust/serving.py
--- a/piecrust/serving.py	Sat Jan 03 21:31:38 2015 -0800
+++ b/piecrust/serving.py	Sat Jan 03 21:54:25 2015 -0800
@@ -418,9 +418,8 @@
     uri = uri.lstrip('/')
     res = []
     for route in routes:
-        m = route.matchUri(uri)
-        if m:
-            metadata = m.groupdict()
+        metadata = route.matchUri(uri)
+        if metadata:
             res.append((route, metadata))
     return res
 
diff -r 7aa5f7880f71 -r d47d9493bb0a tests/test_serving.py
--- a/tests/test_serving.py	Sat Jan 03 21:31:38 2015 -0800
+++ b/tests/test_serving.py	Sat Jan 03 21:54:25 2015 -0800
@@ -22,7 +22,7 @@
         m.source_name = rs['src']
         m.source_realm = rs.setdefault('realm', REALM_USER)
         m.uri_re = re.compile(rs['pat'])
-        m.matchUri = lambda u: m.uri_re.match(u)
+        m.matchUri = lambda u: m.uri_re.match(u).groupdict()
         routes.append(m)
     matching = find_routes(routes, uri)