Run cargo fmt.
This commit is contained in:
Emmanuel Gil Peyrot
parent
d517b8e32e
commit
efd7bd5f2f
51 changed files with 2276 additions and 1324 deletions
|
|
@ -4,19 +4,14 @@
|
|||
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
use try_from::TryFrom;
|
||||
|
||||
use minidom::Element;
|
||||
use jid::Jid;
|
||||
use crate::date::DateTime;
|
||||
|
||||
use crate::error::Error;
|
||||
|
||||
use crate::ns;
|
||||
|
||||
use crate::data_forms::DataForm;
|
||||
|
||||
use crate::pubsub::{NodeName, ItemId, Subscription, SubscriptionId};
|
||||
use crate::date::DateTime;
|
||||
use crate::error::Error;
|
||||
use crate::ns;
|
||||
use crate::pubsub::{ItemId, NodeName, Subscription, SubscriptionId};
|
||||
use jid::Jid;
|
||||
use minidom::Element;
|
||||
use try_from::TryFrom;
|
||||
|
||||
/// One PubSub item from a node.
|
||||
#[derive(Debug, Clone)]
|
||||
|
|
@ -40,7 +35,9 @@ impl TryFrom<Element> for Item {
|
|||
let mut payloads = elem.children().cloned().collect::<Vec<_>>();
|
||||
let payload = payloads.pop();
|
||||
if !payloads.is_empty() {
|
||||
return Err(Error::ParseError("More than a single payload in item element."));
|
||||
return Err(Error::ParseError(
|
||||
"More than a single payload in item element.",
|
||||
));
|
||||
}
|
||||
Ok(Item {
|
||||
payload,
|
||||
|
|
@ -53,11 +50,11 @@ impl TryFrom<Element> for Item {
|
|||
impl From<Item> for Element {
|
||||
fn from(item: Item) -> Element {
|
||||
Element::builder("item")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("id", item.id)
|
||||
.attr("publisher", item.publisher)
|
||||
.append(item.payload)
|
||||
.build()
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("id", item.id)
|
||||
.attr("publisher", item.publisher)
|
||||
.append(item.payload)
|
||||
.build()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -131,21 +128,29 @@ pub enum PubSubEvent {
|
|||
|
||||
fn parse_items(elem: Element, node: NodeName) -> Result<PubSubEvent, Error> {
|
||||
let mut is_retract = None;
|
||||
let mut items = vec!();
|
||||
let mut retracts = vec!();
|
||||
let mut items = vec![];
|
||||
let mut retracts = vec![];
|
||||
for child in elem.children() {
|
||||
if child.is("item", ns::PUBSUB_EVENT) {
|
||||
match is_retract {
|
||||
None => is_retract = Some(false),
|
||||
Some(false) => (),
|
||||
Some(true) => return Err(Error::ParseError("Mix of item and retract in items element.")),
|
||||
Some(true) => {
|
||||
return Err(Error::ParseError(
|
||||
"Mix of item and retract in items element.",
|
||||
))
|
||||
}
|
||||
}
|
||||
items.push(Item::try_from(child.clone())?);
|
||||
} else if child.is("retract", ns::PUBSUB_EVENT) {
|
||||
match is_retract {
|
||||
None => is_retract = Some(true),
|
||||
Some(true) => (),
|
||||
Some(false) => return Err(Error::ParseError("Mix of item and retract in items element.")),
|
||||
Some(false) => {
|
||||
return Err(Error::ParseError(
|
||||
"Mix of item and retract in items element.",
|
||||
))
|
||||
}
|
||||
}
|
||||
check_no_children!(child, "retract");
|
||||
check_no_unknown_attributes!(child, "retract", ["id"]);
|
||||
|
|
@ -157,7 +162,10 @@ fn parse_items(elem: Element, node: NodeName) -> Result<PubSubEvent, Error> {
|
|||
}
|
||||
Ok(match is_retract {
|
||||
Some(false) => PubSubEvent::PublishedItems { node, items },
|
||||
Some(true) => PubSubEvent::RetractedItems { node, items: retracts },
|
||||
Some(true) => PubSubEvent::RetractedItems {
|
||||
node,
|
||||
items: retracts,
|
||||
},
|
||||
None => return Err(Error::ParseError("Missing children in items element.")),
|
||||
})
|
||||
}
|
||||
|
|
@ -176,7 +184,9 @@ impl TryFrom<Element> for PubSubEvent {
|
|||
let mut payloads = child.children().cloned().collect::<Vec<_>>();
|
||||
let item = payloads.pop();
|
||||
if !payloads.is_empty() {
|
||||
return Err(Error::ParseError("More than a single payload in configuration element."));
|
||||
return Err(Error::ParseError(
|
||||
"More than a single payload in configuration element.",
|
||||
));
|
||||
}
|
||||
let form = match item {
|
||||
None => None,
|
||||
|
|
@ -188,7 +198,9 @@ impl TryFrom<Element> for PubSubEvent {
|
|||
for item in child.children() {
|
||||
if item.is("redirect", ns::PUBSUB_EVENT) {
|
||||
if redirect.is_some() {
|
||||
return Err(Error::ParseError("More than one redirect in delete element."));
|
||||
return Err(Error::ParseError(
|
||||
"More than one redirect in delete element.",
|
||||
));
|
||||
}
|
||||
let uri = get_attr!(item, "uri", required);
|
||||
redirect = Some(uri);
|
||||
|
|
@ -222,77 +234,79 @@ impl TryFrom<Element> for PubSubEvent {
|
|||
impl From<PubSubEvent> for Element {
|
||||
fn from(event: PubSubEvent) -> Element {
|
||||
let payload = match event {
|
||||
PubSubEvent::Configuration { node, form } => {
|
||||
Element::builder("configuration")
|
||||
PubSubEvent::Configuration { node, form } => Element::builder("configuration")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.append(form)
|
||||
.build(),
|
||||
PubSubEvent::Delete { node, redirect } => Element::builder("purge")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.append(redirect.map(|redirect| {
|
||||
Element::builder("redirect")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.append(form)
|
||||
.attr("uri", redirect)
|
||||
.build()
|
||||
},
|
||||
PubSubEvent::Delete { node, redirect } => {
|
||||
Element::builder("purge")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.append(redirect.map(|redirect| {
|
||||
Element::builder("redirect")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("uri", redirect)
|
||||
.build()
|
||||
}))
|
||||
.build()
|
||||
},
|
||||
PubSubEvent::PublishedItems { node, items } => {
|
||||
Element::builder("items")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.append(items)
|
||||
.build()
|
||||
},
|
||||
PubSubEvent::RetractedItems { node, items } => {
|
||||
Element::builder("items")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.append(items.into_iter().map(|id| {
|
||||
Element::builder("retract")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("id", id)
|
||||
.build()
|
||||
}).collect::<Vec<_>>())
|
||||
.build()
|
||||
},
|
||||
PubSubEvent::Purge { node } => {
|
||||
Element::builder("purge")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.build()
|
||||
},
|
||||
PubSubEvent::Subscription { node, expiry, jid, subid, subscription } => {
|
||||
Element::builder("subscription")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.attr("expiry", expiry)
|
||||
.attr("jid", jid)
|
||||
.attr("subid", subid)
|
||||
.attr("subscription", subscription)
|
||||
.build()
|
||||
},
|
||||
}))
|
||||
.build(),
|
||||
PubSubEvent::PublishedItems { node, items } => Element::builder("items")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.append(items)
|
||||
.build(),
|
||||
PubSubEvent::RetractedItems { node, items } => Element::builder("items")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.append(
|
||||
items
|
||||
.into_iter()
|
||||
.map(|id| {
|
||||
Element::builder("retract")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("id", id)
|
||||
.build()
|
||||
})
|
||||
.collect::<Vec<_>>(),
|
||||
)
|
||||
.build(),
|
||||
PubSubEvent::Purge { node } => Element::builder("purge")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.build(),
|
||||
PubSubEvent::Subscription {
|
||||
node,
|
||||
expiry,
|
||||
jid,
|
||||
subid,
|
||||
subscription,
|
||||
} => Element::builder("subscription")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.attr("node", node)
|
||||
.attr("expiry", expiry)
|
||||
.attr("jid", jid)
|
||||
.attr("subid", subid)
|
||||
.attr("subscription", subscription)
|
||||
.build(),
|
||||
};
|
||||
Element::builder("event")
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.append(payload)
|
||||
.build()
|
||||
.ns(ns::PUBSUB_EVENT)
|
||||
.append(payload)
|
||||
.build()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::str::FromStr;
|
||||
use crate::compare_elements::NamespaceAwareCompare;
|
||||
use std::str::FromStr;
|
||||
|
||||
#[test]
|
||||
fn missing_items() {
|
||||
let elem: Element = "<event xmlns='http://jabber.org/protocol/pubsub#event'><items node='coucou'/></event>".parse().unwrap();
|
||||
let elem: Element =
|
||||
"<event xmlns='http://jabber.org/protocol/pubsub#event'><items node='coucou'/></event>"
|
||||
.parse()
|
||||
.unwrap();
|
||||
let error = PubSubEvent::try_from(elem).unwrap_err();
|
||||
let message = match error {
|
||||
Error::ParseError(string) => string,
|
||||
|
|
@ -309,9 +323,12 @@ mod tests {
|
|||
PubSubEvent::PublishedItems { node, items } => {
|
||||
assert_eq!(node, NodeName(String::from("coucou")));
|
||||
assert_eq!(items[0].id, Some(ItemId(String::from("test"))));
|
||||
assert_eq!(items[0].publisher, Some(Jid::from_str("test@coucou").unwrap()));
|
||||
assert_eq!(
|
||||
items[0].publisher,
|
||||
Some(Jid::from_str("test@coucou").unwrap())
|
||||
);
|
||||
assert_eq!(items[0].payload, None);
|
||||
},
|
||||
}
|
||||
_ => panic!(),
|
||||
}
|
||||
}
|
||||
|
|
@ -329,7 +346,7 @@ mod tests {
|
|||
Some(ref elem) => assert!(elem.is("foreign", "example:namespace")),
|
||||
_ => panic!(),
|
||||
}
|
||||
},
|
||||
}
|
||||
_ => panic!(),
|
||||
}
|
||||
}
|
||||
|
|
@ -343,7 +360,7 @@ mod tests {
|
|||
assert_eq!(node, NodeName(String::from("something")));
|
||||
assert_eq!(items[0], ItemId(String::from("coucou")));
|
||||
assert_eq!(items[1], ItemId(String::from("test")));
|
||||
},
|
||||
}
|
||||
_ => panic!(),
|
||||
}
|
||||
}
|
||||
|
|
@ -356,19 +373,22 @@ mod tests {
|
|||
PubSubEvent::Delete { node, redirect } => {
|
||||
assert_eq!(node, NodeName(String::from("coucou")));
|
||||
assert_eq!(redirect, Some(String::from("hello")));
|
||||
},
|
||||
}
|
||||
_ => panic!(),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_simple_purge() {
|
||||
let elem: Element = "<event xmlns='http://jabber.org/protocol/pubsub#event'><purge node='coucou'/></event>".parse().unwrap();
|
||||
let elem: Element =
|
||||
"<event xmlns='http://jabber.org/protocol/pubsub#event'><purge node='coucou'/></event>"
|
||||
.parse()
|
||||
.unwrap();
|
||||
let event = PubSubEvent::try_from(elem).unwrap();
|
||||
match event {
|
||||
PubSubEvent::Purge { node } => {
|
||||
assert_eq!(node, NodeName(String::from("coucou")));
|
||||
},
|
||||
}
|
||||
_ => panic!(),
|
||||
}
|
||||
}
|
||||
|
|
@ -381,14 +401,17 @@ mod tests {
|
|||
PubSubEvent::Configuration { node, form: _ } => {
|
||||
assert_eq!(node, NodeName(String::from("coucou")));
|
||||
//assert_eq!(form.type_, Result_);
|
||||
},
|
||||
}
|
||||
_ => panic!(),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_invalid() {
|
||||
let elem: Element = "<event xmlns='http://jabber.org/protocol/pubsub#event'><coucou node='test'/></event>".parse().unwrap();
|
||||
let elem: Element =
|
||||
"<event xmlns='http://jabber.org/protocol/pubsub#event'><coucou node='test'/></event>"
|
||||
.parse()
|
||||
.unwrap();
|
||||
let error = PubSubEvent::try_from(elem).unwrap_err();
|
||||
let message = match error {
|
||||
Error::ParseError(string) => string,
|
||||
|
|
@ -399,7 +422,9 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn test_invalid_attribute() {
|
||||
let elem: Element = "<event xmlns='http://jabber.org/protocol/pubsub#event' coucou=''/>".parse().unwrap();
|
||||
let elem: Element = "<event xmlns='http://jabber.org/protocol/pubsub#event' coucou=''/>"
|
||||
.parse()
|
||||
.unwrap();
|
||||
let error = PubSubEvent::try_from(elem).unwrap_err();
|
||||
let message = match error {
|
||||
Error::ParseError(string) => string,
|
||||
|
|
@ -419,16 +444,29 @@ mod tests {
|
|||
subid='ba49252aaa4f5d320c24d3766f0bdcade78c78d3'
|
||||
subscription='subscribed'/>
|
||||
</event>
|
||||
"#.parse().unwrap();
|
||||
"#
|
||||
.parse()
|
||||
.unwrap();
|
||||
let event = PubSubEvent::try_from(elem.clone()).unwrap();
|
||||
match event.clone() {
|
||||
PubSubEvent::Subscription { node, expiry, jid, subid, subscription } => {
|
||||
PubSubEvent::Subscription {
|
||||
node,
|
||||
expiry,
|
||||
jid,
|
||||
subid,
|
||||
subscription,
|
||||
} => {
|
||||
assert_eq!(node, NodeName(String::from("princely_musings")));
|
||||
assert_eq!(subid, Some(SubscriptionId(String::from("ba49252aaa4f5d320c24d3766f0bdcade78c78d3"))));
|
||||
assert_eq!(
|
||||
subid,
|
||||
Some(SubscriptionId(String::from(
|
||||
"ba49252aaa4f5d320c24d3766f0bdcade78c78d3"
|
||||
)))
|
||||
);
|
||||
assert_eq!(subscription, Some(Subscription::Subscribed));
|
||||
assert_eq!(jid, Some(Jid::from_str("francisco@denmark.lit").unwrap()));
|
||||
assert_eq!(expiry, Some("2006-02-28T23:59:59Z".parse().unwrap()));
|
||||
},
|
||||
}
|
||||
_ => panic!(),
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,19 +4,14 @@
|
|||
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
use try_from::TryFrom;
|
||||
|
||||
use minidom::Element;
|
||||
use jid::Jid;
|
||||
|
||||
use crate::error::Error;
|
||||
|
||||
use crate::ns;
|
||||
|
||||
use crate::iq::{IqGetPayload, IqSetPayload, IqResultPayload};
|
||||
use crate::data_forms::DataForm;
|
||||
|
||||
use crate::pubsub::{NodeName, ItemId, Subscription, SubscriptionId};
|
||||
use crate::error::Error;
|
||||
use crate::iq::{IqGetPayload, IqResultPayload, IqSetPayload};
|
||||
use crate::ns;
|
||||
use crate::pubsub::{ItemId, NodeName, Subscription, SubscriptionId};
|
||||
use jid::Jid;
|
||||
use minidom::Element;
|
||||
use try_from::TryFrom;
|
||||
|
||||
// TODO: a better solution would be to split this into a query and a result elements, like for
|
||||
// XEP-0030.
|
||||
|
|
@ -137,7 +132,9 @@ impl TryFrom<Element> for Item {
|
|||
let mut payloads = elem.children().cloned().collect::<Vec<_>>();
|
||||
let payload = payloads.pop();
|
||||
if !payloads.is_empty() {
|
||||
return Err(Error::ParseError("More than a single payload in item element."));
|
||||
return Err(Error::ParseError(
|
||||
"More than a single payload in item element.",
|
||||
));
|
||||
}
|
||||
Ok(Item {
|
||||
payload,
|
||||
|
|
@ -149,10 +146,10 @@ impl TryFrom<Element> for Item {
|
|||
impl From<Item> for Element {
|
||||
fn from(item: Item) -> Element {
|
||||
Element::builder("item")
|
||||
.ns(ns::PUBSUB)
|
||||
.attr("id", item.id)
|
||||
.append(item.payload)
|
||||
.build()
|
||||
.ns(ns::PUBSUB)
|
||||
.attr("id", item.id)
|
||||
.append(item.payload)
|
||||
.build()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -199,7 +196,9 @@ generate_element!(
|
|||
|
||||
generate_attribute!(
|
||||
/// Whether a retract request should notify subscribers or not.
|
||||
Notify, "notify", bool
|
||||
Notify,
|
||||
"notify",
|
||||
bool
|
||||
);
|
||||
|
||||
generate_element!(
|
||||
|
|
@ -235,11 +234,15 @@ impl TryFrom<Element> for SubscribeOptions {
|
|||
for child in elem.children() {
|
||||
if child.is("required", ns::PUBSUB) {
|
||||
if required {
|
||||
return Err(Error::ParseError("More than one required element in subscribe-options."));
|
||||
return Err(Error::ParseError(
|
||||
"More than one required element in subscribe-options.",
|
||||
));
|
||||
}
|
||||
required = true;
|
||||
} else {
|
||||
return Err(Error::ParseError("Unknown child in subscribe-options element."));
|
||||
return Err(Error::ParseError(
|
||||
"Unknown child in subscribe-options element.",
|
||||
));
|
||||
}
|
||||
}
|
||||
Ok(SubscribeOptions { required })
|
||||
|
|
@ -251,12 +254,10 @@ impl From<SubscribeOptions> for Element {
|
|||
Element::builder("subscribe-options")
|
||||
.ns(ns::PUBSUB)
|
||||
.append(if subscribe_options.required {
|
||||
vec!(Element::builder("required")
|
||||
.ns(ns::PUBSUB)
|
||||
.build())
|
||||
} else {
|
||||
vec!()
|
||||
})
|
||||
vec![Element::builder("required").ns(ns::PUBSUB).build()]
|
||||
} else {
|
||||
vec![]
|
||||
})
|
||||
.build()
|
||||
}
|
||||
}
|
||||
|
|
@ -334,7 +335,7 @@ pub enum PubSub {
|
|||
create: Create,
|
||||
|
||||
/// The configure request for the new node.
|
||||
configure: Option<Configure>
|
||||
configure: Option<Configure>,
|
||||
},
|
||||
|
||||
/// Request to publish items to a node, with optional options.
|
||||
|
|
@ -343,7 +344,7 @@ pub enum PubSub {
|
|||
publish: Publish,
|
||||
|
||||
/// The options related to this publish request.
|
||||
publish_options: Option<PublishOptions>
|
||||
publish_options: Option<PublishOptions>,
|
||||
},
|
||||
|
||||
/// A list of affiliations you have on a service, or on a node.
|
||||
|
|
@ -383,75 +384,114 @@ impl TryFrom<Element> for PubSub {
|
|||
for child in elem.children() {
|
||||
if child.is("create", ns::PUBSUB) {
|
||||
if payload.is_some() {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let create = Create::try_from(child.clone())?;
|
||||
payload = Some(PubSub::Create { create, configure: None });
|
||||
payload = Some(PubSub::Create {
|
||||
create,
|
||||
configure: None,
|
||||
});
|
||||
} else if child.is("configure", ns::PUBSUB) {
|
||||
if let Some(PubSub::Create { create, configure }) = payload {
|
||||
if configure.is_some() {
|
||||
return Err(Error::ParseError("Configure is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Configure is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let configure = Some(Configure::try_from(child.clone())?);
|
||||
payload = Some(PubSub::Create { create, configure });
|
||||
} else {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
} else if child.is("publish", ns::PUBSUB) {
|
||||
if payload.is_some() {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let publish = Publish::try_from(child.clone())?;
|
||||
payload = Some(PubSub::Publish { publish, publish_options: None });
|
||||
payload = Some(PubSub::Publish {
|
||||
publish,
|
||||
publish_options: None,
|
||||
});
|
||||
} else if child.is("publish-options", ns::PUBSUB) {
|
||||
if let Some(PubSub::Publish { publish, publish_options }) = payload {
|
||||
if let Some(PubSub::Publish {
|
||||
publish,
|
||||
publish_options,
|
||||
}) = payload
|
||||
{
|
||||
if publish_options.is_some() {
|
||||
return Err(Error::ParseError("Publish-options are already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Publish-options are already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let publish_options = Some(PublishOptions::try_from(child.clone())?);
|
||||
payload = Some(PubSub::Publish { publish, publish_options });
|
||||
payload = Some(PubSub::Publish {
|
||||
publish,
|
||||
publish_options,
|
||||
});
|
||||
} else {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
} else if child.is("affiliations", ns::PUBSUB) {
|
||||
if payload.is_some() {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let affiliations = Affiliations::try_from(child.clone())?;
|
||||
payload = Some(PubSub::Affiliations(affiliations));
|
||||
} else if child.is("default", ns::PUBSUB) {
|
||||
if payload.is_some() {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let default = Default::try_from(child.clone())?;
|
||||
payload = Some(PubSub::Default(default));
|
||||
} else if child.is("items", ns::PUBSUB) {
|
||||
if payload.is_some() {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let items = Items::try_from(child.clone())?;
|
||||
payload = Some(PubSub::Items(items));
|
||||
} else if child.is("retract", ns::PUBSUB) {
|
||||
if payload.is_some() {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let retract = Retract::try_from(child.clone())?;
|
||||
payload = Some(PubSub::Retract(retract));
|
||||
} else if child.is("subscription", ns::PUBSUB) {
|
||||
if payload.is_some() {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let subscription = SubscriptionElem::try_from(child.clone())?;
|
||||
payload = Some(PubSub::Subscription(subscription));
|
||||
} else if child.is("subscriptions", ns::PUBSUB) {
|
||||
if payload.is_some() {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let subscriptions = Subscriptions::try_from(child.clone())?;
|
||||
payload = Some(PubSub::Subscriptions(subscriptions));
|
||||
} else if child.is("unsubscribe", ns::PUBSUB) {
|
||||
if payload.is_some() {
|
||||
return Err(Error::ParseError("Payload is already defined in pubsub element."));
|
||||
return Err(Error::ParseError(
|
||||
"Payload is already defined in pubsub element.",
|
||||
));
|
||||
}
|
||||
let unsubscribe = Unsubscribe::try_from(child.clone())?;
|
||||
payload = Some(PubSub::Unsubscribe(unsubscribe));
|
||||
|
|
@ -468,28 +508,31 @@ impl From<PubSub> for Element {
|
|||
Element::builder("pubsub")
|
||||
.ns(ns::PUBSUB)
|
||||
.append(match pubsub {
|
||||
PubSub::Create { create, configure } => {
|
||||
let mut elems = vec!(Element::from(create));
|
||||
if let Some(configure) = configure {
|
||||
elems.push(Element::from(configure));
|
||||
}
|
||||
elems
|
||||
},
|
||||
PubSub::Publish { publish, publish_options } => {
|
||||
let mut elems = vec!(Element::from(publish));
|
||||
if let Some(publish_options) = publish_options {
|
||||
elems.push(Element::from(publish_options));
|
||||
}
|
||||
elems
|
||||
},
|
||||
PubSub::Affiliations(affiliations) => vec!(Element::from(affiliations)),
|
||||
PubSub::Default(default) => vec!(Element::from(default)),
|
||||
PubSub::Items(items) => vec!(Element::from(items)),
|
||||
PubSub::Retract(retract) => vec!(Element::from(retract)),
|
||||
PubSub::Subscription(subscription) => vec!(Element::from(subscription)),
|
||||
PubSub::Subscriptions(subscriptions) => vec!(Element::from(subscriptions)),
|
||||
PubSub::Unsubscribe(unsubscribe) => vec!(Element::from(unsubscribe)),
|
||||
})
|
||||
PubSub::Create { create, configure } => {
|
||||
let mut elems = vec![Element::from(create)];
|
||||
if let Some(configure) = configure {
|
||||
elems.push(Element::from(configure));
|
||||
}
|
||||
elems
|
||||
}
|
||||
PubSub::Publish {
|
||||
publish,
|
||||
publish_options,
|
||||
} => {
|
||||
let mut elems = vec![Element::from(publish)];
|
||||
if let Some(publish_options) = publish_options {
|
||||
elems.push(Element::from(publish_options));
|
||||
}
|
||||
elems
|
||||
}
|
||||
PubSub::Affiliations(affiliations) => vec![Element::from(affiliations)],
|
||||
PubSub::Default(default) => vec![Element::from(default)],
|
||||
PubSub::Items(items) => vec![Element::from(items)],
|
||||
PubSub::Retract(retract) => vec![Element::from(retract)],
|
||||
PubSub::Subscription(subscription) => vec![Element::from(subscription)],
|
||||
PubSub::Subscriptions(subscriptions) => vec![Element::from(subscriptions)],
|
||||
PubSub::Unsubscribe(unsubscribe) => vec![Element::from(unsubscribe)],
|
||||
})
|
||||
.build()
|
||||
}
|
||||
}
|
||||
|
|
@ -501,7 +544,9 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn create() {
|
||||
let elem: Element = "<pubsub xmlns='http://jabber.org/protocol/pubsub'><create/></pubsub>".parse().unwrap();
|
||||
let elem: Element = "<pubsub xmlns='http://jabber.org/protocol/pubsub'><create/></pubsub>"
|
||||
.parse()
|
||||
.unwrap();
|
||||
let elem1 = elem.clone();
|
||||
let pubsub = PubSub::try_from(elem).unwrap();
|
||||
match pubsub.clone() {
|
||||
|
|
@ -515,7 +560,10 @@ mod tests {
|
|||
let elem2 = Element::from(pubsub);
|
||||
assert!(elem1.compare_to(&elem2));
|
||||
|
||||
let elem: Element = "<pubsub xmlns='http://jabber.org/protocol/pubsub'><create node='coucou'/></pubsub>".parse().unwrap();
|
||||
let elem: Element =
|
||||
"<pubsub xmlns='http://jabber.org/protocol/pubsub'><create node='coucou'/></pubsub>"
|
||||
.parse()
|
||||
.unwrap();
|
||||
let elem1 = elem.clone();
|
||||
let pubsub = PubSub::try_from(elem).unwrap();
|
||||
match pubsub.clone() {
|
||||
|
|
@ -532,7 +580,10 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn create_and_configure() {
|
||||
let elem: Element = "<pubsub xmlns='http://jabber.org/protocol/pubsub'><create/><configure/></pubsub>".parse().unwrap();
|
||||
let elem: Element =
|
||||
"<pubsub xmlns='http://jabber.org/protocol/pubsub'><create/><configure/></pubsub>"
|
||||
.parse()
|
||||
.unwrap();
|
||||
let elem1 = elem.clone();
|
||||
let pubsub = PubSub::try_from(elem).unwrap();
|
||||
match pubsub.clone() {
|
||||
|
|
@ -549,11 +600,17 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn publish() {
|
||||
let elem: Element = "<pubsub xmlns='http://jabber.org/protocol/pubsub'><publish node='coucou'/></pubsub>".parse().unwrap();
|
||||
let elem: Element =
|
||||
"<pubsub xmlns='http://jabber.org/protocol/pubsub'><publish node='coucou'/></pubsub>"
|
||||
.parse()
|
||||
.unwrap();
|
||||
let elem1 = elem.clone();
|
||||
let pubsub = PubSub::try_from(elem).unwrap();
|
||||
match pubsub.clone() {
|
||||
PubSub::Publish { publish, publish_options } => {
|
||||
PubSub::Publish {
|
||||
publish,
|
||||
publish_options,
|
||||
} => {
|
||||
assert_eq!(&publish.node.0, "coucou");
|
||||
assert!(publish_options.is_none());
|
||||
}
|
||||
|
|
@ -570,7 +627,10 @@ mod tests {
|
|||
let elem1 = elem.clone();
|
||||
let pubsub = PubSub::try_from(elem).unwrap();
|
||||
match pubsub.clone() {
|
||||
PubSub::Publish { publish, publish_options } => {
|
||||
PubSub::Publish {
|
||||
publish,
|
||||
publish_options,
|
||||
} => {
|
||||
assert_eq!(&publish.node.0, "coucou");
|
||||
assert!(publish_options.unwrap().form.is_none());
|
||||
}
|
||||
|
|
@ -583,7 +643,9 @@ mod tests {
|
|||
|
||||
#[test]
|
||||
fn invalid_empty_pubsub() {
|
||||
let elem: Element = "<pubsub xmlns='http://jabber.org/protocol/pubsub'/>".parse().unwrap();
|
||||
let elem: Element = "<pubsub xmlns='http://jabber.org/protocol/pubsub'/>"
|
||||
.parse()
|
||||
.unwrap();
|
||||
let error = PubSub::try_from(elem).unwrap_err();
|
||||
let message = match error {
|
||||
Error::ParseError(string) => string,
|
||||
|
|
@ -596,12 +658,17 @@ mod tests {
|
|||
fn publish_option() {
|
||||
let elem: Element = "<publish-options xmlns='http://jabber.org/protocol/pubsub'><x xmlns='jabber:x:data' type='submit'><field var='FORM_TYPE' type='hidden'><value>http://jabber.org/protocol/pubsub#publish-options</value></field></x></publish-options>".parse().unwrap();
|
||||
let publish_options = PublishOptions::try_from(elem).unwrap();
|
||||
assert_eq!(&publish_options.form.unwrap().form_type.unwrap(), "http://jabber.org/protocol/pubsub#publish-options");
|
||||
assert_eq!(
|
||||
&publish_options.form.unwrap().form_type.unwrap(),
|
||||
"http://jabber.org/protocol/pubsub#publish-options"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn subscribe_options() {
|
||||
let elem1: Element = "<subscribe-options xmlns='http://jabber.org/protocol/pubsub'/>".parse().unwrap();
|
||||
let elem1: Element = "<subscribe-options xmlns='http://jabber.org/protocol/pubsub'/>"
|
||||
.parse()
|
||||
.unwrap();
|
||||
let subscribe_options1 = SubscribeOptions::try_from(elem1).unwrap();
|
||||
assert_eq!(subscribe_options1.required, false);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue