Changeset 21:6e73325a5473 in ralphm-patches

Timestamp:

Dec 30, 2009, 10:01:00 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Split off data forms changes.

Files:

• findform.patch (added)
• form-coerce-values.patch (added)
• pubsub-create-configure.patch (modified) (12 diffs)
• pubsub-forms.patch (added)
• pubsub-request-options-form.patch (added)
• pubsub-subscription-options.patch (modified) (8 diffs)
• series (modified) (1 diff)

pubsub-create-configure.patch

@@ -1 @@
-diff -r 26ba5a2ff579 wokkel/data_form.py
---- a/wokkel/data_form.py       Wed Dec 30 17:55:07 2009 +0100
-+++ b/wokkel/data_form.py       Wed Dec 30 20:46:36 2009 +0100
-@@ -253,10 +253,10 @@
-             field['var'] = self.var
- 
-         for value in self.values:
--            if self.fieldType == 'boolean':
-+            if isinstance(value, bool):
-                 value = unicode(value).lower()
--            elif self.fieldType in ('jid-single', 'jid-multi'):
--                value = value.full()
-+            else:
-+                value = unicode(value)
- 
-             field.addElement('value', content=unicode(value))
- 
-@@ -616,3 +616,24 @@
- 
-         for field in filtered:
-             self.removeField(field)
-+
-+
-+def findForm(element, formNamespace):
-+    """
-+    Find a Data Form.
-+
-+    Look for an element that represents a Data Form with the specified
-+    form namespace as a child element of the given element.
-+    """
-+    if not element:
-+        return None
-+
-+    for child in element.elements():
-+        if (child.uri, child.name) == ((NS_X_DATA, 'x')):
-+            form = Form.fromElement(child)
-+
-+            if (form.formNamespace == formNamespace or
-+                not form.formNamespace and form.formType=='cancel'):
-+                return form
-+
-+    return None
-diff -r 26ba5a2ff579 wokkel/pubsub.py
---- a/wokkel/pubsub.py  Wed Dec 30 17:55:07 2009 +0100
-+++ b/wokkel/pubsub.py  Wed Dec 30 20:46:36 2009 +0100
+diff -r d64e96596c50 -r 8425a88d49f5 wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Wed Dec 30 21:41:55 2009 +0100
++++ b/wokkel/pubsub.py  Wed Dec 30 21:42:27 2009 +0100
 @@ -234,7 +234,7 @@
          'optionsSet': ['nodeOrEmpty', 'jid', 'options'],
@@ -53 +11 @@
          'configureGet': ['nodeOrEmpty'],
          'configureSet': ['nodeOrEmpty', 'configure'],
-@@ -252,30 +252,6 @@
-         self.verb = verb
- 
- 
--    @staticmethod
--    def _findForm(element, formNamespace):
--        """
--        Find a Data Form.
--
--        Look for an element that represents a Data Form with the specified
--        form namespace as a child element of the given element.
--        """
--        if not element:
--            return None
--
--        form = None
--        for child in element.elements():
--            try:
--                form = data_form.Form.fromElement(child)
--            except data_form.Error:
--                continue
--
--            if form.formNamespace != NS_PUBSUB_NODE_CONFIG:
--                continue
--
--        return form
--
--
-     def _parse_node(self, verbElement):
-         """
-         Parse the required node identifier out of the verbElement.
-@@ -366,7 +342,7 @@
-         """
-         Parse node type out of a request for the default node configuration.
-         """
--        form = PubSubRequest._findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
-+        form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
-         if form and form.formType == 'submit':
-             values = form.getValues()
-             self.nodeType = values.get('pubsub#node_type', 'leaf')
-@@ -378,7 +354,7 @@
-         """
-         Parse options out of a request for setting the node configuration.
-         """
--        form = PubSubRequest._findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
-+        form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
-         if form:
-             if form.formType in ('submit', 'cancel'):
-                 self.options = form
-@@ -388,6 +364,33 @@
+@@ -364,6 +364,33 @@
              raise BadRequest(text="Missing configuration form")
  
@@ -136 +45 @@
      def _parse_itemIdentifiers(self, verbElement):
          """
