From 3890cc103b283f6d82292d94e455b6b47f515b12 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <massimo.dipierro@gmail.com>
Date: Tue, 6 Dec 2011 17:01:43 -0600
Subject: [PATCH] now new router passes all tests, thanks Jonathan

---
 VERSION                    |  2 +-
 gluon/tests/test_router.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index a51f0ee3..a90da4d4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.3 (2011-12-06 16:59:36) dev
+Version 1.99.3 (2011-12-06 17:01:38) dev
diff --git a/gluon/tests/test_router.py b/gluon/tests/test_router.py
index 9d8933df..f0ef0951 100644
--- a/gluon/tests/test_router.py
+++ b/gluon/tests/test_router.py
@@ -45,12 +45,15 @@ def setUpModule():
         for ctr in ('ajax_examples', 'appadmin', 'default', 'global', 'spreadsheet'):
             open(abspath('applications', 'examples', 'controllers', '%s.py' % ctr), 'w').close()
         #  applications/welcome/controllers/*.py
-        for ctr in ('appadmin', 'default'):
+        #  (include controller that collides with another app)
+        for ctr in ('appadmin', 'default', 'other', 'admin'):
             open(abspath('applications', 'welcome', 'controllers', '%s.py' % ctr), 'w').close()
+
         #  create an app-specific routes.py for examples app
         routes = open(abspath('applications', 'examples', 'routes.py'), 'w')
         routes.write("routers=dict(examples=dict(default_function='exdef'))")
         routes.close()
+        
         #  create language files for examples app
         for lang in ('en', 'it'):
             os.mkdir(abspath('applications', 'examples', 'static', lang))
@@ -360,6 +363,29 @@ class TestRouter(unittest.TestCase):
         except AttributeError:
             pass
 
+    def test_router_domains_fs(self):
+        '''
+        Test URLs that map domains using test filesystem layout
+        '''
+        routers = dict(
+            BASE = dict(
+                domains = {
+                    "domain1.com" : "admin",
+                    "domain2.com" : "welcome",
+                },
+            ),
+        )
+
+        load(rdict=routers)
+        self.assertEqual(filter_url('http://domain1.com'), '/admin/default/index')
+        self.assertEqual(filter_url('http://domain2.com'), '/welcome/default/index')
+        self.assertEqual(filter_url('http://domain1.com/gae'), '/admin/gae/index')
+        self.assertEqual(filter_url('http://domain2.com/other'), '/welcome/other/index')
+        self.assertEqual(filter_url('http://domain1.com/gae/f1'), '/admin/gae/f1')
+        self.assertEqual(filter_url('http://domain2.com/f2'), '/welcome/default/f2')
+        self.assertEqual(filter_url('http://domain2.com/other/f3'), '/welcome/other/f3')
+
+        
     def test_router_domains(self):
         '''
         Test URLs that map domains