xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

message: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 21:21:34 +01:00
commit f971cbd5c9
2 changed files with 96 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/forwarding.rs
View file

@ -11,7 +11,7 @@ use minidom::Element;
use error::Error;
use delay::Delay;
use message;
use message::Message;
use ns;
@ -19,7 +19,7 @@ use ns;
pub struct Forwarded {
pub delay: Option<Delay>,
// XXX: really? Option?
pub stanza: Option<message::Message>,
pub stanza: Option<Message>,
}
impl<'a> TryFrom<&'a Element> for Forwarded {
@ -35,7 +35,7 @@ impl<'a> TryFrom<&'a Element> for Forwarded {
if child.is("delay", ns::DELAY) {
delay = Some(Delay::try_from(child)?);
} else if child.is("message", ns::JABBER_CLIENT) {
stanza = Some(message::parse_message(child)?);
stanza = Some(Message::try_from(child)?);
// TODO: also handle the five other possibilities.
} else {
return Err(Error::ParseError("Unknown child in forwarded element."));
@ -53,7 +53,7 @@ impl<'a> Into<Element> for &'a Forwarded {
Element::builder("forwarded")
.ns(ns::FORWARD)
.append(match self.delay { Some(ref delay) => { let elem: Element = delay.into(); Some(elem) }, None => None })
.append(self.stanza.clone())
.append(match self.stanza { Some(ref stanza) => { let elem: Element = stanza.into(); Some(elem) }, None => None })
.build()
}
}

64
src/message.rs
View file

@ -7,7 +7,7 @@
use std::convert::TryFrom;
use std::str::FromStr;
use minidom::{Element, IntoElements, IntoAttributeValue, ElementEmitter};
use minidom::{Element, IntoAttributeValue};
use jid::Jid;
@ -95,7 +95,10 @@ pub struct Message {
pub payloads: Vec<MessagePayloadType>,
}
pub fn parse_message(root: &Element) -> Result<Message, Error> {
impl<'a> TryFrom<&'a Element> for Message {
type Error = Error;
fn try_from(root: &'a Element) -> Result<Message, Error> {
if !root.is("message", ns::JABBER_CLIENT) {
return Err(Error::ParseError("This is not a message element."));
}
@ -142,10 +145,12 @@ pub fn parse_message(root: &Element) -> Result<Message, Error> {
type_: type_,
payloads: payloads,
})
}
}
pub fn serialise_payload(payload: &MessagePayload) -> Element {
match *payload {
impl<'a> Into<Element> for &'a MessagePayload {
fn into(self) -> Element {
match *self {
MessagePayload::Body(ref body) => body::serialise(body),
MessagePayload::StanzaError(ref stanza_error) => stanza_error.into(),
MessagePayload::Attention(ref attention) => attention.into(),
@ -155,92 +160,85 @@ pub fn serialise_payload(payload: &MessagePayload) -> Element {
MessagePayload::MessageCorrect(ref replace) => replace.into(),
MessagePayload::ExplicitMessageEncryption(ref eme) => eme.into(),
}
}
}
pub fn serialise(message: &Message) -> Element {
impl<'a> Into<Element> for &'a Message {
fn into(self) -> Element {
let mut stanza = Element::builder("message")
.ns(ns::JABBER_CLIENT)
.attr("from", message.from.clone().and_then(|value| Some(String::from(value))))
.attr("to", message.to.clone().and_then(|value| Some(String::from(value))))
.attr("id", message.id.clone())
.attr("type", message.type_.clone())
.attr("from", self.from.clone().and_then(|value| Some(String::from(value))))
.attr("to", self.to.clone().and_then(|value| Some(String::from(value))))
.attr("id", self.id.clone())
.attr("type", self.type_.clone())
.build();
for child in message.payloads.clone() {
for child in self.payloads.clone() {
let elem = match child {
MessagePayloadType::XML(elem) => elem,
MessagePayloadType::Parsed(payload) => serialise_payload(&payload),
MessagePayloadType::Parsed(payload) => (&payload).into(),
};
stanza.append_child(elem);
}
stanza
}
impl IntoElements for Message {
fn into_elements(self, emitter: &mut ElementEmitter) {
let elem = serialise(&self);
emitter.append_child(elem);
}
}
#[cfg(test)]
mod tests {
use std::str::FromStr;
use minidom::Element;
use jid::Jid;
use message;
use super::*;
#[test]
fn test_simple() {
let elem: Element = "<message xmlns='jabber:client'/>".parse().unwrap();
let message = message::parse_message(&elem).unwrap();
let message = Message::try_from(&elem).unwrap();
assert_eq!(message.from, None);
assert_eq!(message.to, None);
assert_eq!(message.id, None);
assert_eq!(message.type_, message::MessageType::Normal);
assert_eq!(message.type_, MessageType::Normal);
assert!(message.payloads.is_empty());
}
#[test]
fn test_serialise() {
let elem: Element = "<message xmlns='jabber:client' type='normal'/>".parse().unwrap();
let message = message::Message {
let message = Message {
from: None,
to: None,
id: None,
type_: message::MessageType::Normal,
type_: MessageType::Normal,
payloads: vec!(),
};
let elem2 = message::serialise(&message);
let elem2 = (&message).into();
assert_eq!(elem, elem2);
}
#[test]
fn test_body() {
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><body>Hello world!</body></message>".parse().unwrap();
message::parse_message(&elem).unwrap();
Message::try_from(&elem).unwrap();
}
#[test]
fn test_serialise_body() {
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><body>Hello world!</body></message>".parse().unwrap();
let message = message::Message {
let message = Message {
from: None,
to: Some(Jid::from_str("coucou@example.org").unwrap()),
id: None,
type_: message::MessageType::Chat,
type_: MessageType::Chat,
payloads: vec!(
message::MessagePayloadType::Parsed(message::MessagePayload::Body("Hello world!".to_owned())),
MessagePayloadType::Parsed(MessagePayload::Body("Hello world!".to_owned())),
),
};
let elem2 = message::serialise(&message);
let elem2 = (&message).into();
assert_eq!(elem, elem2);
}
#[test]
fn test_attention() {
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><attention xmlns='urn:xmpp:attention:0'/></message>".parse().unwrap();
let message = message::parse_message(&elem).unwrap();
let elem2 = message::serialise(&message);
let message = Message::try_from(&elem).unwrap();
let elem2 = (&message).into();
assert_eq!(elem, elem2);
}
}