-@@ -435,7 +438,7 @@
- 
- 
-     def _parse_options(self, verbElement):
--        form = PubSubRequest._findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)
-+        form = data_form.findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)
-         if form:
-             if form.formType not in ('submit', 'cancel'):
-                 raise BadRequest(text="Unexpected form type %r" % form.formType)
-@@ -451,8 +454,8 @@
-     def _parse_optionsWithSubscribe(self, verbElement):
-         for element in verbElement.parent.elements():
-             if element.name == 'options' and element.uri == NS_PUBSUB:
--                form = PubSubRequest._findForm(element,
--                                               NS_PUBSUB_SUBSCRIBE_OPTIONS)
-+                form = data_form.findForm(element,
-+                                          NS_PUBSUB_SUBSCRIBE_OPTIONS)
-                 if not form:
-                     continue
- 
-@@ -662,7 +665,8 @@
+@@ -602,7 +629,8 @@
          pass
  
@@ -166 +55 @@
          Create a publish subscribe node.
  
-@@ -670,12 +674,20 @@
+@@ -610,12 +638,20 @@
          @type service: L{JID}
          @param nodeIdentifier: Optional suggestion for the id of the node.
@@ -187 +76 @@
              try:
                  new_node = iq.pubsub.create["node"]
-@@ -956,8 +968,6 @@
+@@ -887,8 +923,6 @@
              d = self.getNodes(requestor, target)
          else:
@@ -196 +85 @@
          d.addCallback(lambda nodes: [disco.DiscoItem(target, node)
                                       for node in nodes])
-@@ -1067,6 +1077,12 @@
+@@ -998,6 +1032,12 @@
          form.typeCheck(fieldDefs, filterUnknown=True)
  
@@ -209 +98 @@
          if request.nodeType not in ('leaf', 'collection'):
              raise error.StanzaError('not-acceptable')
-diff -r 26ba5a2ff579 wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Wed Dec 30 17:55:07 2009 +0100
-+++ b/wokkel/test/test_pubsub.py        Wed Dec 30 20:46:36 2009 +0100
+diff -r d64e96596c50 -r 8425a88d49f5 wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Wed Dec 30 21:41:55 2009 +0100
++++ b/wokkel/test/test_pubsub.py        Wed Dec 30 21:42:27 2009 +0100
 @@ -19,7 +19,7 @@
  from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
@@ -262 +151 @@
          """
          Test sending delete request.
-@@ -998,6 +1032,7 @@
+@@ -935,6 +969,7 @@
          self.assertEqual(JID('user@example.org'), request.sender)
          self.assertEqual(JID('pubsub.example.org'), request.recipient)
@@ -270 +159 @@
  
      def test_fromElementCreateInstant(self):
-@@ -1018,6 +1053,78 @@
+@@ -955,6 +990,78 @@
          self.assertIdentical(None, request.nodeIdentifier)
  
@@ -349 +238 @@
          """
          Test parsing a request for the default node configuration.
-@@ -1804,6 +1911,52 @@
+@@ -1741,6 +1848,52 @@
          return d
  
