diff options
Diffstat (limited to 'pecan')
| -rw-r--r-- | pecan/rest.py | 6 | ||||
| -rw-r--r-- | pecan/tests/test_rest.py | 43 |
2 files changed, 49 insertions, 0 deletions
diff --git a/pecan/rest.py b/pecan/rest.py index 881de79..db955c5 100644 --- a/pecan/rest.py +++ b/pecan/rest.py @@ -176,6 +176,12 @@ class RestController(object): if not remainder or remainder == ['']: controller = self._find_controller('get_all', 'get') if controller: + argspec = getargspec(controller) + fixed_args = len(argspec.args[1:]) - len( + request.pecan.get('routing_args', []) + ) + if len(remainder) < fixed_args: + abort(404) return controller, [] abort(404) diff --git a/pecan/tests/test_rest.py b/pecan/tests/test_rest.py index ab088f2..7e1e8b6 100644 --- a/pecan/tests/test_rest.py +++ b/pecan/tests/test_rest.py @@ -741,6 +741,49 @@ class TestRestController(PecanTestCase): r = app.request('/things', method='RESET', status=404) assert r.status_int == 404 + def test_nested_rest_with_missing_intermediate_id(self): + + class BarsController(RestController): + + data = [['zero-zero', 'zero-one'], ['one-zero', 'one-one']] + + @expose('json') + def get_all(self, foo_id): + return dict(items=self.data[int(foo_id)]) + + class FoosController(RestController): + + data = ['zero', 'one'] + + bars = BarsController() + + @expose() + def get_one(self, id): + return self.data[int(id)] + + @expose('json') + def get_all(self): + return dict(items=self.data) + + class RootController(object): + foos = FoosController() + + # create the app + app = TestApp(make_app(RootController())) + + # test get_all + r = app.get('/foos') + assert r.status_int == 200 + assert r.body == b_(dumps(dict(items=FoosController.data))) + + # test nested get_all + r = app.get('/foos/1/bars') + assert r.status_int == 200 + assert r.body == b_(dumps(dict(items=BarsController.data[1]))) + + r = app.get('/foos/bars', expect_errors=True) + assert r.status_int == 404 + def test_custom_with_trailing_slash(self): class CustomController(RestController): |