update version

CHANGES.md

@@ -1,6 +1,15 @@
 # Changes
 
-## [1.0.1] - 2019-06-xx
+## [1.0.2] - 2019-06-17
+
+### Changes
+
+* Move cors middleware to `actix-cors` crate.
+
+* Move identity middleware to `actix-identity` crate.
+
+
+## [1.0.1] - 2019-06-17
 
 ### Add
 
@@ -10,14 +19,20 @@
 
 ### Changes
 
-* Disable default feature `secure-cookies`.
+* Move cors middleware to `actix-cors` crate.
 
 * Move identity middleware to `actix-identity` crate.
 
+* Disable default feature `secure-cookies`.
+
 * Allow to test an app that uses async actors #897
 
 * Re-apply patch from #637 #894
 
+### Fixed
+
+* HttpRequest::url_for is broken with nested scopes #915
+
 
 ## [1.0.0] - 2019-06-05
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "1.0.0"
+version = "1.0.2"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
 readme = "README.md"
@@ -31,6 +31,7 @@ members = [
   ".",
   "awc",
   "actix-http",
+  "actix-cors",
   "actix-files",
   "actix-framed",
   "actix-session",
@@ -69,22 +70,22 @@ rust-tls = ["rustls", "actix-server/rust-tls"]
 
 [dependencies]
 actix-codec = "0.1.2"
-actix-service = "0.4.0"
+actix-service = "0.4.1"
 actix-utils = "0.4.1"
 actix-router = "0.1.5"
 actix-rt = "0.2.2"
 actix-web-codegen = "0.1.2"
-actix-http = "0.2.3"
+actix-http = "0.2.4"
 actix-server = "0.5.1"
 actix-server-config = "0.1.1"
 actix-threadpool = "0.1.1"
 awc = { version = "0.2.1", optional = true }
 
 bytes = "0.4"
-derive_more = "0.14"
+derive_more = "0.15.0"
 encoding = "0.2"
 futures = "0.1.25"
-hashbrown = "0.3.0"
+hashbrown = "0.5.0"
 log = "0.4"
 mime = "0.3"
 net2 = "0.2.33"
@@ -101,10 +102,9 @@ openssl = { version="0.10", optional = true }
 rustls = { version = "0.15", optional = true }
 
 [dev-dependencies]
-actix-http = { version = "0.2.3", features=["ssl", "brotli", "flate2-zlib"] }
-actix-http-test = { version = "0.2.0", features=["ssl"] }
-actix-files = "0.1.1"
 actix = { version = "0.8.3" }
+actix-http = { version = "0.2.4", features=["ssl", "brotli", "flate2-zlib"] }
+actix-http-test = { version = "0.2.2", features=["ssl"] }
 rand = "0.6"
 env_logger = "0.6"
 serde_derive = "1.0"

MIGRATION.md

@@ -1,5 +1,19 @@
 ## 1.0.1
 
+* Cors middleware has been moved to `actix-cors` crate
+
+  instead of
+
+  ```rust
+  use actix_web::middleware::cors::Cors;
+  ```
+
+  use
+
+  ```rust
+  use actix_cors::Cors;
+  ```
+
 * Identity middleware has been moved to `actix-identity` crate
 
   instead of

actix-cors/CHANGES.md

@@ -0,0 +1,5 @@
+# Changes
+
+## [0.1.0] - 2019-06-15
+
+* Move cors middleware to separate crate

actix-cors/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "actix-cors"
+version = "0.1.0"
+authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
+description = "Cross-origin resource sharing (CORS) for Actix applications."
+readme = "README.md"
+keywords = ["web", "framework"]
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-web.git"
+documentation = "https://docs.rs/actix-cors/"
+license = "MIT/Apache-2.0"
+edition = "2018"
+#workspace = ".."
+
+[lib]
+name = "actix_cors"
+path = "src/lib.rs"
+
+[dependencies]
+actix-web = "1.0.0"
+actix-service = "0.4.0"
+derive_more = "0.14.1"
+futures = "0.1.25"

actix-cors/LICENSE-APACHE

@@ -0,0 +1 @@
+../LICENSE-APACHE

actix-cors/LICENSE-MIT

@@ -0,0 +1 @@
+../LICENSE-MIT

actix-cors/README.md

@@ -0,0 +1,9 @@
+# Identity service for actix web framework [![Build Status](https://travis-ci.org/actix/actix-web.svg?branch=master)](https://travis-ci.org/actix/actix-web) [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) [![crates.io](https://meritbadge.herokuapp.com/actix-identity)](https://crates.io/crates/actix-identity) [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+## Documentation & community resources
+
+* [User Guide](https://actix.rs/docs/)
+* [API Documentation](https://docs.rs/actix-identity/)
+* [Chat on gitter](https://gitter.im/actix/actix)
+* Cargo package: [actix-session](https://crates.io/crates/actix-identity)
+* Minimum supported Rust version: 1.34 or later

actix-cors/src/lib.rs

@@ -7,7 +7,7 @@
 //! # Example
 //!
 //! ```rust
-//! use actix_web::middleware::cors::Cors;
+//! use actix_cors::Cors;
 //! use actix_web::{http, web, App, HttpRequest, HttpResponse, HttpServer};
 //!
 //! fn index(req: HttpRequest) -> &'static str {
@@ -42,17 +42,15 @@ use std::iter::FromIterator;
 use std::rc::Rc;
 
 use actix_service::{IntoTransform, Service, Transform};
+use actix_web::dev::{RequestHead, ServiceRequest, ServiceResponse};
+use actix_web::error::{Error, ResponseError, Result};
+use actix_web::http::header::{self, HeaderName, HeaderValue};
+use actix_web::http::{self, HttpTryFrom, Method, StatusCode, Uri};
+use actix_web::HttpResponse;
 use derive_more::Display;
 use futures::future::{ok, Either, Future, FutureResult};
 use futures::Poll;
 
-use crate::dev::RequestHead;
-use crate::error::{Error, ResponseError, Result};
-use crate::http::header::{self, HeaderName, HeaderValue};
-use crate::http::{self, HttpTryFrom, Method, StatusCode, Uri};
-use crate::service::{ServiceRequest, ServiceResponse};
-use crate::HttpResponse;
-
 /// A set of errors that can occur during processing CORS
 #[derive(Debug, Display)]
 pub enum CorsError {
@@ -152,11 +150,11 @@ impl<T> AllOrSome<T> {
 /// # Example
 ///
 /// ```rust
+/// use actix_cors::Cors;
 /// use actix_web::http::header;
-/// use actix_web::middleware::cors;
 ///
 /// # fn main() {
-/// let cors = cors::Cors::new()
+/// let cors = Cors::new()
 ///     .allowed_origin("https://www.rust-lang.org/")
 ///     .allowed_methods(vec!["GET", "POST"])
 ///     .allowed_headers(vec![header::AUTHORIZATION, header::ACCEPT])
@@ -806,9 +804,9 @@ where
 #[cfg(test)]
 mod tests {
     use actix_service::{IntoService, Transform};
+    use actix_web::test::{self, block_on, TestRequest};
 
     use super::*;
-    use crate::test::{self, block_on, TestRequest};
 
     impl Cors {
         fn finish<F, S, B>(self, srv: F) -> CorsMiddleware<S>

actix-files/Cargo.toml

@@ -19,12 +19,12 @@ path = "src/lib.rs"
 
 [dependencies]
 actix-web = { version = "1.0.0", default-features = false }
-actix-http = "0.2.3"
-actix-service = "0.4.0"
+actix-http = "0.2.4"
+actix-service = "0.4.1"
 bitflags = "1"
 bytes = "0.4"
 futures = "0.1.25"
-derive_more = "0.14"
+derive_more = "0.15.0"
 log = "0.4"
 mime = "0.3"
 mime_guess = "2.0.0-alpha"

actix-http/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## [0.2.4] - 2019-06-16
+
+### Fixed
+
+* Do not compress NoContent (204) responses #918
+
+
 ## [0.2.3] - 2019-06-02
 
 ### Added

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "0.2.3"
+version = "0.2.4"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix http primitives"
 readme = "README.md"
@@ -56,11 +56,11 @@ bitflags = "1.0"
 bytes = "0.4"
 byteorder = "1.2"
 copyless = "0.1.2"
-derive_more = "0.14"
+derive_more = "0.15.0"
 either = "1.5.2"
 encoding = "0.2"
 futures = "0.1.25"
-hashbrown = "0.3.0"
+hashbrown = "0.5.0"
 h2 = "0.1.16"
 http = "0.1.17"
 httparse = "1.3"

actix-http/src/encoding/encoder.rs

@@ -33,6 +33,7 @@ impl<B: MessageBody> Encoder<B> {
     ) -> ResponseBody<Encoder<B>> {
         let can_encode = !(head.headers().contains_key(&CONTENT_ENCODING)
             || head.status == StatusCode::SWITCHING_PROTOCOLS
+            || head.status == StatusCode::NO_CONTENT
             || encoding == ContentEncoding::Identity
             || encoding == ContentEncoding::Auto);
 

actix-multipart/Cargo.toml

@@ -19,9 +19,9 @@ path = "src/lib.rs"
 
 [dependencies]
 actix-web = { version = "1.0.0", default-features = false }
-actix-service = "0.4.0"
+actix-service = "0.4.1"
 bytes = "0.4"
-derive_more = "0.14"
+derive_more = "0.15.0"
 httparse = "1.3"
 futures = "0.1.25"
 log = "0.4"
@@ -31,4 +31,4 @@ twoway = "0.2"
 
 [dev-dependencies]
 actix-rt = "0.2.2"
-actix-http = "0.2.2"
+actix-http = "0.2.4"

actix-session/Cargo.toml

@@ -24,12 +24,12 @@ default = ["cookie-session"]
 cookie-session = ["actix-web/secure-cookies"]
 
 [dependencies]
-actix-web = "1.0.0-rc"
-actix-service = "0.4.0"
+actix-web = "1.0.0"
+actix-service = "0.4.1"
 bytes = "0.4"
-derive_more = "0.14"
+derive_more = "0.15.0"
 futures = "0.1.25"
-hashbrown = "0.3.0"
+hashbrown = "0.5.0"
 serde = "1.0"
 serde_json = "1.0"
 time = "0.1.42"

actix-web-actors/Cargo.toml

@@ -19,8 +19,8 @@ path = "src/lib.rs"
 
 [dependencies]
 actix = "0.8.3"
-actix-web = "1.0.0-rc"
-actix-http = "0.2.2"
+actix-web = "1.0.0"
+actix-http = "0.2.4"
 actix-codec = "0.1.2"
 bytes = "0.4"
 futures = "0.1.25"

actix-web-codegen/Cargo.toml

@@ -16,7 +16,7 @@ quote = "0.6.12"
 syn = { version = "0.15.34", features = ["full", "parsing", "extra-traits"] }
 
 [dev-dependencies]
-actix-web = { version = "1.0.0-rc" }
-actix-http = { version = "0.2.2", features=["ssl"] }
+actix-web = { version = "1.0.0" }
+actix-http = { version = "0.2.4", features=["ssl"] }
 actix-http-test = { version = "0.2.0", features=["ssl"] }
 futures = { version = "0.1" }

awc/Cargo.toml

@@ -40,11 +40,11 @@ flate2-rust = ["actix-http/flate2-rust"]
 
 [dependencies]
 actix-codec = "0.1.2"
-actix-service = "0.4.0"
-actix-http = "0.2.3"
+actix-service = "0.4.1"
+actix-http = "0.2.4"
 base64 = "0.10.1"
 bytes = "0.4"
-derive_more = "0.14"
+derive_more = "0.15.0"
 futures = "0.1.25"
 log =" 0.4"
 mime = "0.3"
@@ -58,8 +58,8 @@ openssl = { version="0.10", optional = true }
 
 [dev-dependencies]
 actix-rt = "0.2.2"
-actix-web = { version = "1.0.0-rc", features=["ssl"] }
-actix-http = { version = "0.2.3", features=["ssl"] }
+actix-web = { version = "1.0.0", features=["ssl"] }
+actix-http = { version = "0.2.4", features=["ssl"] }
 actix-http-test = { version = "0.2.0", features=["ssl"] }
 actix-utils = "0.4.1"
 actix-server = { version = "0.5.1", features=["ssl"] }

src/app.rs

@@ -225,7 +225,6 @@ where
     /// It is also possible to use static files as default service.
     ///
     /// ```rust
-    /// use actix_files::Files;
     /// use actix_web::{web, App, HttpResponse};
     ///
     /// fn main() {
@@ -233,7 +232,7 @@ where
     ///         .service(
     ///             web::resource("/index.html").to(|| HttpResponse::Ok()))
     ///         .default_service(
-    ///             Files::new("", "./static")
+    ///             web::to(|| HttpResponse::NotFound())
     ///         );
     /// }
     /// ```

src/middleware/mod.rs

@@ -2,7 +2,6 @@
 mod compress;
 pub use self::compress::{BodyEncoding, Compress};
 
-pub mod cors;
 mod defaultheaders;
 pub mod errhandlers;
 mod logger;

src/rmap.rs

@@ -38,7 +38,8 @@ impl ResourceMap {
     pub(crate) fn finish(&self, current: Rc<ResourceMap>) {
         for (_, nested) in &self.patterns {
             if let Some(ref nested) = nested {
-                *nested.parent.borrow_mut() = Some(current.clone())
+                *nested.parent.borrow_mut() = Some(current.clone());
+                nested.finish(nested.clone());
             }
         }
     }

src/scope.rs

@@ -1135,4 +1135,24 @@ mod tests {
         let body = read_body(resp);
         assert_eq!(body, &b"https://youtube.com/watch/xxxxxx"[..]);
     }
+
+    #[test]
+    fn test_url_for_nested() {
+        let mut srv = init_service(App::new().service(web::scope("/a").service(
+            web::scope("/b").service(web::resource("/c/{stuff}").name("c").route(
+                web::get().to(|req: HttpRequest| {
+                    HttpResponse::Ok()
+                        .body(format!("{}", req.url_for("c", &["12345"]).unwrap()))
+                }),
+            )),
+        )));
+        let req = TestRequest::with_uri("/a/b/c/test").to_request();
+        let resp = call_service(&mut srv, req);
+        assert_eq!(resp.status(), StatusCode::OK);
+        let body = read_body(resp);
+        assert_eq!(
+            body,
+            Bytes::from_static(b"http://localhost:8080/a/b/c/12345")
+        );
+    }
 }

test-server/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.2.2] - 2019-06-16
+
+* Add .put() and .sput() methods
+
 ## [0.2.1] - 2019-06-05
 
 * Add license files

test-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http-test"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix http test server"
 readme = "README.md"
@@ -32,7 +32,7 @@ ssl = ["openssl", "actix-server/ssl", "awc/ssl"]
 [dependencies]
 actix-codec = "0.1.2"
 actix-rt = "0.2.2"
-actix-service = "0.4.0"
+actix-service = "0.4.1"
 actix-server = "0.5.1"
 actix-utils = "0.4.1"
 awc = "0.2.1"
@@ -55,5 +55,5 @@ tokio-timer = "0.2"
 openssl = { version="0.10", optional = true }
 
 [dev-dependencies]
-actix-web = "1.0.0-rc"
-actix-http = "0.2.3"
+actix-web = "1.0.0"
+actix-http = "0.2.4"