From 86dcbb4abdf9ef23cdd4dece480cbc59e2ec4e29 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Thu, 24 Sep 2020 14:24:10 +0600 Subject: [PATCH] Add fn_transform fn, allows to use function as transform service --- ntex-service/CHANGES.md | 276 +------------------------------ ntex-service/src/fn_transform.rs | 114 +++++++++++++ ntex-service/src/lib.rs | 2 + 3 files changed, 120 insertions(+), 272 deletions(-) create mode 100644 ntex-service/src/fn_transform.rs diff --git a/ntex-service/CHANGES.md b/ntex-service/CHANGES.md index 5d36377c..6cf43feb 100644 --- a/ntex-service/CHANGES.md +++ b/ntex-service/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## [0.1.4] - 2020-09-24 + +* Add `fn_transform` fn, allows to use function as transform service + ## [0.1.3] - 2020-04-15 * Upgrade pin-project @@ -19,275 +23,3 @@ * Change Service trait to use `&self` instead of `&mut self` * Add `fn_mut_service` for `FnMut` functions - -## [1.0.5] - 2020-01-16 - -### Fixed - -* Fixed unsoundness in .and_then()/.then() service combinators - -## [1.0.4] - 2020-01-15 - -### Fixed - -* Revert 1.0.3 change - -## [1.0.3] - 2020-01-15 - -### Fixed - -* Fixed unsoundness in `AndThenService` impl - -## [1.0.2] - 2020-01-08 - -### Added - -* Add `into_service` helper function - - -## [1.0.1] - 2019-12-22 - -### Changed - -* `map_config()` and `unit_config()` accepts `IntoServiceFactory` type - - -## [1.0.0] - 2019-12-11 - -### Added - -* Add Clone impl for Apply service - - -## [1.0.0-alpha.4] - 2019-12-08 - -### Changed - -* Renamed `service_fn` to `fn_service` - -* Renamed `factory_fn` to `fn_factory` - -* Renamed `factory_fn_cfg` to `fn_factory_with_config` - - -## [1.0.0-alpha.3] - 2019-12-06 - -### Changed - -* Add missing Clone impls - -* Restore `Transform::map_init_err()` combinator - -* Restore `Service/Factory::apply_fn()` in form of `Pipeline/Factory::and_then_apply_fn()` - -* Optimize service combinators and futures memory layout - - -## [1.0.0-alpha.2] - 2019-12-02 - -### Changed - -* Use owned config value for service factory - -* Renamed BoxedNewService/BoxedService to BoxServiceFactory/BoxService - - -## [1.0.0-alpha.1] - 2019-11-25 - -### Changed - -* Migraded to `std::future` - -* `NewService` renamed to `ServiceFactory` - -* Added `pipeline` and `pipeline_factory` function - - -## [0.4.2] - 2019-08-27 - -### Fixed - -* Check service readiness for `new_apply_cfg` combinator - - -## [0.4.1] - 2019-06-06 - -### Added - -* Add `new_apply_cfg` function - -## [0.4.0] - 2019-05-12 - -### Changed - -* Use associated type for `NewService` config - -* Change `apply_cfg` function - -* Renamed helper functions - -### Added - -* Add `NewService::map_config` and `NewService::unit_config` combinators - - -## [0.3.6] - 2019-04-07 - -### Changed - -* Poll boxed service call result immediately - - -## [0.3.5] - 2019-03-29 - -### Added - -* Add `impl Service for Rc>` - - -## [0.3.4] - 2019-03-12 - -### Added - -* Add `Transform::from_err()` combinator - -* Add `apply_fn` helper - -* Add `apply_fn_factory` helper - -* Add `apply_transform` helper - -* Add `apply_cfg` helper - - -## [0.3.3] - 2019-03-09 - -### Added - -* Add `ApplyTransform` new service for transform and new service. - -* Add `NewService::apply_cfg()` combinator, allows to use - nested `NewService` with different config parameter. - -### Changed - -* Revert IntoFuture change - - -## [0.3.2] - 2019-03-04 - -### Changed - -* Change `NewService::Future` and `Transform::Future` to the `IntoFuture` trait. - -* Export `AndThenTransform` type - - -## [0.3.1] - 2019-03-04 - -### Changed - -* Simplify Transform trait - - -## [0.3.0] - 2019-03-02 - -## Added - -* Added boxed NewService and Service. - -## Changed - -* Added `Config` parameter to `NewService` trait. - -* Added `Config` parameter to `NewTransform` trait. - - -## [0.2.2] - 2019-02-19 - -### Added - -* Added `NewService` impl for `Rc where S: NewService` - -* Added `NewService` impl for `Arc where S: NewService` - - -## [0.2.1] - 2019-02-03 - -### Changed - -* Generalize `.apply` combinator with Transform trait - - -## [0.2.0] - 2019-02-01 - -### Changed - -* Use associated type instead of generic for Service definition. - - * Before: - - ```rust - impl Service for Client { - type Response = Response; - // ... - } - ``` - * After: - - ```rust - impl Service for Client { - type Request = Request; - type Response = Response; - // ... - } - ``` - - -## [0.1.6] - 2019-01-24 - -### Changed - -* Use `FnMut` instead of `Fn` for .apply() and .map() combinators and `FnService` type - -* Change `.apply()` error semantic, new service's error is `From` - - -## [0.1.5] - 2019-01-13 - -### Changed - -* Make `Out::Error` convertable from `T::Error` for apply combinator - - -## [0.1.4] - 2019-01-11 - -### Changed - -* Use `FnMut` instead of `Fn` for `FnService` - - -## [0.1.3] - 2018-12-12 - -### Changed - -* Split service combinators to separate trait - - -## [0.1.2] - 2018-12-12 - -### Fixed - -* Release future early for `.and_then()` and `.then()` combinators - - -## [0.1.1] - 2018-12-09 - -### Added - -* Added Service impl for Box - - -## [0.1.0] - 2018-12-09 - -* Initial import diff --git a/ntex-service/src/fn_transform.rs b/ntex-service/src/fn_transform.rs new file mode 100644 index 00000000..79986e96 --- /dev/null +++ b/ntex-service/src/fn_transform.rs @@ -0,0 +1,114 @@ +use futures_util::future::{ok, Ready}; +use std::{future::Future, marker::PhantomData}; + +use crate::{apply_fn, dev::Apply, Service, Transform}; + +/// Use function as transform service +pub fn fn_transform( + f: F, +) -> impl Transform + Clone +where + S: Service, + F: Fn(Req, &S) -> R + Clone, + R: Future>, +{ + FnTransform::new(f) +} + +pub struct FnTransform +where + S: Service, + F: Fn(Req, &S) -> R + Clone, + R: Future>, +{ + f: F, + _t: PhantomData<(S, R, Req)>, +} + +impl FnTransform +where + S: Service, + F: Fn(Req, &S) -> R + Clone, + R: Future>, +{ + fn new(f: F) -> Self { + FnTransform { f, _t: PhantomData } + } +} + +impl Transform for FnTransform +where + S: Service, + F: Fn(Req, &S) -> R + Clone, + R: Future>, +{ + type Request = Req; + type Response = Res; + type Error = Err; + type Transform = Apply; + type InitError = (); + type Future = Ready>; + + fn new_transform(&self, service: S) -> Self::Future { + ok(apply_fn(service, self.f.clone())) + } +} + +impl Clone for FnTransform +where + S: Service, + F: Fn(Req, &S) -> R + Clone, + R: Future>, +{ + fn clone(&self) -> Self { + Self::new(self.f.clone()) + } +} + +#[cfg(test)] +#[allow(clippy::redundant_clone)] +mod tests { + use futures_util::future::{lazy, ok}; + use std::task::{Context, Poll}; + + use super::*; + use crate::Service; + + #[derive(Clone)] + struct Srv; + + impl Service for Srv { + type Request = usize; + type Response = usize; + type Error = (); + type Future = Ready>; + + fn poll_ready(&self, _: &mut Context<'_>) -> Poll> { + Poll::Ready(Ok(())) + } + + fn call(&self, i: usize) -> Self::Future { + ok(i * 2) + } + } + + #[ntex_rt::test] + async fn transform() { + let srv = + fn_transform::(|i: usize, srv: &_| srv.call(i + 1)) + .clone() + .new_transform(Srv) + .await + .unwrap(); + + let res = srv.call(10usize).await; + assert!(res.is_ok()); + assert_eq!(res.unwrap(), 22); + + let res = lazy(|cx| srv.poll_ready(cx)).await; + assert_eq!(res, Poll::Ready(Ok(()))); + + let res = lazy(|cx| srv.poll_shutdown(cx, true)).await; + assert_eq!(res, Poll::Ready(())); + } +} diff --git a/ntex-service/src/lib.rs b/ntex-service/src/lib.rs index 41aea958..9502adae 100644 --- a/ntex-service/src/lib.rs +++ b/ntex-service/src/lib.rs @@ -11,6 +11,7 @@ mod apply; mod apply_cfg; pub mod boxed; mod fn_service; +mod fn_transform; mod map; mod map_config; mod map_err; @@ -24,6 +25,7 @@ pub use self::apply::{apply_fn, apply_fn_factory}; pub use self::fn_service::{ fn_factory, fn_factory_with_config, fn_mut_service, fn_service, }; +pub use self::fn_transform::fn_transform; pub use self::map_config::{map_config, map_config_service, unit_config}; pub use self::pipeline::{pipeline, pipeline_factory, Pipeline, PipelineFactory}; pub use self::transform::{apply, Transform};