source: ralphm-patches/blah.patch @ 45:51ac2274f989

wokkel/generic.py

@@ -39 +39 @@
     @return: The DOM structure, or C{None} on empty or incomplete input.
     @rtype: L{domish.Element}
     """
-    roots = []
     results = []
     elementStream = domish.elementStream()
-    elementStream.DocumentStartEvent = roots.append
-    elementStream.ElementEvent = lambda elem: roots[0].addChild(elem)
-    elementStream.DocumentEndEvent = lambda: results.append(roots[0])
-    elementStream.parse(string)
+    elementStream.DocumentStartEvent = lambda _: None
+    elementStream.ElementEvent = lambda elem: results.append(elem)
+    elementStream.DocumentEndEvent = lambda: None
+    elementStream.parse('<dummy>%s</dummy>' % string)
     return results and results[0] or None
 
 

wokkel/pubsub.py

@@ -159 +159 @@
     """
     Publish subscribe item.
 
-    @ivar itemIdentifier: optional item identifier
+    @ivar itemIdentifier: Optional item identifier.
     @type itemIdentifier: L{unicode}
-    @ivar payload: optional item payload. Either as a domish element, or as
+    @ivar payload: Optional item payload. Either as a L{domish.Element}, or as
         serialized XML.
-    @type payload: object providing L{domish.IElement} or L{unicode}.
+    @type payload: Object providing L{domish.IElement} or L{unicode}.
+    @ivar timestamp: Optional timestamp when the item was published as 8601
+    string. Timestamps that include a time component must have a time zone
+    indicated.
+    @type timestamp: C{unicode}
+    @ivar publisher: Optional entity that published this item.
+    @type publisher: L{JID}
     """
 
-    def __init__(self, itemIdentifier=None, payload=None):
+    def __init__(self, itemIdentifier=None, payload=None,
+                       timestamp=None, publisher=None):
         self.itemIdentifier = itemIdentifier
         self.payload = payload
+        self.timestamp = timestamp
+        self.publisher = publisher
 
 
     def toElement(self, namespace=NS_PUBSUB):
@@ -191 +200 @@
 
         if self.payload is not None:
             if isinstance(self.payload, basestring):
-                self.addRawXml(self.payload)
+                element.addRawXml(self.payload)
             else:
-                self.addChild(self.payload)
+                element.addChild(self.payload)
 
         return element
 
@@ -1329 +1338 @@
             message = self._createNotification('items', service,
                                                nodeIdentifier, subscriber,
                                                subscriptions)
-            message.event.items.children = items
+            for item in items:
+                message.event.items.addChild(item.toElement())
             self.send(message)
 
 

wokkel/test/test_pubsub.py

@@ -115 +115 @@
 
 
 
+class ItemTest(unittest.TestCase):
+
+    def test_toElement(self):
+        item = pubsub.Item(itemIdentifier='test')
+        element = item.toElement()
+        self.assertEquals('test', element.getAttribute('id'))
+
+
+    def test_toElementPayload(self):
+        payload = domish.Element(('testns', 'test'))
+        item = pubsub.Item(itemIdentifier='test', payload=payload)
+        element = item.toElement()
+        self.assertNotIdentical(None, element.test)
+        self.assertEquals('testns', element.test.uri)
+
+
+    def test_toElementPayloadRawXML(self):
+        payload = u"<test xmlns='testns'/>"
+        item = pubsub.Item(itemIdentifier='test', payload=payload)
+        element = item.toElement()
+        self.assertEquals(1, len(element.children))
+        self.assertEquals(payload, element.children[0])
+
+
 class PubSubClientTest(unittest.TestCase):
     timeout = 2