support de/ser-ialization with namespace
This commit is contained in:
@@ -2,12 +2,13 @@
|
||||
use attribute::*;
|
||||
use field_type::*;
|
||||
use quote::Tokens;
|
||||
use std::collections::BTreeMap;
|
||||
use syn::Fields;
|
||||
use syn::Ident;
|
||||
use syn::DataEnum;
|
||||
use proc_macro2::Span;
|
||||
|
||||
pub fn serialize(data_enum: &DataEnum, name: &Ident, root: &String) -> Tokens {
|
||||
pub fn serialize(data_enum: &DataEnum, name: &Ident, root: &String, namespaces: &BTreeMap<String, String>) -> Tokens {
|
||||
let write_enum_content : Tokens = data_enum.variants.iter().map(|ref variant|
|
||||
{
|
||||
let variant_attrs = YaSerdeAttribute::parse(&variant.attrs);
|
||||
@@ -17,7 +18,12 @@ pub fn serialize(data_enum: &DataEnum, name: &Ident, root: &String) -> Tokens {
|
||||
None => variant.ident
|
||||
};
|
||||
let label = variant.ident;
|
||||
let label_name = renamed_label.to_string();
|
||||
let label_name =
|
||||
if let Some(prefix) = variant_attrs.prefix {
|
||||
prefix + ":" + renamed_label.to_string().as_ref()
|
||||
} else {
|
||||
renamed_label.to_string()
|
||||
};
|
||||
|
||||
match variant.fields {
|
||||
Fields::Unit => {
|
||||
@@ -133,6 +139,15 @@ pub fn serialize(data_enum: &DataEnum, name: &Ident, root: &String) -> Tokens {
|
||||
.map(|x| x.unwrap())
|
||||
.fold(Tokens::new(), |mut tokens, token| {tokens.append_all(token); tokens});
|
||||
|
||||
let add_namespaces : Tokens = namespaces.iter().map(|(ref prefix, ref namespace)| {
|
||||
Some(quote!(
|
||||
.ns(#prefix, #namespace)
|
||||
))
|
||||
})
|
||||
.filter(|x| x.is_some())
|
||||
.map(|x| x.unwrap())
|
||||
.fold(Tokens::new(), |mut tokens, token| {tokens.append_all(token); tokens});
|
||||
|
||||
quote! {
|
||||
use xml::writer::XmlEvent;
|
||||
|
||||
@@ -142,7 +157,7 @@ pub fn serialize(data_enum: &DataEnum, name: &Ident, root: &String) -> Tokens {
|
||||
error!("Enum: start to expand {:?}", #root);
|
||||
|
||||
if !writer.skip_start_end() {
|
||||
let struct_start_event = XmlEvent::start_element(#root);
|
||||
let struct_start_event = XmlEvent::start_element(#root)#add_namespaces;
|
||||
let _ret = writer.write(struct_start_event);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,12 +2,13 @@
|
||||
use attribute::*;
|
||||
use field_type::*;
|
||||
use quote::Tokens;
|
||||
use std::collections::BTreeMap;
|
||||
use syn::Ident;
|
||||
use syn::DataStruct;
|
||||
use proc_macro2::Span;
|
||||
use std::string::ToString;
|
||||
|
||||
pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Tokens {
|
||||
pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String, namespaces: &BTreeMap<String, String>) -> Tokens {
|
||||
let build_attributes : Tokens = data_struct.fields.iter().map(|ref field|
|
||||
{
|
||||
let field_attrs = YaSerdeAttribute::parse(&field.attrs);
|
||||
@@ -21,7 +22,12 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
|
||||
None => field.ident
|
||||
};
|
||||
let label = field.ident;
|
||||
let label_name = renamed_label.unwrap().to_string();
|
||||
let label_name =
|
||||
if let Some(prefix) = field_attrs.prefix {
|
||||
prefix + ":" + renamed_label.unwrap().to_string().as_ref()
|
||||
} else {
|
||||
renamed_label.unwrap().to_string()
|
||||
};
|
||||
|
||||
match get_field_type(field) {
|
||||
Some(FieldType::FieldTypeString) =>
|
||||
@@ -53,6 +59,15 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
|
||||
.map(|x| x.unwrap())
|
||||
.fold(Tokens::new(), |mut tokens, token| {tokens.append_all(token); tokens});
|
||||
|
||||
let add_namespaces : Tokens = namespaces.iter().map(|(ref prefix, ref namespace)| {
|
||||
Some(quote!(
|
||||
.ns(#prefix, #namespace)
|
||||
))
|
||||
})
|
||||
.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);
|
||||
@@ -73,7 +88,13 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
|
||||
Some(value) => Some(Ident::new(&format!("{}", value), Span::call_site())),
|
||||
None => field.ident
|
||||
};
|
||||
let label_name = renamed_label.unwrap().to_string();
|
||||
|
||||
let label_name =
|
||||
if let Some(prefix) = field_attrs.prefix {
|
||||
prefix + ":" + renamed_label.unwrap().to_string().as_ref()
|
||||
} else {
|
||||
renamed_label.unwrap().to_string()
|
||||
};
|
||||
|
||||
match get_field_type(field) {
|
||||
Some(FieldType::FieldTypeString) =>
|
||||
@@ -136,8 +157,6 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
|
||||
.map(|x| x.unwrap())
|
||||
.fold(Tokens::new(), |mut tokens, token| {tokens.append_all(token); tokens});
|
||||
|
||||
// println!("{:?}", struct_inspector);
|
||||
|
||||
quote! {
|
||||
use xml::writer::XmlEvent;
|
||||
|
||||
@@ -147,7 +166,7 @@ pub fn serialize(data_struct: &DataStruct, name: &Ident, root: &String) -> Token
|
||||
error!("Struct: start to expand {:?}", #root);
|
||||
|
||||
if !writer.skip_start_end() {
|
||||
let struct_start_event = XmlEvent::start_element(#root)#build_attributes;
|
||||
let struct_start_event = XmlEvent::start_element(#root)#build_attributes#add_namespaces;
|
||||
let _ret = writer.write(struct_start_event);
|
||||
}
|
||||
|
||||
|
||||
@@ -16,13 +16,20 @@ pub fn expand_derive_serialize(ast: &syn::DeriveInput) -> Result<quote::Tokens,
|
||||
let root_attrs = attribute::YaSerdeAttribute::parse(&attrs);
|
||||
let root = root_attrs.clone().root.unwrap_or(name.to_string());
|
||||
|
||||
let root =
|
||||
if let Some(prefix) = root_attrs.prefix {
|
||||
prefix + ":" + &root
|
||||
} else {
|
||||
root
|
||||
};
|
||||
|
||||
let impl_block =
|
||||
match data {
|
||||
&syn::Data::Struct(ref data_struct) => {
|
||||
expand_struct::serialize(data_struct, &name, &root)
|
||||
expand_struct::serialize(data_struct, &name, &root, &root_attrs.namespaces)
|
||||
},
|
||||
&syn::Data::Enum(ref data_enum) => {
|
||||
expand_enum::serialize(data_enum, &name, &root)
|
||||
expand_enum::serialize(data_enum, &name, &root, &root_attrs.namespaces)
|
||||
},
|
||||
&syn::Data::Union(ref _data_union) => {
|
||||
unimplemented!()
|
||||
|
||||
Reference in New Issue
Block a user