is it worky??

Author: seqre

Cargo.lock

@@ -43,7 +43,7 @@ tracing = "0.1.41"
 
 [dev-dependencies]
 async-stream.workspace = true
-cot.workspace = true
+cot = { workspace = true, features = ["test"] }
 futures.workspace = true
 tokio = { workspace = true, features = ["macros"] }
 

cot-core/Cargo.toml

@@ -10,11 +10,11 @@ use std::future::Future;
 use std::marker::PhantomData;
 use std::pin::Pin;
 
-use aide::openapi::{Operation, PathItem, StatusCode};
 use aide::openapi::{
-    MediaType, Parameter, ParameterData, ParameterSchemaOrContent, PathStyle,
-    QueryStyle, ReferenceOr, RequestBody,
+    MediaType, Parameter, ParameterData, ParameterSchemaOrContent, PathStyle, QueryStyle,
+    ReferenceOr, RequestBody,
 };
+use aide::openapi::{Operation, PathItem, StatusCode};
 use indexmap::IndexMap;
 use schemars::{JsonSchema, Schema, SchemaGenerator};
 use serde_json::Value;
@@ -127,7 +127,6 @@ pub trait AsApiRoute {
     ) -> PathItem;
 }
 
-
 /// A trait that can be implemented for types that should be taken into
 /// account when generating OpenAPI paths.
 ///
@@ -736,7 +735,6 @@ fn extract_is_required(object_item: &mut Schema) -> bool {
     }
 }
 
-
 fn param_with_name(param_name: String, schema: Schema, required: bool) -> ParameterData {
     ParameterData {
         name: param_name,
@@ -753,4 +751,4 @@ fn param_with_name(param_name: String, schema: Schema, required: bool) -> Parame
         explode: None,
         extensions: IndexMap::default(),
     }
-}
+}

cot-core/src/openapi.rs

@@ -7,15 +7,15 @@
 use std::fmt::{Debug, Formatter};
 
 use aide::openapi::Operation;
-use crate::openapi::{
-    AsApiOperation, AsApiRoute, BoxApiRequestHandler, RouteContext, into_box_api_request_handler
-};
-use crate::request::Request;
-use crate::router::method::{InnerHandler, InnerMethodRouter};
 use schemars::SchemaGenerator;
 
 use crate::handler::RequestHandler;
+use crate::openapi::{
+    into_box_api_request_handler, AsApiOperation, AsApiRoute, BoxApiRequestHandler, RouteContext,
+};
+use crate::request::Request;
 use crate::response::Response;
+use crate::router::method::{InnerHandler, InnerMethodRouter};
 
 /// A version of [`MethodRouter`](crate::router::method::MethodRouter) that
 /// supports OpenAPI.
