Improve coverage.

tests/conftest.py

@@ -14,9 +14,12 @@ def handlerconfig():
                 'match': '^/bar/(?P<name>\w+)$',
                 'redirect': 'http://localhost:5555/bar/{name}'
             } , {
-                'match': '^urn:x-barbar:(?P<namespace>:\w+):(?P<id>\d+)$',
+                'match': '^urn:x-barbar:(?P<namespace>\w+):(?P<id>\d+)$',
                 'mount': False,
                 'redirect': 'http://localhost:2222/{namespace}/{id}'
+            }, {
+                'match': 'override/(?P<namespace>\w+)/(?P<id>\d+)$',
+                'redirect': 'http://localhost:2222/{namespace}/{id}'
             }
         ]
     }

tests/test_handler.py

@@ -33,6 +33,12 @@ def test_mounted_redirect(self, urihandler):
         res = urihandler.handle('http://test.urihandler.org/foobar/18', req)
         assert res == 'http://localhost:5555/foobar/18'
 
+    def test_unanchored_redirect(self, urihandler):
+        req = testing.DummyRequest()
+        req.host_url = 'http://test.urihandler.org'
+        res = urihandler.handle('http://test.urihandler.org/something/override/me/987', req)
+        assert res == 'http://localhost:2222/me/987'
+
 
 class MockRegistry:
 

urihandler/__init__.py

@@ -66,7 +66,6 @@ def main(global_config, **settings):
     config.add_directive('get_uri_handler', get_uri_handler)
     config.add_request_method(get_uri_handler, 'uri_handler', reify=True)
 
-    config.add_route('home', '/')
     config.add_route('handle', '/handle')
     config.add_route('redirect', '/{uri:.*}')
 

urihandler/handler.py

@@ -28,7 +28,7 @@ def handle(self, uri, request):
                 if u['match'].startswith('^'):
                     u['match'] = u['match'].replace('^', '^' + request.host_url)
                 else:
-                    u['match'] = request.host + '.*' + u['match']
+                    u['match'] = request.host_url + '/.*' + u['match']
             log.debug('Matching {0} to {1}.'.format(uri, u['match']))
             m = re.match(u['match'], uri)
             if m:

urihandler/views.py

@@ -1,18 +1,12 @@
 from pyramid.view import view_config
 
-from pyramid.response import Response
-
 from pyramid.httpexceptions import (
     HTTPSeeOther,
     HTTPBadRequest,
     HTTPNotFound
 )
 
 
-@view_config(route_name='home')
-def my_view(request):
-    return Response(request.host_url)
-
 @view_config(route_name='redirect')
 def redirect(request):
     uri = request.host_url + '/' + request.matchdict['uri']
@@ -21,6 +15,7 @@ def redirect(request):
         raise HTTPNotFound()
     return HTTPSeeOther(redirect)
 
+
 @view_config(route_name='handle')
 def handle(request):
     uri = request.params.get('uri', None)