support text field and clean warnings

yaserde/src/lib.rs

@@ -14,5 +14,5 @@ pub trait YaDeserialize : Sized {
 }
 
 pub trait YaSerialize : Sized {
-  fn derive_serialize<W: Write>(&self, read: &mut EventWriter<W>, parent_attributes: Option<&Vec<OwnedAttribute>>) -> Result<(), String>;
+  fn derive_serialize<W: Write>(&self, read: &mut EventWriter<W>) -> Result<(), String>;
 }

yaserde/tests/serializer.rs

@@ -11,17 +11,17 @@ use xml::writer::EventWriter;
 use yaserde::YaSerialize;
 
 macro_rules! convert_and_validate {
-  ($model:expr, $content:expr) => {
+  ($model:expr, $content:expr) => (
     let mut buf = Cursor::new(Vec::new());
     let mut writer = EventWriter::new(&mut buf);
-    let _status = $model.derive_serialize(&mut writer, None);
+    let _status = $model.derive_serialize(&mut writer);
 
     let buffer = writer.into_inner();
     let cursor = buffer.get_ref();
 
     let data = str::from_utf8(cursor).expect("Found invalid UTF-8");
     assert_eq!(data, $content);
-  }
+  )
 }
 
 #[test]
@@ -58,3 +58,117 @@ fn ser_list_of_items() {
   let content = "<?xml version=\"1.0\" encoding=\"utf-8\"?><base><items>something1</items><items>something2</items></base>".to_string();
   convert_and_validate!(model, content);
 }
+
+#[test]
+fn se_attributes() {
+  #[derive(YaSerialize, PartialEq, Debug)]
+  #[yaserde(root="base")]
+  pub struct XmlStruct {
+    #[yaserde(attribute)]
+    item: String,
+    sub: SubStruct
+  }
+
+  #[derive(YaSerialize, PartialEq, Debug)]
+  #[yaserde(root="sub")]
+  pub struct SubStruct {
+    #[yaserde(attribute)]
+    subitem: String
+  }
+
+  impl Default for SubStruct {
+    fn default() -> SubStruct {
+      SubStruct{
+        subitem: "".to_string()
+      }
+    }
+  }
+
+  let model = XmlStruct{
+    item: "something".to_string(),
+    sub: SubStruct{
+      subitem: "sub-something".to_string()
+    }
+  };
+
+  let content = "<?xml version=\"1.0\" encoding=\"utf-8\"?><base item=\"something\"><sub subitem=\"sub-something\" /></base>";
+  convert_and_validate!(model, content);
+}
+
+#[test]
+fn ser_rename() {
+  #[derive(YaSerialize, PartialEq, Debug)]
+  #[yaserde(root="base")]
+  pub struct XmlStruct {
+    #[yaserde(attribute, rename="Item")]
+    item: String,
+    #[yaserde(rename="sub")]
+    sub_struct: SubStruct
+  }
+
+  #[derive(YaSerialize, PartialEq, Debug)]
+  #[yaserde(root="sub")]
+  pub struct SubStruct {
+    #[yaserde(attribute, rename="sub_item")]
+    subitem: String,
+  }
+
+  impl Default for SubStruct {
+    fn default() -> SubStruct {
+      SubStruct{
+        subitem: "".to_string()
+      }
+    }
+  }
+
+  let model = XmlStruct{
+    item: "something".to_string(),
+    sub_struct: SubStruct{
+      subitem: "sub_something".to_string()
+    }
+  };
+
+  let content = "<?xml version=\"1.0\" encoding=\"utf-8\"?><base Item=\"something\"><sub sub_item=\"sub_something\" /></base>";
+  convert_and_validate!(model, content);
+}
+
+#[test]
+fn ser_text_content_with_attributes() {
+  #[derive(YaSerialize, PartialEq, Debug)]
+  #[yaserde(root="base")]
+  pub struct XmlStruct {
+    #[yaserde(attribute, rename="Item")]
+    item: String,
+    #[yaserde(rename="sub")]
+    sub_struct: SubStruct
+  }
+
+  #[derive(YaSerialize, PartialEq, Debug)]
+  #[yaserde(root="sub")]
+  pub struct SubStruct {
+    #[yaserde(attribute, rename="sub_item")]
+    subitem: String,
+    #[yaserde(text)]
+    text: String,
+  }
+
+  impl Default for SubStruct {
+    fn default() -> SubStruct {
+      SubStruct{
+        subitem: "".to_string(),
+        text: "".to_string(),
+      }
+    }
+  }
+
+  let model = XmlStruct{
+    item: "something".to_string(),
+    sub_struct: SubStruct{
+      subitem: "sub_something".to_string(),
+      text: "text_content".to_string()
+    }
+  };
+
+  let content = "<?xml version=\"1.0\" encoding=\"utf-8\"?><base Item=\"something\"><sub sub_item=\"sub_something\">text_content</sub></base>";
+  convert_and_validate!(model, content);
+}

