Changeset 6263 for main/waeup.sirp/trunk/src/waeup

Timestamp:

2 Jun 2011, 02:46:07 (14 years ago)

Author:

uli

Message:

Extend converter and create own interface for it.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/utils/converters.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/utils/converters.py

@@ -240 +240 @@
 
 
+from zope import schema
+from zope.component import createObject
 from zope.interface import Interface
 from zope.formlib import form
@@ -248 +250 @@
 
 def getWidgetsData(widgets, form_prefix, data):
-    # from zope.formlib.form
     errors = []
     form_prefix = expandPrefix(form_prefix)
@@ -271 +272 @@
 
 
-class DefaultConverter(Converter):
+class IObjectConverter(Interface):
+    def __init__(iface):
+        """Create an converter.
+
+        `iface` denotes the interface to which we want to turn any
+        passed object.
+
+        """
+
+    def applyRowData(data_dict, context, form_fields=None):
+        """Apply data in `data_dict` to `context`.
+
+        `data_dict` is a dict containing field names as keys and an
+        object or string as `context`.
+
+        If `context` is a string, this is understood as a factory name
+        and we will try to create a proper object calling
+        ``createObject()``.
+
+        `form_fields` are by default (``None``) buildt from the given
+        `iface` but can also be passed in to override the
+        default. This might be handy if you want to omit or select
+        certains fields from the interface.
+
+        Returns a tuple ``(<ERROR_LIST, INV_ERR_LIST, OBJ>)`` where
+        ``ERROR_DICT`` is a dict of errors for single fields (if
+        happened), ``INV_ERR_LIST`` is a list of invariant errors
+        happened (errors that apply to several fields), and ``OBJ`` is
+        the created/updated object.
+        """
+
+class DefaultObjectConverter(grok.Adapter):
+    """An object converter can apply CSV data to objects.
+
+    Thus, in a way, it can turn CSV data into real objects.
+    """
 
     grok.context(Interface)
-    grok.provides(ISchemaTypeConverter)
-
-    def __init__(self, iface, form_fields=None):
+    grok.provides(IObjectConverter)
+
+    def __init__(self, iface):
         self.iface = iface
-        self.form_fields = form_fields
-        if self.form_fields is None:
-            self.form_fields = form.Fields(iface)
+        self.form_fields = form.Fields(iface)
         return
 
-    def applyRowData(self, data_dict, context):
+    def applyRowData(self, data_dict, context, form_fields=None):
+        if form_fields is None:
+            form_fields = self.form_fields
+
+        obj = context
+        if isinstance(context, basestring):
+            obj = createObject(context)
         request = TestRequest(form={})
-        #form_fields = form.Fields(self.iface)
-        form_fields = self.form_fields
         for key, val in data_dict.items():
             request.form['form.%s' % key] = val
         widgets = form.setUpWidgets(
-            form_fields, 'form', context, request)
-        #errors = form.getWidgetsData(widgets, 'form', data_dict)
+            form_fields, 'form', obj, request)
         errors = getWidgetsData(widgets, 'form', data_dict)
+        err_messages = []
         if errors:
-            err_message = []
             for key, error in errors:
-                message = error[1].args[0]
-                err_message.append((key, message))
+                message = error.args[0]
+                err_messages.append((key, message))
         invariant_errors = form.checkInvariants(form_fields, data_dict)
+        invariant_errors = [err.message for err in invariant_errors]
         if not errors and not invariant_errors:
             changed = form.applyChanges(
-                context, form_fields, data_dict)
-        return errors, invariant_errors, data_dict
+                obj, form_fields, data_dict)
+        return err_messages, invariant_errors, obj