pep/xmpp-rs-mirror
1
0
Fork 0
mirror of https://gitlab.com/xmpp-rs/xmpp-rs.git synced 2024-07-12 22:21:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsm: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 20:14:45 +01:00
parent 7ebabf7e91
commit de8fe4bf02
2 changed files with 116 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mam.rs
View file

@ -4,6 +4,8 @@
// 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 minidom::Element; use minidom::Element;
use jid::Jid; use jid::Jid;
@ -11,7 +13,6 @@ use error::Error;
use data_forms; use data_forms;
use data_forms::DataForm; use data_forms::DataForm;
use rsm;
use rsm::Set; use rsm::Set;
use forwarding; use forwarding;
use forwarding::Forwarded; use forwarding::Forwarded;
@ -63,7 +64,7 @@ pub fn parse_query(root: &Element) -> Result<Query, Error> {
if child.is("x", ns::DATA_FORMS) { if child.is("x", ns::DATA_FORMS) {
form = Some(data_forms::parse_data_form(child)?); form = Some(data_forms::parse_data_form(child)?);
} else if child.is("set", ns::RSM) { } else if child.is("set", ns::RSM) {
set = Some(rsm::parse_rsm(child)?); set = Some(Set::try_from(child)?);
} else { } else {
return Err(Error::ParseError("Unknown child in query element.")); return Err(Error::ParseError("Unknown child in query element."));
} }
@ -117,7 +118,7 @@ pub fn parse_fin(root: &Element) -> Result<Fin, Error> {
let mut set = None; let mut set = None;
for child in root.children() { for child in root.children() {
if child.is("set", ns::RSM) { if child.is("set", ns::RSM) {
set = Some(rsm::parse_rsm(child)?); set = Some(Set::try_from(child)?);
} else { } else {
return Err(Error::ParseError("Unknown child in fin element.")); return Err(Error::ParseError("Unknown child in fin element."));
} }
@ -179,7 +180,7 @@ pub fn serialise_query(query: &Query) -> Element {
// elem.append_child(data_forms::serialise(&form)); // elem.append_child(data_forms::serialise(&form));
//} //}
if let Some(ref set) = query.set { if let Some(ref set) = query.set {
elem.append_child(rsm::serialise(&set)); elem.append_child(set.into());
} }
elem elem
} }
@ -202,7 +203,7 @@ pub fn serialise_fin(fin: &Fin) -> Element {
false => None, false => None,
}) })
.build(); .build();
elem.append_child(rsm::serialise(&fin.set)); elem.append_child((&fin.set).into());
elem elem
} }

58
src/rsm.rs
View file

