Changeset 13:42b22edb29bb in ralphm-patches

Timestamp:

Apr 22, 2009, 4:20:10 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Make these backwards compatible.

Files:

• pubsub_request.patch (modified) (38 diffs)
• pubsub_resource.patch (modified) (50 diffs)

pubsub_request.patch

@@ -11 +11 @@
 that is passed to the corresponding handler methods.
 
-diff -r 556fc011f965 wokkel/generic.py
---- a/wokkel/generic.py Tue Apr 07 11:16:01 2009 +0200
-+++ b/wokkel/generic.py Tue Apr 07 11:17:21 2009 +0200
+diff -r e35e291de060 wokkel/generic.py
+--- a/wokkel/generic.py Wed Apr 22 01:48:41 2009 -0700
++++ b/wokkel/generic.py Wed Apr 22 14:48:14 2009 +0200
 @@ -10,7 +10,7 @@
  from zope.interface import implements
@@ -61 +61 @@
      protocol = xmlstream.XmlStream
  
-diff -r 556fc011f965 wokkel/iwokkel.py
---- a/wokkel/iwokkel.py Tue Apr 07 11:16:01 2009 +0200
-+++ b/wokkel/iwokkel.py Tue Apr 07 11:17:21 2009 +0200
-@@ -278,6 +278,7 @@
-                              C{list} of L{domish.Element})
-         """
- 
-+
-     def notifyDelete(service, nodeIdentifier, subscribers,
-                      redirectURI=None):
-         """
-@@ -295,77 +296,60 @@
-         @type redirectURI: C{str}
-         """
- 
--    def publish(requestor, service, nodeIdentifier, items):
-+
-+    def publish(request):
-         """
-         Called when a publish request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeIdentifier: The identifier of the node to publish to.
--        @type nodeIdentifier: C{unicode}
--        @param items: The items to be published as L{domish} elements.
--        @type items: C{list} of C{domish.Element}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-         @return: deferred that fires on success.
-         @rtype: L{defer.Deferred}
-         """
- 
--    def subscribe(requestor, service, nodeIdentifier, subscriber):
-+
-+    def subscribe(request):
-         """
-         Called when a subscribe request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeIdentifier: The identifier of the node to subscribe to.
--        @type nodeIdentifier: C{unicode}
--        @param subscriber: The entity to be subscribed.
--        @type subscriber: L{jid.JID}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-         @return: A deferred that fires with a
-                  L{Subscription<wokkel.pubsub.Subscription>}.
-         @rtype: L{defer.Deferred}
-         """
- 
--    def unsubscribe(requestor, service, nodeIdentifier, subscriber):
-+
-+    def unsubscribe(request):
-         """
-         Called when a subscribe request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeIdentifier: The identifier of the node to unsubscribe from.
--        @type nodeIdentifier: C{unicode}
--        @param subscriber: The entity to be unsubscribed.
--        @type subscriber: L{jid.JID}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-         @return: A deferred that fires with C{None} when unsubscription has
-                  succeeded.
-         @rtype: L{defer.Deferred}
-         """
- 
--    def subscriptions(requestor, service):
-+
-+    def subscriptions(request):
-         """
-         Called when a subscriptions retrieval request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-         @return: A deferred that fires with a C{list} of subscriptions as
-                  L{Subscription<wokkel.pubsub.Subscription>}.
-         @rtype: L{defer.Deferred}
-         """
- 
--    def affiliations(requestor, service):
-+
-+    def affiliations(request):
-         """
-         Called when a affiliations retrieval request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-         @return: A deferred that fires with a C{list} of affiliations as
-                  C{tuple}s of (node identifier as C{unicode}, affiliation state
-                  as C{str}). The affiliation can be C{'owner'}, C{'publisher'},
-@@ -373,24 +357,19 @@
-         @rtype: L{defer.Deferred}
-         """
- 
--    def create(requestor, service, nodeIdentifier):
-+
-+    def create(request):
-         """
-         Called when a node creation request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeIdentifier: The suggestion for the identifier of the node to
--                               be created. If the request did not include a
--                               suggestion for the node identifier, the value
--                               is C{None}.
--        @type nodeIdentifier: C{unicode} or C{NoneType}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-         @return: A deferred that fires with a C{unicode} that represents
-                  the identifier of the new node.
-         @rtype: L{defer.Deferred}
-         """
- 
-+
-     def getConfigurationOptions():
-         """
-         Retrieve all known node configuration options.
-@@ -426,17 +405,13 @@
-         @rtype: C{dict}.
-         """
- 
--    def getDefaultConfiguration(requestor, service, nodeType):
-+
-+    def getDefaultConfiguration(request):
-         """
-         Called when a default node configuration request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeType: The type of node for which the configuration is
--                         retrieved, C{'leaf'} or C{'collection'}.
--        @type nodeType: C{str}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-         @return: A deferred that fires with a C{dict} representing the default
-                  node configuration. Keys are C{str}s that represent the
-                  field name. Values can be of types C{unicode}, C{int} or
-@@ -444,85 +419,74 @@
-         @rtype: L{defer.Deferred}
-         """
- 
--    def getConfiguration(requestor, service, nodeIdentifier):
-+
-+    def getConfiguration(request):
-         """
-         Called when a node configuration retrieval request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeIdentifier: The identifier of the node to retrieve the
--                               configuration from.
--        @type nodeIdentifier: C{unicode}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-         @return: A deferred that fires with a C{dict} representing the node
-                  configuration. Keys are C{str}s that represent the field name.
-                  Values can be of types C{unicode}, C{int} or C{bool}.
-         @rtype: L{defer.Deferred}
-         """
- 
--    def setConfiguration(requestor, service, nodeIdentifier, options):
-+
-+    def setConfiguration(request):
-         """
-         Called when a node configuration change request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeIdentifier: The identifier of the node to change the
--                               configuration of.
--        @type nodeIdentifier: C{unicode}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-         @return: A deferred that fires with C{None} when the node's
-                  configuration has been changed.
-         @rtype: L{defer.Deferred}
-         """
- 
--    def items(requestor, service, nodeIdentifier, maxItems, itemIdentifiers):
-+
-+    def items(request):
-         """
-         Called when a items retrieval request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeIdentifier: The identifier of the node to retrieve items
--                               from.
--        @type nodeIdentifier: C{unicode}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-+        @return: A deferred that fires with a C{list} of L{pubsub.Item}.
-+        @rtype: L{defer.Deferred}
-         """
- 
--    def retract(requestor, service, nodeIdentifier, itemIdentifiers):
-+
-+    def retract(request):
-         """
-         Called when a item retraction request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeIdentifier: The identifier of the node to retract items
--                               from.
--        @type nodeIdentifier: C{unicode}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-+        @return: A deferred that fires with C{None} when the given items have
-+                 been retracted.
-+        @rtype: L{defer.Deferred}
-         """
- 
--    def purge(requestor, service, nodeIdentifier):
-+
-+    def purge(request):
-         """
-         Called when a node purge request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeIdentifier: The identifier of the node to be purged.
--        @type nodeIdentifier: C{unicode}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-+        @return: A deferred that fires with C{None} when the node has been
-+                 purged.
-+        @rtype: L{defer.Deferred}
-         """
- 
--    def delete(requestor, service, nodeIdentifier):
-+
-+    def delete(request):
-         """
-         Called when a node deletion request has been received.
- 
--        @param requestor: The entity the request originated from.
--        @type requestor: L{jid.JID}
--        @param service: The entity the request was addressed to.
--        @type service: L{jid.JID}
--        @param nodeIdentifier: The identifier of the node to be delete.
--        @type nodeIdentifier: C{unicode}
-+        @param request: The publish-subscribe request.
-+        @type request: L{wokkel.pubsub.PubSubRequest}
-+        @return: A deferred that fires with C{None} when the node has been
-+                 deleted.
-+        @rtype: L{defer.Deferred}
-         """
-diff -r 556fc011f965 wokkel/pubsub.py
---- a/wokkel/pubsub.py  Tue Apr 07 11:16:01 2009 +0200
-+++ b/wokkel/pubsub.py  Tue Apr 07 11:17:21 2009 +0200
+diff -r e35e291de060 wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Wed Apr 22 01:48:41 2009 -0700
++++ b/wokkel/pubsub.py  Wed Apr 22 14:48:14 2009 +0200
 @@ -16,7 +16,7 @@
  from twisted.words.protocols.jabber import jid, error, xmlstream
@@ -981 +699 @@
  
      def getDiscoInfo(self, requestor, target, nodeIdentifier):
-@@ -585,92 +862,17 @@
+@@ -585,92 +862,18 @@
          return d
  
@@ -1003 +721 @@
 -                continue
 +    def _on_publish(self, request):
-+        return self.publish(request)
++        return self.publish(request.sender, request.recipient,
++                            request.nodeIdentifier, request.items)
  
 -        return form
@@ -1081 +800 @@
          def toResponse(result):
              response = domish.Element((NS_PUBSUB, "pubsub"))
-@@ -681,28 +883,24 @@
+@@ -681,28 +884,26 @@
              subscription["subscription"] = result.state
              return response
  
 -        d = self.subscribe(requestor, service, nodeIdentifier, subscriber)
-+        d = self.subscribe(request)
++        d = self.subscribe(request.sender, request.recipient,
++                           request.nodeIdentifier, request.subscriber)
          d.addCallback(toResponse)
          return d
@@ -1095 +815 @@
 -                iq, 'unsubscribe', 'nodeOrEmpty', 'jid')
 +    def _on_unsubscribe(self, request):
-+        return self.unsubscribe(request)
++        return self.unsubscribe(request.sender, request.recipient,
++                                request.nodeIdentifier, request.subscriber)
  
 -        return self.unsubscribe(requestor, service, nodeIdentifier, subscriber)
@@ -1116 +837 @@
          def toResponse(result):
              response = domish.Element((NS_PUBSUB, 'pubsub'))
-@@ -714,13 +912,12 @@
+@@ -714,13 +915,12 @@
                  item['subscription'] = subscription.state
              return response
  
 -        d = self.subscriptions(requestor, service)
-+        d = self.subscriptions(request)
++        d = self.subscriptions(request.sender, request.recipient)
          d.addCallback(toResponse)
          return d
@@ -1132 +853 @@
          def toResponse(result):
              response = domish.Element((NS_PUBSUB, 'pubsub'))
-@@ -733,17 +930,15 @@
+@@ -733,17 +933,15 @@
  
              return response
  
 -        d = self.affiliations(requestor, service)
-+        d = self.affiliations(request)
++        d = self.affiliations(request.sender, request.recipient)
          d.addCallback(toResponse)
          return d
@@ -1153 +874 @@
                  create = response.addElement('create')
                  create['node'] = result
-@@ -751,7 +946,7 @@
+@@ -751,7 +949,8 @@
              else:
                  return None
  
 -        d = self.create(requestor, service, nodeIdentifier)
-+        d = self.create(request)
++        d = self.create(request.sender, request.recipient,
++                        request.nodeIdentifier)
          d.addCallback(toResponse)
          return d
  
-@@ -771,6 +966,7 @@
+@@ -771,6 +970,7 @@
              fields.append(data_form.Field.fromDict(option))
          return fields
@@ -1170 +892 @@
          options = self.getConfigurationOptions()
          fields = self._makeFields(options, values)
-@@ -780,6 +976,7 @@
+@@ -780,6 +980,7 @@
  
          return form
@@ -1178 +900 @@
          options = self.getConfigurationOptions()
          processedValues = {}
-@@ -805,8 +1002,7 @@
+@@ -805,8 +1006,7 @@
          return processedValues
  
@@ -1188 +910 @@
          def toResponse(options):
              response = domish.Element((NS_PUBSUB_OWNER, "pubsub"))
-@@ -814,127 +1010,82 @@
+@@ -814,127 +1014,91 @@
              default.addChild(self._formFromConfiguration(options).toElement())
              return response
@@ -1201 +923 @@
  
 -        d = self.getDefaultConfiguration(requestor, service, nodeType)
-+        d = self.getDefaultConfiguration(request)
++        d = self.getDefaultConfiguration(request.sender, request.recipient,
++                                         request.nodeType)
          d.addCallback(toResponse)
          return d
@@ -1226 +949 @@
  
 -        d = self.getConfiguration(requestor, service, nodeIdentifier)
-+        d = self.getConfiguration(request)
++        d = self.getConfiguration(request.sender, request.recipient,
++                                  request.nodeIdentifier)
          d.addCallback(toResponse)
          return d
@@ -1237 +961 @@
 +        if request.options:
 +            request.options = self._checkConfiguration(request.options)
-+            return self.setConfiguration(request)
++            return self.setConfiguration(request.sender, request.recipient,
++                                         request.nodeIdentifier,
++                                         request.options)
 +        else:
 +            return None
@@ -1284 +1010 @@
 -        d = self.items(requestor, service, nodeIdentifier, maxItems,
 -                       itemIdentifiers)
-+        d = self.items(request)
++        d = self.items(request.sender, request.recipient,
++                       request.nodeIdentifier, request.maxItems,
++                       request.itemIdentifiers)
          d.addCallback(toResponse)
          return d
@@ -1293 +1021 @@
 -                iq, 'retract', 'node')
 +    def _on_retract(self, request):
-+        return self.retract(request)
++        return self.retract(request.sender, request.recipient,
++                            request.nodeIdentifier, request.itemIdentifiers)
  
 -        itemIdentifiers = []
@@ -1306 +1035 @@
 -                            itemIdentifiers)
 +    def _on_purge(self, request):
-+        return self.purge(request)
++        return self.purge(request.sender, request.recipient,
++                          request.nodeIdentifier)
  
  
@@ -1314 +1044 @@
 -        return self.purge(requestor, service, nodeIdentifier)
 +    def _on_delete(self, request):
-+        return self.delete(request)
++        return self.delete(request.sender, request.recipient,
++                           request.nodeIdentifier)
  
  
@@ -1343 +1074 @@
  
      # public methods
-@@ -990,27 +1141,27 @@
-         return []
- 
- 
--    def publish(self, requestor, service, nodeIdentifier, items):
-+    def publish(self, request):
-         raise Unsupported('publish')
- 
- 
--    def subscribe(self, requestor, service, nodeIdentifier, subscriber):
-+    def subscribe(self, request):
-         raise Unsupported('subscribe')
- 
- 
--    def unsubscribe(self, requestor, service, nodeIdentifier, subscriber):
-+    def unsubscribe(self, request):
-         raise Unsupported('subscribe')
- 
- 
--    def subscriptions(self, requestor, service):
-+    def subscriptions(self, request):
-         raise Unsupported('retrieve-subscriptions')
- 
- 
--    def affiliations(self, requestor, service):
-+    def affiliations(self, request):
-         raise Unsupported('retrieve-affiliations')
- 
- 
--    def create(self, requestor, service, nodeIdentifier):
-+    def create(self, request):
-         raise Unsupported('create-nodes')
- 
- 
-@@ -1018,30 +1169,29 @@
-         return {}
- 
- 
--    def getDefaultConfiguration(self, requestor, service, nodeType):
-+    def getDefaultConfiguration(self, request):
-         raise Unsupported('retrieve-default')
- 
- 
--    def getConfiguration(self, requestor, service, nodeIdentifier):
-+    def getConfiguration(self, request):
-         raise Unsupported('config-node')
- 
- 
--    def setConfiguration(self, requestor, service, nodeIdentifier, options):
-+    def setConfiguration(self, request):
-         raise Unsupported('config-node')
- 
- 
--    def items(self, requestor, service, nodeIdentifier, maxItems,
--                    itemIdentifiers):
-+    def items(self, request):
-         raise Unsupported('retrieve-items')
- 
- 
--    def retract(self, requestor, service, nodeIdentifier, itemIdentifiers):
-+    def retract(self, request):
-         raise Unsupported('retract-items')
- 
- 
--    def purge(self, requestor, service, nodeIdentifier):
-+    def purge(self, request):
-         raise Unsupported('purge-nodes')
- 
- 
--    def delete(self, requestor, service, nodeIdentifier):
-+    def delete(self, request):
-         raise Unsupported('delete-nodes')
-diff -r 556fc011f965 wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Tue Apr 07 11:16:01 2009 +0200
-+++ b/wokkel/test/test_pubsub.py        Tue Apr 07 11:17:21 2009 +0200
+diff -r e35e291de060 wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Wed Apr 22 01:48:41 2009 -0700
++++ b/wokkel/test/test_pubsub.py        Wed Apr 22 14:48:14 2009 +0200
 @@ -15,6 +15,7 @@
  from twisted.words.protocols.jabber.xmlstream import toResponse
@@ -2116 +1775 @@
          """
          A publish request should result in L{PubSubService.publish} being
