From 333bd06861e55f97dfcaeebff100657734829add Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Sun, 24 Jan 2010 08:45:35 +0000
Subject: Merge reversepolarity branch.

---
 repoze/bfg/tests/hybridapp/__init__.py    |  1 +
 repoze/bfg/tests/hybridapp/configure.zcml | 42 +++++++++++++++++++++++++++++++
 repoze/bfg/tests/hybridapp/views.py       | 13 ++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 repoze/bfg/tests/hybridapp/__init__.py
 create mode 100644 repoze/bfg/tests/hybridapp/configure.zcml
 create mode 100644 repoze/bfg/tests/hybridapp/views.py

(limited to 'repoze/bfg/tests/hybridapp')

diff --git a/repoze/bfg/tests/hybridapp/__init__.py b/repoze/bfg/tests/hybridapp/__init__.py
new file mode 100644
index 000000000..5bb534f79
--- /dev/null
+++ b/repoze/bfg/tests/hybridapp/__init__.py
@@ -0,0 +1 @@
+# package
diff --git a/repoze/bfg/tests/hybridapp/configure.zcml b/repoze/bfg/tests/hybridapp/configure.zcml
new file mode 100644
index 000000000..80e9e4fe5
--- /dev/null
+++ b/repoze/bfg/tests/hybridapp/configure.zcml
@@ -0,0 +1,42 @@
+<configure xmlns="http://namespaces.repoze.org/bfg">
+
+  <include package="repoze.bfg.includes" />
+
+  <!-- we want this view to "win" -->
+  <route
+     view=".views.route_view"
+     path="abc"
+     name="route" />
+
+  <!-- .. even though this one has a more specific context -->
+  <view
+     view=".views.global_view"
+     context="repoze.bfg.traversal.DefaultRootFactory"
+     />
+
+  <route
+     path="def"
+     name="route2"
+     />
+
+  <!-- we want this view to win for route2 even though global view with 
+       context is more specific -->
+  <view
+     route_name="route2"
+     view=".views.route2_view"
+     />
+
+  <!-- the global view should be found for this route -->
+  <route
+     path="ghi"
+     name="route3"
+     use_global_views="True"
+     />
+
+  <!-- the global view should not be found for this route -->
+  <route
+     path="jkl"
+     name="route4"
+     />
+
+</configure>
diff --git a/repoze/bfg/tests/hybridapp/views.py b/repoze/bfg/tests/hybridapp/views.py
new file mode 100644
index 000000000..06423da83
--- /dev/null
+++ b/repoze/bfg/tests/hybridapp/views.py
@@ -0,0 +1,13 @@
+from webob import Response
+
+def route_view(request):
+    """ """
+    return Response('route')
+
+def global_view(request):
+    """ """
+    return Response('global')
+
+def route2_view(request):
+    """ """
+    return Response('route2')
-- 
cgit v1.2.3