Merge branch 'release/v0.12.1'

thoth-pub · Apr 8, 2024 · 7d10b34 · 7d10b34
2 parents 1f17fc8 + a080658
commit 7d10b34
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[0.12.1]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.1) - 2024-04-8
+### Fixed
+  - [589](https://github.com/thoth-pub/thoth/issues/589) - Truncation of `short_abstract` in Thoth ONIX results in Invalid UTF-8 sequences
+
 ## [[0.12.0]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.0) - 2024-03-14
 ### Removed
   - [549](https://github.com/thoth-pub/thoth/pull/549) - Deprecate public-facing pages in Thoth APP in favour of a separate, standalone, website

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 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.0", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.12.0", path = "thoth-api-server" }
-thoth-app-server = { version = "0.12.0", path = "thoth-app-server" }
-thoth-errors = { version = "0.12.0", path = "thoth-errors" }
-thoth-export-server = { version = "0.12.0", path = "thoth-export-server" }
+thoth-api = { version = "=0.12.1", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "=0.12.1", path = "thoth-api-server" }
+thoth-app-server = { version = "=0.12.1", path = "thoth-app-server" }
+thoth-errors = { version = "=0.12.1", path = "thoth-errors" }
+thoth-export-server = { version = "=0.12.1", path = "thoth-export-server" }
 clap = { version = "4.4.7", features = ["cargo", "env"] }
 dialoguer = { version = "0.11.0", features = ["password"] }
 dotenv = "0.15.0"

diff --git a/thoth-api-server/Cargo.toml b/thoth-api-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 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.0", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.12.0", path = "../thoth-errors" }
+thoth-api = { version = "0.12.1", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.12.1", path = "../thoth-errors" }
 actix-web = "4.5.1"
 actix-cors = "0.7.0"
 actix-identity = "0.7.1"

diff --git a/thoth-api/Cargo.toml b/thoth-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 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.0", path = "../thoth-errors" }
+thoth-errors = { version = "0.12.1", path = "../thoth-errors" }
 actix-web = { version = "4.5.1", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"

diff --git a/thoth-app-server/Cargo.toml b/thoth-app-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app-server"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/thoth-app/Cargo.toml b/thoth-app/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 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.12.0", path = "../thoth-api"  }
-thoth-errors = { version = "0.12.0", path = "../thoth-errors" }
+thoth-api = { version = "0.12.1", path = "../thoth-api"  }
+thoth-errors = { version = "0.12.1", path = "../thoth-errors" }
 
 [build-dependencies]
 dotenv = "0.15.0"
diff --git a/thoth-app/manifest.json b/thoth-app/manifest.json
@@ -9,7 +9,7 @@
   "start_url": "/?homescreen=1",
   "background_color": "#ffffff",
   "theme_color": "#ffdd57",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "icons": [
       {
         "src": "\/admin\/android-icon-36x36.png",

diff --git a/thoth-client/Cargo.toml b/thoth-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-client"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -10,8 +10,8 @@ readme = "README.md"
 build = "build.rs"
 
 [dependencies]
-thoth-api = {version = "0.12.0", path = "../thoth-api" }
-thoth-errors = {version = "0.12.0", path = "../thoth-errors" }
+thoth-api = {version = "0.12.1", path = "../thoth-api" }
+thoth-errors = {version = "0.12.1", 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.12.0", path = "../thoth-api", features = ["backend"] }
+thoth-api = { version = "0.12.1", path = "../thoth-api", features = ["backend"] }
diff --git a/thoth-errors/Cargo.toml b/thoth-errors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-errors"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/thoth-export-server/Cargo.toml b/thoth-export-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-export-server"
-version = "0.12.0"
+version = "0.12.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -10,9 +10,9 @@ readme = "README.md"
 build = "build.rs"
 
 [dependencies]
-thoth-api = { version = "0.12.0", path = "../thoth-api" }
-thoth-errors = { version = "0.12.0", path = "../thoth-errors" }
-thoth-client = { version = "0.12.0", path = "../thoth-client" }
+thoth-api = { version = "0.12.1", path = "../thoth-api" }
+thoth-errors = { version = "0.12.1", path = "../thoth-errors" }
+thoth-client = { version = "0.12.1", path = "../thoth-client" }
 actix-web = "4.5.1"
 actix-cors = "0.7.0"
 cc_license = "0.1.0"

diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -422,8 +422,13 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                 })?;
                 write_element_block("CollateralDetail", w, |w| {
                     if let Some(mut short_abstract) = self.short_abstract.clone() {
-                        // Short description field may not exceed 350 characters
-                        short_abstract.truncate(350);
+                        // Short description field may not exceed 350 characters.
+                        // Ensure that the string is truncated at a valid UTF-8 boundary
+                        // by finding the byte index of the 350th character and then truncating
+                        // the string at that index, to avoid creating invalid UTF-8 sequences.
+                        if let Some((byte_index, _)) = short_abstract.char_indices().nth(350) {
+                            short_abstract.truncate(byte_index);
+                        }
                         write_element_block("TextContent", w, |w| {
                             // 02 Short description
                             write_element_block("TextType", w, |w| {