Merge branch 'release/v0.12.10'

CHANGELOG.md

@@ -6,6 +6,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[0.12.10]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.10) - 2024-10-01
+### Added
+  - [628](https://github.com/thoth-pub/thoth/pull/628) - Implement OpenAPI v3 schema in export API, served under `/openapi.json`
+  - [628](https://github.com/thoth-pub/thoth/pull/628) - Added terms of service to export API
+
+### Changed
+  - [551](https://github.com/thoth-pub/thoth/issues/551) - Only include chapters in Crossref metadata output if they have DOIs
+  - [628](https://github.com/thoth-pub/thoth/pull/628) - Upgrade `paperclip` to v0.9.1
+  - [628](https://github.com/thoth-pub/thoth/pull/628) - Upgrade rust to `1.81.0` in production and development `Dockerfile`
+  - [544](https://github.com/thoth-pub/thoth/issues/544) - Implement non-OA metadata in export outputs
+
+### Fixed
+  - [565](https://github.com/thoth-pub/thoth/issues/565) - Don't generate Crossref metadata output if no DOIs (work or chapter) are present
+  - [632](https://github.com/thoth-pub/thoth/pull/632) - Add second order by clause (work\_id) to work queries for consistent ordering when multiple works share the same user-ordered field, such as publication date
+
 ## [[0.12.9]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.9) - 2024-09-06
 ### Added
   - [595](https://github.com/thoth-pub/thoth/issues/595), [626](https://github.com/thoth-pub/thoth/pull/626) - Remove infrequently used and unused work statuses (unspecified, no longer our product, out of stock indefinitely, out of print, inactive, unknown, remaindered, recalled). Require a publication date for active, withdrawn, and superseded works in Thoth. Add a new `Superseded` work status to replace Out of Print for older editions of Works. Require a withdrawn date for Superseded works.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "0.12.9"
+version = "0.12.10"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
 members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
 
 [dependencies]
-thoth-api = { version = "=0.12.9", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "=0.12.9", path = "thoth-api-server" }
-thoth-app-server = { version = "=0.12.9", path = "thoth-app-server" }
-thoth-errors = { version = "=0.12.9", path = "thoth-errors" }
-thoth-export-server = { version = "=0.12.9", path = "thoth-export-server" }
+thoth-api = { version = "=0.12.10", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "=0.12.10", path = "thoth-api-server" }
+thoth-app-server = { version = "=0.12.10", path = "thoth-app-server" }
+thoth-errors = { version = "=0.12.10", path = "thoth-errors" }
+thoth-export-server = { version = "=0.12.10", path = "thoth-export-server" }
 clap = { version = "4.5.16", features = ["cargo", "env"] }
 dialoguer = { version = "0.11.0", features = ["password"] }
 dotenv = "0.15.0"

Dockerfile

@@ -1,4 +1,4 @@
-ARG MUSL_IMAGE=clux/muslrust:1.80.1-stable
+ARG MUSL_IMAGE=clux/muslrust:1.81.0-stable
 
 FROM ${MUSL_IMAGE} as build
 

Dockerfile.dev

@@ -1,4 +1,4 @@
-ARG RUST_VERSION=1.80.1
+ARG RUST_VERSION=1.81.0
 
 FROM rust:${RUST_VERSION}
 

thoth-api-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "0.12.9"
+version = "0.12.10"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "=0.12.9", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "=0.12.9", path = "../thoth-errors" }
+thoth-api = { version = "=0.12.10", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "=0.12.10", path = "../thoth-errors" }
 actix-web = "4.9"
 actix-cors = "0.7.0"
 actix-identity = "0.7.1"

thoth-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.12.9"
+version = "0.12.10"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
 backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web", "jsonwebtoken"]
 
 [dependencies]
-thoth-errors = { version = "=0.12.9", path = "../thoth-errors" }
+thoth-errors = { version = "=0.12.10", path = "../thoth-errors" }
 actix-web = { version = "4.8", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"

thoth-api/src/model/work/crud.rs

@@ -315,6 +315,7 @@ impl Crud for Work {
             );
         }
         match query
+            .then_order_by(dsl::work_id)
             .limit(limit.into())
             .offset(offset.into())
             .load::<Work>(&mut connection)

thoth-app-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app-server"
-version = "0.12.9"
+version = "0.12.10"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"

thoth-app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app"
-version = "0.12.9"
+version = "0.12.10"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -36,8 +36,8 @@ uuid = { version = "1.10.0", features = ["serde", "v4"] }
 # `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
 # https://docs.rs/getrandom/latest/getrandom/#webassembly-support
 getrandom = { version = "0.2", features = ["js"] }
-thoth-api = { version = "=0.12.9", path = "../thoth-api"  }
-thoth-errors = { version = "=0.12.9", path = "../thoth-errors" }
+thoth-api = { version = "=0.12.10", path = "../thoth-api"  }
+thoth-errors = { version = "=0.12.10", path = "../thoth-errors" }
 
 [build-dependencies]
 dotenv = "0.15.0"

thoth-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-client"
-version = "0.12.9"
+version = "0.12.10"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -10,8 +10,8 @@ readme = "README.md"
 build = "build.rs"
 
 [dependencies]
-thoth-api = {version = "=0.12.9", path = "../thoth-api" }
-thoth-errors = {version = "=0.12.9", path = "../thoth-errors" }
+thoth-api = {version = "=0.12.10", path = "../thoth-api" }
+thoth-errors = {version = "=0.12.10", path = "../thoth-errors" }
 graphql_client = "0.14.0"
 chrono = { version = "0.4.38", features = ["serde"] }
 reqwest = { version = "0.11", features = ["json"] }
@@ -22,4 +22,4 @@ serde_json = "1.0"
 uuid = { version = "1.10.0", features = ["serde"] }
 
 [build-dependencies]
-thoth-api = { version = "=0.12.9", path = "../thoth-api", features = ["backend"] }
+thoth-api = { version = "=0.12.10", path = "../thoth-api", features = ["backend"] }

thoth-errors/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-errors"
-version = "0.12.9"
+version = "0.12.10"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"

thoth-export-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-export-server"
-version = "0.12.9"
+version = "0.12.10"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -10,9 +10,9 @@ readme = "README.md"
 build = "build.rs"
 
 [dependencies]
-thoth-api = { version = "=0.12.9", path = "../thoth-api" }
-thoth-errors = { version = "=0.12.9", path = "../thoth-errors" }
-thoth-client = { version = "=0.12.9", path = "../thoth-client" }
+thoth-api = { version = "=0.12.10", path = "../thoth-api" }
+thoth-errors = { version = "=0.12.10", path = "../thoth-errors" }
+thoth-client = { version = "=0.12.10", path = "../thoth-client" }
 actix-web = "4.9"
 actix-cors = "0.7.0"
 cc_license = "0.1.0"
@@ -23,7 +23,7 @@ futures = "0.3.30"
 lazy_static = "1.5.0"
 log = "0.4.20"
 marc = { version = "3.1.1", features = ["xml"] }
-paperclip = { version = "0.8.2", features = ["actix-base", "actix4", "uuid1", "v2"] }
+paperclip = { version = "0.9.1", features = ["actix4", "uuid1", "v3"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 uuid = { version = "1.10.0", features = ["serde"] }

thoth-export-server/src/lib.rs

@@ -31,7 +31,7 @@ struct ApiConfig {
 impl ApiConfig {
     pub fn new(public_url: String) -> Self {
         Self {
-            api_schema: format!("{public_url}/swagger.json"),
+            api_schema: format!("{public_url}/openapi.json"),
         }
     }
 }
@@ -82,6 +82,7 @@ pub async fn start_server(
                     "Obtain Thoth metadata records in various formats and platform specifications"
                         .to_string(),
                 ),
+                terms_of_service: Some("https://thoth.pub/policies/terms-thoth-free".to_string()),
                 contact: Some(Contact {
                     name: Some("Thoth Support".to_string()),
                     url: Some("https://thoth.pub".to_string()),
@@ -107,6 +108,7 @@ pub async fn start_server(
             .configure(platform::route)
             .configure(specification::route)
             .with_json_spec_at("/swagger.json")
+            .with_json_spec_v3_at("/openapi.json")
             .build()
     })
     .workers(threads)