0.4.15

Author: MXWXZ

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.15
+## New
+1. `Response` allows for multiple `builder`.
+2. `Response` add several convenient methods.
+
 # 0.4.14
 ## New
 1. Default memory database now support basic capacity and key eviction.

actix-cloud/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-cloud"
-version = "0.4.14"
+version = "0.4.15"
 edition = "2021"
 authors = ["MXWXZ <matrixwxz@gmail.com>"]
 description = "Actix Cloud is an all-in-one web framework based on Actix Web."
@@ -145,7 +145,7 @@ actix-web = { version = "4", features = ["secure-cookies"], optional = true }
 # memorydb
 glob = { version = "0.3", optional = true }
 parking_lot = { version = "0.12", optional = true }
-priority-queue = { version = "2.5", optional = true }
+priority-queue = { version = "2.6", optional = true }
 
 # chrono
 chrono = { version = "0.4", features = ["serde"], optional = true }

actix-cloud/src/response.rs

@@ -2,7 +2,7 @@ use std::fmt::{self, Display};
 
 use actix_web::{
     http::{
-        header::{ContentDisposition, DispositionParam, DispositionType},
+        header::{self, ContentDisposition, DispositionParam, DispositionType},
         StatusCode,
     },
     HttpResponse, HttpResponseBuilder,
@@ -51,7 +51,7 @@ pub struct Response<T> {
     pub code: i64,
     pub message: String,
     pub data: Option<T>,
-    pub builder: Option<ResponseBuilderFn>,
+    pub builder: Vec<ResponseBuilderFn>,
     #[cfg(feature = "i18n")]
     pub translate: bool,
 }
@@ -66,7 +66,7 @@ impl<T> Response<T> {
             code: r.code(),
             message: r.message().to_owned(),
             data: None,
-            builder: None,
+            builder: Vec::new(),
             #[cfg(feature = "i18n")]
             translate: true,
         }
@@ -78,7 +78,7 @@ impl<T> Response<T> {
             code: 0,
             message: String::new(),
             data: None,
-            builder: None,
+            builder: Vec::new(),
             #[cfg(feature = "i18n")]
             translate: false,
         }
@@ -88,15 +88,26 @@ impl<T> Response<T> {
         Self::new_code(400).message(s)
     }
 
+    pub fn forbidden() -> Self {
+        Self::new_code(403)
+    }
+
     pub fn not_found() -> Self {
         Self::new_code(404)
     }
 
+    pub fn redirect<S: Into<String>>(code: u16, s: S) -> Self {
+        let s: String = s.into();
+        Self::new_code(code).builder(move |r| {
+            r.insert_header((header::LOCATION, s.clone()));
+        })
+    }
+
     pub fn builder<F>(mut self, f: F) -> Self
     where
         F: Fn(&mut HttpResponseBuilder) + 'static,
     {
-        self.builder = Some(Box::new(f));
+        self.builder.push(Box::new(f));
         self
     }
 
@@ -190,15 +201,17 @@ impl actix_web::Responder for JsonResponse {
             let mut rsp =
                 HttpResponse::build(actix_web::http::StatusCode::from_u16(self.http_code).unwrap());
             rsp.content_type(actix_web::http::header::ContentType::json());
-            if let Some(builder) = self.builder {
+            for builder in self.builder {
                 builder(&mut rsp);
             }
             rsp.message_body(body).unwrap().map_into_left_body()
         } else {
-            HttpResponse::build(actix_web::http::StatusCode::from_u16(self.http_code).unwrap())
-                .message_body(self.message)
-                .unwrap()
-                .map_into_left_body()
+            let mut rsp =
+                HttpResponse::build(actix_web::http::StatusCode::from_u16(self.http_code).unwrap());
+            for builder in self.builder {
+                builder(&mut rsp);
+            }
+            rsp.message_body(self.message).unwrap().map_into_left_body()
         }
     }
 }