Changeset 243

Timestamp:

07/06/06 11:54:48 (3 years ago)

Author:

matt

Message:

Merge composite branch to composite-2.

Files:

• branches/composite-2/formal/__init__.py (modified) (2 diffs)
• branches/composite-2/formal/examples/composite.py (copied) (copied from branches/composite/formal/examples/composite.py)
• branches/composite-2/formal/examples/main.py (modified) (1 diff)
• branches/composite-2/formal/form.py (modified) (1 diff)
• branches/composite-2/formal/formal.css (modified) (2 diffs)
• branches/composite-2/formal/test/test_types.py (modified) (1 diff)
• branches/composite-2/formal/types.py (modified) (1 diff)
• branches/composite-2/formal/widget.py (modified) (13 diffs)
• branches/composite-2/formal/widgets/composite.py (copied) (copied from branches/composite/formal/widgets/composite.py)

branches/composite-2/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-2/formal/examples/main.py

@@ -24 +24 @@
-    'formal.examples.nofields.NoFieldsFormPage',
-    'formal.examples.hidden.HiddenFieldsFormPage',
+    'formal.examples.composite.CompositeFormPage',
-    ]
-

branches/composite-2/formal/form.py

@@ -128 +128 @@
-            return
-
-
+
+
-        try:
-
+
+
-        except validation.FieldError, e:
-            if e.fieldName is None:

branches/composite-2/formal/formal.css

@@ -19 +19 @@
-}
-
+.nevow-form .composite .inputs div {
+  margin-bottom: 0.25em;
+}
+
-.nevow-form .inputs {
-  margin-left: 110px;
@@ -27 +31 @@
-  font-weight: bold;
-  color: #555;
+}
+
+.nevow-form .composite .inputs label {
+  font-style: normal;
+  font-weight: normal;
+  color: #222;
-}
-

branches/composite-2/formal/test/test_types.py

@@ -125 +125 @@
-    test_file.skip = "write tests"
-
+
+
+class TestComposite(unittest.TestCase):
+
+    def test_one(self):
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String())
+            ]).validate([u'bar']), {'foo': u'bar'})
+        self.assertEquals(formal.Composite([
+            ('foo', formal.Integer())
+            ]).validate([123]), {'foo': 123})
+
+    def test_multisame(self):
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String()),
+            ('bar', formal.String())
+            ]).validate([u'foo', u'bar']), {'foo': u'foo', 'bar': u'bar'})
+        self.assertEquals(formal.Composite([
+            ('foo', formal.Integer()),
+            ('bar', formal.Integer()),
+            ]).validate([123, 456]), {'foo': 123, 'bar': 456})
+
+    def test_multidiff(self):
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String()),
+            ('bar', formal.Integer())
+            ]).validate([u'foo', 123]), {'foo': u'foo', 'bar': 123})
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String()),
+            ('bar', formal.Integer())
+            ]).validate([u'foo', None]), {'foo': u'foo', 'bar': None})
+
+    def test_none(self):
+        self.assertEquals(formal.Composite([('foo',
+            formal.String())]).validate([None]), None)
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String()),
+            ('bar', formal.Integer())
+            ]).validate([None, None]), None)
+
+    def test_missing(self):
+        missing = object()
+        self.assertEquals(formal.Composite([('foo',
+            formal.String())], missing=missing).validate([None]), missing)
+
+    def test_notrequired_required(self):
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String(required=True))
+            ]).validate([u'foo']), {'foo': u'foo'})
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer(required=True))
+            ]).validate([u'foo', 123]), {'foo': u'foo', 'bar': 123})
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String(required=True))
+            ]).validate([None]), None)
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer(required=True))
+            ]).validate([None, None]), None)
+
+    def test_notrequired_onerequired(self):
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer())
+            ]).validate([u'foo', None]), {'foo': u'foo', 'bar': None})
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer())
+            ]).validate([None, None]), None)
+        self.assertRaises(formal.FieldValidationError, formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer())
+            ]).validate, [None, 123])
+
+    def test_required(self):
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String())
+            ], required=True).validate([u'foo']), {'foo': u'foo'})
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String()),
+            ('bar', formal.Integer())
+            ], required=True).validate([u'foo', None]), {'foo': u'foo', 'bar': None})
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String()),
+            ('bar', formal.Integer())
+            ], required=True).validate([None, 123]), {'foo': None, 'bar': 123})
+        self.assertRaises(formal.FieldRequiredError, formal.Composite([
+            ('foo', formal.String())
+            ], required=True).validate, [None])
+        self.assertRaises(formal.FieldRequiredError, formal.Composite([
+            ('foo', formal.String()),
+            ('bar', formal.Integer())
+            ], required=True).validate, [None, None])
+
+    def test_required_onerequired(self):
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer())
+            ], required=True).validate([u'foo', None]), {'foo': u'foo', 'bar': None})
+        self.assertEquals(formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer())
+            ], required=True).validate([u'foo', 123]), {'foo': u'foo', 'bar': 123})
+        self.assertRaises(formal.FieldRequiredError, formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer())
+            ], required=True).validate, [None, None])
+        self.assertRaises(formal.FieldRequiredError, formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer())
+            ], required=True).validate, [None, 123])
+
+    def test_required_allrequired(self):
+        self.assertRaises(formal.FieldRequiredError, formal.Composite([
+            ('foo', formal.String(required=True))
+            ], required=True).validate, [None])
+        self.assertRaises(formal.FieldRequiredError, formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer(required=True))
+            ], required=True).validate, [None, None])
+        self.assertRaises(formal.FieldRequiredError, formal.Composite([
+            ('foo', formal.String(required=True)),
+            ('bar', formal.Integer(required=True))
+            ], required=True).validate, [u'foo', None])
+
+    def test_wrongNumberOfValues(self):
+        self.assertRaises(ValueError, formal.Composite([
+            ('foo', formal.Integer()),
+            ('bar', formal.String()),
+            ]).validate, [123])
+

