diff options
| author | Aleksey Lim <alsroot@sugarlabs.org> | 2012-01-10 06:55:43 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2012-01-10 06:55:43 (GMT) |
| commit | ee13179ca21681619572860791f209ede304795c (patch) | |
| tree | b6eff6a818f121e13e9b2c20be496bd62790b69f | |
| parent | 7d991afe7a2f37202130a931c2780692db509274 (diff) | |
Reflect on recent active-document changes
| -rw-r--r-- | restful_document/document.py | 5 | ||||
| -rw-r--r-- | restful_document/metadata.py | 1 | ||||
| -rw-r--r-- | restful_document/router.py | 3 | ||||
| -rw-r--r-- | tests/__init__.py | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/restful_document/document.py b/restful_document/document.py index c2424f0..395b69e 100644 --- a/restful_document/document.py +++ b/restful_document/document.py @@ -48,11 +48,10 @@ class Document(ad.Document): query = env.pop_str('query', kwargs, None) reply = env.pop_list('reply', kwargs, None) order_by = env.pop_list('order_by', kwargs, None) - group_by = env.pop_str('group_by', kwargs, None) documents, total = cls.find(offset, limit, kwargs, query, reply, - order_by, group_by) - return {'total': total, + order_by) + return {'total': total.value, 'documents': [i.all_properties(reply) for i in documents]} @restful_method(method='PUT') diff --git a/restful_document/metadata.py b/restful_document/metadata.py index d2e358c..5791aab 100644 --- a/restful_document/metadata.py +++ b/restful_document/metadata.py @@ -94,7 +94,6 @@ class _ObjectMethod(Method): def _list_methods(classes): for cls in classes: - cls.init() for attr in [getattr(cls, i) for i in dir(cls)]: if not hasattr(attr, 'is_restful_method'): continue diff --git a/restful_document/router.py b/restful_document/router.py index b87332c..e361736 100644 --- a/restful_document/router.py +++ b/restful_document/router.py @@ -18,6 +18,8 @@ import types import urlparse from gettext import gettext as _ +import active_document as ad + from restful_document import util, env from restful_document.metadata import Metadata from restful_document.util import enforce @@ -26,6 +28,7 @@ from restful_document.util import enforce class Router(object): def __init__(self, classes): + ad.init(classes) self.metadata = Metadata(classes) def __call__(self, environ, start_response): diff --git a/tests/__init__.py b/tests/__init__.py index 8cebfa5..292590b 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -64,14 +64,12 @@ class Test(unittest.TestCase): _env.index_flush_timeout.value = 0 _env.index_flush_threshold.value = 1 _env.find_limit.value = 1024 - _env.index_pool.value = 0 _env.index_write_queue.value = 0 _env.LAYOUT_VERSION = 1 ad.data_root.value = tmpdir + '/db' ad.index_flush_timeout.value = 0 ad.index_flush_threshold.value = 0 - ad.index_pool.value = 0 def tearDown(self): while Test.httpd_pids: |