source: ralphm-patches/pubsub_resource.patch @ 4:c8c73d9e5496

wokkel/iwokkel.py

@@ -297 +297 @@
         """
 
 
-    def publish(request):
+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.
-        @rtype: L{defer.Deferred}
-        """
-
-
-    def subscribe(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 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.
-        @rtype: L{defer.Deferred}
         """
 
 
@@ -406 +344 @@
         """
 
 
-    def getDefaultConfiguration(request):
+    def pubsub_publish(request):
+        """
+        Called when a publish request has been received.
+
+        @param request: The publish-subscribe request.
+        @type request: L{wokkel.pubsub.PubSubRequest}
+        @return: deferred that fires on success.
+        @rtype: L{defer.Deferred}
+        """
+
+
+    def pubsub_subscribe(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 a
+                 L{Subscription<wokkel.pubsub.Subscription>}.
+        @rtype: L{defer.Deferred}
+        """
+
+
+    def pubsub_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 pubsub_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 pubsub_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 pubsub_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.
+        @rtype: L{defer.Deferred}
+        """
+
+
+    def pubsub_default(request):
         """
         Called when a default node configuration request has been received.
 
@@ -420 +431 @@
         """
 
 
-    def getConfiguration(request):
+    def pubsub_configureGet(request):
         """
         Called when a node configuration retrieval request has been received.
 
@@ -433 +444 @@
         """
 
 
-    def setConfiguration(request):
+    def pubsub_configureSet(request):
         """
         Called when a node configuration change request has been received.
 
@@ -445 +456 @@
         """
 
 
-    def items(request):
+    def pubsub_items(request):
         """
         Called when a items retrieval request has been received.
 
@@ -456 +467 @@
         """
 
 
-    def retract(request):
+    def pubsub_retract(request):
         """
         Called when a item retraction request has been received.
 
@@ -468 +479 @@
         """
 
 
-    def purge(request):
+    def pubsub_purge(request):
         """
         Called when a node purge request has been received.
 
@@ -480 +491 @@
         """
 
 
-    def delete(request):
+    def pubsub_delete(request):
         """
         Called when a node deletion request has been received.
 

wokkel/pubsub.py

@@ -18 +18 @@
 
 from wokkel import disco, data_form, generic, shim
 from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
-from wokkel.iwokkel import IPubSubClient, IPubSubService
+from wokkel.iwokkel import IPubSubClient, IPubSubService, IPubSubResource
 
 # Iq get and set XPath queries
 IQ_GET = '/iq[@type="get"]'
@@ -77 +77 @@
 
 class Unsupported(PubSubError):
     def __init__(self, feature, text=None):
+        self.feature = feature
         PubSubError.__init__(self, 'feature-not-implemented',
                                    'unsupported',
                                    feature,
                                    text)
 
+    def __str__(self):
+        message = PubSubError.__str__(self)
+        message += ', feature %r' % self.feature
+        return message
 
 
 class Subscription(object):
@@ -228 +233 @@
         'retract': ['node', 'itemIdentifiers'],
         'purge': ['node'],
         'delete': ['node'],
-        'affiliationsGet': [],
+        'affiliationsGet': ['nodeOrEmpty'],
         'affiliationsSet': [],
-        'subscriptionsGet': [],
+        'subscriptionsGet': ['nodeOrEmpty'],
         'subscriptionsSet': [],
     }
 
@@ -359 +364 @@
         else:
             self.nodeType = 'leaf'
 
+        if self.nodeType not in ('leaf', 'collection'):
+            raise error.StanzaError('not-acceptable')
+
 
     def _parse_configure(self, verbElement):
         """
@@ -787 +795 @@
             '/*': '_onPubSubRequest',
             }
 
-
-    def __init__(self):
+    def __init__(self, resource):
+        self.resource = resource
         self.discoIdentity = {'category': 'pubsub',
                               'type': 'generic',
                               'name': 'Generic Publish-Subscribe Service'}
@@ -851 +859 @@
 
     def _onPubSubRequest(self, iq):
         request = PubSubRequest.fromElement(iq)
-        handler = getattr(self, '_on_%s' % request.verb)
-        return handler(request)
+        resource = self.resource.locateResource(request)
 
+        # Preprocess the request, knowing the handling resource
+        try:
+            preProcessor = getattr(self, '_preProcess_%s' % request.verb)
+        except AttributeError:
+            pass
+        else:
+            request = preProcessor(resource, request)
+            if request is None:
+                return defer.succeed(None)
 
-    def _on_publish(self, request):
-        return self.publish(request)
+        # Process the request itself, 
+        try:
+            handler = getattr(resource, 'pubsub_%s' % request.verb)
+        except AttributeError:
+            # fix lookup feature
+            text = "Request verb: %s" % request.verb
+            return defer.fail(Unsupported('', text))
 
+        d = handler(request)
 
-    def _on_subscribe(self, 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)
 
-        def toResponse(result):
-            response = domish.Element((NS_PUBSUB, "pubsub"))
-            subscription = response.addElement("subscription")
-            if result.nodeIdentifier:
-                subscription["node"] = result.nodeIdentifier
-            subscription["jid"] = result.subscriber.full()
-            subscription["subscription"] = result.state
-            return response
-
-        d = self.subscribe(request)
-        d.addCallback(toResponse)
         return d
 
 
-    def _on_unsubscribe(self, request):
-        return self.unsubscribe(request)
+    def _toResponse_subscribe(self, result, resource, request):
+        response = domish.Element((NS_PUBSUB, "pubsub"))
+        subscription = response.addElement("subscription")
+        if result.nodeIdentifier:
+            subscription["node"] = result.nodeIdentifier
+        subscription["jid"] = result.subscriber.full()
+        subscription["subscription"] = result.state
+        return response
 
 
-    def _on_optionsGet(self, request):
-        raise Unsupported('subscription-options')
+    def _toResponse_subscriptions(self, result, resource, request):
+        response = domish.Element((NS_PUBSUB, 'pubsub'))
+        subscriptions = response.addElement('subscriptions')
+        for subscription in result:
+            item = subscriptions.addElement('subscription')
+            item['node'] = subscription.nodeIdentifier
+            item['jid'] = subscription.subscriber.full()
+            item['subscription'] = subscription.state
+        return response
 
 
-    def _on_optionsSet(self, request):
-        raise Unsupported('subscription-options')
+    def _toResponse_affiliations(self, result, resource, request):
+        response = domish.Element((NS_PUBSUB, 'pubsub'))
+        affiliations = response.addElement('affiliations')
 
+        for nodeIdentifier, affiliation in result:
+            item = affiliations.addElement('affiliation')
+            item['node'] = nodeIdentifier
+            item['affiliation'] = affiliation
 
-    def _on_subscriptions(self, request):
+        return response
 
-        def toResponse(result):
+
+    def _toResponse_create(self, result, resource, request):
+        if not request.nodeIdentifier or request.nodeIdentifier != result:
             response = domish.Element((NS_PUBSUB, 'pubsub'))
-            subscriptions = response.addElement('subscriptions')
-            for subscription in result:
-                item = subscriptions.addElement('subscription')
-                item['node'] = subscription.nodeIdentifier
-                item['jid'] = subscription.subscriber.full()
-                item['subscription'] = subscription.state
+            create = response.addElement('create')
+            create['node'] = result
             return response
-
-        d = self.subscriptions(request)
-        d.addCallback(toResponse)
-        return d
-
-
-    def _on_affiliations(self, request):
-
-        def toResponse(result):
-            response = domish.Element((NS_PUBSUB, 'pubsub'))
-            affiliations = response.addElement('affiliations')
-
-            for nodeIdentifier, affiliation in result:
-                item = affiliations.addElement('affiliation')
-                item['node'] = nodeIdentifier
-                item['affiliation'] = affiliation
-
-            return response
-
-        d = self.affiliations(request)
-        d.addCallback(toResponse)
-        return d
-
-
-    def _on_create(self, request):
-
-        def toResponse(result):
-            if not request.nodeIdentifier or request.nodeIdentifier != result:
-                response = domish.Element((NS_PUBSUB, 'pubsub'))
-                create = response.addElement('create')
-                create['node'] = result
-                return response
-            else:
-                return None
-
-        d = self.create(request)
-        d.addCallback(toResponse)
-        return d
+        else:
+            return None
 
 
     def _makeFields(self, options, values):
@@ -954 +951 @@
         return fields
 
 
-    def _formFromConfiguration(self, values):
-        options = self.getConfigurationOptions()
+    def _formFromConfiguration(self, resource, values):
+        options = resource.getConfigurationOptions()
         fields = self._makeFields(options, values)
         form = data_form.Form(formType="form",
                               formNamespace=NS_PUBSUB_NODE_CONFIG,
@@ -964 +961 @@
         return form
 
 
-    def _checkConfiguration(self, values):
-        options = self.getConfigurationOptions()
+    def _checkConfiguration(self, resource, values):
+        options = resource.getConfigurationOptions()
         processedValues = {}
 
         for key, value in values.iteritems():
@@ -989 +986 @@
         return processedValues
 
 
-    def _on_default(self, request):
+    def _toResponse_default(self, options, resource, request):
+        response = domish.Element((NS_PUBSUB_OWNER, "pubsub"))
+        default = response.addElement("default")
+        form = self._formFromConfiguration(resource, options)
+        default.addChild(form.toElement())
+        return response
 
-        def toResponse(options):
-            response = domish.Element((NS_PUBSUB_OWNER, "pubsub"))
-            default = response.addElement("default")
-            default.addChild(self._formFromConfiguration(options).toElement())
-            return response
 
-        if request.nodeType not in ('leaf', 'collection'):
-            return defer.fail(error.StanzaError('not-acceptable'))
+    def _toResponse_configureGet(self, options, resource, request):
+        response = domish.Element((NS_PUBSUB_OWNER, "pubsub"))
+        configure = response.addElement("configure")
+        form = self._formFromConfiguration(resource, options)
+        configure.addChild(form.toElement())
 
-        d = self.getDefaultConfiguration(request)
-        d.addCallback(toResponse)
-        return d
+        if request.nodeIdentifier:
+            configure["node"] = request.nodeIdentifier
 
+        return response
 
-    def _on_configureGet(self, request):
-        def toResponse(options):
-            response = domish.Element((NS_PUBSUB_OWNER, "pubsub"))
-            configure = response.addElement("configure")
-            form = self._formFromConfiguration(options)
-            configure.addChild(form.toElement())
 
-            if request.nodeIdentifier:
-                configure["node"] = request.nodeIdentifier
-
-            return response
-
-        d = self.getConfiguration(request)
-        d.addCallback(toResponse)
-        return d
-
-
-    def _on_configureSet(self, request):
+    def _preProcess_configureSet(self, resource, request):
         if request.options:
-            request.options = self._checkConfiguration(request.options)
-            return self.setConfiguration(request)
+            request.options = self._checkConfiguration(resource,
+                                                       request.options)
+            return request
         else:
             return None
 
 
+    def _toResponse_items(self, result, resource, request):
+        response = domish.Element((NS_PUBSUB, 'pubsub'))
+        items = response.addElement('items')
+        items["node"] = request.nodeIdentifier
 
-    def _on_items(self, request):
+        for item in result:
+            items.addChild(item)
 
-        def toResponse(result):
-            response = domish.Element((NS_PUBSUB, 'pubsub'))
-            items = response.addElement('items')
-            items["node"] = request.nodeIdentifier
+        return response
 
-            for item in result:
-                items.addChild(item)
-
-            return response
-
-        d = self.items(request)
-        d.addCallback(toResponse)
-        return d
-
-
-    def _on_retract(self, request):
-        return self.retract(request)
-
-
-    def _on_purge(self, request):
-        return self.purge(request)
-
-
-    def _on_delete(self, request):
-        return self.delete(request)
-
-
-    def _on_affiliationsGet(self, iq):
-        raise Unsupported('modify-affiliations')
-
-
-    def _on_affiliationsSet(self, iq):
-        raise Unsupported('modify-affiliations')
-
-
-    def _on_subscriptionsGet(self, iq):
-        raise Unsupported('manage-subscriptions')
-
-
-    def _on_subscriptionsSet(self, iq):
-        raise Unsupported('manage-subscriptions')
-
-    # public methods
 
     def _createNotification(self, eventType, service, nodeIdentifier,
                                   subscriber, subscriptions=None):
@@ -1099 +1048 @@
 
         return message
 
+    # public methods
+
     def notifyPublish(self, service, nodeIdentifier, notifications):
         for subscriber, subscriptions, items in notifications:
             message = self._createNotification('items', service,
@@ -1120 +1071 @@
             self.send(message)
 
 
-    def getNodeInfo(self, requestor, service, nodeIdentifier):
-        return None
+
+class PubSubResource(object):
+
+    implements(IPubSubResource)
+
+    def locateResource(self, request):
+        return self
+
+
+    def getInfo(self, requestor, service, nodeIdentifier):
+        return defer.succeed(None)
 
 
     def getNodes(self, requestor, service):
         return []
 
 
-    def publish(self, request):
-        raise Unsupported('publish')
-
-
-    def subscribe(self, request):
-        raise Unsupported('subscribe')
-
-
-    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 getConfigurationOptions(self):
         return {}
 
 
-    def getDefaultConfiguration(self, request):
-        raise Unsupported('retrieve-default')
+    def pubsub_publish(self, request):
+        return defer.fail(Unsupported('publish'))
 
 
-    def getConfiguration(self, request):
-        raise Unsupported('config-node')
+    def pubsub_subscribe(self, request):
+        return defer.fail(Unsupported('subscribe'))
 
 
-    def setConfiguration(self, request):
-        raise Unsupported('config-node')
+    def pubsub_unsubscribe(self, request):
+        return defer.fail(Unsupported('subscribe'))
 
 
-    def items(self, request):
-        raise Unsupported('retrieve-items')
+    def pubsub_subscriptions(self, request):
+        return defer.fail(Unsupported('retrieve-subscriptions'))
 
 
-    def retract(self, request):
-        raise Unsupported('retract-items')
+    def pubsub_affiliations(self, request):
+        return defer.fail(Unsupported('retrieve-affiliations'))
 
 
-    def purge(self, request):
-        raise Unsupported('purge-nodes')
+    def pubsub_create(self, request):
+        return defer.fail(Unsupported('create-nodes'))
 
 
-    def delete(self, request):
-        raise Unsupported('delete-nodes')
+    def pubsub_default(self, request):
+        return defer.fail(Unsupported('retrieve-default'))
+
+
+    def pubsub_configureGet(self, request):
+        return defer.fail(Unsupported('config-node'))
+
+
+    def pubsub_configureSet(self, request):
+        return defer.fail(Unsupported('config-node'))
+
+
+    def pubsub_items(self, request):
+        return defer.fail(Unsupported('retrieve-items'))
+
+
+    def pubsub_retract(self, request):
+        return defer.fail(Unsupported('retract-items'))
+
+
+    def pubsub_purge(self, request):
+        return defer.fail(Unsupported('purge-nodes'))
+
+
+    def pubsub_delete(self, request):
+        return defer.fail(Unsupported('delete-nodes'))
+
+
+    def pubsub_affiliationsGet(self, request):
+        return defer.fail(Unsupported('modify-affiliations'))
+
+
+    def pubsub_affiliationsSet(self, request):
+        return defer.fail(Unsupported('modify-affiliations'))
+
+
+    def pubsub_subscriptionsGet(self, request):
+        return defer.fail(Unsupported('manage-subscriptions'))
+
+
+    def pubsub_subscriptionsSet(self, request):
+        return defer.fail(Unsupported('manage-subscriptions'))

wokkel/test/test_pubsub.py

@@ -600 +600 @@
 
     def setUp(self):
         self.stub = XmlStreamStub()
-        self.service = pubsub.PubSubService()
+        self.resource = pubsub.PubSubResource()
+        self.service = pubsub.PubSubService(self.resource)
         self.service.send = self.stub.xmlstream.send
 
     def test_interface(self):
@@ -694 +695 @@
             self.assertEqual([], request.items)
             return defer.succeed(None)
 
-        self.service.publish = publish
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_publish = publish
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         return self.handleRequest(xml)
 
 
@@ -722 +723 @@
             self.assertEqual(u'item2', request.items[1]["id"])
             return defer.succeed(None)
 
-        self.service.publish = publish
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_publish = publish
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         return self.handleRequest(xml)
 
 
@@ -759 +760 @@
             self.assertEqual('user@example.org/Home', subscription['jid'])
             self.assertEqual('subscribed', subscription['subscription'])
 
-        self.service.subscribe = subscribe
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_subscribe = subscribe
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -789 +790 @@
         def cb(element):
             self.assertFalse(element.subscription.hasAttribute('node'))
 
-        self.service.subscribe = subscribe
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_subscribe = subscribe
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -820 +821 @@
         def cb(element):
             self.assertIdentical(None, element)
 
-        self.service.unsubscribe = unsubscribe
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_unsubscribe = unsubscribe
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -914 +915 @@
                                                'subscribed')
             return defer.succeed([subscription])
 
-        self.service.subscriptions = subscriptions
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_subscriptions = subscriptions
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -956 +957 @@
             affiliation = ('test', 'owner')
             return defer.succeed([affiliation])
 
-        self.service.affiliations = affiliations
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_affiliations = affiliations
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -986 +987 @@
         def cb(element):
             self.assertIdentical(None, element)
 
-        self.service.create = create
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_create = create
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -1017 +1018 @@
             self.assertEqual(u'myrenamednode',
                              element.create.getAttribute('node'))
 
-        self.service.create = create
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_create = create
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -1048 +1049 @@
             self.assertEqual(NS_PUBSUB, element.create.uri)
             self.assertEqual(u'random', element.create.getAttribute('node'))
 
-        self.service.create = create
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_create = create
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -1093 +1094 @@
             form = data_form.Form.fromElement(element.default.x)
             self.assertEqual(NS_PUBSUB_CONFIG, form.formNamespace)
 
-        self.service.getConfigurationOptions = getConfigurationOptions
-        self.service.getDefaultConfiguration = getDefaultConfiguration
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.getConfigurationOptions = getConfigurationOptions
+        self.resource.pubsub_default = getDefaultConfiguration
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -1143 +1144 @@
             form = data_form.Form.fromElement(element.default.x)
             self.assertEqual(NS_PUBSUB_CONFIG, form.formNamespace)
 
-        self.service.getConfigurationOptions = getConfigurationOptions
-        self.service.getDefaultConfiguration = getDefaultConfiguration
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.getConfigurationOptions = getConfigurationOptions
+        self.resource.pubsub_default = getDefaultConfiguration
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -1182 +1183 @@
         def cb(result):
             self.assertEquals('not-acceptable', result.condition)
 
-        self.service.getDefaultConfiguration = getDefaultConfiguration
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_default = getDefaultConfiguration
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         self.assertFailure(d, error.StanzaError)
         d.addCallback(cb)
@@ -1257 +1258 @@
             self.assertNotIn('x-myfield', fields)
 
 
-        self.service.getConfigurationOptions = getConfigurationOptions
-        self.service.getConfiguration = getConfiguration
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.getConfigurationOptions = getConfigurationOptions
+        self.resource.pubsub_configureGet = getConfiguration
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -1306 +1307 @@
                               'pubsub#persist_items': True}, request.options)
             return defer.succeed(None)
 