branches/composite-2/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__ = [
-
+
+
-    ]
-

branches/composite-2/formal/widget.py

@@ -53 +53 @@
-    def processInput(self, ctx, key, args):
-        value = args.get(key, [''])[0].decode(util.getPOSTCharset(ctx))
-
-
+
-
-
@@ -91 +90 @@
-        if not value:
-            value = 'False'
-
-
+
-
-
@@ -142 +140 @@
-    def processInput(self, ctx, key, args):
-        value = args.get(key, [''])[0].decode(util.getPOSTCharset(ctx))
-
-
+
-
-
@@ -186 +183 @@
-            if pwds[0] != pwds[1]:
-                raise validation.FieldValidationError('Passwords do not match.')
-self.original.validate(pwds[0])
+pwds[0]
-
-
@@ -218 +215 @@
-        if self.noneOption is not None and value == self.noneOption[0]:
-            value = None
-self.original.validate(value)
+value
-
-
@@ -369 +366 @@
-        if self.noneOption is not None and value == self.noneOption[0]:
-            value = None
-self.original.validate(value)
+value
-
-
@@ -533 +530 @@
-            except ValueError, e:
-                raise validation.FieldValidationError("Invalid date")
-
-
+
-
-
@@ -609 +605 @@
-                value[0] = 2000 + value[0]
-            value.append(1)
-
-
+
-
-
@@ -674 +669 @@
-        values = args.get(key, [])
-        converter = iformal.IStringConvertible(self.original.type)
-
-
+
-
-
@@ -706 +700 @@
-        value = (name, fileitem.file)
-
-
-
+
-
-
@@ -770 +763 @@
-           value = args.get(namer('value'))[0]
-
-
-
+
-
-
@@ -922 +914 @@
-        # original file meet a required field validation?
-        value = resourceManager.getResourceForWidget( key )
-
-
+
-
-    def _registerWithResourceManager( self, key, args, resourceManager ):
@@ -992 +983 @@
-    def processInput(self, ctx, key, args):
-        value = args.get(key, [''])[0].decode(util.getPOSTCharset(ctx))
-
-
+
-
-