Changeset 82:f965c6c5da15 for wokkel/pubsub.py

Timestamp:

Jan 5, 2010, 2:55:40 PM (13 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Add support for configuration options in node creation requests

File:

• wokkel/pubsub.py (modified) (6 diffs)

wokkel/pubsub.py

@@ -235 +235 @@
         'subscriptions': [],
         'affiliations': [],
-        'create': ['nodeOrNone'],
+        'create': ['nodeOrNone', 'configureOrNone'],
         'default': ['default'],
         'configureGet': ['nodeOrEmpty'],
@@ -365 +365 @@
 
 
+    def _parse_configureOrNone(self, verbElement):
+        """
+        Parse optional node configuration form in create request.
+        """
+        for element in verbElement.parent.elements():
+            if element.uri == NS_PUBSUB and element.name == 'configure':
+                form = data_form.findForm(element, NS_PUBSUB_NODE_CONFIG)
+                if form:
+                    if form.formType == 'submit':
+                        self.options = form
+                    else:
+                        raise BadRequest(text=u"Unexpected form type '%s'" %
+                                              form.formType)
+                else:
+                    form = data_form.Form('submit',
+                                          formNamespace=NS_PUBSUB_NODE_CONFIG)
+                    self.options = form
+
+
+    def _render_configureOrNone(self, verbElement):
+        """
+        Render optional node configuration form in create request.
+        """
+        if self.options is not None:
+            configure = verbElement.parent.addElement('configure')
+            configure.addChild(self.options.toElement())
+
 
     def _parse_itemIdentifiers(self, verbElement):
@@ -608 +635 @@
 
 
-    def createNode(self, service, nodeIdentifier=None, sender=None):
+    def createNode(self, service, nodeIdentifier=None, options=None,
+                         sender=None):
         """
         Create a publish subscribe node.
@@ -616 +644 @@
         @param nodeIdentifier: Optional suggestion for the id of the node.
         @type nodeIdentifier: C{unicode}
+        @param options: Optional node configuration options.
+        @type options: C{dict}
         """
         request = PubSubRequest('create')
@@ -621 +651 @@
         request.nodeIdentifier = nodeIdentifier
         request.sender = sender
+
+        if options:
+            form = data_form.Form(formType='submit',
+                                  formNamespace=NS_PUBSUB_NODE_CONFIG)
+            form.makeFields(options)
+            request.options = form
 
         def cb(iq):
@@ -1002 +1038 @@
 
 
+    def _preProcess_create(self, resource, request):
+        if request.options:
+            self._checkConfiguration(resource, request.options)
+        return request
+
+
     def _preProcess_default(self, resource, request):
         if request.nodeType not in ('leaf', 'collection'):