chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change syntax for meta items and remove them after use.

Browse Source
This commit is contained in:
Jimmy Cuadra 2017-05-14 17:34:21 -07:00
parent f624e1ff50
commit 24370f3d4c
2 changed files with 109 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/request.rs
View File

@ -1,5 +1,5 @@
use quote::{ToTokens, Tokens};
use syn::{Field, Lit, MetaItem};
use syn::{Field, MetaItem, NestedMetaItem};
#[derive(Debug)]
pub struct Request {
@ -37,34 +37,56 @@ impl Request {
impl From<Vec<Field>> for Request {
fn from(fields: Vec<Field>) -> Self {
let request_fields = fields.into_iter().map(|field| {
for attr in field.attrs.clone().iter() {
match attr.value {
MetaItem::Word(ref ident) => {
if ident == "query" {
return RequestField::Query(field);
}
}
MetaItem::List(_, _) => {}
MetaItem::NameValue(ref ident, ref lit) => {
if ident == "header" {
if let Lit::Str(ref name, _) = *lit {
return RequestField::Header(name.clone(), field);
} else {
panic!("ruma_api! header attribute expects a string value");
}
} else if ident == "path" {
if let Lit::Str(ref name, _) = *lit {
return RequestField::Path(name.clone(), field);
} else {
panic!("ruma_api! path attribute expects a string value");
let request_fields = fields.into_iter().map(|mut field| {
let mut request_field_kind = RequestFieldKind::Body;
field.attrs = field.attrs.into_iter().filter(|attr| {
let (attr_ident, nested_meta_items) = match attr.value {
MetaItem::List(ref attr_ident, ref nested_meta_items) => (attr_ident, nested_meta_items),
_ => return true,
};
if attr_ident != "ruma_api" {
return true;
}
for nested_meta_item in nested_meta_items {
match *nested_meta_item {
NestedMetaItem::MetaItem(ref meta_item) => {
match *meta_item {
MetaItem::Word(ref ident) => {
if ident == "header" {
request_field_kind = RequestFieldKind::Header;
} else if ident == "path" {
request_field_kind = RequestFieldKind::Path;
} else if ident == "query" {
request_field_kind = RequestFieldKind::Query;
} else {
panic!(
"ruma_api! attribute meta item on requests must be: header, path, or query"
);
}
}
_ => panic!(
"ruma_api! attribute meta item on requests cannot be a list or name/value pair"
),
}
}
NestedMetaItem::Literal(_) => panic!(
"ruma_api! attribute meta item on requests must be: header, path, or query"
),
}
}
}
return RequestField::Body(field);
false
}).collect();
match request_field_kind {
RequestFieldKind::Body => RequestField::Body(field),
RequestFieldKind::Header => RequestField::Header(field),
RequestFieldKind::Path => RequestField::Path(field),
RequestFieldKind::Query => RequestField::Query(field),
}
}).collect();
Request {
@ -89,8 +111,8 @@ impl ToTokens for Request {
for request_field in self.fields.iter() {
match *request_field {
RequestField::Body(ref field) => field.to_tokens(&mut tokens),
RequestField::Header(_, ref field) => field.to_tokens(&mut tokens),
RequestField::Path(_, ref field) => field.to_tokens(&mut tokens),
RequestField::Header(ref field) => field.to_tokens(&mut tokens),
RequestField::Path(ref field) => field.to_tokens(&mut tokens),
RequestField::Query(ref field) => field.to_tokens(&mut tokens),
}
@ -128,8 +150,8 @@ impl ToTokens for Request {
#[derive(Debug)]
pub enum RequestField {
Body(Field),
Header(String, Field),
Path(String, Field),
Header(Field),
Path(Field),
Query(Field),
}
@ -142,6 +164,13 @@ impl RequestField {
}
}
enum RequestFieldKind {
Body,
Header,
Path,
Query,
}
#[derive(Debug)]
pub struct RequestBodyFields<'a> {
fields: &'a [RequestField],

70
src/response.rs
View File

@ -1,5 +1,5 @@
use quote::{ToTokens, Tokens};
use syn::{Field, Lit, MetaItem};
use syn::{Field, MetaItem, NestedMetaItem};
#[derive(Debug)]
pub struct Response {
@ -28,14 +28,14 @@ impl Response {
#field_name: response_body.#field_name,
});
}
ResponseField::Header(ref name, ref field) => {
ResponseField::Header(ref field) => {
let field_name = field.ident.as_ref()
.expect("expected body field to have a name");
tokens.append(quote! {
#field_name: hyper_response.headers()
.get_raw(#name)
.expect("missing expected request header: {}", #name),
.get_raw(#field_name)
.expect("missing expected request header: {}", #field_name),
});
}
}
@ -47,23 +47,52 @@ impl Response {
impl From<Vec<Field>> for Response {
fn from(fields: Vec<Field>) -> Self {
let response_fields = fields.into_iter().map(|field| {
for attr in field.attrs.clone().iter() {
match attr.value {
MetaItem::Word(_) | MetaItem::List(_, _) => {}
MetaItem::NameValue(ref ident, ref lit) => {
if ident == "header" {
if let Lit::Str(ref name, _) = *lit {
return ResponseField::Header(name.clone(), field);
} else {
panic!("ruma_api! header attribute expects a string value");
let response_fields = fields.into_iter().map(|mut field| {
let mut response_field_kind = ResponseFieldKind::Body;
field.attrs = field.attrs.into_iter().filter(|attr| {
let (attr_ident, nested_meta_items) = match attr.value {
MetaItem::List(ref attr_ident, ref nested_meta_items) => {
(attr_ident, nested_meta_items)
}
_ => return true,
};
if attr_ident != "ruma_api" {
return true;
}
for nested_meta_item in nested_meta_items {
match *nested_meta_item {
NestedMetaItem::MetaItem(ref meta_item) => {
match *meta_item {
MetaItem::Word(ref ident) => {
if ident == "header" {
response_field_kind = ResponseFieldKind::Header;
} else {
panic!(
"ruma_api! attribute meta item on responses must be: header"
);
}
}
_ => panic!(
"ruma_api! attribute meta item on requests cannot be a list or name/value pair"
),
}
}
NestedMetaItem::Literal(_) => panic!(
"ruma_api! attribute meta item on responses must be: header"
),
}
}
}
return ResponseField::Body(field);
false
}).collect();
match response_field_kind {
ResponseFieldKind::Body => ResponseField::Body(field),
ResponseFieldKind::Header => ResponseField::Header(field),
}
}).collect();
Response {
@ -88,7 +117,7 @@ impl ToTokens for Response {
for response in self.fields.iter() {
match *response {
ResponseField::Body(ref field) => field.to_tokens(&mut tokens),
ResponseField::Header(_, ref field) => field.to_tokens(&mut tokens),
ResponseField::Header(ref field) => field.to_tokens(&mut tokens),
}
tokens.append(",");
@ -123,7 +152,7 @@ impl ToTokens for Response {
#[derive(Debug)]
pub enum ResponseField {
Body(Field),
Header(String, Field),
Header(Field),
}
impl ResponseField {
@ -134,3 +163,8 @@ impl ResponseField {
}
}
}
enum ResponseFieldKind {
Body,
Header,
}