engine macro

Cargo.toml

@@ -16,5 +16,5 @@ members = [
     "rwf-macros",
     "rwf-tests",
     "examples/django",
-    "examples/request-tracking",
+    "examples/request-tracking", "examples/engine",
 ]

examples/engine/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "engine"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+rwf = { path = "../../rwf" }
+tokio = { version = "1", features = ["full"] }

examples/engine/src/main.rs

@@ -0,0 +1,26 @@
+use rwf::{
+    controller::Engine,
+    http::{self},
+    prelude::*,
+    Server,
+};
+
+#[derive(Default)]
+struct Index;
+
+#[async_trait]
+impl Controller for Index {
+    async fn handle(&self, _request: &Request) -> Result<Response, Error> {
+        Ok(Response::new().text("Engine"))
+    }
+}
+
+#[tokio::main]
+async fn main() -> Result<(), http::Error> {
+    Logger::init();
+
+    let engine = Engine::new(vec![route!("/index" => Index)]);
+    Server::new(vec![engine!("/engine" => engine)])
+        .launch("0.0.0.0:8000")
+        .await
+}

rwf-macros/src/lib.rs

@@ -422,7 +422,7 @@ pub fn engine(input: TokenStream) -> TokenStream {
     let engine = iter.next().unwrap();
 
     quote! {
-        #engine.remount(rwf::http::Path::parse(route).unwrap()).wildcard(#route)
+        #engine.remount(&rwf::http::Path::parse(#route).unwrap()).wildcard(#route)
     }
     .into()
 }

rwf/src/config.rs

@@ -169,9 +169,7 @@ impl Default for Config {
             tty: std::io::stderr().is_terminal(),
             default_auth: AuthHandler::new(AllowAll {}),
             session_duration: Duration::days(4),
-            default_middleware: MiddlewareSet::without_default(vec![
-                RequestTracker::new().middleware()
-            ]),
+            default_middleware: MiddlewareSet::without_default(vec![]),
             cache_templates,
             websocket: Websocket::default(),
             log_queries: var("RWF_LOG_QUERIES").is_ok(),

rwf/src/controller/engine.rs

@@ -9,18 +9,21 @@ pub struct Engine {
 }
 
 impl Engine {
+    /// Create new engine for the given routes.
     pub fn new(handlers: Vec<Handler>) -> Self {
         Self {
             router: Router::new(handlers).unwrap(),
             mount: Path::parse("/").unwrap(),
         }
     }
 
+    /// Move the engine to this mount point.
     pub fn remount(mut self, mount: &Path) -> Self {
         self.mount = mount.clone();
         self
     }
 
+    /// Get the engine mount point.
     pub fn mount(&self) -> &Path {
         &self.mount
     }

rwf/src/prelude.rs

@@ -14,5 +14,5 @@ pub use async_trait::async_trait;
 pub use time::{Duration, OffsetDateTime};
 pub use tokio;
 
-pub use macros::{context, crud, render, rest, route, engine};
+pub use macros::{context, crud, engine, render, rest, route};
 pub use rwf_macros as macros;