Changeset 47:f6d222b68f1c in ralphm-patches for pubsub-item.patch

Timestamp:

Mar 7, 2011, 7:39:36 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Many new patches, upstreamed affiliations and worked on pubsub item.
Upstreamed pubsub_manage_affiliations

File:

• pubsub-item.patch (modified) (9 diffs)

pubsub-item.patch

@@ -1 @@
-diff -r e58b9f2cf8a3 wokkel/pubsub.py
---- a/wokkel/pubsub.py  Fri Jan 01 01:34:14 2010 +0100
-+++ b/wokkel/pubsub.py  Fri Jan 01 11:12:36 2010 +0100
-@@ -119,33 +119,47 @@
+diff -r d16bd03316ad wokkel/generic.py
+--- a/wokkel/generic.py Mon Feb 28 09:31:41 2011 +0100
++++ b/wokkel/generic.py Mon Feb 28 09:43:34 2011 +0100
+@@ -38,13 +38,12 @@
+     @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
+ 
+ 
+diff -r d16bd03316ad wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Mon Feb 28 09:31:41 2011 +0100
++++ b/wokkel/pubsub.py  Mon Feb 28 09:43:34 2011 +0100
+@@ -157,33 +157,56 @@
  
  
@@ -15 +36 @@
 -    Item payload can be added using C{addChild} or C{addRawXml}, or using the
 -    C{payload} keyword argument to C{__init__}.
-+    @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, id=None, payload=None):
-+    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
 +
 +
@@ -59 +89 @@
 +        if self.payload is not None:
 +            if isinstance(self.payload, basestring):
-+                self.addRawXml(self.payload)
++                element.addRawXml(self.payload)
              else:
 -                self.addChild(payload)
-+                self.addChild(self.payload)
++                element.addChild(self.payload)
 +
 +        return element
@@ -68 +98 @@
  
  
-@@ -309,7 +323,13 @@
+@@ -351,7 +374,13 @@
          self.items = []
          for element in verbElement.elements():
@@ -83 +113 @@
  
      def _render_items(self, verbElement):
-@@ -318,7 +338,7 @@
+@@ -360,8 +389,7 @@
          """
          if self.items:
              for item in self.items:
+-                item.uri = NS_PUBSUB
 -                verbElement.addChild(item)
 +                verbElement.addChild(item.toElement())
@@ -92 +123 @@
  
      def _parse_jid(self, verbElement):
-@@ -1124,7 +1144,7 @@
+@@ -1307,8 +1335,7 @@
          items["node"] = request.nodeIdentifier
  
          for item in result:
+-            item.uri = NS_PUBSUB
 -            items.addChild(item)
 +            items.addChild(item.toElement())
@@ -101 +133 @@
          return response
  
-diff -r e58b9f2cf8a3 wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Fri Jan 01 01:34:14 2010 +0100
-+++ b/wokkel/test/test_pubsub.py        Fri Jan 01 11:12:36 2010 +0100
-@@ -365,7 +365,6 @@
+@@ -1359,8 +1386,7 @@
+                                                nodeIdentifier, subscriber,
+                                                subscriptions)
+             for item in items:
+-                item.uri = NS_PUBSUB_EVENT
+-                message.event.items.addChild(item)
++                message.event.items.addChild(item.toElement(NS_PUBSUB_EVENT))
+             self.send(message)
+ 
+ 
+diff -r d16bd03316ad wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Mon Feb 28 09:31:41 2011 +0100
++++ b/wokkel/test/test_pubsub.py        Mon Feb 28 09:43:34 2011 +0100
+@@ -115,6 +115,30 @@
+ 
+ 
+ 
++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
+ 
+@@ -465,7 +489,6 @@
          items = list(domish.generateElementsQNamed(child.children,
                                                     'item', NS_PUBSUB))
@@ -112 +185 @@
          response = toResponse(iq, 'result')
          self.stub.send(response)
-@@ -699,8 +698,8 @@
+@@ -1048,8 +1071,8 @@
  
          request = pubsub.PubSubRequest.fromElement(parseXml(xml))
@@ -122 +195 @@
  
  
+     def test_fromElementPublishItemsOptions(self):
+@@ -1075,8 +1098,9 @@
+ 
+         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"])
++        self.assertEqual(u'item1', request.items[0].itemIdentifier)
++        self.assertEqual(u'item2', request.items[1].itemIdentifier)
++
+ 
      def test_fromElementPublishNoNode(self):
+         """