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

data_forms: Use a macro for <option/>.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-05-28 17:05:04 +02:00
parent 45fdb3d5e2
commit bb60af1531
1 changed files with 33 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/data_forms.rs
View file

@ -13,47 +13,15 @@ use ns;
use media_element::MediaElement;
#[derive(Debug, Clone)]
pub struct Option_ {
pub label: Option<String>,
pub value: String,
}
impl TryFrom<Element> for Option_ {
type Err = Error;
fn try_from(elem: Element) -> Result<Option_, Error> {
check_self!(elem, "option", DATA_FORMS);
check_no_unknown_attributes!(elem, "option", ["label"]);
let mut value = None;
for child in elem.children() {
if !child.is("value", ns::DATA_FORMS) {
return Err(Error::ParseError("Non-value element in option element"));
}
if value.is_some() {
return Err(Error::ParseError("More than one value element in option element"));
}
value = Some(child.text());
}
Ok(Option_ {
label: get_attr!(elem, "label", optional),
value: value.ok_or(Error::ParseError("No value element in option element"))?,
})
}
}
impl From<Option_> for Element {
fn from(option: Option_) -> Element {
Element::builder("option")
.ns(ns::DATA_FORMS)
.attr("label", option.label)
.append(Element::builder("value")
.ns(ns::DATA_FORMS)
.append(option.value)
.build())
.build()
}
}
generate_element!(
Option_, "option", DATA_FORMS,
attributes: [
label: Option<String> = "label" => optional
],
children: [
value: Required<String> = ("value", DATA_FORMS) => String
]
);
generate_attribute!(FieldType, "type", {
Boolean => "boolean",
@ -266,4 +234,28 @@ mod tests {
};
assert_eq!(message, "Unknown child in data form element.");
}
#[test]
fn option() {
let elem: Element = "<option xmlns='jabber:x:data' label='Coucou !'><value>coucou</value></option>".parse().unwrap();
let option = Option_::try_from(elem).unwrap();
assert_eq!(&option.label.unwrap(), "Coucou !");
assert_eq!(&option.value, "coucou");
let elem: Element = "<option xmlns='jabber:x:data' label='Coucou !'/>".parse().unwrap();
let error = Option_::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
_ => panic!(),
};
assert_eq!(message, "Missing child value in option element.");
let elem: Element = "<option xmlns='jabber:x:data' label='Coucou !'><value>coucou</value><value>error</value></option>".parse().unwrap();
let error = Option_::try_from(elem).unwrap_err();
let message = match error {
Error::ParseError(string) => string,
_ => panic!(),
};
assert_eq!(message, "Element option must not have more than one value child.");
}
}