Ticket #1587: naive_implementation.patch

turbogears/startup.py

@@ -11 +11 @@
 import pkg_resources
 import cherrypy
 from cherrypy import _cputil
-from formencode.variabledecode import NestedVariables
 from cherrypy._cpwsgi import wsgiApp, CPHTTPRequest
 from cherrypy._cpwsgiserver import CherryPyWSGIServer
 
@@ -140 +139 @@
             else:
                 raise cherrypy.NotFound(path)
 
-class NestedVariablesFilter(object):
-
-    def before_main(self):
-        if hasattr(cherrypy.request, "params"):
-            cherrypy.request.params = \
-                NestedVariables.to_python(cherrypy.request.params or {})
-
-
 def startTurboGears():
     """Handles TurboGears tasks when the CherryPy server starts.
 
@@ -187 +178 @@
     if hasattr(cherrypy, "root") and cherrypy.root:
         if not hasattr(cherrypy.root, "_cp_filters"):
             cherrypy.root._cp_filters= []
-        morefilters = [EndTransactionsFilter(),
-                       NestedVariablesFilter()]
+        morefilters = [EndTransactionsFilter()]
         if webpath:
             morefilters.insert(0, VirtualPathFilter())
         cherrypy.root._cp_filters.extend(morefilters)

turbogears/controllers.py

@@ -6 +6 @@
 from itertools import izip
 import cherrypy
 from dispatch import generic, strategy, functions
+from formencode.variabledecode import NestedVariables
 import turbogears.util as tg_util
 import turbogears
 from inspect import isclass
@@ -331 +332 @@
             "content-type: %s", template, format, allow_json, content_type)
         if not getattr(func, "exposed", False):
             def expose(func, *args, **kw):
+                kw = NestedVariables.to_python(kw)
                 cherrypy.request.tg_template_enginename = view.base._choose_engine(template)[2]
                 accept = cherrypy.request.headers.get('Accept', "").lower()
                 if not hasattr(func, "_expose"):

turbogears/tests/test_controllers.py

@@ -112 +112 @@
         "lastname": validators.String()})(save)
     save = turbogears.expose()(save)
 
+    def echo_values(self, values=[]):
+        return ', '.join(map(str, values))
+    echo_values = turbogears.validate(validators={
+        "values": formencode.ForEach(validators.Int())})(echo_values)
+    echo_values = turbogears.expose()(echo_values)
+
     class Registration(formencode.Schema):
         allow_extra_fields = True
         firstname = validators.String(min=2, not_empty=True)
@@ -382 +388 @@
         testutil.createRequest("/save2?submit=send&firstname=D&lastname=")
         assert len(cherrypy.root.errors) == 1
         assert cherrypy.root.errors.has_key("firstname")
+        
+    def test_variabledecode(self):
+        "validate decorator calls formencode.variabledecode"
+        parameters = {'values-1': '1', 'values-2': '2', 'values-3': '3'}
+        items = []
+        for key in parameters:
+            items.append(key + "=" + parameters[key])
+        query_string = "&".join(items)
+        testutil.createRequest("/echo_values?" + query_string)
+        self.assertEqual("1, 2, 3", cherrypy.response.body[0])
 
     def test_othertemplate(self):
         "'tg_html' in a returned dict will use the template specified there"