Merge pull request #9 from alishir/new-example

echo example with `impl Future`

examples/echo.rs

@@ -4,39 +4,37 @@ extern crate env_logger;
 
 extern crate actix_http;
 extern crate actix_net;
+extern crate bytes;
 extern crate futures;
 extern crate http;
-extern crate bytes;
 
-use actix_http::{h1, Response, Request};
+use actix_http::HttpMessage;
-use bytes::Bytes;
+use actix_http::{h1, Request, Response};
 use actix_net::server::Server;
 use actix_net::service::NewServiceExt;
+use bytes::Bytes;
 use futures::Future;
-use http::header::{HeaderValue};
+use http::header::HeaderValue;
-use actix_http::HttpMessage;
 use std::env;
 
 fn main() {
     env::set_var("RUST_LOG", "echo=info");
     env_logger::init();
 
-    Server::new().bind("echo", "127.0.0.1:8080", || {
+    Server::new()
-        h1::H1Service::build()
+        .bind("echo", "127.0.0.1:8080", || {
-            .client_timeout(1000)
+            h1::H1Service::build()
-            .client_disconnect(1000)
+                .client_timeout(1000)
-            .server_hostname("localhost")
+                .client_disconnect(1000)
-            .finish(|_req: Request| {
+                .server_hostname("localhost")
-                _req.body()
+                .finish(|_req: Request| {
-                    .limit(512)
+                    _req.body().limit(512).and_then(|bytes: Bytes| {
-                    .and_then(|bytes: Bytes| {
                         info!("request body: {:?}", bytes);
                         let mut res = Response::Ok();
                         res.header("x-head", HeaderValue::from_static("dummy value!"));
                         Ok(res.body(bytes))
                     })
-            })
+                }).map(|_| ())
-            .map(|_| ())
+        }).unwrap()
-    }).unwrap().run();
+        .run();
 }
-

examples/echo2.rs

@@ -0,0 +1,42 @@
+#[macro_use]
+extern crate log;
+extern crate env_logger;
+
+extern crate actix_http;
+extern crate actix_net;
+extern crate bytes;
+extern crate futures;
+
+use actix_http::http::HeaderValue;
+use actix_http::HttpMessage;
+use actix_http::{h1, Error, Request, Response};
+use actix_net::server::Server;
+use actix_net::service::NewServiceExt;
+use bytes::Bytes;
+use futures::Future;
+use std::env;
+
+fn handle_request(_req: Request) -> impl Future<Item = Response, Error = Error> {
+    _req.body().limit(512).from_err().and_then(|bytes: Bytes| {
+        info!("request body: {:?}", bytes);
+        let mut res = Response::Ok();
+        res.header("x-head", HeaderValue::from_static("dummy value!"));
+        Ok(res.body(bytes))
+    })
+}
+
+fn main() {
+    env::set_var("RUST_LOG", "echo=info");
+    env_logger::init();
+
+    Server::new()
+        .bind("echo", "127.0.0.1:8080", || {
+            h1::H1Service::build()
+                .client_timeout(1000)
+                .client_disconnect(1000)
+                .server_hostname("localhost")
+                .finish(|_req: Request| handle_request(_req))
+                .map(|_| ())
+        }).unwrap()
+        .run();
+}

examples/framed_hello.rs

@@ -1,18 +1,18 @@
-extern crate log;
 extern crate env_logger;
+extern crate log;
 
 extern crate actix_http;
 extern crate actix_net;
+extern crate bytes;
 extern crate futures;
 extern crate http;
-extern crate bytes;
 
-use actix_http::{h1, ServiceConfig, SendResponse, Response};
+use actix_http::{h1, Response, SendResponse, ServiceConfig};
-use actix_net::framed::IntoFramed;
 use actix_net::codec::Framed;
-use actix_net::stream::TakeItem;
+use actix_net::framed::IntoFramed;
 use actix_net::server::Server;
 use actix_net::service::NewServiceExt;
+use actix_net::stream::TakeItem;
 use futures::Future;
 use std::env;
 
@@ -20,14 +20,15 @@ fn main() {
     env::set_var("RUST_LOG", "framed_hello=info");
     env_logger::init();
 
-    Server::new().bind("framed_hello", "127.0.0.1:8080", || {
+    Server::new()
-        IntoFramed::new(|| h1::Codec::new(ServiceConfig::default()))
+        .bind("framed_hello", "127.0.0.1:8080", || {
-            .and_then(TakeItem::new().map_err(|_| ()))
+            IntoFramed::new(|| h1::Codec::new(ServiceConfig::default()))
-            .and_then(|(_req, _framed): (_, Framed<_, _>)| {
+                .and_then(TakeItem::new().map_err(|_| ()))
-                SendResponse::send(_framed, Response::Ok().body("Hello world!"))
+                .and_then(|(_req, _framed): (_, Framed<_, _>)| {
-                    .map_err(|_| ())
+                    SendResponse::send(_framed, Response::Ok().body("Hello world!"))
-                    .map(|_| ())
+                        .map_err(|_| ())
-            })
+                        .map(|_| ())
-    }).unwrap().run();
+                })
+        }).unwrap()
+        .run();
 }
-

examples/hello-world.rs

@@ -11,25 +11,25 @@ use actix_http::{h1, Response};
 use actix_net::server::Server;
 use actix_net::service::NewServiceExt;
 use futures::future;
-use http::header::{HeaderValue};
+use http::header::HeaderValue;
 use std::env;
 
 fn main() {
     env::set_var("RUST_LOG", "hello_world=info");
     env_logger::init();
 
-    Server::new().bind("hello-world", "127.0.0.1:8080", || {
+    Server::new()
-        h1::H1Service::build()
+        .bind("hello-world", "127.0.0.1:8080", || {
-            .client_timeout(1000)
+            h1::H1Service::build()
-            .client_disconnect(1000)
+                .client_timeout(1000)
-            .server_hostname("localhost")
+                .client_disconnect(1000)
-            .finish(|_req| {
+                .server_hostname("localhost")
-                info!("{:?}", _req);
+                .finish(|_req| {
-                let mut res = Response::Ok();
+                    info!("{:?}", _req);
-                res.header("x-head", HeaderValue::from_static("dummy value!"));
+                    let mut res = Response::Ok();
-                future::ok::<_, ()>(res.body("Hello world!"))
+                    res.header("x-head", HeaderValue::from_static("dummy value!"));
-            })
+                    future::ok::<_, ()>(res.body("Hello world!"))
-            .map(|_| ())
+                }).map(|_| ())
-    }).unwrap().run();
+        }).unwrap()
+        .run();
 }
-

src/client/mod.rs

@@ -13,4 +13,4 @@ pub use self::connection::Connection;
 pub use self::connector::Connector;
 pub use self::error::{ConnectorError, InvalidUrlKind, SendRequestError};
 pub use self::request::{ClientRequest, ClientRequestBuilder};
-pub use self::response::ClientResponse;
+pub use self::response::ClientResponse;