-@@ -606,27 +1232,147 @@
-         </iq>
+@@ -607,26 +1233,146 @@
          """
  
--        def publish(requestor, service, nodeIdentifier, items):
+         def publish(requestor, service, nodeIdentifier, items):
 -            self.assertEqual(JID('user@example.org'), requestor)
 -            self.assertEqual(JID('pubsub.example.org'), service)
 -            self.assertEqual('test', nodeIdentifier)
 -            self.assertEqual([], items)
-+        def publish(request):
              return defer.succeed(None)
  
@@ -2147 +1804 @@
 +        """
 +
-+        def subscribe(request):
-+            return defer.succeed(pubsub.Subscription(request.nodeIdentifier,
-+                                                     request.subscriber,
++        def subscribe(requestor, service, nodeIdentifier, subscriber):
++            return defer.succeed(pubsub.Subscription(nodeIdentifier,
++                                                     subscriber,
 +                                                     'subscribed'))
 +
@@ -2182 +1839 @@
 +        """
 +
-+        def subscribe(request):
-+            return defer.succeed(pubsub.Subscription(request.nodeIdentifier,
-+                                                     request.subscriber,
++        def subscribe(requestor, service, nodeIdentifier, subscriber):
++            return defer.succeed(pubsub.Subscription(nodeIdentifier,
++                                                     subscriber,
 +                                                     'subscribed'))
 +
@@ -2211 +1868 @@
 +        """
 +
-+        def unsubscribe(request):
++        def unsubscribe(requestor, service, nodeIdentifier, subscriber):
 +            return defer.succeed(None)
 +
@@ -2271 +1928 @@
          </iq>
          """
-@@ -672,14 +1418,141 @@
-             self.assertEqual('subscribed', subscription['subscription'])
- 
- 
--        def subscriptions(requestor, service):
+@@ -673,13 +1419,140 @@
+ 
+ 
+         def subscriptions(requestor, service):
 -            self.assertEqual(JID('user@example.org'), requestor)
 -            self.assertEqual(JID('pubsub.example.org'), service)
-+        def subscriptions(request):
              subscription = pubsub.Subscription('test', JID('user@example.org'),
                                                 'subscribed')
@@ -2319 +1974 @@
 +
 +
-+        def affiliations(request):
++        def affiliations(requestor, service):
 +            affiliation = ('test', 'owner')
 +            return defer.succeed([affiliation])
@@ -2344 +1999 @@
 +        """
 +
-+        def create(request):
-+            return defer.succeed(request.nodeIdentifier)
++        def create(requestor, service, nodeIdentifier):
++            return defer.succeed(nodeIdentifier)
 +
 +        def cb(element):
@@ -2371 +2026 @@
 +        """
 +
-+        def create(request):
++        def create(requestor, service, nodeIdentifier):
 +            return defer.succeed(u'myrenamednode')
 +
@@ -2402 +2057 @@
 +        """
 +
-+        def create(request):
++        def create(requestor, service, nodeIdentifier):
 +            return defer.succeed(u'random')
 +
@@ -2416 +2071 @@
          d.addCallback(cb)
          return d
-@@ -710,10 +1583,7 @@
-                      "label": "Deliver payloads with event notifications"}
+@@ -711,9 +1584,6 @@
                  }
  
