Changeset 239

Timestamp:

07/05/06 09:53:11 (3 years ago)

Author:

matt

Message:

Move the Component and ComponentWidget? classes to correct/better modules.

Files:

• branches/composite/formal/__init__.py (modified) (2 diffs)
• branches/composite/formal/examples/composite.py (modified) (3 diffs)
• branches/composite/formal/test/test_types.py (modified) (9 diffs)
• branches/composite/formal/types.py (modified) (1 diff)
• branches/composite/formal/widgets/composite.py (added)

branches/composite/formal/__init__.py

@@ -12 +12 @@
-from formal.validation import *
-from formal.widget import *
+from formal.widgets.composite import *
-from formal.widgets.restwidget import *
-from formal.widgets.multiselect import *
@@ -45 +46 @@
-registerAdapter(TextInput, Time, iformal.IWidget)
-registerAdapter(FileUploadRaw, File, iformal.IWidget)
+registerAdapter(CompositeWidget, Composite, iformal.IWidget)
-registerAdapter(SequenceKeyLabelAdapter, tuple, iformal.IKey)
-registerAdapter(SequenceKeyLabelAdapter, tuple, iformal.ILabel)

branches/composite/formal/examples/composite.py

@@ -1 @@
-
-
-
-
+
-from formal.examples import main
-
-
-
-#####
-# TODO:
-#
-#  * composition labels, and position (?)
-#  * composition widgets
-#  * composition errors (?)
-#  * composition description (?)
-#  * Validate XHTML
-#
-
-
-
-class Composite(formal.types.Type):
-
-    def __init__(self, composition, *a, **k):
-        super(Composite, self).__init__(*a, **k)
-        self.composition = composition
-
-
-    def validate(self, value):
-
-        # Check we have the correct number of values, otherwise the final value
-        # could be completely wrong because we're relying on zip to build the
-        # dict.
-        if len(value) != len(self.composition):
-            raise ValueError("Incorrect number of values to validate")
-
-        # If nothing has been entered then we'll have a sequence of None
-        # instances, in which case my value if None (not a sequence). If there
-        # is anything other than None in the sequence then pass validation on to
-        # the composite types.
-        if not filter(None, value):
-            value = None
-        else:
-            value = dict([
-                    (name, type.validate(value))
-                    for (name, type), value in zip(self.composition, value)])
-
-        # Allow normal validation to run on the new value
-        return super(Composite, self).validate(value)
-
-
-
-class CompositeWidget(object):
-    implements(formal.iformal.IWidget)
-
-
-    labels = None
-    widgetFactories = None
-
-
-    def __init__(self, composite, labels=None, widgetFactories=None):
-        self.composite = composite
-        if labels is not None:
-            self.labels = labels
-        if widgetFactories is not None:
-            self.widgetFactories = widgetFactories
-
-
-    def render(self, ctx, key, args, errors):
-        for name, type in self.composite.composition:
-            childKey = '.'.join([key, name])
-            yield T.div(class_=name)[
-                T.label(for_=formal.util.render_cssid(childKey))[
-                    formal.util.titleFromName(name)
-                    ],
-                formal.iformal.IWidget(type).render(ctx, childKey, args, errors)
-                ]
-
-
-    def renderImmutable(self, ctx, key, args, errors):
-        for name, type in self.composite.composition:
-            childKey = '.'.join([key, name])
-            yield T.div(class_=name)[
-                T.label[formal.util.titleFromName(name)],
-                formal.iformal.IWidget(type).renderImmutable(ctx, childKey,
-                        args, errors)
-                ]
-
-
-    def processInput(self, ctx, key, args):
-        value = []
-        for name, type in self.composite.composition:
-            childKey = '.'.join([key, name])
-            value.append(formal.iformal.IWidget(type).processInput(ctx,
-                childKey, args))
-        return tuple(value)
-
-
-
-registerAdapter(CompositeWidget, Composite, formal.iformal.IWidget)
-
-
@@ -113 +16 @@
-        # Add a required name where the family name is required but the first
-        # name is optional.
-
+formal.
-            ('family', formal.String(required=True)),
-            ('first', formal.String())],
@@ -120 +23 @@
-        # Add an optional temperature field where, once entered, both values
-        # must be entered.
-
+formal.
-            ('temperature', formal.Integer(required=True)),
-            ('units', formal.String(required=True))])))
-
-        # Add a required height field where both values are also required.
-
+formal.
-            ('feet', formal.Integer(required=True)),
-            ('inches', formal.Integer(required=True))],

branches/composite/formal/test/test_types.py

