NationTech/yaserde
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support de/ser-ialization with namespace

Browse Source
This commit is contained in:
Marc-Antoine Arnaud
2018-05-13 17:43:36 +02:00
parent 355565c84d
commit 07a258f8fc
10 changed files with 300 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
yaserde_derive/src/attribute.rs
View File

@@ -3,12 +3,15 @@ use proc_macro2::TokenTreeIter;
use proc_macro2::TokenNode::*;
use proc_macro2::Spacing;
use proc_macro2::Delimiter::Parenthesis;
use std::collections::BTreeMap;
use syn::Attribute;
#[derive(Debug, Clone)]
pub struct YaSerdeAttribute {
pub root: Option<String>,
pub rename: Option<String>,
pub prefix: Option<String>,
pub namespaces: BTreeMap<String, String>,
pub attribute: bool,
pub text: bool,
}
@@ -29,9 +32,11 @@ fn get_value(iter: &mut TokenTreeIter) -> Option<String> {
impl YaSerdeAttribute {
pub fn parse(attrs: &Vec<Attribute>) -> YaSerdeAttribute {
let mut root = None;
let mut rename = None;
let mut attribute = false;
let mut namespaces = BTreeMap::new();
let mut prefix = None;
let mut rename = None;
let mut root = None;
let mut text = false;
for attr in attrs.iter() {
@@ -46,15 +51,31 @@ impl YaSerdeAttribute {
match item.kind {
Term(t) => {
match t.as_str() {
"root" => {
root = get_value(&mut attr_iter);
"attribute" => {
attribute = true;
},
"namespace" => {
if let Some(namespace) = get_value(&mut attr_iter) {
let splitted : Vec<&str> = namespace.split(": ").collect();
if splitted.len() == 2 {
namespaces.insert(splitted[0].to_owned(), splitted[1].to_owned());
}
if splitted.len() == 1 {
namespaces.insert("".to_owned(), splitted[0].to_owned());
}
}
},
"prefix" => {
prefix = get_value(&mut attr_iter);
}
"rename" => {
rename = get_value(&mut attr_iter);
},
"attribute" => {
attribute = true;
}
"root" => {
root = get_value(&mut attr_iter);
},
"text" => {
text = true;
}
@@ -73,9 +94,11 @@ impl YaSerdeAttribute {
}
YaSerdeAttribute {
root: root,
rename: rename,
attribute: attribute,
namespaces: namespaces,
prefix: prefix,
rename: rename,
root: root,
text: text,
}
}

3
yaserde_derive/src/de/expand_enum.rs
View File

@@ -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 parse(data_enum: &DataEnum, name: &Ident, root: &String) -> Tokens {
pub fn parse(data_enum: &DataEnum, name: &Ident, root: &String, namespaces: &BTreeMap<String, String>) -> Tokens {
let variables : Tokens = data_enum.variants.iter().map(|ref variant|
{
match variant.fields {

28
yaserde_derive/src/de/expand_struct.rs
View File

@@ -2,11 +2,33 @@
use attribute::*;
use field_type::*;
use quote::Tokens;
use std::collections::BTreeMap;
use syn::Ident;
use syn::DataStruct;
use proc_macro2::Span;
pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String) -> Tokens {
pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String, namespaces: &BTreeMap<String, String>) -> Tokens {
let validate_namespace : Tokens = namespaces.iter().map(|(ref prefix, ref namespace)| {
Some(quote!(
let mut found = false;
for (key, value) in namespace {
if #namespace == value {
found = true;
}
}
if !found {
return Err("bad namespace".to_string());
}
// println!("{}: {}", #prefix, #namespace);
))
})
.filter(|x| x.is_some())
.map(|x| x.unwrap())
.fold(Tokens::new(), |mut tokens, token| {tokens.append_all(token); tokens});
let variables: Tokens = data_struct.fields.iter().map(|ref field|
{
let label = field.ident;
@@ -353,7 +375,9 @@ pub fn parse(data_struct: &DataStruct, name: &Ident, root: &String) -> Tokens {
loop {
match reader.peek()?.to_owned() {
XmlEvent::StartElement{ref name, ref attributes, ..} => {
XmlEvent::StartElement{ref name, ref attributes, ref namespace} => {
#validate_namespace
match name.local_name.as_str() {
#call_visitors
named_element => {

4
yaserde_derive/src/de/mod.rs
View File

@@ -19,10 +19,10 @@ pub fn expand_derive_deserialize(ast: &syn::DeriveInput) -> Result<quote::Tokens
let impl_block =
match data {
&syn::Data::Struct(ref data_struct) => {
expand_struct::parse(data_struct, &name, &root)
expand_struct::parse(data_struct, &name, &root, &root_attrs.namespaces)
},
&syn::Data::Enum(ref data_enum) => {
expand_enum::parse(data_enum, &name, &root)
expand_enum::parse(data_enum, &name, &root, &root_attrs.namespaces)
},
&syn::Data::Union(ref _data_union) => {
unimplemented!()

21
yaserde_derive/src/ser/expand_enum.rs
View File

@@ -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);
}

31
yaserde_derive/src/ser/expand_struct.rs
View File

@@ -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);
}

11
yaserde_derive/src/ser/mod.rs
View File

@@ -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!()