--        def getDefaultConfiguration(requestor, service, nodeType):
+         def getDefaultConfiguration(requestor, service, nodeType):
 -            self.assertEqual(JID('user@example.org'), requestor)
 -            self.assertEqual(JID('pubsub.example.org'), service)
 -            self.assertEqual('leaf', nodeType)
-+        def getDefaultConfiguration(request):
              return defer.succeed({})
  
@@ -2463 +2116 @@
 +                }
 +
-+        def getDefaultConfiguration(request):
++        def getDefaultConfiguration(requestor, service, nodeType):
 +            return defer.succeed({})
 +
@@ -2497 +2150 @@
 +        """
 +
-+        def getDefaultConfiguration(request):
++        def getDefaultConfiguration(requestor, service, nodeType):
 +            self.fail("Unexpected call to getConfiguration")
 +
@@ -2514 +2167 @@
          """
          On a node configuration get request L{PubSubService.getConfiguration}
-@@ -759,14 +1708,11 @@
-                      "label": "Owner of the node"}
+@@ -760,13 +1709,10 @@
                  }
  
--        def getConfiguration(requestor, service, nodeIdentifier):
+         def getConfiguration(requestor, service, nodeIdentifier):
 -            self.assertEqual(JID('user@example.org'), requestor)
 -            self.assertEqual(JID('pubsub.example.org'), service)
 -            self.assertEqual('test', nodeIdentifier)
 -
-+        def getConfiguration(request):
              return defer.succeed({'pubsub#deliver_payloads': '0',
                                    'pubsub#persist_items': '1',
@@ -2545 +2196 @@
          d.addCallback(cb)
          return d
-@@ -834,16 +1784,14 @@
-                      "label": "Deliver payloads with event notifications"}
+@@ -835,15 +1785,13 @@
                  }
  
--        def setConfiguration(requestor, service, nodeIdentifier, options):
+         def setConfiguration(requestor, service, nodeIdentifier, options):
 -            self.assertEqual(JID('user@example.org'), requestor)
 -            self.assertEqual(JID('pubsub.example.org'), service)
 -            self.assertEqual('test', nodeIdentifier)
-+        def setConfiguration(request):
              self.assertEqual({'pubsub#deliver_payloads': False,
--                              'pubsub#persist_items': True}, options)
-+                              'pubsub#persist_items': True}, request.options)
+                               'pubsub#persist_items': True}, options)
              return defer.succeed(None)
  
@@ -2565 +2213 @@
  
  
-@@ -868,10 +1816,11 @@
-         </iq>
-         """
- 
--        def setConfiguration(requestor, service, nodeIdentifier, options):
-+        def setConfiguration(request):
+@@ -872,6 +1820,7 @@
              self.fail("Unexpected call to setConfiguration")
  
@@ -2578 +2221 @@
  
  
-@@ -907,14 +1856,47 @@
-                      "label": "Deliver payloads with event notifications"}
-                 }
- 
--        def setConfiguration(requestor, service, nodeIdentifier, options):
--            self.assertEquals(['pubsub#deliver_payloads'], options.keys())
-+        def setConfiguration(request):
-+            self.assertEquals(['pubsub#deliver_payloads'],
-+                              request.options.keys())
+@@ -912,9 +1861,41 @@
  
          self.service.getConfigurationOptions = getConfigurationOptions
@@ -2628 +2263 @@
          """
          On a items request, return all items for the given node.
-@@ -928,12 +1910,7 @@
+@@ -928,12 +1909,8 @@
          </iq>
          """
@@ -2638 +2273 @@
 -            self.assertIdentical(None, maxItems)
 -            self.assertEqual([], items)
-+        def items(request):
++        def items(requestor, service, nodeIdentifier, maxItems,
++                  itemIdentifiers):
              return defer.succeed([pubsub.Item('current')])
  
          def cb(element):
-@@ -970,11 +1947,7 @@
-         </iq>
+@@ -971,10 +1948,6 @@
          """
  
--        def retract(requestor, service, nodeIdentifier, itemIdentifiers):
+         def retract(requestor, service, nodeIdentifier, itemIdentifiers):
 -            self.assertEqual(JID('user@example.org'), requestor)
 -            self.assertEqual(JID('pubsub.example.org'), service)
 -            self.assertEqual('test', nodeIdentifier)
 -            self.assertEqual(['item1', 'item2'], itemIdentifiers)
-+        def retract(request):
              return defer.succeed(None)
  
          self.service.retract = retract
-@@ -996,10 +1969,7 @@
-         </iq>
+@@ -997,9 +1970,6 @@
          """
  
--        def purge(requestor, service, nodeIdentifier):
+         def purge(requestor, service, nodeIdentifier):
 -            self.assertEqual(JID('user@example.org'), requestor)
 -            self.assertEqual(JID('pubsub.example.org'), service)
 -            self.assertEqual('test', nodeIdentifier)
-+        def purge(request):
              return defer.succeed(None)
  
          self.service.purge = purge
-@@ -1021,10 +1991,7 @@
-         </iq>
+@@ -1022,9 +1992,6 @@
          """
  
