Remove dependency on website.www_root

AspenWeb · Oct 3, 2014 · 5e6ac6d · 5e6ac6d
1 parent d2c007c
commit 5e6ac6d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/aspen/algorithms/website.py b/aspen/algorithms/website.py
@@ -68,6 +68,7 @@ def dispatch_request_to_filesystem(website, request):
                                 , pathparts=request.line.uri.path.parts
                                 , uripath=request.line.uri.path.raw
                                 , querystring=request.line.uri.querystring.raw
+                                , startdir=website.www_root
                                  )
     request.fs = result.match
     for k, v in result.wildcards.iteritems():

diff --git a/aspen/dispatcher.py b/aspen/dispatcher.py
@@ -265,7 +265,7 @@ def update_neg_type(media_type_default, capture_accept, filename):
 
 
 def dispatch(website, indices, media_type_default, pathparts, uripath, querystring,
-        pure_dispatch=False):
+        startdir, pure_dispatch=False):
     """Concretize dispatch_abstract.
     """
 
@@ -278,7 +278,6 @@ def dispatch(website, indices, media_type_default, pathparts, uripath, querystri
     traverse = os.path.join
     find_index = lambda x: match_index(indices, x)
     noext_matched = lambda x: update_neg_type(media_type_default, capture_accept, x)
-    startdir = website.www_root
 
 
     # Dispatch!

diff --git a/tests/test_dispatcher.py b/tests/test_dispatcher.py
@@ -51,23 +51,43 @@ def assert_body(harness, uripath, expected_body):
 
 def test_dispatcher_returns_a_result(harness):
     harness.fs.www.mk(('index.html', 'Greetings, program!'),)
-    result = dispatcher.dispatch(harness.client.website, ['index.html'], '', [''], '/', '')
+    result = dispatcher.dispatch( harness.client.website
+                                , ['index.html']
+                                , ''
+                                , ['']
+                                , '/'
+                                , ''
+                                , harness.fs.www.root
+                                 )
     assert result.status == dispatcher.DispatchStatus.okay
     assert result.match == os.path.join(harness.fs.www.root, 'index.html')
     assert result.wildcards == {}
     assert result.detail == 'Found.'
 
 def test_dispatcher_returns_a_result_for_favicon(harness):
-    website = harness.client.website
-    result = dispatcher.dispatch(website, [], '', ['favicon.ico'], '/favicon.ico', '')
+    result = dispatcher.dispatch( harness.client.website
+                                , []
+                                , ''
+                                , ['favicon.ico']
+                                , '/favicon.ico'
+                                , ''
+                                , harness.fs.www.root
+                                 )
     assert result.status == dispatcher.DispatchStatus.okay
     assert result.match == harness.client.website.find_ours('favicon.ico')
     assert result.wildcards == {}
     assert result.detail == 'Found.'
 
 def test_dispatcher_returns_a_result_for_autoindex(harness):
     harness.client.website.list_directories = True
-    result = dispatcher.dispatch(harness.client.website, [], '', [''], '/', '')
+    result = dispatcher.dispatch( harness.client.website
+                                , []
+                                , ''
+                                , ['']
+                                , '/'
+                                , ''
+                                , harness.fs.www.root
+                                 )
     assert result.status == dispatcher.DispatchStatus.okay
     assert result.match == harness.client.website.find_ours('autoindex.html.spt')
     assert result.wildcards == {}