@@ -402 +291 @@
          """
          A default request should result in
-@@ -1837,7 +1990,7 @@
+@@ -1774,7 +1927,7 @@
              self.assertEqual(NS_PUBSUB_OWNER, element.uri)
              self.assertEqual(NS_PUBSUB_OWNER, element.default.uri)
@@ -411 +300 @@
          self.resource.getConfigurationOptions = getConfigurationOptions
          self.resource.default = default
-@@ -1966,7 +2119,7 @@
+@@ -1903,7 +2056,7 @@
              self.assertEqual(NS_PUBSUB_OWNER, element.uri)
              self.assertEqual(NS_PUBSUB_OWNER, element.configure.uri)

pubsub-subscription-options.patch

@@ -1 @@
-diff -r 3ef9bc7a0d70 wokkel/data_form.py
---- a/wokkel/data_form.py       Wed Dec 30 16:53:05 2009 +0100
-+++ b/wokkel/data_form.py       Wed Dec 30 21:05:59 2009 +0100
-@@ -76,6 +76,7 @@
-             option['label'] = self.label
-         return option
- 
-+
-     @staticmethod
-     def fromElement(element):
-         valueElements = list(domish.generateElementsQNamed(element.children,
-@@ -212,7 +213,7 @@
- 
-         if self.values:
-             if (self.fieldType not in ('hidden', 'jid-multi', 'list-multi',
--                                 'text-multi') and
-+                                       'text-multi') and
-                 len(self.values) > 1):
-                 raise TooManyValuesError()
- 
-@@ -233,6 +234,7 @@
- 
-             self.values = newValues
- 
-+
-     def toElement(self, asForm=False):
-         """
-         Return the DOM representation of this Field.
-@@ -256,7 +258,7 @@
-             elif self.fieldType in ('jid-single', 'jid-multi'):
-                 value = value.full()
- 
--            field.addElement('value', content=value)
-+            field.addElement('value', content=unicode(value))
- 
-         if asForm:
-             if self.fieldType in ('list-single', 'list-multi'):
-@@ -322,16 +324,16 @@
- 
- 
-     @staticmethod
--    def fromDict(dictionary):
--        kwargs = dictionary.copy()
-+    def fromDict(fieldDict):
-+        kwargs = fieldDict.copy()
- 
--        if 'type' in dictionary:
--            kwargs['fieldType'] = dictionary['type']
-+        if 'type' in fieldDict:
-+            kwargs['fieldType'] = fieldDict['type']
-             del kwargs['type']
- 
--        if 'options' in dictionary:
-+        if 'options' in fieldDict:
-             options = []
--            for value, label in dictionary['options'].iteritems():
-+            for value, label in fieldDict['options'].iteritems():
-                 options.append(Option(value, label))
-             kwargs['options'] = options
- 
-@@ -343,7 +345,7 @@
-     """
-     Data Form.
- 
--    There are two similarly named properties of forms. The L{formType} is the
-+    There are two similarly named properties of forms. The C{formType} is the
-     the so-called type of the form, and is set as the C{'type'} attribute
-     on the form's root element.
- 
-@@ -351,19 +353,25 @@
-     provide a context for the field names used in this form, by setting a
-     special hidden field named C{'FORM_TYPE'}, to put the names of all
-     other fields in the namespace of the value of that field. This namespace
--    is recorded in the L{formNamespace} instance variable.
-+    is recorded in the C{formNamespace} instance variable.
- 
-     @ivar formType: Type of form. One of C{'form'}, C{'submit'}, {'cancel'},
-                     or {'result'}.
--    @type formType: C{str}.
-+    @type formType: C{str}
-+
-     @ivar formNamespace: The optional namespace of the field names for this
--                         form. This goes in the special field named
--                         C{'FORM_TYPE'}, if set.
--    @type formNamespace: C{str}.
--    @ivar fields: Dictionary of fields that have a name. Note that this is
--                  meant to be used for reading, only. One should use
--                  L{addField} for adding fields.
-+        form. This goes in the special field named C{'FORM_TYPE'}, if set.
-+    @type formNamespace: C{str}
-+
-+    @ivar fields: Dictionary of named fields. Note that this is meant to be
-+        used for reading, only. One should use L{addField} or L{makeFields} and
-+        L{removeField} for adding and removing fields.
-     @type fields: C{dict}
-+
-+    @ivar fieldList: List of all fields, in the order they are added. Like
-+        C{fields}, this is meant to be used for reading, only.
-+    @type fieldList: C{list}
-+
-     """
- 
-     def __init__(self, formType, title=None, instructions=None,
-@@ -403,7 +411,7 @@
-         """
-         Add a field to this form.
- 
--        Fields are added in order, and L{fields} is a dictionary of the
-+        Fields are added in order, and C{fields} is a dictionary of the
-         named fields, that is kept in sync only if this method is used for
-         adding new fields. Multiple fields with the same name are disallowed.
-         """
-@@ -416,7 +424,71 @@
-         self.fieldList.append(field)
- 
- 
-+    def removeField(self, field):
-+        """
-+        Remove a field from this form.
-+        """
-+        self.fieldList.remove(field)
-+
-+        if field.var is not None:
-+            del self.fields[field.var]
-+
-+
-+    def makeFields(self, values, fieldDefs=None, filterUnknown=True):
-+        """
-+        Create fields from values and add them to this form.
-+
-+        This creates fields from a mapping of name to value(s) and adds them to
-+        this form. If C{fieldDefs} is not C{None}, this is used to fill in
-+        additional properties of fields, like the field types, labels and
-+        possible options. If C{filterUnknown} is C{True} and C{fieldDefs} is
-+        not C{None}, fields will only be created from C{values} with a
-+        corresponding entry in C{fieldDefs}.
-+
-+        @param values: Values to create fields from.
-+        @type values: C{dict}
-+
-+        @param fieldDefs: Field definitions as a dictionary. See
-+            L{wokkel.iwokkel.IPubSubService.getConfigurationOptions}
-+        @type fieldDefs: C{dict}
-+
-+        @param filterUnknown: If C{True}, ignore fields that are not in
-+            C{fieldDefs}.
-+        @type filterUnknown: C{bool}
-+        """
-+        for name, value in values.iteritems():
-+            fieldDict = {'var': name}
-+
-+            if fieldDefs is not None:
-+                if name in fieldDefs:
-+                    fieldDict.update(fieldDefs[name])
-+                elif filterUnknown:
-+                    continue
-+
-+            if isinstance(value, list):
-+                fieldDict['values'] = value
-+                if 'type' not in fieldDict:
-+                    if value and hasattr(value[0], 'full'):
-+                        fieldDict['type'] = 'jid-multi'
-+                    else:
-+                        fieldDict['type'] = 'text-multi'
-+            else:
-+                fieldDict['value'] = value
-+                if 'type' not in fieldDict:
-+                    if hasattr(value, 'full'):
-+                        fieldDict['type'] = 'jid-single'
-+                    elif isinstance(value, bool):
-+                        fieldDict['type'] = 'boolean'
-+
-+            self.addField(Field.fromDict(fieldDict))
-+
-+
-     def toElement(self):
-+        """
-+        Return the DOM representation of this Form.
-+
-+        @rtype: L{domish.Element}
-+        """
-         form = domish.Element((NS_X_DATA, 'x'))
-         form['type'] = self.formType
- 
-@@ -477,7 +549,17 @@
- 
-         return form
- 
-+
-     def getValues(self):
-+        """
-+        Extract values from the named form fields.
-+
-+        For all named fields, the corresponding value or values are
-+        returned in a dictionary keyed by the field name. For multi-value
-+        fields, the dictionary value is a list, otherwise a single value.
-+
-+        @rtype: C{dict}
-+        """
-         values = {}
- 
-         for name, field in self.fields.iteritems():
-@@ -489,3 +571,48 @@
-             values[name] = value
- 
-         return values
-+
-+
-+    def typeCheck(self, fieldDefs, filterUnknown=False):
-+        """
-+        Check values of fields according to the field definition.
-+
-+        This method walks all named fields to check their values against their
-+        type. The field definition in C{fieldDefs} is used to check the field
-+        type. Unknown fields are ignored.
-+
-+        If the field type is C{None} (when not set by the receiving entity),
-+        C{'text-single'} is assumed, as this is the default value.
-+
-+        @param fieldDefs: Field definitions as a dictionary. See
-+            L{wokkel.iwokkel.IPubSubService.getConfigurationOptions}
-+        @type fieldDefs: C{dict}
-+
-+        @param filterUnknown: If C{True}, remove fields that are not in
-+            C{fieldDefs}.
-+        @type filterUnknown: C{bool}
-+        """
-+
-+        filtered = []
-+
-+        for name, field in self.fields.iteritems():
-+            if name in fieldDefs:
-+                if field.fieldType is None:
-+                    field.fieldType = fieldDefs[name]['type']
-+                elif field.fieldType != fieldDefs[name]['type']:
-+                    raise TypeError("Field type for %r is %r, expected %r" %
-+                                    (name,
-+                                     field.fieldType,
-+                                     fieldDefs[name]['type']))
-+                else:
-+                    # Field type is correct
-+                    pass
-+                field.typeCheck()
-+            elif filterUnknown:
-+                filtered.append(field)
-+            else:
-+                # Unknown field, not filtering
-+                pass
-+
-+        for field in filtered:
-+            self.removeField(field)
-diff -r 3ef9bc7a0d70 wokkel/pubsub.py
---- a/wokkel/pubsub.py  Wed Dec 30 16:53:05 2009 +0100
-+++ b/wokkel/pubsub.py  Wed Dec 30 21:05:59 2009 +0100
+diff -r 3f7b69ddecb4 wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Wed Dec 30 21:44:18 2009 +0100
++++ b/wokkel/pubsub.py  Wed Dec 30 21:45:01 2009 +0100
 @@ -228,7 +228,7 @@
      # Map request verb to parameter handler names
@@ -262 +11 @@
          'optionsGet': ['nodeOrEmpty', 'jid'],
          'optionsSet': ['nodeOrEmpty', 'jid', 'options'],
-@@ -380,10 +380,8 @@
-         """
-         form = PubSubRequest._findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
-         if form:
--            if form.formType == 'submit':
--                self.options = form.getValues()
--            elif form.formType == 'cancel':
--                self.options = {}
-+            if form.formType in ('submit', 'cancel'):
-+                self.options = form
-             else:
-                 raise BadRequest(text="Unexpected form type %r" % form.formType)
-         else:
-@@ -439,38 +437,71 @@
-     def _parse_options(self, verbElement):
-         form = PubSubRequest._findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)
-         if form:
--            if form.formType == 'submit':
--                self.options = form.getValues()
--            elif form.formType == 'cancel':
--                self.options = {}
--            else:
-+            if form.formType not in ('submit', 'cancel'):
-                 raise BadRequest(text="Unexpected form type %r" % form.formType)
-+            self.options = form
+@@ -419,29 +419,65 @@
          else:
              raise BadRequest(text="Missing options form")
@@ -298 +23 @@
 +        for element in verbElement.parent.elements():
 +            if element.name == 'options' and element.uri == NS_PUBSUB:
-+                form = PubSubRequest._findForm(element,
-+                                               NS_PUBSUB_SUBSCRIBE_OPTIONS)
++                form = data_form.findForm(element,
++                                          NS_PUBSUB_SUBSCRIBE_OPTIONS)
 +                if not form:
 +                    continue
@@ -357 +82 @@
          """
          Send this request to its recipient.
-@@ -674,7 +705,8 @@
+@@ -645,7 +681,8 @@
          return request.send(self.xmlstream)
  
@@ -367 +92 @@
          Subscribe to a publish subscribe node.
  
-@@ -685,6 +717,8 @@
+@@ -656,6 +693,8 @@
          @param subscriber: The entity to subscribe to the node. This entity
                             will get notifications of new published items.
@@ -376 +101 @@
          request = PubSubRequest('subscribe')
          request.recipient = service
-@@ -692,6 +726,12 @@
+@@ -663,6 +702,12 @@
          request.subscriber = subscriber
          request.sender = sender
@@ -389 +114 @@
              subscription = iq.pubsub.subscription["subscription"]
  
-@@ -956,6 +996,8 @@
-             handlerName, argNames = self._legacyHandlers[request.verb]
-             handler = getattr(self, handlerName)
-             args = [getattr(request, arg) for arg in argNames]
-+            if 'options' in argNames:
-+                args[argNames.index('options')] = request.options.getValues()
-             d = handler(*args)
- 
-         # If needed, translate the result into a response
-@@ -1012,55 +1054,17 @@
-             return None
- 
- 
--    def _makeFields(self, options, values):
--        fields = []
--        for name, value in values.iteritems():
--            if name not in options:
--                continue
--
--            option = {'var': name}
--            option.update(options[name])
--            if isinstance(value, list):
--                option['values'] = value
--            else:
--                option['value'] = value
--            fields.append(data_form.Field.fromDict(option))
--        return fields
--
--
-     def _formFromConfiguration(self, resource, values):
--        options = resource.getConfigurationOptions()
--        fields = self._makeFields(options, values)
-+        fieldDefs = resource.getConfigurationOptions()
-         form = data_form.Form(formType="form",
--                              formNamespace=NS_PUBSUB_NODE_CONFIG,
--                              fields=fields)
--
-+                              formNamespace=NS_PUBSUB_NODE_CONFIG)
-+        form.makeFields(values, fieldDefs)
-         return form
- 
- 
--    def _checkConfiguration(self, resource, values):
--        options = resource.getConfigurationOptions()
--        processedValues = {}
--
--        for key, value in values.iteritems():
--            if key not in options:
--                continue
--
--            option = {'var': key}
--            option.update(options[key])
--            field = data_form.Field.fromDict(option)
--            if isinstance(value, list):
--                field.values = value
--            else:
--                field.value = value
--            field.typeCheck()
--
--            if isinstance(value, list):
--                processedValues[key] = field.values
--            else:
--                processedValues[key] = field.value
--
--        return processedValues
-+    def _checkConfiguration(self, resource, form):
-+        fieldDefs = resource.getConfigurationOptions()
-+        form.typeCheck(fieldDefs, filterUnknown=True)
- 
- 
-     def _preProcess_default(self, resource, request):
-@@ -1091,12 +1095,11 @@
- 
- 
-     def _preProcess_configureSet(self, resource, request):
--        if request.options:
--            request.options = self._checkConfiguration(resource,
--                                                       request.options)
-+        if request.options.formType == 'cancel':
-+            return None
-+        else:
-+            self._checkConfiguration(resource, request.options)
-             return request
--        else:
--            return None
- 
- 
-     def _toResponse_items(self, result, resource, request):
-diff -r 3ef9bc7a0d70 wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Wed Dec 30 16:53:05 2009 +0100
-+++ b/wokkel/test/test_pubsub.py        Wed Dec 30 21:05:59 2009 +0100
+diff -r 3f7b69ddecb4 wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Wed Dec 30 21:44:18 2009 +0100
++++ b/wokkel/test/test_pubsub.py        Wed Dec 30 21:45:01 2009 +0100
 @@ -447,6 +447,37 @@
          return d