--        def delete(requestor, service, nodeIdentifier):
+         def delete(requestor, service, nodeIdentifier):
 -            self.assertEqual(JID('user@example.org'), requestor)
 -            self.assertEqual(JID('pubsub.example.org'), service)
 -            self.assertEqual('test', nodeIdentifier)
-+        def delete(request):
              return defer.succeed(None)
  

pubsub_resource.patch

@@ -1 @@
-diff -r ce121b9d0797 wokkel/iwokkel.py
---- a/wokkel/iwokkel.py Fri Apr 10 15:36:22 2009 +0200
-+++ b/wokkel/iwokkel.py Fri Apr 10 17:31:54 2009 +0200
-@@ -297,75 +297,46 @@
-         """
- 
- 
--    def publish(request):
+diff -r 29f67459352b wokkel/iwokkel.py
+--- a/wokkel/iwokkel.py Wed Apr 22 14:48:20 2009 +0200
++++ b/wokkel/iwokkel.py Wed Apr 22 16:14:56 2009 +0200
+@@ -278,6 +278,7 @@
+                              C{list} of L{domish.Element})
+         """
+ 
++
+     def notifyDelete(service, nodeIdentifier, subscribers,
+                      redirectURI=None):
+         """
+@@ -526,3 +527,243 @@
+         @param nodeIdentifier: The identifier of the node to be delete.
+         @type nodeIdentifier: C{unicode}
+         """
++
++
++
 +class IPubSubResource(Interface):
 +
 +    def locateResource(request):
-         """
--        Called when a publish request has been received.
++        """
 +        Locate a resource that will handle the request.
- 
-         @param request: The publish-subscribe request.
-         @type request: L{wokkel.pubsub.PubSubRequest}
--        @return: deferred that fires on success.
++
++        @param request: The publish-subscribe request.
++        @type request: L{wokkel.pubsub.PubSubRequest}
 +        """
 +
@@ -34 +42 @@
 +                 respectively the node type and a dictionary with the meta
 +                 data for that node.
-         @rtype: L{defer.Deferred}
-         """
- 
- 
--    def subscribe(request):
++        @rtype: L{defer.Deferred}
++        """
++
++
 +    def getNodes(requestor, service, nodeIdentifier):
-         """
--        Called when a subscribe request has been received.
++        """
 +        Get all nodes contained by this node.
- 
--        @param request: The publish-subscribe request.
--        @type request: L{wokkel.pubsub.PubSubRequest}
--        @return: A deferred that fires with a
--                 L{Subscription<wokkel.pubsub.Subscription>}.
--        @rtype: L{defer.Deferred}
--        """
--
--
--    def unsubscribe(request):
--        """
--        Called when a subscribe request has been received.
--
--        @param request: The publish-subscribe request.
--        @type request: L{wokkel.pubsub.PubSubRequest}
--        @return: A deferred that fires with C{None} when unsubscription has
--                 succeeded.
--        @rtype: L{defer.Deferred}
--        """
--
--
--    def subscriptions(request):
--        """
--        Called when a subscriptions retrieval request has been received.
--
--        @param request: The publish-subscribe request.
--        @type request: L{wokkel.pubsub.PubSubRequest}
--        @return: A deferred that fires with a C{list} of subscriptions as
--                 L{Subscription<wokkel.pubsub.Subscription>}.
--        @rtype: L{defer.Deferred}
--        """
--
--
--    def affiliations(request):
--        """
--        Called when a affiliations retrieval request has been received.
--
--        @param request: The publish-subscribe request.
--        @type request: L{wokkel.pubsub.PubSubRequest}
--        @return: A deferred that fires with a C{list} of affiliations as
--                 C{tuple}s of (node identifier as C{unicode}, affiliation state
--                 as C{str}). The affiliation can be C{'owner'}, C{'publisher'},
--                 or C{'outcast'}.
--        @rtype: L{defer.Deferred}
--        """
--
--
--    def create(request):
--        """
--        Called when a node creation request has been received.
--
--        @param request: The publish-subscribe request.
--        @type request: L{wokkel.pubsub.PubSubRequest}
--        @return: A deferred that fires with a C{unicode} that represents
--                 the identifier of the new node.
++
 +        @param requestor: The entity the request originated from.
 +        @type requestor: L{jid.JID}
@@ -105 +57 @@
 +        @type nodeIdentifier: L{unicode}
 +        @return: A deferred that fires with a list of child node identifiers.
-         @rtype: L{defer.Deferred}
-         """
- 
-@@ -406,7 +377,80 @@
-         """
- 
- 
--    def getDefaultConfiguration(request):
++        @rtype: L{defer.Deferred}
++        """
++
++
++    def getConfigurationOptions():
++        """
++        Retrieve all known node configuration options.
++
++        The returned dictionary holds the possible node configuration options
++        by option name. The value of each entry represents the specifics for
++        that option in a dictionary:
++
++         - C{'type'} (C{str}): The option's type (see
++           L{Field<wokkel.data_form.Field>}'s doc string for possible values).
++         - C{'label'} (C{unicode}): A human readable label for this option.
++         - C{'options'} (C{dict}): Optional list of possible values for this
++           option.
++
++        Example::
++
++            {
++            "pubsub#persist_items":
++                {"type": "boolean",
++                 "label": "Persist items to storage"},
++            "pubsub#deliver_payloads":
++                {"type": "boolean",
++                 "label": "Deliver payloads with event notifications"},
++            "pubsub#send_last_published_item":
++                {"type": "list-single",
++                 "label": "When to send the last published item",
++                 "options": {
++                     "never": "Never",
++                     "on_sub": "When a new subscription is processed"}
++                }
++            }
++
++        @rtype: C{dict}.
++        """
++
++
 +    def publish(request):
 +        """
@@ -187 +171 @@
 +
 +    def default(request):
-         """
-         Called when a default node configuration request has been received.
- 
-@@ -420,7 +464,7 @@
-         """
- 
- 
--    def getConfiguration(request):
++        """
++        Called when a default node configuration request has been received.
++
++        @param request: The publish-subscribe request.
++        @type request: L{wokkel.pubsub.PubSubRequest}
++        @return: A deferred that fires with a C{dict} representing the default
++                 node configuration. Keys are C{str}s that represent the
++                 field name. Values can be of types C{unicode}, C{int} or
++                 C{bool}.
++        @rtype: L{defer.Deferred}
++        """
++
++
 +    def configureGet(request):
-         """
-         Called when a node configuration retrieval request has been received.
- 
-@@ -433,7 +477,7 @@
-         """
- 
- 
--    def setConfiguration(request):
++        """
++        Called when a node configuration retrieval request has been received.
++
++        @param request: The publish-subscribe request.
++        @type request: L{wokkel.pubsub.PubSubRequest}
++        @return: A deferred that fires with a C{dict} representing the node
++                 configuration. Keys are C{str}s that represent the field name.
++                 Values can be of types C{unicode}, C{int} or C{bool}.
++        @rtype: L{defer.Deferred}
++        """
++
++
 +    def configureSet(request):
-         """
-         Called when a node configuration change request has been received.
- 
-diff -r ce121b9d0797 wokkel/pubsub.py
---- a/wokkel/pubsub.py  Fri Apr 10 15:36:22 2009 +0200
-+++ b/wokkel/pubsub.py  Fri Apr 10 17:31:54 2009 +0200
++        """
++        Called when a node configuration change request has been received.
++
++        @param request: The publish-subscribe request.
++        @type request: L{wokkel.pubsub.PubSubRequest}
++        @return: A deferred that fires with C{None} when the node's
++                 configuration has been changed.
++        @rtype: L{defer.Deferred}
++        """
++
++
++    def items(request):
++        """
++        Called when a items retrieval request has been received.
++
++        @param request: The publish-subscribe request.
++        @type request: L{wokkel.pubsub.PubSubRequest}
++        @return: A deferred that fires with a C{list} of L{pubsub.Item}.
++        @rtype: L{defer.Deferred}
++        """
++
++
++    def retract(request):
++        """
++        Called when a item retraction request has been received.
++
++        @param request: The publish-subscribe request.
++        @type request: L{wokkel.pubsub.PubSubRequest}
++        @return: A deferred that fires with C{None} when the given items have
++                 been retracted.
++        @rtype: L{defer.Deferred}
++        """
++
++
++    def purge(request):
++        """
++        Called when a node purge request has been received.
++
++        @param request: The publish-subscribe request.
++        @type request: L{wokkel.pubsub.PubSubRequest}
++        @return: A deferred that fires with C{None} when the node has been
++                 purged.
++        @rtype: L{defer.Deferred}
++        """
++
++
++    def delete(request):
++        """
++        Called when a node deletion request has been received.
++
++        @param request: The publish-subscribe request.
++        @type request: L{wokkel.pubsub.PubSubRequest}
++        @return: A deferred that fires with C{None} when the node has been
++                 deleted.
++        @rtype: L{defer.Deferred}
++        """
+diff -r 29f67459352b wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Wed Apr 22 14:48:20 2009 +0200
++++ b/wokkel/pubsub.py  Wed Apr 22 16:14:56 2009 +0200
 @@ -13,12 +13,13 @@
  from zope.interface import implements
