plugin XEP-0277, test: set keys of data dict as unicode + fix the tests
This commit is contained in:
souliane
parent
9782588177
commit
a336975a7a
2 changed files with 54 additions and 48 deletions
|
|
@ -181,7 +181,7 @@ class XEP_0277(object):
|
|||
|
||||
|
||||
id_ = item_elt.getAttribute('id', '') # there can be no id for transient nodes
|
||||
microblog_data['id'] = id_
|
||||
microblog_data[u'id'] = id_
|
||||
if item_elt.uri not in (pubsub.NS_PUBSUB, NS_PUBSUB_EVENT):
|
||||
msg = u"Unsupported namespace {ns} in pubsub item {id_}".format(ns=item_elt.uri, id_=id_)
|
||||
log.warning(msg)
|
||||
|
|
@ -199,9 +199,9 @@ class XEP_0277(object):
|
|||
except StopIteration:
|
||||
msg = u'No atom id found in the pubsub item {}, this is not standard !'.format(id_)
|
||||
log.warning(msg)
|
||||
microblog_data['atom_id'] = ""
|
||||
microblog_data[u'atom_id'] = ""
|
||||
else:
|
||||
microblog_data['atom_id'] = unicode(id_elt)
|
||||
microblog_data[u'atom_id'] = unicode(id_elt)
|
||||
|
||||
# title/content(s)
|
||||
|
||||
|
|
@ -233,18 +233,18 @@ class XEP_0277(object):
|
|||
log.warning(u"item {id_} provide a {key}_xhtml data but not a text one".format(id_=id_, key=key))
|
||||
# ... and do the conversion if it's not
|
||||
microblog_data[key] = yield self.host.plugins["TEXT-SYNTAXES"].\
|
||||
convert(microblog_data['{}_xhtml'.format(key)],
|
||||
convert(microblog_data[u'{}_xhtml'.format(key)],
|
||||
self.host.plugins["TEXT-SYNTAXES"].SYNTAX_XHTML,
|
||||
self.host.plugins["TEXT-SYNTAXES"].SYNTAX_TEXT,
|
||||
False)
|
||||
|
||||
if 'content' not in microblog_data:
|
||||
# use the atom title data as the microblog body content
|
||||
microblog_data['content'] = microblog_data['title']
|
||||
del microblog_data['title']
|
||||
microblog_data[u'content'] = microblog_data[u'title']
|
||||
del microblog_data[u'title']
|
||||
if 'title_xhtml' in microblog_data:
|
||||
microblog_data['content_xhtml'] = microblog_data['title_xhtml']
|
||||
del microblog_data['title_xhtml']
|
||||
microblog_data[u'content_xhtml'] = microblog_data[u'title_xhtml']
|
||||
del microblog_data[u'title_xhtml']
|
||||
|
||||
# published/updated dates
|
||||
try:
|
||||
|
|
@ -252,13 +252,13 @@ class XEP_0277(object):
|
|||
except StopIteration:
|
||||
msg = u'No atom updated element found in the pubsub item {}'.format(id_)
|
||||
raise failure.Failure(exceptions.DataError(msg))
|
||||
microblog_data['updated'] = unicode(rfc3339.tf_from_timestamp(unicode(updated_elt)))
|
||||
microblog_data[u'updated'] = unicode(rfc3339.tf_from_timestamp(unicode(updated_elt)))
|
||||
try:
|
||||
published_elt = entry_elt.elements(NS_ATOM, 'published').next()
|
||||
except StopIteration:
|
||||
microblog_data['published'] = microblog_data['updated']
|
||||
microblog_data[u'published'] = microblog_data[u'updated']
|
||||
else:
|
||||
microblog_data['published'] = unicode(rfc3339.tf_from_timestamp(unicode(published_elt)))
|
||||
microblog_data[u'published'] = unicode(rfc3339.tf_from_timestamp(unicode(published_elt)))
|
||||
|
||||
# links
|
||||
for link_elt in entry_elt.elements(NS_ATOM, 'link'):
|
||||
|
|
@ -271,8 +271,8 @@ class XEP_0277(object):
|
|||
log.warning(u"Can't parse url {}".format(microblog_data[key]))
|
||||
del microblog_data[key]
|
||||
else:
|
||||
microblog_data['{}_service'.format(key)] = service.full()
|
||||
microblog_data['{}_node'.format(key)] = node
|
||||
microblog_data[u'{}_service'.format(key)] = service.full()
|
||||
microblog_data[u'{}_node'.format(key)] = node
|
||||
else:
|
||||
rel = link_elt.getAttribute('rel','')
|
||||
title = link_elt.getAttribute('title','')
|
||||
|
|
@ -292,37 +292,37 @@ class XEP_0277(object):
|
|||
except StopIteration:
|
||||
log.warning(u"No name element found in author element of item {}".format(id_))
|
||||
else:
|
||||
microblog_data['author'] = unicode(name_elt)
|
||||
microblog_data[u'author'] = unicode(name_elt)
|
||||
# uri
|
||||
try:
|
||||
uri_elt = author_elt.elements(NS_ATOM, 'uri').next()
|
||||
except StopIteration:
|
||||
log.debug(u"No uri element found in author element of item {}".format(id_))
|
||||
if publisher:
|
||||
microblog_data['author_jid'] = publisher
|
||||
microblog_data[u'author_jid'] = publisher
|
||||
else:
|
||||
uri = unicode(uri_elt)
|
||||
if uri.startswith("xmpp:"):
|
||||
uri = uri[5:]
|
||||
microblog_data['author_jid'] = uri
|
||||
microblog_data[u'author_jid'] = uri
|
||||
else:
|
||||
microblog_data['author_jid'] = item_elt.getAttribute("publisher") or ""
|
||||
microblog_data[u'author_jid'] = item_elt.getAttribute(u"publisher") or ""
|
||||
|
||||
if not publisher:
|
||||
log.debug(u"No publisher attribute, we can't verify author jid")
|
||||
microblog_data['author_jid_verified'] = C.BOOL_FALSE
|
||||
microblog_data[u'author_jid_verified'] = C.BOOL_FALSE
|
||||
elif jid.JID(publisher).userhostJID() == jid.JID(uri).userhostJID():
|
||||
microblog_data['author_jid_verified'] = C.BOOL_TRUE
|
||||
microblog_data[u'author_jid_verified'] = C.BOOL_TRUE
|
||||
else:
|
||||
log.warning(u"item atom:uri differ from publisher attribute, spoofing attempt ? atom:uri = {} publisher = {}".format(uri, item_elt.getAttribute("publisher")))
|
||||
microblog_data['author_jid_verified'] = C.BOOL_FALSE
|
||||
microblog_data[u'author_jid_verified'] = C.BOOL_FALSE
|
||||
# email
|
||||
try:
|
||||
email_elt = author_elt.elements(NS_ATOM, 'email').next()
|
||||
except StopIteration:
|
||||
pass
|
||||
else:
|
||||
microblog_data['author_email'] = unicode(email_elt)
|
||||
microblog_data[u'author_email'] = unicode(email_elt)
|
||||
|
||||
# categories
|
||||
categories = (category_elt.getAttribute('term','') for category_elt in entry_elt.elements(NS_ATOM, 'category'))
|
||||
|
|
|
|||
|
|
@ -24,13 +24,14 @@ from sat.plugins import plugin_xep_0277
|
|||
from sat.plugins import plugin_xep_0060
|
||||
from sat.plugins import plugin_misc_text_syntaxes
|
||||
from sat.tools.xml_tools import ElementParser
|
||||
from wokkel.pubsub import NS_PUBSUB
|
||||
|
||||
|
||||
class XEP_0277Test(helpers.SatTestCase):
|
||||
|
||||
PUBSUB_ENTRY_1 = """
|
||||
<item id="c745a688-9b02-11e3-a1a3-c0143dd4fe51" xmlns="%s">
|
||||
<entry>
|
||||
PUBSUB_ENTRY_1 = u"""
|
||||
<item id="c745a688-9b02-11e3-a1a3-c0143dd4fe51">
|
||||
<entry xmlns="%s">
|
||||
<title type="text"><span>titre</span></title>
|
||||
<id>c745a688-9b02-11e3-a1a3-c0143dd4fe51</id>
|
||||
<updated>2014-02-21T16:16:39+02:00</updated>
|
||||
|
|
@ -42,24 +43,25 @@ class XEP_0277Test(helpers.SatTestCase):
|
|||
</author>
|
||||
</entry>
|
||||
</item>
|
||||
""" % plugin_xep_0277.NS_PUBSUB
|
||||
""" % plugin_xep_0277.NS_ATOM
|
||||
|
||||
PUBSUB_ENTRY_2 = """
|
||||
<item id="c745a688-9b02-11e3-a1a3-c0143dd4fe51" xmlns="%s">
|
||||
<entry xmlns=''>
|
||||
PUBSUB_ENTRY_2 = u"""
|
||||
<item id="c745a688-9b02-11e3-a1a3-c0143dd4fe51">
|
||||
<entry xmlns='%s'>
|
||||
<title type="text"><div>titre</div></title>
|
||||
<title type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><div style="background-image: url('xxx');">titre</div></div></title>
|
||||
<id>c745a688-9b02-11e3-a1a3-c0143dd4fe51</id>
|
||||
<updated>2014-02-21T16:16:39+02:00</updated>
|
||||
<published>2014-02-21T16:16:38+02:00</published>
|
||||
<content type="text"><div><p>contenu</p>texte dans balise<p>autre contenu</p></div></content>
|
||||
<content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><div><p>contenu</p>texte dans balise<p>autre contenu</p></div></div></content>
|
||||
<content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><p>contenu</p>texte dans balise<p>autre contenu</p></div></content>
|
||||
<author>
|
||||
<nick>test1@souliane.org</nick>
|
||||
<name>test1@souliane.org</name>
|
||||
<nick>test1</nick>
|
||||
</author>
|
||||
</entry>
|
||||
</item>
|
||||
""" % plugin_xep_0277.NS_PUBSUB
|
||||
""" % plugin_xep_0277.NS_ATOM
|
||||
|
||||
def setUp(self):
|
||||
self.host = helpers.FakeSAT()
|
||||
|
|
@ -77,28 +79,32 @@ class XEP_0277Test(helpers.SatTestCase):
|
|||
self.plugin = plugin_xep_0277.XEP_0277(self.host)
|
||||
|
||||
def test_item2mbdata_1(self):
|
||||
expected = {'id': 'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
|
||||
'title': '<span>titre</span>',
|
||||
'updated': '1392992199.0',
|
||||
'published': '1392992198.0',
|
||||
'content': '<p>contenu</p>texte sans balise<p>autre contenu</p>',
|
||||
'content_xhtml': '<div><p>contenu</p>texte sans balise<p>autre contenu</p></div>',
|
||||
'author': 'test1@souliane.org'
|
||||
expected = {u'id': u'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
|
||||
u'atom_id': u'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
|
||||
u'title': u'<span>titre</span>',
|
||||
u'updated': u'1392992199.0',
|
||||
u'published': u'1392992198.0',
|
||||
u'content': u'<p>contenu</p>texte sans balise<p>autre contenu</p>',
|
||||
u'content_xhtml': u'<div><p>contenu</p>texte sans balise<p>autre contenu</p></div>',
|
||||
u'author': u'test1@souliane.org'
|
||||
}
|
||||
d = self.plugin.item2mbdata(ElementParser()(self.PUBSUB_ENTRY_1))
|
||||
item_elt = ElementParser()(self.PUBSUB_ENTRY_1, namespace=NS_PUBSUB).elements().next()
|
||||
d = self.plugin.item2mbdata(item_elt)
|
||||
d.addCallback(self.assertEqual, expected)
|
||||
return d
|
||||
|
||||
def test_item2mbdata_2(self):
|
||||
expected = {'id': 'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
|
||||
'title': '<div>titre</div>',
|
||||
'title_xhtml': '<div style="">titre</div>',
|
||||
'updated': '1392992199.0',
|
||||
'published': '1392992198.0',
|
||||
'content': '<div><p>contenu</p>texte dans balise<p>autre contenu</p></div>',
|
||||
'content_xhtml': '<div><p>contenu</p>texte dans balise<p>autre contenu</p></div>',
|
||||
'author': 'test1@souliane.org'
|
||||
expected = {u'id': u'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
|
||||
u'atom_id': u'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
|
||||
u'title': u'<div>titre</div>',
|
||||
u'title_xhtml': u'<div><div style="">titre</div></div>',
|
||||
u'updated': u'1392992199.0',
|
||||
u'published': u'1392992198.0',
|
||||
u'content': u'<div><p>contenu</p>texte dans balise<p>autre contenu</p></div>',
|
||||
u'content_xhtml': u'<div><p>contenu</p>texte dans balise<p>autre contenu</p></div>',
|
||||
u'author': u'test1@souliane.org'
|
||||
}
|
||||
d = self.plugin.item2mbdata(ElementParser()(self.PUBSUB_ENTRY_2))
|
||||
item_elt = ElementParser()(self.PUBSUB_ENTRY_2, namespace=NS_PUBSUB).elements().next()
|
||||
d = self.plugin.item2mbdata(item_elt)
|
||||
d.addCallback(self.assertEqual, expected)
|
||||
return d
|
||||
|
|
|
|||
Loading…
Reference in a new issue