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

jingle_ibb: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 14:03:41 +01:00
commit 8fbda37f6b
1 changed files with 37 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/jingle_ibb.rs
View file

@ -4,6 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this // 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/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
use std::convert::TryFrom;
use std::str::FromStr; use std::str::FromStr;
use minidom::Element; use minidom::Element;
@ -30,14 +31,17 @@ fn required_attr<T: FromStr>(root: &Element, attr: &str, err: Error) -> Result<T
optional_attr(root, attr).ok_or(err) optional_attr(root, attr).ok_or(err)
} }
pub fn parse_jingle_ibb(root: &Element) -> Result<Transport, Error> { impl<'a> TryFrom<&'a Element> for Transport {
if root.is("transport", ns::JINGLE_IBB) { type Error = Error;
for _ in root.children() {
fn try_from(elem: &'a Element) -> Result<Transport, Error> {
if elem.is("transport", ns::JINGLE_IBB) {
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in JingleIBB element.")); return Err(Error::ParseError("Unknown child in JingleIBB element."));
} }
let block_size = required_attr(root, "block-size", Error::ParseError("Required attribute 'block-size' missing in JingleIBB element."))?; let block_size = required_attr(elem, "block-size", Error::ParseError("Required attribute 'block-size' missing in JingleIBB element."))?;
let sid = required_attr(root, "sid", Error::ParseError("Required attribute 'sid' missing in JingleIBB element."))?; let sid = required_attr(elem, "sid", Error::ParseError("Required attribute 'sid' missing in JingleIBB element."))?;
let stanza = root.attr("stanza") let stanza = elem.attr("stanza")
.unwrap_or("iq") .unwrap_or("iq")
.parse()?; .parse()?;
Ok(Transport { Ok(Transport {
@ -48,37 +52,37 @@ pub fn parse_jingle_ibb(root: &Element) -> Result<Transport, Error> {
} else { } else {
Err(Error::ParseError("This is not an JingleIBB element.")) Err(Error::ParseError("This is not an JingleIBB element."))
} }
}
} }
pub fn serialise(transport: &Transport) -> Element { impl<'a> Into<Element> for &'a Transport {
fn into(self) -> Element {
Element::builder("transport") Element::builder("transport")
.ns(ns::JINGLE_IBB) .ns(ns::JINGLE_IBB)
.attr("block-size", format!("{}", transport.block_size)) .attr("block-size", format!("{}", self.block_size))
.attr("sid", transport.sid.clone()) .attr("sid", self.sid.clone())
.attr("stanza", transport.stanza.clone()) .attr("stanza", self.stanza.clone())
.build() .build()
}
} }
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use minidom::Element; use super::*;
use error::Error;
use ibb;
use jingle_ibb;
#[test] #[test]
fn test_simple() { fn test_simple() {
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='3' sid='coucou'/>".parse().unwrap(); let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='3' sid='coucou'/>".parse().unwrap();
let transport = jingle_ibb::parse_jingle_ibb(&elem).unwrap(); let transport = Transport::try_from(&elem).unwrap();
assert_eq!(transport.block_size, 3); assert_eq!(transport.block_size, 3);
assert_eq!(transport.sid, "coucou"); assert_eq!(transport.sid, "coucou");
assert_eq!(transport.stanza, ibb::Stanza::Iq); assert_eq!(transport.stanza, Stanza::Iq);
} }
#[test] #[test]
fn test_invalid() { fn test_invalid() {
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1'/>".parse().unwrap(); let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1'/>".parse().unwrap();
let error = jingle_ibb::parse_jingle_ibb(&elem).unwrap_err(); let error = Transport::try_from(&elem).unwrap_err();
let message = match error { let message = match error {
Error::ParseError(string) => string, Error::ParseError(string) => string,
_ => panic!(), _ => panic!(),
@ -87,7 +91,7 @@ mod tests {
// TODO: maybe make a better error message here. // TODO: maybe make a better error message here.
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='-5'/>".parse().unwrap(); let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='-5'/>".parse().unwrap();
let error = jingle_ibb::parse_jingle_ibb(&elem).unwrap_err(); let error = Transport::try_from(&elem).unwrap_err();
let message = match error { let message = match error {
Error::ParseError(string) => string, Error::ParseError(string) => string,
_ => panic!(), _ => panic!(),
@ -95,7 +99,7 @@ mod tests {
assert_eq!(message, "Required attribute 'block-size' missing in JingleIBB element."); assert_eq!(message, "Required attribute 'block-size' missing in JingleIBB element.");
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='128'/>".parse().unwrap(); let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='128'/>".parse().unwrap();
let error = jingle_ibb::parse_jingle_ibb(&elem).unwrap_err(); let error = Transport::try_from(&elem).unwrap_err();
let message = match error { let message = match error {
Error::ParseError(string) => string, Error::ParseError(string) => string,
_ => panic!(), _ => panic!(),
@ -106,7 +110,7 @@ mod tests {
#[test] #[test]
fn test_invalid_stanza() { fn test_invalid_stanza() {
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='128' sid='coucou' stanza='fdsq'/>".parse().unwrap(); let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:ibb:1' block-size='128' sid='coucou' stanza='fdsq'/>".parse().unwrap();
let error = jingle_ibb::parse_jingle_ibb(&elem).unwrap_err(); let error = Transport::try_from(&elem).unwrap_err();
let message = match error { let message = match error {
Error::ParseError(string) => string, Error::ParseError(string) => string,
_ => panic!(), _ => panic!(),