Switch test_app generation over to use py.test fixtures.

[mediagoblin.git] / mediagoblin / routing.py

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index dc22ba0947dfbf58f67ed1b17f4baef135817eb3..a650f22fbd7d10b6daf5b3bcf4849758bd12f532 100644 (file)
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -16,70 +16,27 @@
 
 import logging
 
-from werkzeug.routing import Map, Rule
-from mediagoblin.tools.common import import_component
+from mediagoblin.tools.routing import add_route, mount, url_map
 from mediagoblin.tools.pluginapi import PluginManager
+from mediagoblin.admin.routing import admin_routes
+from mediagoblin.auth.routing import auth_routes
 
 
 _log = logging.getLogger(__name__)
 
-url_map = Map()
-
-view_functions = {}
-
-
-def endpoint_to_controller(endpoint):
-    view_func = view_functions[endpoint]
-
-    _log.debug('endpoint: {0} view_func: {1}'.format(endpoint, view_func))
-
-    # import the endpoint, or if it's already a callable, call that
-    if isinstance(view_func, basestring):
-        view_func = import_component(view_func)
-        view_functions[endpoint] = view_func
-
-    return view_func
-
-
-def add_route(endpoint, url, controller):
-    """
-    Add a route to the url mapping
-    """
-    # XXX: We cannot use this, since running tests means that the plugin
-    # routes will be populated over and over over the same session.
-    #
-    # assert endpoint not in view_functions.keys(), 'Trying to overwrite a rule'
-
-    view_functions.update({endpoint: controller})
 
-    url_map.add(Rule(url, endpoint=endpoint))
-
-
-def mount(mountpoint, routes):
-    """
-    Mount a bunch of routes to this mountpoint
-    """
-    for endpoint, url, controller in routes:
-        url = "%s/%s" % (mountpoint.rstrip('/'), url.lstrip('/'))
-        add_route(endpoint, url, controller)
+def get_url_map():
+    add_route('index', '/', 'mediagoblin.views:root_view')
+    mount('/auth', auth_routes)
+    mount('/a', admin_routes)
 
+    import mediagoblin.submit.routing
+    import mediagoblin.user_pages.routing
+    import mediagoblin.edit.routing
+    import mediagoblin.webfinger.routing
+    import mediagoblin.listings.routing
 
-def get_url_map():
     for route in PluginManager().get_routes():
         add_route(*route)
 
     return url_map
-
-
-add_route('index', '/', 'mediagoblin.views:root_view')
-
-from mediagoblin.admin.routing import admin_routes
-from mediagoblin.auth.routing import auth_routes
-mount('/auth', auth_routes)
-mount('/a', admin_routes)
-
-import mediagoblin.submit.routing
-import mediagoblin.user_pages.routing
-import mediagoblin.edit.routing
-import mediagoblin.webfinger.routing
-import mediagoblin.listings.routing