@@ -520,10 +520,10 @@ mod tests {
     use cot::test::TestRequestBuilder;
 
     use super::*;
-    use crate::Method;
     use crate::error::MethodNotAllowed;
     use crate::request::extractors::Path;
     use crate::response::{IntoResponse, Response};
+    use crate::{Method, StatusCode};
 
     async fn test_handler(method: Method) -> crate::Result<Response> {
         Html::new(method.as_str()).into_response()

cot-core/src/openapi/method.rs

@@ -282,6 +282,8 @@ pub struct AppName(pub String);
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::request::extractors::Path;
+    use crate::Body;
 
     #[test]
     fn path_params() {

cot-core/src/request.rs

@@ -268,11 +268,15 @@ impl FromRequestHead for Method {
 /// ```
 pub use cot_macros::FromRequestHead;
 
+
 use crate::impl_into_cot_error;
 
 #[cfg(test)]
 mod tests {
+    use cot::form::Form;
     use cot::html::Html;
+    use cot::request::extractors::RequestForm;
+    use cot::reverse;
     use cot::router::{Route, Router, Urls};
     use cot::test::TestRequestBuilder;
     use serde::Deserialize;

cot-core/src/request/extractors.rs

@@ -67,6 +67,7 @@ pub use into_response::{
     IntoResponse, WithBody, WithContentType, WithExtension, WithHeader, WithStatus,
 };
 
+
 use crate::{Body, StatusCode};
 
 const RESPONSE_BUILD_FAILURE: &str = "Failed to build response";
@@ -146,39 +147,9 @@ impl ResponseExt for Response {
 
 #[cfg(test)]
 mod tests {
-    use cot::headers::JSON_CONTENT_TYPE;
-
     use super::*;
-    use crate::body::BodyInner;
     use crate::response::{Response, ResponseExt};
 
-    #[test]
-    #[cfg(feature = "json")]
-    fn response_new_json() {
-        #[derive(serde::Serialize)]
-        struct MyData {
-            hello: String,
-        }
-
-        let data = MyData {
-            hello: String::from("world"),
-        };
-        let response = cot::json::Json(data).into_response().unwrap();
-        assert_eq!(response.status(), StatusCode::OK);
-        assert_eq!(
-            response.headers().get(http::header::CONTENT_TYPE).unwrap(),
-            JSON_CONTENT_TYPE
-        );
-        match &response.body().inner {
-            BodyInner::Fixed(fixed) => {
-                assert_eq!(fixed, r#"{"hello":"world"}"#);
-            }
-            _ => {
-                panic!("Expected fixed body");
-            }
-        }
-    }
-
     #[test]
     fn response_new_redirect() {
         let location = "http://example.com";

cot-core/src/response.rs

@@ -31,11 +31,11 @@ use derive_more::with_trait::Debug;
 use tracing::debug;
 
 use crate::error::NotFound;
-use crate::handler::{BoxRequestHandler, RequestHandler, into_box_request_handler};
+use crate::handler::{into_box_request_handler, BoxRequestHandler, RequestHandler};
 use crate::request::{AppName, PathParams, Request, RequestHead, RouteName};
 use crate::response::Response;
 use crate::router::path::{CaptureResult, PathMatcher, ReverseParamMap};
-use crate::{Error, Result, impl_into_cot_error};
+use crate::{impl_into_cot_error, Error, Result};
 
 pub mod method;
 pub mod path;
@@ -784,10 +784,14 @@ impl Debug for RouteInner {
 
 #[cfg(test)]
 mod tests {
+    use cot::reverse;
+    use cot::test::TestRequestBuilder;
+
     use super::*;
-    use crate::StatusCode;
+    use crate::html::Html;
     use crate::request::Request;
     use crate::response::{IntoResponse, Response};
+    use crate::StatusCode;
 
     struct MockHandler;
 
@@ -798,10 +802,10 @@ mod tests {
     }
 
     #[cfg(feature = "openapi")]
-    impl cot::openapi::AsApiRoute for MockHandler {
+    impl crate::openapi::AsApiRoute for MockHandler {
         fn as_api_route(
             &self,
-            _route_context: &cot::openapi::RouteContext<'_>,
+            _route_context: &crate::openapi::RouteContext<'_>,
             _schema_generator: &mut schemars::SchemaGenerator,
         ) -> aide::openapi::PathItem {
             aide::openapi::PathItem::default()

cot-core/src/router.rs

@@ -6,16 +6,16 @@
 use std::any::Any;
 use std::marker::PhantomData;
 
-use askama::Template;
-use async_trait::async_trait;
-use bytes::Bytes;
 use crate::error::NotFound;
 use crate::html::Html;
 use crate::request::extractors::{FromRequestHead, Path, StaticFiles, UrlQuery};
 use crate::request::{Request, RequestExt, RequestHead};
 use crate::response::{IntoResponse, Response};
 use crate::reverse_redirect;
 use crate::router::{Router, Urls};
+use askama::Template;
+use async_trait::async_trait;
+use bytes::Bytes;
 /// Implements the [`AdminModel`] trait for a struct.
 ///
 /// This is a simple method for adding a database model to the admin panel.

cot/src/admin.rs

@@ -13,11 +13,11 @@ use std::any::Any;
 use std::borrow::Cow;
 use std::sync::{Arc, Mutex, MutexGuard};
 
+use crate::error::error_impl::impl_into_cot_error;
+use crate::request::{Request, RequestExt};
 /// backwards compatible shim for form Password type.
 use async_trait::async_trait;
 use chrono::{DateTime, FixedOffset};
-use crate::error::error_impl::impl_into_cot_error;
-use crate::request::{Request, RequestExt};
 use derive_more::with_trait::Debug;
 #[cfg(test)]
 use mockall::automock;