Merge branch 'release/v0.10.0'

Author: ja573

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[0.10.0]](https://github.com/thoth-pub/thoth/releases/tag/v0.10.0) - 2023-04-03
+### Added
+  - [42](https://github.com/thoth-pub/thoth/pull/42) - Generate MARC 21 records
+  - New `work` field `bibliography_note`
+
 ## [[0.9.18]](https://github.com/thoth-pub/thoth/releases/tag/v0.9.18) - 2023-03-27
 ### Security
   - Upgrade `r2d2` to v0.8.10

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "0.9.18"
+version = "0.10.0"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 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.9.18", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.9.18", path = "thoth-api-server" }
-thoth-app-server = { version = "0.9.18", path = "thoth-app-server" }
-thoth-errors = { version = "0.9.18", path = "thoth-errors" }
-thoth-export-server = { version = "0.9.18", path = "thoth-export-server" }
+thoth-api = { version = "0.10.0", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "0.10.0", path = "thoth-api-server" }
+thoth-app-server = { version = "0.10.0", path = "thoth-app-server" }
+thoth-errors = { version = "0.10.0", path = "thoth-errors" }
+thoth-export-server = { version = "0.10.0", path = "thoth-export-server" }
 clap = "2.33.3"
 dialoguer = "0.7.1"
 dotenv = "0.15.0"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "0.9.18"
+version = "0.10.0"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.9.18", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.9.18", path = "../thoth-errors" }
+thoth-api = { version = "0.10.0", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.10.0", path = "../thoth-errors" }
 actix-web = "4.3.0"
 actix-cors = "0.6.4"
 actix-identity = "0.4.0"

thoth-api-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.9.18"
+version = "0.10.0"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
 backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web"]
 
 [dependencies]
-thoth-errors = { version = "0.9.18", path = "../thoth-errors" }
+thoth-errors = { version = "0.10.0", path = "../thoth-errors" }
 actix-web = { version = "4.3.0", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"

thoth-api/Cargo.toml

@@ -0,0 +1,2 @@
+ALTER TABLE work
+    DROP COLUMN IF EXISTS bibliography_note;

thoth-api/migrations/0.10.0/down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE work
+    ADD COLUMN IF NOT EXISTS bibliography_note TEXT CHECK (octet_length(bibliography_note) >= 1);

thoth-api/migrations/0.10.0/up.sql

@@ -2341,10 +2341,20 @@ impl Work {
         self.long_abstract.as_ref()
     }
 
+    #[graphql(
+        description = "A general-purpose field used to include information that does not have a specific designated field"
+    )]
     pub fn general_note(&self) -> Option<&String> {
         self.general_note.as_ref()
     }
 
+    #[graphql(
+        description = "Indicates that the work contains a bibliogrpahy or other similar information"
+    )]
+    pub fn bibliography_note(&self) -> Option<&String> {
+        self.bibliography_note.as_ref()
+    }
+
     #[graphql(description = "Table of contents of the work (not applicable to chapters)")]
     pub fn toc(&self) -> Option<&String> {
         self.toc.as_ref()

thoth-api/src/graphql/model.rs

@@ -255,6 +255,12 @@ impl Doi {
     }
 }
 
+impl Isbn {
+    pub fn to_hyphenless_string(&self) -> String {
+        self.0.replace('-', "")
+    }
+}
+
 #[cfg(feature = "backend")]
 #[allow(clippy::too_many_arguments)]
 /// Common functionality to perform basic CRUD actions on Thoth entities
@@ -811,6 +817,12 @@ fn test_ror_fromstr() {
     assert!(Ror::from_str("0abcdef12https://ror.org/").is_err());
 }
 
+#[test]
+fn test_isbn_to_hyphenless_string() {
+    let hyphenless_isbn = Isbn("978-3-16-148410-0".to_string()).to_hyphenless_string();
+    assert_eq!(hyphenless_isbn, "9783161484100");
+}
+
 #[test]
 // Float equality comparison is fine here because the floats
 // have already been rounded by the functions under test

thoth-api/src/model/mod.rs

@@ -248,6 +248,10 @@ impl Crud for Work {
                 Direction::Asc => query.order(dsl::general_note.asc()),
                 Direction::Desc => query.order(dsl::general_note.desc()),
             },
+            WorkField::BibliographyNote => match order.direction {
+                Direction::Asc => query.order(dsl::bibliography_note.asc()),
+                Direction::Desc => query.order(dsl::bibliography_note.desc()),
+            },
             WorkField::Toc => match order.direction {
                 Direction::Asc => query.order(dsl::toc.asc()),
                 Direction::Desc => query.order(dsl::toc.desc()),