@@ -255 +301 @@
      }
  
-@@ -806,13 +812,10 @@
+@@ -806,8 +812,35 @@
              '/*': '_onPubSubRequest',
              }
  
++    _legacyHandlers = {
++        'publish': ('publish', ['sender', 'recipient',
++                                'nodeIdentifier', 'items']),
++        'subscribe': ('subscribe', ['sender', 'recipient',
++                                    'nodeIdentifier', 'subscriber']),
++        'unsubscribe': ('unsubscribe', ['sender', 'recipient',
++                                        'nodeIdentifier', 'subscriber']),
++        'subscriptions': ('subscriptions', ['sender', 'recipient']),
++        'affiliations': ('affiliations', ['sender', 'recipient']),
++        'create': ('create', ['sender', 'recipient', 'nodeIdentifier']),
++        'getConfigurationOptions': ('getConfigurationOptions', []),
++        'default': ('getDefaultConfiguration',
++                    ['sender', 'recipient', 'nodeType']),
++        'configureGet': ('getConfiguration', ['sender', 'recipient',
++                                              'nodeIdentifier']),
++        'configureSet': ('setConfiguration', ['sender', 'recipient',
++                                              'nodeIdentifier', 'options']),
++        'items': ('items', ['sender', 'recipient', 'nodeIdentifier',
++                            'maxItems', 'itemIdentifiers']),
++        'retract': ('retract', ['sender', 'recipient', 'nodeIdentifier',
++                                'itemIdentifiers']),
++        'purge': ('purge', ['sender', 'recipient', 'nodeIdentifier']),
++        'delete': ('delete', ['sender', 'recipient', 'nodeIdentifier']),
++    }
+ 
+-    def __init__(self):
 +    hideNodes = False
- 
--    def __init__(self):
--        self.discoIdentity = {'category': 'pubsub',
--                              'type': 'generic',
--                              'name': 'Generic Publish-Subscribe Service'}
--
--        self.pubSubFeatures = []
-+    def __init__(self, resource):
++
++    def __init__(self, resource=None):
 +        self.resource = resource
- 
- 
-     def connectionMade(self):
-@@ -820,19 +823,9 @@
+         self.discoIdentity = {'category': 'pubsub',
+                               'type': 'generic',
+                               'name': 'Generic Publish-Subscribe Service'}
+@@ -820,19 +853,9 @@
  
  
@@ -294 +360 @@
              (nodeType, metaData) = nodeInfo['type'], nodeInfo['meta-data']
              info.append(disco.DiscoIdentity('pubsub', nodeType))
-@@ -852,17 +845,33 @@
+@@ -852,17 +875,49 @@
  
                  info.append(form)
@@ -306 +372 @@
 +
 +        request = PubSubRequest('discoInfo')
-+        resource = self.resource.locateResource(request)
++
++        if self.resource is not None:
++            resource = self.resource.locateResource(request)
++            identity = resource.discoIdentity
++            features = resource.features
++            getInfo = resource.getInfo
++        else:
++            category, idType, name = self.discoIdentity
++            identity = disco.DiscoIdentity(category, idType, name)
++            features = self.pubSubFeatures
++            getInfo = self.getNodeInfo
 +
 +        if not nodeIdentifier:
-+            info.append(resource.discoIdentity)
++            info.append(identity)
 +            info.append(disco.DiscoFeature(disco.NS_DISCO_ITEMS))
 +            info.extend([disco.DiscoFeature("%s#%s" % (NS_PUBSUB, feature))
-+                         for feature in resource.features])
-+
-+        d = resource.getInfo(requestor, target, nodeIdentifier or '')
++                         for feature in features])
++
++        d = getInfo(requestor, target, nodeIdentifier or '')
 +        d.addCallback(toInfo, info)
 +        d.addErrback(log.err)
@@ -322 +398 @@
      def getDiscoItems(self, requestor, target, nodeIdentifier):
 -        if nodeIdentifier or self.hideNodes:
-+        request = PubSubRequest('discoInfo')
-+        resource = self.resource.locateResource(request)
-+
+-            return defer.succeed([])
 +        if self.hideNodes:
-             return defer.succeed([])
++            d = defer.succeed([])
++        elif self.resource is not None:
++            request = PubSubRequest('discoInfo')
++            resource = self.resource.locateResource(request)
++            d = resource.getNodes(requestor, target, nodeIdentifier)
++        elif nodeIdentifier:
++            d = self.getNodes(requestor, target)
++        else:
++            d = defer.succeed([])
++            
  
 -        d = self.getNodes(requestor, target)
-+        d = resource.getNodes(requestor, target, nodeIdentifier)
++
          d.addCallback(lambda nodes: [disco.DiscoItem(target, node)
                                       for node in nodes])
          return d
-@@ -870,91 +879,80 @@
+@@ -870,95 +925,90 @@
  
      def _onPubSubRequest(self, iq):
@@ -339 +422 @@
 -        handler = getattr(self, '_on_%s' % request.verb)
 -        return handler(request)
-+        resource = self.resource.locateResource(request)
- 
+ 
++        if self.resource is not None:
++            resource = self.resource.locateResource(request)
++        else:
++            resource = self
+ 
+-    def _on_publish(self, request):
+-        return self.publish(request.sender, request.recipient,
+-                            request.nodeIdentifier, request.items)
 +        # Preprocess the request, knowing the handling resource
 +        try:
@@ -351 +441 @@
 +                return defer.succeed(None)
  
--    def _on_publish(self, request):
--        return self.publish(request)
 +        # Process the request itself, 
-+        try:
-+            handler = getattr(resource, request.verb)
-+        except AttributeError:
-+            # fix lookup feature
-+            text = "Request verb: %s" % request.verb
-+            return defer.fail(Unsupported('', text))
- 
-+        d = handler(request)
++        if resource is not self:
++            try:
++                handler = getattr(resource, request.verb)
++            except AttributeError:
++                # fix lookup feature
++                text = "Request verb: %s" % request.verb
++                return defer.fail(Unsupported('', text))
  
 -    def _on_subscribe(self, request):
-+        # If needed, translate the result into a response
-+        try:
-+            cb = getattr(self, '_toResponse_%s' % request.verb)
-+        except AttributeError:
-+            pass
++            d = handler(request)
 +        else:
-+            d.addCallback(cb, resource, request)
++            handlerName, argNames = self._legacyHandlers[request.verb]
++            handler = getattr(self, handlerName)
++            args = [getattr(request, arg) for arg in argNames]
++            d = handler(*args)
  
 -        def toResponse(result):
@@ -380 +466 @@
 -            subscription["subscription"] = result.state
 -            return response
--
--        d = self.subscribe(request)
++        # If needed, translate the result into a response
++        try:
++            cb = getattr(self, '_toResponse_%s' % request.verb)
++        except AttributeError:
++            pass
++        else:
++            d.addCallback(cb, resource, request)
+ 
+-        d = self.subscribe(request.sender, request.recipient,
+-                           request.nodeIdentifier, request.subscriber)
 -        d.addCallback(toResponse)
          return d
@@ -387 +481 @@
  
 -    def _on_unsubscribe(self, request):
