Merge branch 'master' into openapi

examples/users.rs

@@ -1,5 +1,4 @@
 #[macro_use] extern crate log;
-#[macro_use] extern crate serde;
 
 use fake::{faker::internet::en::Username, Fake};
 use gotham::{
@@ -16,13 +15,17 @@ use log4rs::{
 	encode::pattern::PatternEncoder
 };
 
-struct Users;
+rest_resource!{Users, route => {
+	route.read_all::<Self, _>();
+	route.read::<Self, _, _>();
+	route.create::<Self, _, _>();
+	route.update_all::<Self, _, _>();
+	route.update::<Self, _, _, _>();
+}}
 
-#[derive(Deserialize, Serialize)]
+rest_struct!{User {
-struct User
-{
 	username : String
-}
+}}
 
 impl ResourceReadAll<Success<Vec<User>>> for Users
 {
@@ -90,18 +93,6 @@ impl ResourceDelete<u64, Success<()>> for Users
 	}
 }
 
-impl Resource for Users
-{
-	fn setup<D : DrawResourceRoutes>(mut route : D)
-	{
-		route.read_all::<Self, _>();
-		route.read::<Self, _, _>();
-		route.create::<Self, _, _>();
-		route.update_all::<Self, _, _>();
-		route.update::<Self, _, _, _>();
-	}
-}
-
 const ADDR : &str = "127.0.0.1:18080";
 
 fn main()

src/helper.rs

@@ -0,0 +1,28 @@
+
+#[macro_export]
+macro_rules! rest_struct {
+	($struct_name:ident { $($field_id:ident : $field_ty:ty),* }) => {
+		#[derive(serde::Deserialize, serde::Serialize)]
+		struct $struct_name
+		{
+			$($field_id : $field_ty),*
+		}
+	}
+}
+
+#[macro_export]
+macro_rules! rest_resource {
+	($res_name:ident, $route:ident => $setup:block) => {
+		struct $res_name;
+
+		impl ::gotham_restful::Resource for $res_name
+		{
+			fn name() -> String
+			{
+				stringify!($res_name).to_string()
+			}
+
+			fn setup<D : ::gotham_restful::DrawResourceRoutes>(mut $route : D) $setup
+		}
+	}
+}

src/lib.rs

@@ -3,6 +3,8 @@
 
 pub use hyper::StatusCode;
 
+pub mod helper;
+
 #[cfg(feature = "openapi")]
 pub mod openapi;
 #[cfg(feature = "openapi")]

src/resource.rs

@@ -7,6 +7,11 @@ use std::panic::RefUnwindSafe;
 /// allow you to register the different methods for this Resource.
 pub trait Resource
 {
+	/// The name of this resource. Must be unique.
+	fn name() -> String;
+
+	/// Setup all routes of this resource. Take a look at the rest_resource!
+	/// macro if you don't feel like caring yourself.
 	fn setup<D : DrawResourceRoutes>(route : D);
 }