Changeset 92:f69b08281bec

Timestamp:

Feb 12, 2011, 12:08:30 AM (9 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Properly pass verb element to parse methods, not just the last one.

Author: ralphm.
Fixes: #72.

This also cleans up a few pyflakes warnings, including a masked test.

Location:

wokkel

Files:

• pubsub.py (modified) (5 diffs)
• test/test_pubsub.py (modified) (5 diffs)

wokkel/pubsub.py

@@ -1 +1 @@
 # -*- test-case-name: wokkel.test.test_pubsub -*-
 #
-# Copyright (c) 2003-2010 Ralph Meijer
+# Copyright (c) 2003-2011 Ralph Meijer
 # See LICENSE for details.
 
@@ -534 +534 @@
 
         verbs = []
-        children = []
+        verbElements = []
         for child in element.pubsub.elements():
             key = (self.stanzaType, child.uri, child.name)
@@ -543 +543 @@
 
             verbs.append(verb)
-            children.append(child)
+            verbElements.append(child)
 
         if not verbs:
@@ -551 +551 @@
             if 'optionsSet' in verbs and 'subscribe' in verbs:
                 self.verb = 'subscribe'
-                child = children[verbs.index('subscribe')]
+                verbElement = verbElements[verbs.index('subscribe')]
             else:
                 raise NotImplementedError()
         else:
             self.verb = verbs[0]
+            verbElement = verbElements[0]
 
         for parameter in self._parameters[self.verb]:
-            getattr(self, '_parse_%s' % parameter)(child)
+            getattr(self, '_parse_%s' % parameter)(verbElement)
 
 
@@ -1182 +1183 @@
     def _toResponse_subscribe(self, result, resource, request):
         response = domish.Element((NS_PUBSUB, "pubsub"))
-        subscription = response.addChild(result.toElement())
+        response.addChild(result.toElement())
         return response
 

wokkel/test/test_pubsub.py

@@ -1 @@
-# Copyright (c) 2003-2010 Ralph Meijer
+# Copyright (c) 2003-2011 Ralph Meijer
 # See LICENSE for details.
 
@@ -1057 +1057 @@
 
 
+    def test_fromElementPublishItemsOptions(self):
+        """
+        Test parsing a publish request with items and options.
+
+        Note that publishing options are not supported, but passing them
+        shouldn't affect processing of the publish request itself.
+        """
+
+        xml = """
+        <iq type='set' to='pubsub.example.org'
+                       from='user@example.org'>
+          <pubsub xmlns='http://jabber.org/protocol/pubsub'>
+            <publish node='test'>
+              <item id="item1"/>
+              <item id="item2"/>
+            </publish>
+            <publish-options/>
+          </pubsub>
+        </iq>
+        """
+
+        request = pubsub.PubSubRequest.fromElement(parseXml(xml))
+        self.assertEqual(2, len(request.items))
+        self.assertEqual(u'item1', request.items[0]["id"])
+        self.assertEqual(u'item2', request.items[1]["id"])
+
     def test_fromElementPublishNoNode(self):
         """
@@ -1546 +1572 @@
         request = pubsub.PubSubRequest.fromElement(parseXml(xml))
         self.assertEqual({}, request.options.getValues())
+        self.assertEqual(u'mynode', request.nodeIdentifier)
 
 
@@ -1568 +1595 @@
         request = pubsub.PubSubRequest.fromElement(parseXml(xml))
         self.assertEqual({}, request.options.getValues())
+        self.assertEqual(u'mynode', request.nodeIdentifier)
 
 
@@ -2286 +2314 @@
 
 
-    def test_on_unsubscribe(self):
+    def test_on_unsubscribeSubscriptionIdentifier(self):
         """
         A successful unsubscription with subid should return an empty response.