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

wokkel/pubsub.py

@@ -605 +605 @@
         pass
 
 
-    def createNode(self, service, nodeIdentifier=None):
+    def createNode(self, service, nodeIdentifier=None, sender=None):
         """
         Create a publish subscribe node.
 
@@ -617 +617 @@
         request = PubSubRequest('create')
         request.recipient = service
         request.nodeIdentifier = nodeIdentifier
+        request.sender = sender
 
         def cb(iq):
             try:
@@ -631 +632 @@
         return d
 
 
-    def deleteNode(self, service, nodeIdentifier):
+    def deleteNode(self, service, nodeIdentifier, sender=None):
         """
         Delete a publish subscribe node.
 
@@ -643 +644 @@
         request = PubSubRequest('delete')
         request.recipient = service
         request.nodeIdentifier = nodeIdentifier
+        request.sender = sender
         return request.send(self.xmlstream)
 
 
-    def subscribe(self, service, nodeIdentifier, subscriber):
+    def subscribe(self, service, nodeIdentifier, subscriber, sender=None):
         """
         Subscribe to a publish subscribe node.
 
@@ -662 +664 @@
         request.recipient = service
         request.nodeIdentifier = nodeIdentifier
         request.subscriber = subscriber
+        request.sender = sender
 
         def cb(iq):
             subscription = iq.pubsub.subscription["subscription"]
@@ -681 +684 @@
         return d
 
 
-    def unsubscribe(self, service, nodeIdentifier, subscriber):
+    def unsubscribe(self, service, nodeIdentifier, subscriber, sender=None):
         """
         Unsubscribe from a publish subscribe node.
 
@@ -696 +699 @@
         request.recipient = service
         request.nodeIdentifier = nodeIdentifier
         request.subscriber = subscriber
+        request.sender = sender
         return request.send(self.xmlstream)
 
 
-    def publish(self, service, nodeIdentifier, items=None):
+    def publish(self, service, nodeIdentifier, items=None, sender=None):
         """
         Publish to a publish subscribe node.
 
@@ -714 +718 @@
         request.recipient = service
         request.nodeIdentifier = nodeIdentifier
         request.items = items
+        request.sender = sender
         return request.send(self.xmlstream)
 
 
-    def items(self, service, nodeIdentifier, maxItems=None):
+    def items(self, service, nodeIdentifier, maxItems=None, sender=None):
         """
         Retrieve previously published items from a publish subscribe node.
 
@@ -733 +738 @@
         request.nodeIdentifier = nodeIdentifier
         if maxItems:
             request.maxItems = str(int(maxItems))
+        request.sender = sender
 
         def cb(iq):
             items = []

wokkel/test/test_pubsub.py

@@ -257 +257 @@
         return d
 
 
+    def test_createNodeWithSender(self):
+        """
+        Test sending create request from a specific JID.
+        """
+
+        d = self.protocol.createNode(JID('pubsub.example.org'), 'test',
+                                     sender=JID('user@example.org'))
+
+        iq = self.stub.output[-1]
+        self.assertEquals('user@example.org', iq['from'])
+
+        response = toResponse(iq, 'result')
+        self.stub.send(response)
+        return d
+
+
     def test_deleteNode(self):
         """
         Test sending delete request.
@@ -280 +296 @@
         return d
 
 
+    def test_deleteNodeWithSender(self):
+        """
+        Test sending delete request.
+        """
+
+        d = self.protocol.deleteNode(JID('pubsub.example.org'), 'test',
+                                     sender=JID('user@example.org'))
+
+        iq = self.stub.output[-1]
+        self.assertEquals('user@example.org', iq['from'])
+
+        response = toResponse(iq, 'result')
+        self.stub.send(response)
+        return d
+
+
     def test_publish(self):
         """
         Test sending publish request.
@@ -331 +363 @@
         return d
 
 
+    def test_publishWithSender(self):
+        """
+        Test sending publish request from a specific JID.
+        """
+
+        item = pubsub.Item()
+        d = self.protocol.publish(JID('pubsub.example.org'), 'test', [item],
+                                  JID('user@example.org'))
+
+        iq = self.stub.output[-1]
+        self.assertEquals('user@example.org', iq['from'])
+
+        response = toResponse(iq, 'result')
+        self.stub.send(response)
+        return d
+
+
     def test_subscribe(self):
         """
         Test sending subscription request.
@@ -400 +449 @@
         return d
 
 
+    def test_subscribeWithSender(self):
+        """
+        Test sending subscription request from a specific JID.
+        """
+        d = self.protocol.subscribe(JID('pubsub.example.org'), 'test',
+                                      JID('user@example.org'),
+                                      sender=JID('user@example.org'))
+
+        iq = self.stub.output[-1]
+        self.assertEquals('user@example.org', iq['from'])
+
+        response = toResponse(iq, 'result')
+        pubsub = response.addElement((NS_PUBSUB, 'pubsub'))
+        subscription = pubsub.addElement('subscription')
+        subscription['node'] = 'test'
+        subscription['jid'] = 'user@example.org'
+        subscription['subscription'] = 'subscribed'
+        self.stub.send(response)
+        return d
+
+
     def test_unsubscribe(self):
         """
         Test sending unsubscription request.
@@ -423 +493 @@
         return d
 
 
+    def test_unsubscribeWithSender(self):
+        """
+        Test sending unsubscription request from a specific JID.
+        """
+        d = self.protocol.unsubscribe(JID('pubsub.example.org'), 'test',
+                                      JID('user@example.org'),
+                                      sender=JID('user@example.org'))
+
+        iq = self.stub.output[-1]
+        self.assertEquals('user@example.org', iq['from'])
+        self.stub.send(toResponse(iq, 'result'))
+        return d
+
+
     def test_items(self):
         """
         Test sending items request.
@@ -489 +573 @@
         return d
 
 
+    def test_itemsWithSender(self):
+        """
+        Test sending items request from a specific JID.
+        """
+
+        d = self.protocol.items(JID('pubsub.example.org'), 'test',
+                               sender=JID('user@example.org'))
+
+        iq = self.stub.output[-1]
+        self.assertEquals('user@example.org', iq['from'])
+
+        response = toResponse(iq, 'result')
+        items = response.addElement((NS_PUBSUB, 'pubsub')).addElement('items')
+        items['node'] = 'test'
+
+        self.stub.send(response)
+        return d
+
+
 
 class PubSubServiceTest(unittest.TestCase, TestableRequestHandlerMixin):
     """