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

mam: Switch to Into/TryFrom.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-06 21:08:44 +01:00
commit 418956c720
1 changed files with 195 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

132
src/mam.rs
View file

@ -52,13 +52,16 @@ pub struct Prefs {
pub never: Vec<Jid>, pub never: Vec<Jid>,
} }
pub fn parse_query(root: &Element) -> Result<Query, Error> { impl<'a> TryFrom<&'a Element> for Query {
if !root.is("query", ns::MAM) { type Error = Error;
fn try_from(elem: &'a Element) -> Result<Query, Error> {
if !elem.is("query", ns::MAM) {
return Err(Error::ParseError("This is not a query element.")); return Err(Error::ParseError("This is not a query element."));
} }
let mut form = None; let mut form = None;
let mut set = None; let mut set = None;
for child in root.children() { for child in elem.children() {
if child.is("x", ns::DATA_FORMS) { if child.is("x", ns::DATA_FORMS) {
form = Some(DataForm::try_from(child)?); form = Some(DataForm::try_from(child)?);
} else if child.is("set", ns::RSM) { } else if child.is("set", ns::RSM) {
@ -67,34 +70,38 @@ pub fn parse_query(root: &Element) -> Result<Query, Error> {
return Err(Error::ParseError("Unknown child in query element.")); return Err(Error::ParseError("Unknown child in query element."));
} }
} }
let queryid = match root.attr("queryid") { let queryid = match elem.attr("queryid") {
Some(queryid) => Some(queryid.to_owned()), Some(queryid) => Some(queryid.to_owned()),
None => None, None => None,
}; };
let node = match root.attr("node") { let node = match elem.attr("node") {
Some(node) => Some(node.to_owned()), Some(node) => Some(node.to_owned()),
None => None, None => None,
}; };
Ok(Query { queryid, node, form, set }) Ok(Query { queryid, node, form, set })
} }
}
pub fn parse_result(root: &Element) -> Result<Result_, Error> { impl<'a> TryFrom<&'a Element> for Result_ {
if !root.is("result", ns::MAM) { type Error = Error;
fn try_from(elem: &'a Element) -> Result<Result_, Error> {
if !elem.is("result", ns::MAM) {
return Err(Error::ParseError("This is not a result element.")); return Err(Error::ParseError("This is not a result element."));
} }
let mut forwarded = None; let mut forwarded = None;
for child in root.children() { for child in elem.children() {
if child.is("forwarded", ns::FORWARD) { if child.is("forwarded", ns::FORWARD) {
forwarded = Some(Forwarded::try_from(child)?); forwarded = Some(Forwarded::try_from(child)?);
} else { } else {
return Err(Error::ParseError("Unknown child in result element.")); return Err(Error::ParseError("Unknown child in result element."));
} }
} }
let queryid = match root.attr("queryid") { let queryid = match elem.attr("queryid") {
Some(queryid) => queryid.to_owned(), Some(queryid) => queryid.to_owned(),
None => return Err(Error::ParseError("No 'queryid' attribute present in result.")), None => return Err(Error::ParseError("No 'queryid' attribute present in result.")),
}; };
let id = match root.attr("id") { let id = match elem.attr("id") {
Some(id) => id.to_owned(), Some(id) => id.to_owned(),
None => return Err(Error::ParseError("No 'id' attribute present in result.")), None => return Err(Error::ParseError("No 'id' attribute present in result.")),
}; };
@ -108,20 +115,24 @@ pub fn parse_result(root: &Element) -> Result<Result_, Error> {
forwarded, forwarded,
}) })
} }
}
pub fn parse_fin(root: &Element) -> Result<Fin, Error> { impl<'a> TryFrom<&'a Element> for Fin {
if !root.is("fin", ns::MAM) { type Error = Error;
fn try_from(elem: &'a Element) -> Result<Fin, Error> {
if !elem.is("fin", ns::MAM) {
return Err(Error::ParseError("This is not a fin element.")); return Err(Error::ParseError("This is not a fin element."));
} }
let mut set = None; let mut set = None;
for child in root.children() { for child in elem.children() {
if child.is("set", ns::RSM) { if child.is("set", ns::RSM) {
set = Some(Set::try_from(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."));
} }
} }
let complete = match root.attr("complete") { let complete = match elem.attr("complete") {
Some(complete) => complete == "true", Some(complete) => complete == "true",
None => false, None => false,
}; };
@ -131,14 +142,18 @@ pub fn parse_fin(root: &Element) -> Result<Fin, Error> {
let set = set.unwrap(); let set = set.unwrap();
Ok(Fin { complete, set }) Ok(Fin { complete, set })
} }
}
pub fn parse_prefs(root: &Element) -> Result<Prefs, Error> { impl<'a> TryFrom<&'a Element> for Prefs {
if !root.is("prefs", ns::MAM) { type Error = Error;
fn try_from(elem: &'a Element) -> Result<Prefs, Error> {
if !elem.is("prefs", ns::MAM) {
return Err(Error::ParseError("This is not a prefs element.")); return Err(Error::ParseError("This is not a prefs element."));
} }
let mut always = vec!(); let mut always = vec!();
let mut never = vec!(); let mut never = vec!();
for child in root.children() { for child in elem.children() {
if child.is("always", ns::MAM) { if child.is("always", ns::MAM) {
for jid_elem in child.children() { for jid_elem in child.children() {
if !jid_elem.is("jid", ns::MAM) { if !jid_elem.is("jid", ns::MAM) {
@ -157,7 +172,7 @@ pub fn parse_prefs(root: &Element) -> Result<Prefs, Error> {
return Err(Error::ParseError("Unknown child in prefs element.")); return Err(Error::ParseError("Unknown child in prefs element."));
} }
} }
let default_ = match root.attr("default") { let default_ = match elem.attr("default") {
Some("always") => Some(DefaultPrefs::Always), Some("always") => Some(DefaultPrefs::Always),
Some("never") => Some(DefaultPrefs::Never), Some("never") => Some(DefaultPrefs::Never),
Some("roster") => Some(DefaultPrefs::Roster), Some("roster") => Some(DefaultPrefs::Roster),
@ -167,59 +182,67 @@ pub fn parse_prefs(root: &Element) -> Result<Prefs, Error> {
}; };
Ok(Prefs { default_, always, never }) Ok(Prefs { default_, always, never })
} }
}
pub fn serialise_query(query: &Query) -> Element { impl<'a> Into<Element> for &'a Query {
fn into(self) -> Element {
let mut elem = Element::builder("query") let mut elem = Element::builder("query")
.ns(ns::MAM) .ns(ns::MAM)
.attr("queryid", query.queryid.clone()) .attr("queryid", self.queryid.clone())
.attr("node", query.node.clone()) .attr("node", self.node.clone())
.build(); .build();
//if let Some(form) = query.form { //if let Some(form) = self.form {
// elem.append_child((&form).into()); // elem.append_child((&form).into());
//} //}
if let Some(ref set) = query.set { if let Some(ref set) = self.set {
elem.append_child(set.into()); elem.append_child(set.into());
} }
elem elem
} }
pub fn serialise_result(result: &Result_) -> Element {
let mut elem = Element::builder("result")
.ns(ns::MAM)
.attr("queryid", result.queryid.clone())
.attr("id", result.id.clone())
.build();
elem.append_child((&result.forwarded).into());
elem
} }
pub fn serialise_fin(fin: &Fin) -> Element { impl<'a> Into<Element> for &'a Result_ {
fn into(self) -> Element {
let mut elem = Element::builder("result")
.ns(ns::MAM)
.attr("queryid", self.queryid.clone())
.attr("id", self.id.clone())
.build();
elem.append_child((&self.forwarded).into());
elem
}
}
impl<'a> Into<Element> for &'a Fin {
fn into(self) -> Element {
let mut elem = Element::builder("fin") let mut elem = Element::builder("fin")
.ns(ns::MAM) .ns(ns::MAM)
.attr("complete", match fin.complete { .attr("complete", match self.complete {
true => Some("true"), true => Some("true"),
false => None, false => None,
}) })
.build(); .build();
elem.append_child((&fin.set).into()); elem.append_child((&self.set).into());
elem elem
} }
}
pub fn serialise_prefs(prefs: &Prefs) -> Element { impl<'a> Into<Element> for &'a Prefs {
fn into(self) -> Element {
let mut elem = Element::builder("prefs") let mut elem = Element::builder("prefs")
.ns(ns::MAM) .ns(ns::MAM)
.attr("default", match prefs.default_ { .attr("default", match self.default_ {
Some(DefaultPrefs::Always) => Some("always"), Some(DefaultPrefs::Always) => Some("always"),
Some(DefaultPrefs::Never) => Some("never"), Some(DefaultPrefs::Never) => Some("never"),
Some(DefaultPrefs::Roster) => Some("roster"), Some(DefaultPrefs::Roster) => Some("roster"),
None => None, None => None,
}) })
.build(); .build();
if !prefs.always.is_empty() { if !self.always.is_empty() {
let mut always = Element::builder("always") let mut always = Element::builder("always")
.ns(ns::RSM) .ns(ns::RSM)
.build(); .build();
for jid in prefs.always.clone() { for jid in self.always.clone() {
always.append_child(Element::builder("jid") always.append_child(Element::builder("jid")
.ns(ns::RSM) .ns(ns::RSM)
.append(String::from(jid)) .append(String::from(jid))
@ -227,11 +250,11 @@ pub fn serialise_prefs(prefs: &Prefs) -> Element {
} }
elem.append_child(always); elem.append_child(always);
} }
if !prefs.never.is_empty() { if !self.never.is_empty() {
let mut never = Element::builder("never") let mut never = Element::builder("never")
.ns(ns::RSM) .ns(ns::RSM)
.build(); .build();
for jid in prefs.never.clone() { for jid in self.never.clone() {
never.append_child(Element::builder("jid") never.append_child(Element::builder("jid")
.ns(ns::RSM) .ns(ns::RSM)
.append(String::from(jid)) .append(String::from(jid))
@ -241,17 +264,16 @@ pub fn serialise_prefs(prefs: &Prefs) -> Element {
} }
elem elem
} }
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use minidom::Element; use super::*;
use error::Error;
use mam;
#[test] #[test]
fn test_query() { fn test_query() {
let elem: Element = "<query xmlns='urn:xmpp:mam:2'/>".parse().unwrap(); let elem: Element = "<query xmlns='urn:xmpp:mam:2'/>".parse().unwrap();
mam::parse_query(&elem).unwrap(); Query::try_from(&elem).unwrap();
} }
#[test] #[test]
@ -266,7 +288,7 @@ mod tests {
</forwarded> </forwarded>
</result> </result>
"#.parse().unwrap(); "#.parse().unwrap();
mam::parse_result(&elem).unwrap(); Result_::try_from(&elem).unwrap();
} }
#[test] #[test]
@ -279,7 +301,7 @@ mod tests {
</set> </set>
</fin> </fin>
"#.parse().unwrap(); "#.parse().unwrap();
mam::parse_fin(&elem).unwrap(); Fin::try_from(&elem).unwrap();
} }
#[test] #[test]
@ -296,7 +318,7 @@ mod tests {
</x> </x>
</query> </query>
"#.parse().unwrap(); "#.parse().unwrap();
mam::parse_query(&elem).unwrap(); Query::try_from(&elem).unwrap();
} }
#[test] #[test]
@ -316,13 +338,13 @@ mod tests {
</set> </set>
</query> </query>
"#.parse().unwrap(); "#.parse().unwrap();
mam::parse_query(&elem).unwrap(); Query::try_from(&elem).unwrap();
} }
#[test] #[test]
fn test_prefs_get() { fn test_prefs_get() {
let elem: Element = "<prefs xmlns='urn:xmpp:mam:2'/>".parse().unwrap(); let elem: Element = "<prefs xmlns='urn:xmpp:mam:2'/>".parse().unwrap();
mam::parse_prefs(&elem).unwrap(); Prefs::try_from(&elem).unwrap();
let elem: Element = r#" let elem: Element = r#"
<prefs xmlns='urn:xmpp:mam:2' default='roster'> <prefs xmlns='urn:xmpp:mam:2' default='roster'>
@ -330,7 +352,7 @@ mod tests {
<never/> <never/>
</prefs> </prefs>
"#.parse().unwrap(); "#.parse().unwrap();
mam::parse_prefs(&elem).unwrap(); Prefs::try_from(&elem).unwrap();
} }
#[test] #[test]
@ -345,13 +367,13 @@ mod tests {
</never> </never>
</prefs> </prefs>
"#.parse().unwrap(); "#.parse().unwrap();
mam::parse_prefs(&elem).unwrap(); Prefs::try_from(&elem).unwrap();
} }
#[test] #[test]
fn test_invalid_child() { fn test_invalid_child() {
let elem: Element = "<query xmlns='urn:xmpp:mam:2'><coucou/></query>".parse().unwrap(); let elem: Element = "<query xmlns='urn:xmpp:mam:2'><coucou/></query>".parse().unwrap();
let error = mam::parse_query(&elem).unwrap_err(); let error = Query::try_from(&elem).unwrap_err();
let message = match error { let message = match error {
Error::ParseError(string) => string, Error::ParseError(string) => string,
_ => panic!(), _ => panic!(),
@ -362,8 +384,8 @@ mod tests {
#[test] #[test]
fn test_serialise() { fn test_serialise() {
let elem: Element = "<query xmlns='urn:xmpp:mam:2'/>".parse().unwrap(); let elem: Element = "<query xmlns='urn:xmpp:mam:2'/>".parse().unwrap();
let replace = mam::Query { queryid: None, node: None, form: None, set: None }; let replace = Query { queryid: None, node: None, form: None, set: None };
let elem2 = mam::serialise_query(&replace); let elem2 = (&replace).into();
assert_eq!(elem, elem2); assert_eq!(elem, elem2);
} }
} }