prep for 1.3a13

5 files changed, 129 insertions, 4 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 5bf4a8ef8..14e2c2b56 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.3a13 (2010-09-14)
+===================
 
 Bug Fixes
 ---------
@@ -120,6 +120,9 @@ Documentation
 
 - New interface in interfaces API documentation: ``IRoutePregenerator``.
 
+- Added a "The Matched Route" section to the URL Dispatch narrative
+  docs chapter, detailing the ``matched_route`` attribute.
+
 1.3a12 (2010-09-08)
 ===================
 
diff --git a/docs/conf.py b/docs/conf.py
index 0038c81a8..45ca785b4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -61,7 +61,7 @@ copyright = '2008-2010, Agendaless Consulting'
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.3a12'
+version = '1.3a13'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index b7c71da6a..edf954587 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -806,6 +806,20 @@ strings.  The values will be Unicode objects.
    If no route URL pattern matches, no ``matchdict`` is attached to
    the request.
 
+.. index::
+   single: matched_route
+
+The Matched Route
+~~~~~~~~~~~~~~~~~
+
+When the URL pattern associated with a particular route configuration
+is matched by a request, an object named ``matched_route`` is added as
+an attribute of the :term:`request` object.  Thus,
+``request.matched_route`` will be an object implementing the
+:class:`repoze.bfg.interfaces.IRoute` interface which matched the
+request.  The most useful attribute of the route object is ``name``,
+which is the name of the route that matched.
+
 Routing Examples
 ----------------
 
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index 06635be7a..0d75375f9 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -361,6 +361,50 @@ Minor Feature Additions
 - The ``routesalchemy`` paster template has been updated to use
   ``pattern`` in its route declarations rather than ``path``.
 
+- In support of making it easier to configure applications which are
+  "secure by default", a default permission feature was added.  If
+  supplied, the default permission is used as the permission string to
+  all view registrations which don't otherwise name a permission.
+  These APIs are in support of that:
+
+  - A new constructor argument was added to
+    :mod:`repoze.bfg.configuration.Configurator`:
+    ``default_permission``.
+
+  - A new method was added:
+    :meth:`repoze.bfg.configuration.Configurator.set_default_permission`.
+
+  - A new ZCML directive was added: :ref:`default_permission_directive`.
+
+- Add a new request API:
+  :meth:`repoze.bfg.request.Request.add_finished_callback`.  Finished
+  callbacks are called by the router unconditionally near the very end
+  of request processing.  See the :ref:`using_finished_callbacks` for
+  more information.
+
+- A ``matched_route`` attribute is now added to the :term:`request`
+  object when a route has matched.  Its value is the :term:`route`
+  object that matched (see :class:`repoze.bfg.interfaces.IRoute` for
+  the API of a route object).
+
+- The ``exception`` attribute of the :term:`request` is now set
+  slightly earlier and in a slightly different set of scenarios by the
+  router, for benefit of "finished callbacks" and "response
+  callbacks".  In previous versions, the ``exception`` attribute of
+  the request was not set at all if an exception view was not found.
+  In this version, the ``request.exception`` attribute is set
+  immediately when an exception is caught by the router, even if an
+  exception view could not be found.
+
+- The :meth:`repoze.bfg.configuration.Configurator.add_route` method
+  now accepts a ``pregenerator`` argument.  The pregenerator for the
+  resulting route is called by :func:`repoze.bfg.url.route_url` in
+  order to adjust the set of arguments passed to it by the user for
+  special purposes, such as Pylons 'subdomain' support.  It will
+  influence the URL returned by ``route_url``.  See
+  :class:`repoze.bfg.interfaces.IRoutePregenerator` for more
+  information.
+
 Backwards Incompatibilities
 ---------------------------
 
@@ -486,6 +530,19 @@ Backwards Incompatibilities
   renderer) is not a "real" response (e.g. if it does not have
   ``.status``, ``.headerlist`` and ``.app_iter`` attribtues).
 
+- The router no longer sets the value ``wsgiorg.routing_args`` into
+  the environ when a route matches. The value used to be something
+  like ``((), matchdict)``.  This functionality was only ever
+  obliquely referred to in change logs; it was never documented as an
+  API.
+
+- The ``exception`` attribute of the request now defaults to ``None``.
+  In prior versions, the ``request.exception`` attribute did not exist
+  if an exception was not raised by user code during request
+  processing; it only began existence once an exception view was
+  found.
+
+
 Deprecations and Behavior Differences
 -------------------------------------
 
@@ -522,6 +579,26 @@ Deprecations and Behavior Differences
   In general, to perform template-related functions, one should now
   use the various methods in the :mod:`repoze.bfg.renderers` module.
 
+- The ``repoze.bfg.interfaces.IWSGIApplicationCreatedEvent`` event
+  interface was renamed to
+  :class:`repoze.bfg.interfaces.IApplicationCreated`.  Likewise, the
+  ``repoze.bfg.events.WSGIApplicationCreatedEvent`` class was renamed
+  to :class:`repoze.bfg.events.ApplicationCreated`.  The older aliases
+  will continue to work indefinitely.
+
+- The ``repoze.bfg.interfaces.IAfterTraversal`` event interface was
+  renamed to :class:`repoze.bfg.interfaces.IContextFound`.  Likewise,
+  the ``repoze.bfg.events.AfterTraversal`` class was renamed to
+  :class:`repoze.bfg.events.ContextFound`.  The older aliases will
+  continue to work indefinitely.
+
+- References to the WSGI environment values ``bfg.routes.matchdict``
+  and ``bfg.routes.route`` were removed from documentation.  These
+  will stick around internally for several more releases, but it is
+  ``request.matchdict`` and ``request.matched_route`` are now the
+  "official" way to obtain the matchdict and the route object which
+  resulted in the match.
+
 Dependency Changes
 ------------------
 
@@ -629,6 +706,37 @@ Documentation Enhancements
   :mod:`repoze.bfg.interfaces` chapter to explain the API of an
   :class:`repoze.bfg.interfaces.IRoute` object.
 
+- Added documentation for the :ref:`default_permission_directive` ZCML
+  directive.
+
+- Added documentation for the ``default_permission`` parameter of the
+  :class:`repoze.bfg.configuration.Configurator` constructor and the
+  :meth:`repoze.bfg.configuration.Configurator.set_default_permission``
+  method.
+
+- Added a new section to the :ref:`security_chapter` named
+  :ref:`setting_a_default_permission`.
+
+- Document ``renderer_globals_factory`` and ``request_factory``
+  arguments to the :class:`repoze.bfg.configuration.Configurator`
+  constructor.
+
+- Added two sections to the "Hooks" chapter of the documentation:
+  :ref:`using_response_callbacks` and :ref:`using_finished_callbacks`.
+
+- Added documentation of the ``request.exception`` attribute to the
+  :class:`repoze.bfg.request.Request` API documentation.
+
+- The :ref:`router_chapter` narrative chapter has been updated to note
+  finished and response callback steps.
+
+- New interface in interfaces API documentation:
+  :class:`repoze.bfg.interfaces.IRoutePregenerator`.
+
+- Added a "The Matched Route" section to the
+  :ref:`urldispatch_chapter` narrative docs chapter, detailing the
+  ``matched_route`` attribute.
+
 Licensing Changes
 -----------------
 
diff --git a/setup.py b/setup.py
index 88d9c09d0..17db104cc 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-__version__ = '1.3a12'
+__version__ = '1.3a13'
 
 import os
 import platform