-        self.service.getConfigurationOptions = getConfigurationOptions
-        self.service.setConfiguration = setConfiguration
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.getConfigurationOptions = getConfigurationOptions
+        self.resource.pubsub_configureSet = setConfiguration
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         return self.handleRequest(xml)
 
 
@@ -1336 +1337 @@
         def setConfiguration(request):
             self.fail("Unexpected call to setConfiguration")
 
-        self.service.setConfiguration = setConfiguration
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.pubsub_configureSet = setConfiguration
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         return self.handleRequest(xml)
 
 
@@ -1377 +1378 @@
             self.assertEquals(['pubsub#deliver_payloads'],
                               request.options.keys())
 
-        self.service.getConfigurationOptions = getConfigurationOptions
-        self.service.setConfiguration = setConfiguration
-        verify.verifyObject(iwokkel.IPubSubService, self.service)
+        self.resource.getConfigurationOptions = getConfigurationOptions
+        self.resource.pubsub_configureSet = setConfiguration
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         return self.handleRequest(xml)
 
 
@@ -1445 +1446 @@
             self.assertEqual(NS_PUBSUB, item.uri)
             self.assertEqual('current', item['id'])
 
-        self.service.items = items
+        self.resource.pubsub_items = items
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         d = self.handleRequest(xml)
         d.addCallback(cb)
         return d
@@ -1476 +1478 @@
             self.assertEqual(['item1', 'item2'], request.itemIdentifiers)
             return defer.succeed(None)
 
-        self.service.retract = retract
+        self.resource.pubsub_retract = retract
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         return self.handleRequest(xml)
 
 
@@ -1501 +1504 @@
             self.assertEqual('test', request.nodeIdentifier)
             return defer.succeed(None)
 
-        self.service.purge = purge
+        self.resource.pubsub_purge = purge
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         return self.handleRequest(xml)
 
 
@@ -1526 +1530 @@
             self.assertEqual('test', request.nodeIdentifier)
             return defer.succeed(None)
 
-        self.service.delete = delete
+        self.resource.pubsub_delete = delete
+        verify.verifyObject(iwokkel.IPubSubResource, self.resource)
         return self.handleRequest(xml)
 
 
@@ -1687 +1692 @@
 
     def test_publish(self):
         """
-        Non-overridden L{PubSubService.publish} yields unsupported error.
+        Non-overridden L{PubSubResource.publish} yields unsupported error.
         """
 
         xml = """