Changeset 5311

Timestamp:

08/30/08 11:06:39 (4 months ago)

Author:

chrisz

Message:

Make paginate work with tg.strict_parameters=False (#1889).

Files:

• branches/1.0/turbogears/controllers.py (modified) (1 diff)
• branches/1.0/turbogears/paginate.py (modified) (2 diffs)
• branches/1.0/turbogears/tests/test_paginate.py (modified) (5 diffs)

branches/1.0/turbogears/controllers.py

@@ -395 +395 @@
-            + config.get("tg.ignore_parameters", []))
-    else:
+        # get special parameters used by upstream decorators like paginate
+        try:
+            tg_kw = dict([(k, v) for k, v in kw.items() if k in func._tg_args])
+        except AttributeError:
+            tg_kw = {}
+        # remove excessive parameters
-        args, kw = tg_util.adapt_call(func, args, kw)
+        # add special parameters again
+        kw.update(tg_kw)
-    if config.get('server.environment', 'development') == 'development':
-        # Only output this in development mode: If it's a field storage object,

branches/1.0/turbogears/paginate.py

@@ -113 +113 @@
-    def entangle(func):
-
+        get = turbogears.config.get
+
-        def decorated(func, *args, **kw):
-
-            get = turbogears.config.get
-
-            def kwpop(name, default=None):
@@ -299 +299 @@
-
-            return output
+        if not get('tg.strict_parameters', False):
+            # add hint that paginate parameters shall be left intact
+            try:
+                args = func._tg_args
+            except AttributeError:
+                args = set()
+            for arg in 'no', 'limit', 'order', 'ordering':
+                args.add(var_name + '_tgp_' + arg)
+                args.add('tg_paginate_' + arg)
+            func._tg_args = args
-        return decorated
-    return weak_signature_decorator(entangle)

branches/1.0/turbogears/tests/test_paginate.py

@@ -25 +25 @@
-    query_methods.remove('SR')
-
-
-
+
-
-# sqlalchemy setup
@@ -270 +269 @@
-        create_request(url)
-        self.body = cherrypy.response.body[0]
+        self.status = cherrypy.response.status
-        if "fail: " in self.body:
-            print self.body
@@ -469 +469 @@
-        Spy.assert_ok(self.body, 'pages', xrange(4, 8))
-
+    def test_strict_parameters(self):
+        config.update({'tg.strict_parameters': True})
+        try:
+            self.request("/basic?tg_paginate_no=2")
+            assert self.status.startswith('200')
+            assert '"data": [4, 5, 6, 7]' in self.body
+            Spy.assert_ok(self.body, 'current_page', 2)
+            self.request("/basic?data_tgp_no=2")
+            assert self.status.startswith('200')
+            assert '"data": [4, 5, 6, 7]' in self.body
+            Spy.assert_ok(self.body, 'current_page', 2)
+            self.request('/custom_limit?tg_paginate_limit=2')
+            assert self.status.startswith('200')
+            assert '"data": [0, 1]' in self.body
+            Spy.assert_ok(self.body, 'limit', 2)
+            self.request('/custom_limit?data_tgp_limit=2')
+            assert self.status.startswith('200')
+            assert '"data": [0, 1]' in self.body
+            Spy.assert_ok(self.body, 'limit', 2)
+            self.request("/default_max_pages?data_tgp_no=5")
+            assert self.status.startswith('200')
+            assert '"data": [40, 41, 42, ' in self.body
+            Spy.assert_ok(self.body, 'pages', xrange(3, 8))
+            self.request("/default_max_pages?tg_paginate_no=5")
+            assert self.status.startswith('200')
+            assert '"data": [40, 41, 42, ' in self.body
+            Spy.assert_ok(self.body, 'pages', xrange(3, 8))
+            self.request("/basic?data_tgp_rubbish=2")
+            assert self.status.startswith('500')
+            assert ("basic() got an unexpected keyword argument"
+                " 'data_tgp_rubbish'") in self.body
+            self.request("/basic?tg_paginate_rubbish=2")
+            assert self.status.startswith('500')
+            assert ("basic() got an unexpected keyword argument"
+                " 'tg_paginate_rubbish'") in self.body
+        finally:
+            config.update({'tg.strict_parameters': False})
+
-    def test_invalid_dynamic_limit(self):
-        self.request("/invalid_dynamic")
-cherrypy.response
+self
-        assert 'paginate: dynamic_limit (foobar) not found in output dict' in self.body
-
@@ -851 +889 @@
-                Spy.assert_ok(self.body, 'ordering', ['street'])
-
+    def test_strict_parameters(self):
+        config.update({'tg.strict_parameters': True})
+        try:
+            self.request("/basic1?method=Q&data_tgp_ordering=street")
+            assert self.status.startswith('200')
+            self.assert_order(16, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+            Spy.assert_ok(self.body, 'ordering', ['street'])
+            self.request("/basic1?method=Q&tg_paginate_ordering=street")
+            self.assert_order(16, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+            Spy.assert_ok(self.body, 'ordering', ['street'])
+        finally:
+            config.update({'tg.strict_parameters': False})
+
-    def test_default_reversed(self):
-        for test in "reversed1", "reversed2", "reversed3":
@@ -871 +922 @@
-        for method in query_methods:
-            self.request("/wrong_reversed?method=%s" % method)
-cherrypy.response
+self
-            assert ('paginate: default_reversed (deprecated) only allowed'
-                ' when default_order is a basestring') in self.body