Changeset 28:4692e23155a3 in ralphm-patches for pubsub-forms.patch

Timestamp:

Jan 2, 2010, 10:50:14 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Add PubSubClient?.getOptions, allow form type checking without field defs.

File:

• pubsub-forms.patch (modified) (9 diffs)

pubsub-forms.patch

@@ -3 +3 @@
 diff -r ba58db23e8b9 wokkel/data_form.py
 --- a/wokkel/data_form.py       Fri Jan 01 15:54:26 2010 +0100
-+++ b/wokkel/data_form.py       Sat Jan 02 13:53:24 2010 +0100
++++ b/wokkel/data_form.py       Sat Jan 02 22:49:40 2010 +0100
 @@ -76,6 +76,7 @@
              option['label'] = self.label
@@ -155 +155 @@
          form['type'] = self.formType
  
-@@ -516,3 +604,58 @@
+@@ -516,3 +604,65 @@
              values[name] = value
  
@@ -161 +161 @@
 +
 +
-+    def typeCheck(self, fieldDefs, filterUnknown=False):
++    def typeCheck(self, fieldDefs=None, filterUnknown=False):
 +        """
 +        Check values of fields according to the field definition.
@@ -176 +176 @@
 +        that is not set.
 +
++        If C{fieldDefs} is None, an empty dictionary is assumed. This is
++        useful for coercing boolean and JID values on forms with type
++        C{'form'}.
++
 +        @param fieldDefs: Field definitions as a dictionary. See
 +            L{wokkel.iwokkel.IPubSubService.getConfigurationOptions}
@@ -184 +188 @@
 +        @type filterUnknown: C{bool}
 +        """
++
++        if fieldDefs is None:
++            fieldDefs = {}
 +
 +        filtered = []
@@ -216 +223 @@
 diff -r ba58db23e8b9 wokkel/pubsub.py
 --- a/wokkel/pubsub.py  Fri Jan 01 15:54:26 2010 +0100
-+++ b/wokkel/pubsub.py  Sat Jan 02 13:53:24 2010 +0100
++++ b/wokkel/pubsub.py  Sat Jan 02 22:49:40 2010 +0100
 @@ -1,6 +1,6 @@
  # -*- test-case-name: wokkel.test.test_pubsub -*-
@@ -260 +267 @@
 diff -r ba58db23e8b9 wokkel/test/test_data_form.py
 --- a/wokkel/test/test_data_form.py     Fri Jan 01 15:54:26 2010 +0100
-+++ b/wokkel/test/test_data_form.py     Sat Jan 02 13:53:24 2010 +0100
++++ b/wokkel/test/test_data_form.py     Sat Jan 02 22:49:40 2010 +0100
 @@ -787,6 +787,128 @@
          self.assertRaises(data_form.Error, form.addField, field2)
@@ -390 +397 @@
          """
          Each named field is represented in the values, keyed by name.
-@@ -834,3 +956,126 @@
+@@ -834,3 +956,142 @@
          form = data_form.Form('submit', fields=fields)
          values = form.getValues()
@@ -517 +524 @@
 +        self.assertNotIn('pubsub#description', form.fields)
 +        self.assertEqual([], checked)
++
++
++    def test_typeCheckNoFieldDefs(self):
++        """
++        If there are no field defs, an empty dictionary is assumed.
++        """
++        checked = []
++        form = data_form.Form('submit')
++        form.addField(data_form.Field('list-single', var='pubsub#description',
++                                                     value='a node'))
++        field = form.fields['pubsub#description']
++        field.typeCheck = lambda : checked.append(None)
++        form.typeCheck()
++
++        self.assertIn('pubsub#description', form.fields)
++        self.assertEqual([None], checked)