@@ -557 +194 @@
          """
          Test parsing an unsubscription request.
-@@ -805,7 +868,7 @@
-         self.assertEqual(JID('pubsub.example.org'), request.recipient)
-         self.assertEqual('test', request.nodeIdentifier)
-         self.assertEqual(JID('user@example.org/Home'), request.subscriber)
--        self.assertEqual({'pubsub#deliver': '1'}, request.options)
-+        self.assertEqual({'pubsub#deliver': '1'}, request.options.getValues())
- 
- 
-     def test_fromElementOptionsSetCancel(self):
-@@ -825,7 +888,7 @@
-         """
- 
-         request = pubsub.PubSubRequest.fromElement(parseXml(xml))
--        self.assertEqual({}, request.options)
-+        self.assertEqual('cancel', request.options.formType)
- 
- 
-     def test_fromElementOptionsSetBadFormType(self):
-@@ -1053,7 +1116,8 @@
-         self.assertEqual(JID('pubsub.example.org'), request.recipient)
-         self.assertEqual('test', request.nodeIdentifier)
-         self.assertEqual({'pubsub#deliver_payloads': '0',
--                          'pubsub#persist_items': '1'}, request.options)
-+                          'pubsub#persist_items': '1'},
-+                         request.options.getValues())
- 
- 
-     def test_fromElementConfigureSetCancel(self):
-@@ -1073,7 +1137,7 @@
-         """
- 
-         request = pubsub.PubSubRequest.fromElement(parseXml(xml))
--        self.assertEqual({}, request.options)
-+        self.assertEqual('cancel', request.options.formType)
- 
- 
-     def test_fromElementConfigureSetBadFormType(self):
-@@ -1895,7 +1959,7 @@
-             return defer.succeed({'pubsub#deliver_payloads': '0',
-                                   'pubsub#persist_items': '1',
-                                   'pubsub#owner': JID('user@example.org'),
--                                  'x-myfield': ['a', 'b']})
-+                                  'x-myfield': 'a'})
- 
-         def cb(element):
-             self.assertEqual('pubsub', element.name)
-@@ -1968,7 +2032,8 @@
- 
-         def configureSet(request):
-             self.assertEqual({'pubsub#deliver_payloads': False,
--                              'pubsub#persist_items': True}, request.options)
-+                              'pubsub#persist_items': True},
-+                             request.options.getValues())
-             return defer.succeed(None)
- 
-         self.resource.getConfigurationOptions = getConfigurationOptions
-@@ -2040,7 +2105,7 @@
- 
-         def configureSet(request):
-             self.assertEquals(['pubsub#deliver_payloads'],
--                              request.options.keys())
-+                              request.options.fields.keys())
- 
-         self.resource.getConfigurationOptions = getConfigurationOptions
-         self.resource.configureSet = configureSet
-@@ -2595,6 +2660,48 @@
-         return d
- 
- 
-+    def test_setConfigurationOptionsDict(self):
-+        """
-+        Options should be passed as a dictionary, not a form.
-+        """
-+
-+        xml = """
-+        <iq type='set' to='pubsub.example.org'
-+                       from='user@example.org'>
-+          <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
-+            <configure node='test'>
-+              <x xmlns='jabber:x:data' type='submit'>
-+                <field var='FORM_TYPE' type='hidden'>
-+                  <value>http://jabber.org/protocol/pubsub#node_config</value>
-+                </field>
-+                <field var='pubsub#deliver_payloads'><value>0</value></field>
-+                <field var='pubsub#persist_items'><value>1</value></field>
-+              </x>
-+            </configure>
-+          </pubsub>
-+        </iq>
-+        """
-+
-+        def getConfigurationOptions():
-+            return {
-+                "pubsub#persist_items":
-+                    {"type": "boolean",
-+                     "label": "Persist items to storage"},
-+                "pubsub#deliver_payloads":
-+                    {"type": "boolean",
-+                     "label": "Deliver payloads with event notifications"}
-+                }
-+
-+        def setConfiguration(requestor, service, nodeIdentifier, options):
-+            self.assertEquals({'pubsub#deliver_payloads': False,
-+                               'pubsub#persist_items': True}, options)
-+
-+
-+        self.service.getConfigurationOptions = getConfigurationOptions
-+        self.service.setConfiguration = setConfiguration
-+        return self.handleRequest(xml)
-+
-+
-     def test_items(self):
-         """
-         Non-overridden L{PubSubService.items} yields unsupported error.

series

@@ +1 @@
+pubsub-forms.patch
+pubsub-request-options-form.patch
+findform.patch
+form-coerce-values.patch
 pubsub-subscription-options.patch
 pubsub-create-configure.patch