Merge branch 'develop' into feature/218-make-series-issn-optional

CHANGELOG.md

@@ -5,12 +5,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [[0.11.18]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.18) - 2024-03-07
+### Added
+  - [441](https://github.com/thoth-pub/thoth/issues/441) - Implement ONIX 3.0 "Thoth" specification (i.e. complete record reflecting full data model)
+  - [401](https://github.com/thoth-pub/thoth/issues/401) - Add BDS Live to list of supported platforms for JSTOR ONIX output
+
 ### Fixed
   - [475](https://github.com/thoth-pub/thoth/issues/475) - Add seconds to timestamp for Crossref metadata output
   - [571](https://github.com/thoth-pub/thoth/issues/571) - Fix overlapping URL text for Locations in Thoth Admin panel on website in Safari and Chromium browsers
 
 ### Changed
-  - [218](https://github.com/thoth-pub/thoth/issues/218) - Make series ISSN optional
+ - [218](https://github.com/thoth-pub/thoth/issues/218) - Make series ISSN optional
+ - [578](https://github.com/thoth-pub/thoth/pull/578) - Upgrade `actix-identity` to v0.7.1
+ - [578](https://github.com/thoth-pub/thoth/pull/578) - Upgrade `actix-session` to v0.9.0
 
 ### Security
   - [572](https://github.com/thoth-pub/thoth/pull/572) - Upgrade `mio` to v0.8.11

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "0.11.17"
+version = "0.11.18"
 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.11.17", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.11.17", path = "thoth-api-server" }
-thoth-app-server = { version = "0.11.17", path = "thoth-app-server" }
-thoth-errors = { version = "0.11.17", path = "thoth-errors" }
-thoth-export-server = { version = "0.11.17", path = "thoth-export-server" }
+thoth-api = { version = "0.11.18", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "0.11.18", path = "thoth-api-server" }
+thoth-app-server = { version = "0.11.18", path = "thoth-app-server" }
+thoth-errors = { version = "0.11.18", path = "thoth-errors" }
+thoth-export-server = { version = "0.11.18", path = "thoth-export-server" }
 clap = { version = "4.4.7", features = ["cargo", "env"] }
 dialoguer = { version = "0.11.0", features = ["password"] }
 dotenv = "0.15.0"

thoth-api-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "0.11.17"
+version = "0.11.18"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -9,12 +9,12 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.11.17", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
+thoth-api = { version = "0.11.18", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
 actix-web = "4.5.1"
 actix-cors = "0.7.0"
-actix-identity = "0.6.0"
-actix-session = { version = "0.8.0", features = ["cookie-session"] }
+actix-identity = "0.7.1"
+actix-session = { version = "0.9.0", features = ["cookie-session"] }
 env_logger = "0.11.2"
 juniper = "0.15.12"
 serde = { version = "1.0", features = ["derive"] }

thoth-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.11.17"
+version = "0.11.18"
 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.11.17", path = "../thoth-errors" }
+thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
 actix-web = { version = "4.5.1", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"

thoth-app-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app-server"
-version = "0.11.17"
+version = "0.11.18"
 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.11.17"
+version = "0.11.18"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -36,8 +36,8 @@ uuid = { version = "0.8.2", 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.11.17", path = "../thoth-api"  }
-thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
+thoth-api = { version = "0.11.18", path = "../thoth-api"  }
+thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
 
 [build-dependencies]
 dotenv = "0.15.0"

thoth-app/manifest.json

@@ -9,7 +9,7 @@
   "start_url": "/?homescreen=1",
   "background_color": "#ffffff",
   "theme_color": "#ffdd57",
-  "version": "0.11.17",
+  "version": "0.11.18",
   "icons": [
       {
         "src": "\/android-icon-36x36.png",

thoth-app/src/models/work/mod.rs

@@ -116,6 +116,7 @@ pub trait DisplayWork {
     fn marc21_thoth_endpoint(&self) -> String;
     fn marc21markup_thoth_endpoint(&self) -> String;
     fn marc21xml_thoth_endpoint(&self) -> String;
+    fn onix_thoth_endpoint(&self) -> String;
     fn onix_projectmuse_endpoint(&self) -> String;
     fn onix_oapen_endpoint(&self) -> String;
     fn onix_jstor_endpoint(&self) -> String;
@@ -156,6 +157,13 @@ impl DisplayWork for WorkWithRelations {
         )
     }
 
+    fn onix_thoth_endpoint(&self) -> String {
+        format!(
+            "{}/specifications/onix_3.0::thoth/work/{}",
+            THOTH_EXPORT_API, &self.work_id
+        )
+    }
+
     fn onix_projectmuse_endpoint(&self) -> String {
         format!(
             "{}/specifications/onix_3.0::project_muse/work/{}",
@@ -424,6 +432,12 @@ impl DisplayWork for WorkWithRelations {
                                     </div>
                                     <div class="dropdown-menu" id="dropdown-menu" role="menu">
                                         <div class="dropdown-content">
+                                            <a
+                                                href={self.onix_thoth_endpoint()}
+                                                class="dropdown-item"
+                                            >
+                                            {"ONIX 3.0 (Thoth)"}
+                                            </a>
                                             <a
                                                 href={self.onix_projectmuse_endpoint()}
                                                 class="dropdown-item"

thoth-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-client"
-version = "0.11.17"
+version = "0.11.18"
 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.11.17", path = "../thoth-api" }
-thoth-errors = {version = "0.11.17", path = "../thoth-errors" }
+thoth-api = {version = "0.11.18", path = "../thoth-api" }
+thoth-errors = {version = "0.11.18", path = "../thoth-errors" }
 graphql_client = "0.13.0"
 chrono = { version = "0.4.31", features = ["serde"] }
 reqwest = { version = "0.11", features = ["json"] }
@@ -22,4 +22,4 @@ serde_json = "1.0"
 uuid = { version = "0.8.2", features = ["serde"] }
 
 [build-dependencies]
-thoth-api = { version = "0.11.17", path = "../thoth-api", features = ["backend"] }
+thoth-api = { version = "0.11.18", path = "../thoth-api", features = ["backend"] }

thoth-client/assets/queries.graphql

@@ -167,6 +167,7 @@ fragment Work on Work {
             place
             firstPage
             lastPage
+            pageCount
             pageInterval
             landingPage
             imprint {

thoth-client/src/queries.rs

@@ -26,6 +26,12 @@ impl fmt::Display for work_query::LanguageCode {
     }
 }
 
+impl fmt::Display for work_query::CurrencyCode {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{self:?}")
+    }
+}
+
 impl fmt::Display for work_query::SubjectType {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{self:?}")
@@ -38,6 +44,12 @@ impl fmt::Display for work_query::PublicationType {
     }
 }
 
+impl fmt::Display for work_query::LocationPlatform {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{self:?}")
+    }
+}
+
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "assets/schema.graphql",

thoth-errors/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-errors"
-version = "0.11.17"
+version = "0.11.18"
 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.11.17"
+version = "0.11.18"
 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.11.17", path = "../thoth-api" }
-thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
-thoth-client = { version = "0.11.17", path = "../thoth-client" }
+thoth-api = { version = "0.11.18", path = "../thoth-api" }
+thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
+thoth-client = { version = "0.11.18", path = "../thoth-client" }
 actix-web = "4.5.1"
 actix-cors = "0.7.0"
 cc_license = "0.1.0"

thoth-export-server/src/bibtex/bibtex_thoth.rs

@@ -483,6 +483,7 @@ mod tests {
                     place: None,
                     first_page: None,
                     last_page: None,
+                    page_count: None,
                     page_interval: None,
                     landing_page: None,
                     imprint: WorkRelationsRelatedWorkImprint {
@@ -512,6 +513,7 @@ mod tests {
                     place: None,
                     first_page: None,
                     last_page: None,
+                    page_count: None,
                     page_interval: None,
                     landing_page: None,
                     imprint: WorkRelationsRelatedWorkImprint {

thoth-export-server/src/csv/csv_thoth.rs

@@ -831,6 +831,7 @@ mod tests {
                     place: None,
                     first_page: None,
                     last_page: None,
+                    page_count: None,
                     page_interval: None,
                     landing_page: None,
                     imprint: WorkRelationsRelatedWorkImprint {
@@ -1155,6 +1156,7 @@ mod tests {
                 place: None,
                 first_page: None,
                 last_page: None,
+                page_count: None,
                 page_interval: None,
                 landing_page: None,
                 imprint: WorkRelationsRelatedWorkImprint {