Changeset 307

Timestamp:

06/24/08 15:06:38 (7 months ago)

Author:

matt

Message:

Added a Tuple type.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/formal/__init__.py (modified) (2 diffs)
• trunk/formal/converters.py (modified) (2 diffs)
• trunk/formal/types.py (modified) (3 diffs)
• trunk/setup.py (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2008-06-24  Matt Goodall <matt@pollenation.net>
+
+        Added a Tuple type. It allows the entry of multiple values using a text
+        field, splitting the text field and ensuring the tuple items are the
+        correct type.
+
-2008-04-03  Matt Goodall <matt@pollenation.net>
-

trunk/formal/__init__.py

@@ -42 +42 @@
-registerAdapter(TextInput, Integer, iformal.IWidget)
-registerAdapter(TextInput, Float, iformal.IWidget)
+registerAdapter(TextInput, Tuple, iformal.IWidget)
-registerAdapter(Checkbox, Boolean, iformal.IWidget)
-registerAdapter(DatePartsInput, Date, iformal.IWidget)
@@ -60 +61 @@
-registerAdapter(converters.NullConverter, Sequence, iformal.ISequenceConvertible)
-registerAdapter(converters.SequenceToStringConverter, Sequence, iformal.IStringConvertible)
+registerAdapter(converters.TupleToStringConverter, Tuple, iformal.IStringConvertible)
+
-try:
-    Decimal

trunk/formal/converters.py

@@ -3 +3 @@
-"""
-
+from StringIO import StringIO
+import csv
-from datetime import date, time
-try:
@@ -178 +180 @@
-
-
+class TupleToStringConverter(object):
+
+    def __init__(self, type):
+        self.type = type
+
+    def fromType(self, value):
+        if value is None:
+            return ""
+        row = [iformal.IStringConvertible(t).fromType(v) for (t,v) in
+                zip(self.type.fields, value)]
+        row = [(i or "").encode("utf-8") for i in row]
+        out = StringIO()
+        csv.writer(out, delimiter=self.type.delimiter).writerow(row)
+        return out.getvalue().decode("utf-8")
+
+    def toType(self, value):
+        if value is not None:
+            value = value.strip()
+        if not value:
+            return None
+        value = value.encode("utf-8")
+        row = csv.reader(StringIO(value), delimiter=self.type.delimiter).next()
+        row = [i.strip() for i in row]
+        row = [i.decode("utf-8") for i in row]
+        if len(row) != len(self.type.fields):
+            raise validation.FieldValidationError("Please enter %d values, separated by a %s" % (len(self.type.fields), self.type.delimiter))
+        value = [iformal.IStringConvertible(t).toType(v) for (t,v) in
+                zip(self.type.fields, row)]
+        return tuple(value)
+
+
+
-class SequenceToStringConverter(_Adapter):
-    implements( iformal.IStringConvertible)

trunk/formal/types.py

@@ -9 +9 @@
-    haveDecimal = False
-from zope.interface import implements
-
+, task
-
-from formal import iformal, validation
@@ -123 +123 @@
-
-
+class Tuple(Type):
+
+    delimeter = ","
+    fields = None
+
+    def __init__(self, **k):
+        fields = k.pop("fields", None)
+        delimiter = k.pop("delimiter", None)
+        super(Tuple, self).__init__(**k)
+        if fields is not None:
+            self.fields = fields
+        if delimiter is not None:
+            self.delimiter = delimiter
+
+    def validate(self, value):
+        if not value:
+            return super(Tuple, self).validate(None)
+        def driver():
+            for (f,v) in zip(self.fields, value):
+                yield defer.maybeDeferred(f.validate, v).addCallback(result.append)
+        # Map the items to their validated versions.
+        result = []
+        d = task.coiterate(driver())
+        # Call the super class with the result.
+        d.addCallback(lambda ignore: super(Tuple, self).validate(tuple(result)))
+        return d
+
+
-class Sequence(Type):
-
@@ -200 +228 @@
-
-__all__ = [
-
+
+
-    ]
-

trunk/setup.py

@@ -3 +3 @@
-setup(
-    name='formal',
-8
+9
-    description='HTML forms framework for Nevow',
-    author='Matt Goodall',