@ -4,6 +4,8 @@
// 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 minidom::Element; use minidom::Element;
use error::Error; use error::Error;
@ -27,8 +29,11 @@ pub struct Set {
pub max: Option<usize>, pub max: Option<usize>,
} }
pub fn parse_rsm(root: &Element) -> Result<Set, Error> { impl<'a> TryFrom<&'a Element> for Set {
if !root.is("set", ns::RSM) { type Error = Error;
fn try_from(elem: &'a Element) -> Result<Set, Error> {
if !elem.is("set", ns::RSM) {
return Err(Error::ParseError("This is not a RSM element.")); return Err(Error::ParseError("This is not a RSM element."));
} }
let mut after = None; let mut after = None;
@ -38,7 +43,7 @@ pub fn parse_rsm(root: &Element) -> Result<Set, Error> {
let mut index = None; let mut index = None;
let mut last = None; let mut last = None;
let mut max = None; let mut max = None;
for child in root.children() { for child in elem.children() {
if child.is("after", ns::RSM) { if child.is("after", ns::RSM) {
if after.is_some() { if after.is_some() {
return Err(Error::ParseError("Set can’t have more than one after.")); return Err(Error::ParseError("Set can’t have more than one after."));
@ -94,22 +99,24 @@ pub fn parse_rsm(root: &Element) -> Result<Set, Error> {
max: max, max: max,
}) })
} }
}
pub fn serialise(rsm: &Set) -> Element { impl<'a> Into<Element> for &'a Set {
fn into(self) -> Element {
let mut elem = Element::builder("set") let mut elem = Element::builder("set")
.ns(ns::RSM) .ns(ns::RSM)
.build(); .build();
if rsm.after.is_some() { if self.after.is_some() {
elem.append_child(Element::builder("after").ns(ns::RSM).append(rsm.after.clone()).build()); elem.append_child(Element::builder("after").ns(ns::RSM).append(self.after.clone()).build());
} }
if rsm.before.is_some() { if self.before.is_some() {
elem.append_child(Element::builder("before").ns(ns::RSM).append(rsm.before.clone()).build()); elem.append_child(Element::builder("before").ns(ns::RSM).append(self.before.clone()).build());
} }
if rsm.count.is_some() { if self.count.is_some() {
elem.append_child(Element::builder("count").ns(ns::RSM).append(format!("{}", rsm.count.unwrap())).build()); elem.append_child(Element::builder("count").ns(ns::RSM).append(format!("{}", self.count.unwrap())).build());
} }
if rsm.first.is_some() { if self.first.is_some() {
let first = rsm.first.clone().unwrap(); let first = self.first.clone().unwrap();
elem.append_child(Element::builder("first") elem.append_child(Element::builder("first")
.ns(ns::RSM) .ns(ns::RSM)
.attr("index", match first.index { .attr("index", match first.index {
@ -118,28 +125,27 @@ pub fn serialise(rsm: &Set) -> Element {
}) })
.append(first.base.clone()).build()); .append(first.base.clone()).build());
} }
if rsm.index.is_some() { if self.index.is_some() {
elem.append_child(Element::builder("index").ns(ns::RSM).append(format!("{}", rsm.index.unwrap())).build()); elem.append_child(Element::builder("index").ns(ns::RSM).append(format!("{}", self.index.unwrap())).build());
} }
if rsm.last.is_some() { if self.last.is_some() {
elem.append_child(Element::builder("last").ns(ns::RSM).append(rsm.last.clone()).build()); elem.append_child(Element::builder("last").ns(ns::RSM).append(self.last.clone()).build());
} }
if rsm.max.is_some() { if self.max.is_some() {
elem.append_child(Element::builder("max").ns(ns::RSM).append(format!("{}", rsm.max.unwrap())).build()); elem.append_child(Element::builder("max").ns(ns::RSM).append(format!("{}", self.max.unwrap())).build());
} }
elem elem
} }
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use minidom::Element; use super::*;
use error::Error;
use rsm;
#[test] #[test]
fn test_simple() { fn test_simple() {
let elem: Element = "<set xmlns='http://jabber.org/protocol/rsm'/>".parse().unwrap(); let elem: Element = "<set xmlns='http://jabber.org/protocol/rsm'/>".parse().unwrap();
let set = rsm::parse_rsm(&elem).unwrap(); let set = Set::try_from(&elem).unwrap();
assert_eq!(set.after, None); assert_eq!(set.after, None);
assert_eq!(set.before, None); assert_eq!(set.before, None);
assert_eq!(set.count, None); assert_eq!(set.count, None);
@ -155,7 +161,7 @@ mod tests {
#[test] #[test]
fn test_unknown() { fn test_unknown() {
let elem: Element = "<replace xmlns='urn:xmpp:message-correct:0'/>".parse().unwrap(); let elem: Element = "<replace xmlns='urn:xmpp:message-correct:0'/>".parse().unwrap();
let error = rsm::parse_rsm(&elem).unwrap_err(); let error = Set::try_from(&elem).unwrap_err();
let message = match error { let message = match error {
Error::ParseError(string) => string, Error::ParseError(string) => string,
_ => panic!(), _ => panic!(),
@ -166,7 +172,7 @@ mod tests {
#[test] #[test]
fn test_invalid_child() { fn test_invalid_child() {
let elem: Element = "<set xmlns='http://jabber.org/protocol/rsm'><coucou/></set>".parse().unwrap(); let elem: Element = "<set xmlns='http://jabber.org/protocol/rsm'><coucou/></set>".parse().unwrap();
let error = rsm::parse_rsm(&elem).unwrap_err(); let error = Set::try_from(&elem).unwrap_err();
let message = match error { let message = match error {
Error::ParseError(string) => string, Error::ParseError(string) => string,
_ => panic!(), _ => panic!(),
@ -177,7 +183,7 @@ mod tests {
#[test] #[test]
fn test_serialise() { fn test_serialise() {
let elem: Element = "<set xmlns='http://jabber.org/protocol/rsm'/>".parse().unwrap(); let elem: Element = "<set xmlns='http://jabber.org/protocol/rsm'/>".parse().unwrap();
let rsm = rsm::Set { let rsm = Set {
after: None, after: None,
before: None, before: None,
count: None, count: None,
@ -186,7 +192,7 @@ mod tests {
last: None, last: None,
max: None, max: None,
}; };
let elem2 = rsm::serialise(&rsm); let elem2 = (&rsm).into();
assert_eq!(elem, elem2); assert_eq!(elem, elem2);
} }
} }