--        return self.unsubscribe(request)
+-        return self.unsubscribe(request.sender, request.recipient,
+-                                request.nodeIdentifier, request.subscriber)
 +    def _toResponse_subscribe(self, result, resource, request):
 +        response = domish.Element((NS_PUBSUB, "pubsub"))
@@ -440 +535 @@
              return response
 -
--        d = self.subscriptions(request)
+-        d = self.subscriptions(request.sender, request.recipient)
 -        d.addCallback(toResponse)
 -        return d
@@ -458 +553 @@
 -            return response
 -
--        d = self.affiliations(request)
+-        d = self.affiliations(request.sender, request.recipient)
 -        d.addCallback(toResponse)
 -        return d
@@ -474 +569 @@
 -                return None
 -
--        d = self.create(request)
+-        d = self.create(request.sender, request.recipient,
+-                        request.nodeIdentifier)
 -        d.addCallback(toResponse)
 -        return d
@@ -482 +578 @@
  
      def _makeFields(self, options, values):
-@@ -973,8 +971,8 @@
+@@ -977,8 +1027,8 @@
          return fields
  
@@ -493 +589 @@
          form = data_form.Form(formType="form",
                                formNamespace=NS_PUBSUB_NODE_CONFIG,
-@@ -983,8 +981,8 @@
+@@ -987,8 +1037,8 @@
          return form
  
@@ -504 +600 @@
  
          for key, value in values.iteritems():
-@@ -1008,93 +1006,52 @@
+@@ -1012,102 +1062,52 @@
          return processedValues
  
@@ -530 +626 @@
 +        return response
  
--        d = self.getDefaultConfiguration(request)
+-        d = self.getDefaultConfiguration(request.sender, request.recipient,
+-                                         request.nodeType)
 -        d.addCallback(toResponse)
 -        return d
@@ -555 +652 @@
 -            return response
  
--        d = self.getConfiguration(request)
+-        d = self.getConfiguration(request.sender, request.recipient,
+-                                  request.nodeIdentifier)
 -        d.addCallback(toResponse)
 -        return d
@@ -564 +662 @@
          if request.options:
 -            request.options = self._checkConfiguration(request.options)
--            return self.setConfiguration(request)
+-            return self.setConfiguration(request.sender, request.recipient,
+-                                         request.nodeIdentifier,
+-                                         request.options)
 +            request.options = self._checkConfiguration(resource,
 +                                                       request.options)
@@ -592 +692 @@
 -            return response
 -
--        d = self.items(request)
+-        d = self.items(request.sender, request.recipient,
+-                       request.nodeIdentifier, request.maxItems,
+-                       request.itemIdentifiers)
 -        d.addCallback(toResponse)
 -        return d
@@ -598 +700 @@
 -
 -    def _on_retract(self, request):
--        return self.retract(request)
+-        return self.retract(request.sender, request.recipient,
+-                            request.nodeIdentifier, request.itemIdentifiers)
 -
 -
 -    def _on_purge(self, request):
--        return self.purge(request)
+-        return self.purge(request.sender, request.recipient,
+-                          request.nodeIdentifier)
 -
 -
 -    def _on_delete(self, request):
--        return self.delete(request)
+-        return self.delete(request.sender, request.recipient,
+-                           request.nodeIdentifier)
 -
 -
@@ -628 +733 @@
      def _createNotification(self, eventType, service, nodeIdentifier,
                                    subscriber, subscriptions=None):
-@@ -1118,6 +1075,8 @@
+@@ -1131,6 +1131,8 @@
  
          return message
@@ -637 +742 @@
          for subscriber, subscriptions, items in notifications:
              message = self._createNotification('items', service,
-@@ -1139,65 +1098,96 @@
-             self.send(message)
- 
- 
--    def getNodeInfo(self, requestor, service, nodeIdentifier):
--        return None
- 
+@@ -1215,3 +1217,98 @@
+ 
+     def delete(self, requestor, service, nodeIdentifier):
+         raise Unsupported('delete-nodes')
++
++
++
 +class PubSubResource(object):
- 
--    def getNodes(self, requestor, service):
--        return []
++
 +    implements(IPubSubResource)
- 
++
 +    features = []
 +    discoIdentity = disco.DiscoIdentity('pubsub',
 +                                        'service',
 +                                        'Publish-Subscribe Service')
- 
--    def publish(self, request):
--        raise Unsupported('publish')
- 
++
++
 +    def locateResource(self, request):
 +        return self
- 
--    def subscribe(self, request):
--        raise Unsupported('subscribe')
- 
++
++
 +    def getInfo(self, requestor, service, nodeIdentifier):
 +        return defer.succeed(None)
- 
--    def unsubscribe(self, request):
--        raise Unsupported('subscribe')
- 
--
--    def subscriptions(self, request):
--        raise Unsupported('retrieve-subscriptions')
--
--
--    def affiliations(self, request):
--        raise Unsupported('retrieve-affiliations')
--
--
--    def create(self, request):
--        raise Unsupported('create-nodes')
++
++
 +    def getNodes(self, requestor, service, nodeIdentifier):
 +        return defer.succeed([])
- 
- 
-     def getConfigurationOptions(self):
-         return {}
- 
- 
--    def getDefaultConfiguration(self, request):
--        raise Unsupported('retrieve-default')
++
++
++    def getConfigurationOptions(self):
++        return {}
++
++
 +    def publish(self, request):
 +        return defer.fail(Unsupported('publish'))
- 
- 
--    def getConfiguration(self, request):
--        raise Unsupported('config-node')
++
++
 +    def subscribe(self, request):
 +        return defer.fail(Unsupported('subscribe'))
- 
- 
--    def setConfiguration(self, request):
--        raise Unsupported('config-node')
++
++
 +    def unsubscribe(self, request):
 +        return defer.fail(Unsupported('subscribe'))
@@ -729 +809 @@
 +    def configureSet(self, request):
 +        return defer.fail(Unsupported('config-node'))
- 
- 
-     def items(self, request):
--        raise Unsupported('retrieve-items')
++
++
++    def items(self, request):
 +        return defer.fail(Unsupported('retrieve-items'))
- 
- 
-     def retract(self, request):
--        raise Unsupported('retract-items')
++
++
++    def retract(self, request):
 +        return defer.fail(Unsupported('retract-items'))
- 
- 
-     def purge(self, request):
--        raise Unsupported('purge-nodes')
++
++
++    def purge(self, request):
 +        return defer.fail(Unsupported('purge-nodes'))
- 
- 
-     def delete(self, request):
--        raise Unsupported('delete-nodes')
++
++
++    def delete(self, request):
 +        return defer.fail(Unsupported('delete-nodes'))
 +
@@ -765 +841 @@
 +    def subscriptionsSet(self, request):
 +        return defer.fail(Unsupported('manage-subscriptions'))
-diff -r ce121b9d0797 wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Fri Apr 10 15:36:22 2009 +0200
-+++ b/wokkel/test/test_pubsub.py        Fri Apr 10 17:31:54 2009 +0200
+diff -r 29f67459352b wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Wed Apr 22 14:48:20 2009 +0200
++++ b/wokkel/test/test_pubsub.py        Wed Apr 22 16:14:56 2009 +0200
 @@ -1222,7 +1222,8 @@
  
@@ -914 +990 @@
          A publish request should result in L{PubSubService.publish} being
          called.
-@@ -1338,12 +1419,12 @@
-         def publish(request):
+@@ -1335,15 +1416,15 @@
+         </iq>
+         """
+ 
+-        def publish(requestor, service, nodeIdentifier, items):
++        def publish(request):
              return defer.succeed(None)
  
@@ -930 +1010 @@
          A successful subscription should return the current subscription.
          """
+@@ -1357,9 +1438,9 @@
+         </iq>
+         """
+ 
+-        def subscribe(requestor, service, nodeIdentifier, subscriber):
+-            return defer.succeed(pubsub.Subscription(nodeIdentifier,
+-                                                     subscriber,
++        def subscribe(request):
++            return defer.succeed(pubsub.Subscription(request.nodeIdentifier,
++                                                     request.subscriber,
+                                                      'subscribed'))
+ 
+         def cb(element):
 @@ -1371,14 +1452,14 @@
              self.assertEqual('user@example.org/Home', subscription['jid'])
@@ -948 +1041 @@
          A successful subscription on root node should return no node attribute.
          """
-@@ -1400,14 +1481,14 @@
+@@ -1392,22 +1473,22 @@
+         </iq>
+         """
+ 
+-        def subscribe(requestor, service, nodeIdentifier, subscriber):
+-            return defer.succeed(pubsub.Subscription(nodeIdentifier,
+-                                                     subscriber,
++        def subscribe(request):
++            return defer.succeed(pubsub.Subscription(request.nodeIdentifier,
++                                                     request.subscriber,
+                                                      'subscribed'))
+ 
          def cb(element):
              self.assertFalse(element.subscription.hasAttribute('node'))
@@ -966 +1070 @@
          A successful unsubscription should return an empty response.
          """
-@@ -1427,14 +1508,14 @@
+@@ -1421,20 +1502,20 @@
+         </iq>
+         """
+ 
+-        def unsubscribe(requestor, service, nodeIdentifier, subscriber):
++        def unsubscribe(request):
+             return defer.succeed(None)
+ 
          def cb(element):
              self.assertIdentical(None, element)
@@ -1019 +1130 @@
  
 -
--        def subscriptions(request):
+-        def subscriptions(requestor, service):
 -            subscription = pubsub.Subscription('test', JID('user@example.org'),
 -                                               'subscribed')
@@ -1054 +1165 @@
  
 -
--        def affiliations(request):
+-        def affiliations(requestor, service):
 -            affiliation = ('test', 'owner')
 -            return defer.succeed([affiliation])
@@ -1072 +1183 @@
          Replies to create node requests don't return the created node.
          """
-@@ -1593,14 +1672,14 @@
+@@ -1587,20 +1666,20 @@
+         </iq>
+         """
+ 
+-        def create(requestor, service, nodeIdentifier):
+-            return defer.succeed(nodeIdentifier)
++        def create(request):
++            return defer.succeed(request.nodeIdentifier)
+ 
          def cb(element):
              self.assertIdentical(None, element)
@@ -1090 +1209 @@
          Replies to create node requests return the created node if changed.
          """
+@@ -1614,7 +1693,7 @@
+         </iq>
+         """
+ 
+-        def create(requestor, service, nodeIdentifier):
++        def create(request):
+             return defer.succeed(u'myrenamednode')
+ 
+         def cb(element):
 @@ -1624,14 +1703,14 @@
              self.assertEqual(u'myrenamednode',
@@ -1108 +1236 @@
          Replies to create instant node requests return the created node.
          """
+@@ -1645,7 +1724,7 @@
+         </iq>
+         """
+ 
+-        def create(requestor, service, nodeIdentifier):
++        def create(request):
+             return defer.succeed(u'random')
+ 
+         def cb(element):
 @@ -1654,14 +1733,14 @@
              self.assertEqual(NS_PUBSUB, element.create.uri)
@@ -1130 +1267 @@
                  }
  
--        def getDefaultConfiguration(request):
+-        def getDefaultConfiguration(requestor, service, nodeType):
 +        def default(request):
              return defer.succeed({})
@@ -1159 +1296 @@
                  }
  
--        def getDefaultConfiguration(request):
+-        def getDefaultConfiguration(requestor, service, nodeType):
 +        def default(request):
              return defer.succeed({})
@@ -1185 +1322 @@
          """
  
--        def getDefaultConfiguration(request):
+-        def getDefaultConfiguration(requestor, service, nodeType):
 +        def default(request):
              self.fail("Unexpected call to getConfiguration")
@@ -1217 +1354 @@
                  }
  
--        def getConfiguration(request):
+-        def getConfiguration(requestor, service, nodeIdentifier):
 +        def configureGet(request):
              return defer.succeed({'pubsub#deliver_payloads': '0',
@@ -1251 +1388 @@
                  }
  
--        def setConfiguration(request):
+-        def setConfiguration(requestor, service, nodeIdentifier, options):
 +        def configureSet(request):
              self.assertEqual({'pubsub#deliver_payloads': False,
-                               'pubsub#persist_items': True}, request.options)
+-                              'pubsub#persist_items': True}, options)
++                              'pubsub#persist_items': True}, request.options)
              return defer.succeed(None)
  