yaserde_derive/src/ser/expand_struct.rs

@@ -7,9 +7,13 @@ use syn::DataStruct;
 use proc_macro2::Span;
 
 pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Tokens {
-  let struct_inspector : Tokens = data_struct.fields.iter().map(|ref field|
+  let build_attributes : Tokens = data_struct.fields.iter().map(|ref field|
     {
       let field_attrs = YaSerdeAttribute::parse(&field.attrs);
+      if field_attrs.attribute == false {
+        return None;
+      }
+
       let renamed_label =
         match field_attrs.rename {
           Some(value) => Some(Ident::new(&format!("{}", value), Span::call_site())),
@@ -21,30 +25,66 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
       match get_field_type(field) {
         Some(FieldType::FieldTypeString) =>
           Some(quote!{
-            let start_event = xml::writer::events::XmlEvent::start_element(#label_name);
+            .attr(#label_name, &self.#label)
-            let data_event = xml::writer::events::XmlEvent::characters(&self.#label);
+          }),
-            let end_event = xml::writer::events::XmlEvent::end_element();
+        _ => None
+      }
+    })
+    .filter(|x| x.is_some())
+    .map(|x| x.unwrap())
+    .fold(Tokens::new(), |mut tokens, token| {tokens.append_all(token); tokens});
+
+  let struct_inspector : Tokens = data_struct.fields.iter().map(|ref field|
+    {
+      let field_attrs = YaSerdeAttribute::parse(&field.attrs);
+      if field_attrs.attribute == true {
+        return None;
+      }
+
+      let label = field.ident;
+      if field_attrs.text == true {
+        return Some(quote!(
+          let data_event = XmlEvent::characters(&self.#label);
+          let _ret = writer.write(data_event);
+        ))
+      }
+
+      let renamed_label =
+        match field_attrs.rename {
+          Some(value) => Some(Ident::new(&format!("{}", value), Span::call_site())),
+          None => field.ident
+        };
+      let label_name = renamed_label.unwrap().to_string();
+
+      match get_field_type(field) {
+        Some(FieldType::FieldTypeString) =>
+          Some(quote!{
+            let start_event = XmlEvent::start_element(#label_name);
+            let data_event = XmlEvent::characters(&self.#label);
+            let end_event = XmlEvent::end_element();
             let _ret = writer.write(start_event);
             let _ret = writer.write(data_event);
             let _ret = writer.write(end_event);
           }),
         Some(FieldType::FieldTypeStruct{..}) =>
           Some(quote!{
-            let start_event = xml::writer::events::XmlEvent::start_element(#label_name);
+            match self.#label.derive_serialize(writer) {
-            let end_event = xml::writer::events::XmlEvent::end_element();
+              Ok(()) => {},
-            let _ret = writer.write(start_event);
+              Err(msg) => {
-            let _ret = writer.write(end_event);
+                return Err(msg);
+              },
+            };
           }),
         Some(FieldType::FieldTypeVec) =>
           Some(quote!{
             for item in &self.#label {
-              let start_event = xml::writer::events::XmlEvent::start_element(#label_name);
+              let start_event = XmlEvent::start_element(#label_name);
               let _ret = writer.write(start_event);
 
-              let data_event = xml::writer::events::XmlEvent::characters(item);
+              let data_event = XmlEvent::characters(item);
               let _ret = writer.write(data_event);
 
-              let end_event = xml::writer::events::XmlEvent::end_element();
+              let end_event = XmlEvent::end_element();
               let _ret = writer.write(end_event);
             }
           }),
@@ -62,13 +102,13 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
 
     impl YaSerialize for #name {
       #[allow(unused_variables)]
-      fn derive_serialize<W: Write>(&self, writer: &mut xml::EventWriter<W>, parent_attributes: Option<&Vec<xml::attribute::OwnedAttribute>>) -> Result<(), String> {
+      fn derive_serialize<W: Write>(&self, writer: &mut xml::EventWriter<W>) -> Result<(), String> {
-        let struct_start_event = xml::writer::events::XmlEvent::start_element(#root);
+        let struct_start_event = XmlEvent::start_element(#root)#build_attributes;
         let _ret = writer.write(struct_start_event);
 
         #struct_inspector
 
-        let struct_end_event = xml::writer::events::XmlEvent::end_element();
+        let struct_end_event = XmlEvent::end_element();
         let _ret = writer.write(struct_end_event);
         Ok(())
       }