mirrors/ntex-extras
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex-extras.git synced 2025-04-01 20:07:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

chore: upgrade to ntex 2.0 (#14)

Browse source 
* chore: upgrade to ntex 2.0

* bump version to 2.0
This commit is contained in:
leone 2024-05-28 17:38:47 +02:00 • committed by GitHub
parent 7034dcc851
commit b89f611c12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 27 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ntex-cors/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-cors"
version = "1.0.0"
version = "2.0.0"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Cross-origin resource sharing (CORS) for ntex applications."
readme = "README.md"
@ -16,9 +16,9 @@ name = "ntex_cors"
path = "src/lib.rs"
[dependencies]
ntex = "1.1"
ntex = "2"
derive_more = "0.99"
futures = "0.3"
[dev-dependencies]
ntex = { version = "1.1", features=["tokio"] }
ntex = { version = "2", features=["tokio"] }

4
ntex-cors/src/lib.rs
View file

@ -742,8 +742,8 @@ where
type Response = WebResponse;
type Error = S::Error;
ntex::forward_poll_ready!(service);
ntex::forward_poll_shutdown!(service);
ntex::forward_ready!(service);
ntex::forward_shutdown!(service);
async fn call(
&self,

6
ntex-files/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-files"
version = "1.0.0"
version = "2.0.0"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Static files support for ntex web."
readme = "README.md"
@ -18,7 +18,7 @@ name = "ntex_files"
path = "src/lib.rs"
[dependencies]
ntex = "1.1"
ntex = "2"
ntex-http = "0.1.12"
bitflags = "2.1"
futures = "0.3"
@ -34,4 +34,4 @@ language-tags = "0.3"
httpdate = "1.0"
[dev-dependencies]
ntex = { version = "1.1", features = ["tokio", "openssl", "compress"] }
ntex = { version = "2", features = ["tokio", "openssl", "compress"] }

9
ntex-files/src/file_header/method.rs
View file

@ -13,11 +13,12 @@ use self::Method::{Connect, Delete, Extension, Get, Head, Options, Patch, Post,
///
/// It may make sense to grow this to include all variants currently
/// registered with IANA, if they are at all common to use.
#[derive(Clone, PartialEq, Eq, Hash, Debug)]
#[derive(Default, Clone, PartialEq, Eq, Hash, Debug)]
pub enum Method {
/// OPTIONS
Options,
/// GET
#[default]
Get,
/// POST
Post,
@ -141,12 +142,6 @@ impl fmt::Display for Method {
}
}
impl Default for Method {
fn default() -> Method {
Method::Get
}
}
impl From<http::Method> for Method {
fn from(method: http::Method) -> Method {
match method {

6
ntex-identity/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-identity"
version = "1.0.0"
version = "2.0.0"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Identity service for ntex web framework."
readme = "README.md"
@ -21,7 +21,7 @@ default = ["cookie-policy"]
cookie-policy = ["cookie/secure", "ntex/cookie"]
[dependencies]
ntex = "1.1"
ntex = "2"
futures = "0.3"
serde = "1.0"
serde_json = "1.0"
@ -30,4 +30,4 @@ cookie = { version = "0.18", features = ["private"] }
time = { version = "0.3", default-features = false, features = ["std"] }
[dev-dependencies]
ntex = { version = "1.1", features=["tokio"] }
ntex = { version = "2", features=["tokio"] }

12
ntex-identity/src/lib.rs
View file

@ -247,8 +247,8 @@ where
type Response = WebResponse;
type Error = S::Error;
ntex::forward_poll_ready!(service);
ntex::forward_poll_shutdown!(service);
ntex::forward_ready!(service);
ntex::forward_shutdown!(service);
async fn call(
&self,
@ -571,7 +571,7 @@ mod tests {
use super::*;
use ntex::web::test::{self, TestRequest};
use ntex::web::{self, error, App, Error, HttpResponse};
use ntex::{http::StatusCode, service::into_service, service::Pipeline, time};
use ntex::{http::StatusCode, service::fn_service, service::Pipeline, time};
const COOKIE_KEY_MASTER: [u8; 32] = [0; 32];
const COOKIE_NAME: &str = "ntex_auth";
@ -973,7 +973,7 @@ mod tests {
#[ntex::test]
async fn test_borrowed_mut_error() {
use futures::future::{lazy, ok, Ready};
use futures::future::{ok, Ready};
use ntex::web::{DefaultError, Error};
struct Ident;
@ -998,7 +998,7 @@ mod tests {
let srv: Pipeline<_> = IdentityServiceMiddleware {
backend: Rc::new(Ident),
service: into_service(|_: WebRequest<DefaultError>| async move {
service: fn_service(|_: WebRequest<DefaultError>| async move {
time::sleep(time::Seconds(100)).await;
Err::<WebResponse, _>(error::ErrorBadRequest("error"))
}),
@ -1012,6 +1012,6 @@ mod tests {
});
time::sleep(time::Millis(50)).await;
let _ = lazy(|cx| srv.poll_ready(cx)).await;
srv.ready().await.expect("srv to be ready");
}
}

6
ntex-multipart/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-multipart"
version = "1.0.0"
version = "2.0.0"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Multipart support for ntex web framework."
readme = "README.md"
@ -16,7 +16,7 @@ name = "ntex_multipart"
path = "src/lib.rs"
[dependencies]
ntex = "1.1"
ntex = "2"
derive_more = "0.99"
httparse = "1.3"
futures = "0.3"
@ -25,4 +25,4 @@ mime = "0.3"
twoway = "0.2"
[dev-dependencies]
ntex = { version = "1.1", features=["tokio"] }
ntex = { version = "2", features=["tokio"] }

6
ntex-session/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-session"
version = "1.0.0"
version = "2.0.0"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Session for ntex web framework."
readme = "README.md"
@ -22,7 +22,7 @@ default = ["cookie-session"]
cookie-session = ["cookie/secure", "ntex/cookie"]
[dependencies]
ntex = "1.1"
ntex = "2"
cookie = "0.18"
derive_more = "0.99"
futures = "0.3"
@ -31,4 +31,4 @@ serde_json = "1.0"
time = { version = "0.3", default-features = false, features = ["std"] }
[dev-dependencies]
ntex = { version = "1.1", features=["tokio"] }
ntex = { version = "2", features=["tokio"] }

4
ntex-session/src/cookie.rs
View file

@ -300,8 +300,8 @@ where
type Response = WebResponse;
type Error = S::Error;
ntex::forward_poll_ready!(service);
ntex::forward_poll_shutdown!(service);
ntex::forward_ready!(service);
ntex::forward_shutdown!(service);
/// On first request, a new session cookie is returned in response, regardless
/// of whether any session state is set. With subsequent requests, if the