@@ -127 +127 @@
-
-
-from formal.examples.composite import Composite
-
-class TestComposite(unittest.TestCase):
-
-    def test_one(self):
-
+formal.
-            ('foo', formal.String())
-            ]).validate([u'bar']), {'foo': u'bar'})
-
+formal.
-            ('foo', formal.Integer())
-            ]).validate([123]), {'foo': 123})
-
-    def test_multisame(self):
-
+formal.
-            ('foo', formal.String()),
-            ('bar', formal.String())
-            ]).validate([u'foo', u'bar']), {'foo': u'foo', 'bar': u'bar'})
-
+formal.
-            ('foo', formal.Integer()),
-            ('bar', formal.Integer()),
@@ -150 +148 @@
-
-    def test_multidiff(self):
-
+formal.
-            ('foo', formal.String()),
-            ('bar', formal.Integer())
-            ]).validate([u'foo', 123]), {'foo': u'foo', 'bar': 123})
-
+formal.
-            ('foo', formal.String()),
-            ('bar', formal.Integer())
@@ -160 +158 @@
-
-    def test_none(self):
-
+formal.
-            formal.String())]).validate([None]), None)
-
+formal.
-            ('foo', formal.String()),
-            ('bar', formal.Integer())
@@ -169 +167 @@
-    def test_missing(self):
-        missing = object()
-
+formal.
-            formal.String())], missing=missing).validate([None]), missing)
-
-    def test_notrequired_required(self):
-
+formal.
-            ('foo', formal.String(required=True))
-            ]).validate([u'foo']), {'foo': u'foo'})
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer(required=True))
-            ]).validate([u'foo', 123]), {'foo': u'foo', 'bar': 123})
-
+formal.
-            ('foo', formal.String(required=True))
-            ]).validate([None]), None)
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer(required=True))
@@ -189 +187 @@
-
-    def test_notrequired_onerequired(self):
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer())
-            ]).validate([u'foo', None]), {'foo': u'foo', 'bar': None})
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer())
-            ]).validate([None, None]), None)
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer())
@@ -203 +201 @@
-
-    def test_required(self):
-
+formal.
-            ('foo', formal.String())
-            ], required=True).validate([u'foo']), {'foo': u'foo'})
-
+formal.
-            ('foo', formal.String()),
-            ('bar', formal.Integer())
-            ], required=True).validate([u'foo', None]), {'foo': u'foo', 'bar': None})
-
+formal.
-            ('foo', formal.String()),
-            ('bar', formal.Integer())
-            ], required=True).validate([None, 123]), {'foo': None, 'bar': 123})
-
+formal.
-            ('foo', formal.String())
-            ], required=True).validate, [None])
-
+formal.
-            ('foo', formal.String()),
-            ('bar', formal.Integer())
@@ -223 +221 @@
-
-    def test_required_onerequired(self):
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer())
-            ], required=True).validate([u'foo', None]), {'foo': u'foo', 'bar': None})
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer())
-            ], required=True).validate([u'foo', 123]), {'foo': u'foo', 'bar': 123})
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer())
-            ], required=True).validate, [None, None])
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer())
@@ -241 +239 @@
-
-    def test_required_allrequired(self):
-
+formal.
-            ('foo', formal.String(required=True))
-            ], required=True).validate, [None])
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer(required=True))
-            ], required=True).validate, [None, None])
-
+formal.
-            ('foo', formal.String(required=True)),
-            ('bar', formal.Integer(required=True))
@@ -254 +252 @@
-
-    def test_wrongNumberOfValues(self):
-
+formal.
-            ('foo', formal.Integer()),
-            ('bar', formal.String()),

branches/composite/formal/types.py

@@ -132 +132 @@
-
-
+
+class Composite(Type):
+
+
+    def __init__(self, composition, *a, **k):
+        super(Composite, self).__init__(*a, **k)
+        self.composition = composition
+
+
+    def validate(self, value):
+
+        # Check we have the correct number of values, otherwise the final value
+        # could be completely wrong because we're relying on zip to build the
+        # dict.
+        if len(value) != len(self.composition):
+            raise ValueError("Incorrect number of values to validate")
+
+        # If nothing has been entered then we'll have a sequence of None
+        # instances, in which case my value if None (not a sequence). If there
+        # is anything other than None in the sequence then pass validation on to
+        # the composite types.
+        if not filter(None, value):
+            value = None
+        else:
+            value = dict([
+                    (name, type.validate(value))
+                    for (name, type), value in zip(self.composition, value)])
+
+        # Allow normal validation to run on the new value
+        return super(Composite, self).validate(value)
+
+
+
-__all__ = [
-
+
+
-    ]
-