@@ -1280 +1418 @@
          """
  
--        def setConfiguration(request):
+-        def setConfiguration(requestor, service, nodeIdentifier, options):
 +        def configureSet(request):
              self.fail("Unexpected call to setConfiguration")
@@ -1296 +1434 @@
          On a node configuration set request unknown fields should be ignored.
          """
-@@ -1959,17 +2038,17 @@
+@@ -1959,16 +2038,17 @@
                       "label": "Deliver payloads with event notifications"}
                  }
  
--        def setConfiguration(request):
+-        def setConfiguration(requestor, service, nodeIdentifier, options):
+-            self.assertEquals(['pubsub#deliver_payloads'], options.keys())
 +        def configureSet(request):
-             self.assertEquals(['pubsub#deliver_payloads'],
-                               request.options.keys())
++            self.assertEquals(['pubsub#deliver_payloads'],
++                              request.options.keys())
  
 -        self.service.getConfigurationOptions = getConfigurationOptions
@@ -1319 +1458 @@
          On a node configuration set request unknown fields should be ignored.
          """
-@@ -2000,7 +2079,7 @@
+@@ -1999,7 +2079,7 @@
          return d
  
@@ -1328 +1467 @@
          On a items request, return all items for the given node.
          """
+@@ -2012,8 +2092,7 @@
+         </iq>
+         """
+ 
+-        def items(requestor, service, nodeIdentifier, maxItems,
+-                  itemIdentifiers):
++        def items(request):
+             return defer.succeed([pubsub.Item('current')])
+ 
+         def cb(element):
 @@ -2026,16 +2105,17 @@
              self.assertEqual(NS_PUBSUB, item.uri)
@@ -1350 +1499 @@
  
          xml = """
-@@ -2053,13 +2133,14 @@
-         def retract(request):
+@@ -2050,16 +2130,17 @@
+         </iq>
+         """
+ 
+-        def retract(requestor, service, nodeIdentifier, itemIdentifiers):
++        def retract(request):
              return defer.succeed(None)
  
@@ -1368 +1521 @@
          """
  
-@@ -2075,13 +2156,14 @@
-         def purge(request):
+@@ -2072,16 +2153,17 @@
+         </iq>
+         """
+ 
+-        def purge(requestor, service, nodeIdentifier):
++        def purge(request):
              return defer.succeed(None)
  
@@ -1386 +1543 @@
          """
  
-@@ -2097,7 +2179,8 @@
-         def delete(request):
+@@ -2094,10 +2176,11 @@
+         </iq>
+         """
+ 
+-        def delete(requestor, service, nodeIdentifier):
++        def delete(request):
              return defer.succeed(None)
  
@@ -1432 +1593 @@
          Setting subscription options is not supported.
          """
