- The interface for ``repoze.bfg.interfaces.ITraverser`` and the

  built-in implementations that implement the interface
  (``repoze.bfg.traversal.ModelGraphTraverser``, and
  ``repoze.bfg.urldispatch.RoutesModelTraverser``) now expect the
  ``__call__`` method of an ITraverser to return 3 additional
  arguments: ``traversed``, ``virtual_root``, and
  ``virtual_root_path`` (the old contract was that the ``__call__``
  method of an ITraverser returned; three arguments, the contract new
  is that it returns six).  ``traversed`` will be a sequence of
  Unicode names that were traversed (including the virtual root path,
  if any) or ``None`` if no traversal was performed, ``virtual_root``
  will be a model object representing the virtual root (or the
  physical root if traversal was not performed), and
  ``virtual_root_path`` will be a sequence representing the virtual
  root path (a sequence of Unicode names) or ``None`` if traversal was
  not performed.

  Six arguments are now returned from BFG ITraversers.  They are
  returned in this order: ``context``, ``view_name``, ``subpath``,
  ``traversed``, ``virtual_root``, and ``virtual_root_path``.

  Places in the BFG code which called an ITraverser continue to accept
  a 3-argument return value, although BFG will generate and log a
  warning when one is encountered.

- The request object now has the following attributes: ``traversed``
  (the sequence of names traversed or ``None`` if traversal was not
  performed), ``virtual_root`` (the model object representing the
  virtual root, including the virtual root path if any), and
  ``virtual_root_path`` (the seuquence of names representing the
  virtual root path or ``None`` if traversal was not performed).

- A new decorator named ``wsgiapp2`` was added to the
  ``repoze.bfg.wsgi`` module.  This decorator performs the same
  function as ``repoze.bfg.wsgi.wsgiapp`` except it fixes up the
  ``SCRIPT_NAME``, and ``PATH_INFO`` environment values before
  invoking the WSGI subapplication.

- The ``repoze.bfg.testing.DummyRequest`` object now has default
  attributes for ``traversed``, ``virtual_root``, and
  ``virtual_root_path``.

- The RoutesModelTraverser now behaves more like the Routes
  "RoutesMiddleware" object when an element in the match dict is named
  ``path_info`` (usually when there's a pattern like
  ``http://foo/*path_info``).  When this is the case, the
  ``PATH_INFO`` environment variable is set to the value in the match
  dict, and the ``SCRIPT_NAME`` is appended to with the prefix of the
  original ``PATH_INFO`` not including the value of the new variable.

- The notfound debug now shows the traversed path, the virtual root,
  and the virtual root path too.

1 files changed, 22 insertions, 6 deletions

diff --git a/repoze/bfg/urldispatch.py b/repoze/bfg/urldispatch.py
index 03b73d6c6..96650f9a5 100644
--- a/repoze/bfg/urldispatch.py
+++ b/repoze/bfg/urldispatch.py
@@ -1,3 +1,5 @@
+import re
+
 from zope.interface import implements
 from zope.interface import alsoProvides
 
@@ -210,26 +212,40 @@ class RoutesModelTraverser(object):
         # compatibility
         try:
             # 0.6.5 +
-            routing_args = environ['wsgiorg.routing_args'][1]
+            match = environ['wsgiorg.routing_args'][1]
         except KeyError:
             # <= 0.6.4
-            routing_args = self.context.__dict__
+            match = self.context.__dict__
         try:
-            view_name = routing_args['view_name']
+            view_name = match['view_name']
         except KeyError:
             # b/w compat < 0.6.3
             try:
-                view_name = routing_args['controller']
+                view_name = match['controller']
             except KeyError:
                 view_name = ''
         try:
-            subpath = routing_args['subpath']
+            subpath = match['subpath']
             subpath = filter(None, subpath.split('/'))
         except KeyError:
             # b/w compat < 0.6.5
             subpath = []
 
-        return self.context, view_name, subpath
+        if 'path_info' in match:
+            # this is stolen from routes.middleware; if the route map
+            # has a *path_info capture, use it to influence the path
+            # info and script_name of the generated environment
+            oldpath = environ['PATH_INFO']
+            newpath = match['path_info'] or ''
+            environ['PATH_INFO'] = newpath
+            if not environ['PATH_INFO'].startswith('/'):
+                environ['PATH_INFO'] = '/' + environ['PATH_INFO']
+            pattern = r'^(.*?)/' + re.escape(newpath) + '$'
+            environ['SCRIPT_NAME'] += re.sub(pattern, r'\1', oldpath)
+            if environ['SCRIPT_NAME'].endswith('/'):
+                environ['SCRIPT_NAME'] = environ['SCRIPT_NAME'][:-1]
+
+        return self.context, view_name, subpath, None, self.context, None
 
 class RoutesContextURL(object):
     """ The IContextURL adapter used to generate URLs for a context