-@@ -2256,18 +2339,38 @@
-         return d
- 
- 
+@@ -2256,6 +2339,15 @@
+         return d
+ 
+ 
++
++class PubSubServiceWithoutResourceTest(unittest.TestCase, TestableRequestHandlerMixin):
++
++    def setUp(self):
++        self.stub = XmlStreamStub()
++        self.service = pubsub.PubSubService()
++        self.service.send = self.stub.xmlstream.send
++
++
+     def test_publish(self):
+         """
+         Non-overridden L{PubSubService.publish} yields unsupported error.
+@@ -2604,3 +2696,257 @@
+         self.assertFailure(d, error.StanzaError)
+         d.addCallback(cb)
+         return d
++
++
 +
 +class PubSubResourceTest(unittest.TestCase):
@@ -1464 +1643 @@
 +
 +
-     def test_publish(self):
-         """
--        Non-overridden L{PubSubService.publish} yields unsupported error.
--        """
--
--        xml = """
--        <iq type='set' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub'>
--            <publish node='mynode'/>
--          </pubsub>
--        </iq>
++    def test_publish(self):
++        """
 +        Non-overridden L{PubSubResource.publish} yields unsupported
 +        error.
-         """
- 
-         def cb(result):
-@@ -2276,7 +2379,7 @@
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
-             self.assertEquals('publish', result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('publish', result.appCondition['feature'])
++
 +        d = self.resource.publish(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
-@@ -2284,16 +2387,7 @@
- 
-     def test_subscribe(self):
-         """
--        Non-overridden L{PubSubService.subscribe} yields unsupported error.
--        """
--
--        xml = """
--        <iq type='set' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub'>
--            <subscribe node='test' jid='user@example.org/Home'/>
--          </pubsub>
--        </iq>
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
++    def test_subscribe(self):
++        """
 +        Non-overridden subscriptions yields unsupported error.
-         """
- 
-         def cb(result):
-@@ -2302,7 +2396,7 @@
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
-             self.assertEquals('subscribe', result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('subscribe', result.appCondition['feature'])
++
 +        d = self.resource.subscribe(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
-@@ -2310,16 +2404,7 @@
- 
-     def test_unsubscribe(self):
-         """
--        Non-overridden L{PubSubService.unsubscribe} yields unsupported error.
--        """
--
--        xml = """
--        <iq type='set' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub'>
--            <unsubscribe node='test' jid='user@example.org/Home'/>
--          </pubsub>
--        </iq>
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
++    def test_unsubscribe(self):
++        """
 +        Non-overridden unsubscribe yields unsupported error.
-         """
- 
-         def cb(result):
-@@ -2328,7 +2413,7 @@
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
-             self.assertEquals('subscribe', result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('subscribe', result.appCondition['feature'])
++
 +        d = self.resource.unsubscribe(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
-@@ -2336,16 +2421,7 @@
- 
-     def test_subscriptions(self):
-         """
--        Non-overridden L{PubSubService.subscriptions} yields unsupported error.
--        """
--
--        xml = """
--        <iq type='get' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub'>
--            <subscriptions/>
--          </pubsub>
--        </iq>
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
++    def test_subscriptions(self):
++        """
 +        Non-overridden subscriptions yields unsupported error.
-         """
- 
-         def cb(result):
-@@ -2355,7 +2431,7 @@
-             self.assertEquals('retrieve-subscriptions',
-                               result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('retrieve-subscriptions',
++                              result.appCondition['feature'])
++
 +        d = self.resource.subscriptions(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
-@@ -2363,16 +2439,7 @@
- 
-     def test_affiliations(self):
-         """
--        Non-overridden L{PubSubService.affiliations} yields unsupported error.
--        """
--
--        xml = """
--        <iq type='get' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub'>
--            <affiliations/>
--          </pubsub>
--        </iq>
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
++    def test_affiliations(self):
++        """
 +        Non-overridden affiliations yields unsupported error.
-         """
- 
-         def cb(result):
-@@ -2382,7 +2449,7 @@
-             self.assertEquals('retrieve-affiliations',
-                               result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('retrieve-affiliations',
++                              result.appCondition['feature'])
++
 +        d = self.resource.affiliations(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
-@@ -2390,16 +2457,7 @@
- 
-     def test_create(self):
-         """
--        Non-overridden L{PubSubService.create} yields unsupported error.
--        """
--
--        xml = """
--        <iq type='set' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub'>
--            <create node='mynode'/>
--          </pubsub>
--        </iq>
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
++    def test_create(self):
++        """
 +        Non-overridden create yields unsupported error.
-         """
- 
-         def cb(result):
-@@ -2408,87 +2466,51 @@
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
-             self.assertEquals('create-nodes', result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('create-nodes', result.appCondition['feature'])
++
 +        d = self.resource.create(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
- 
- 
--    def test_getDefaultConfiguration(self):
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
 +    def test_default(self):
-         """
--        Non-overridden L{PubSubService.getDefaultConfiguration} yields
--        unsupported error.
--        """
--
--        xml = """
--        <iq type='get' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
--            <default/>
--          </pubsub>
--        </iq>
++        """
 +        Non-overridden default yields unsupported error.
-         """
- 
-         def cb(result):
-             self.assertEquals('feature-not-implemented', result.condition)
-             self.assertEquals('unsupported', result.appCondition.name)
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
--            self.assertEquals('retrieve-default', result.appCondition['feature'])
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
 +            self.assertEquals('retrieve-default',
 +                              result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++
 +        d = self.resource.default(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
- 
- 
--    def test_getConfiguration(self):
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
 +    def test_configureGet(self):
-         """
--        Non-overridden L{PubSubService.getConfiguration} yields unsupported
++        """
 +        Non-overridden configureGet yields unsupported
-         error.
-         """
- 
--        xml = """
--        <iq type='get' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
--            <configure/>
--          </pubsub>
--        </iq>
--        """
--
-         def cb(result):
-             self.assertEquals('feature-not-implemented', result.condition)
-             self.assertEquals('unsupported', result.appCondition.name)
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
-             self.assertEquals('config-node', result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        error.
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('config-node', result.appCondition['feature'])
++
 +        d = self.resource.configureGet(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
- 
- 
--    def test_setConfiguration(self):
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
 +    def test_configureSet(self):
-         """
--        Non-overridden L{PubSubService.setConfiguration} yields unsupported
--        error.
--        """
--
--        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>
++        """
 +        Non-overridden configureSet yields unsupported error.
-         """
- 
-         def cb(result):
-@@ -2497,7 +2519,7 @@
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
-             self.assertEquals('config-node', result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('config-node', result.appCondition['feature'])
++
 +        d = self.resource.configureSet(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
-@@ -2505,15 +2527,7 @@
- 
-     def test_items(self):
-         """
--        Non-overridden L{PubSubService.items} yields unsupported error.
--        """
--        xml = """
--        <iq type='get' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub'>
--            <items node='test'/>
--          </pubsub>
--        </iq>
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
++    def test_items(self):
++        """
 +        Non-overridden items yields unsupported error.
-         """
- 
-         def cb(result):
-@@ -2522,7 +2536,7 @@
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
-             self.assertEquals('retrieve-items', result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('retrieve-items', result.appCondition['feature'])
++
 +        d = self.resource.items(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
-@@ -2530,18 +2544,7 @@
- 
-     def test_retract(self):
-         """
--        Non-overridden L{PubSubService.retract} yields unsupported error.
--        """
--        xml = """
--        <iq type='set' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub'>
--            <retract node='test'>
--              <item id='item1'/>
--              <item id='item2'/>
--            </retract>
--          </pubsub>
--        </iq>
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
++    def test_retract(self):
++        """
 +        Non-overridden retract yields unsupported error.
-         """
- 
-         def cb(result):
-@@ -2550,7 +2553,7 @@
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
-             self.assertEquals('retract-items', result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('retract-items', result.appCondition['feature'])
++
 +        d = self.resource.retract(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
-@@ -2558,15 +2561,7 @@
- 
-     def test_purge(self):
-         """
--        Non-overridden L{PubSubService.purge} yields unsupported error.
--        """
--        xml = """
--        <iq type='set' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
--            <purge node='test'/>
--          </pubsub>
--        </iq>
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
++    def test_purge(self):
++        """
 +        Non-overridden purge yields unsupported error.
-         """
- 
-         def cb(result):
-@@ -2575,7 +2570,7 @@
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
-             self.assertEquals('purge-nodes', result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('purge-nodes', result.appCondition['feature'])
++
 +        d = self.resource.purge(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
-@@ -2583,15 +2578,7 @@
- 
-     def test_delete(self):
-         """
--        Non-overridden L{PubSubService.delete} yields unsupported error.
--        """
--        xml = """
--        <iq type='set' to='pubsub.example.org'
--                       from='user@example.org'>
--          <pubsub xmlns='http://jabber.org/protocol/pubsub#owner'>
--            <delete node='test'/>
--          </pubsub>
--        </iq>
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d
++
++
++    def test_delete(self):
++        """
 +        Non-overridden delete yields unsupported error.
-         """
- 
-         def cb(result):
-@@ -2600,7 +2587,7 @@
-             self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
-             self.assertEquals('delete-nodes', result.appCondition['feature'])
- 
--        d = self.handleRequest(xml)
++        """
++
++        def cb(result):
++            self.assertEquals('feature-not-implemented', result.condition)
++            self.assertEquals('unsupported', result.appCondition.name)
++            self.assertEquals(NS_PUBSUB_ERRORS, result.appCondition.uri)
++            self.assertEquals('delete-nodes', result.appCondition['feature'])
++
 +        d = self.resource.delete(pubsub.PubSubRequest())
-         self.assertFailure(d, error.StanzaError)
-         d.addCallback(cb)
-         return d
++        self.assertFailure(d, error.StanzaError)
++        d.addCallback(cb)
++        return d