Merge branch 'release/v0.11.7'

thoth-pub · Oct 2, 2023 · 9e3e4bd · 9e3e4bd
2 parents 7188f65 + 4370f3c
commit 9e3e4bd
Show file tree

Hide file tree

Showing 18 changed files with 333 additions and 155 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[0.11.7]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.7) - 2023-10-02
+### Changed
+  - Improve MARC records with recommendations
+  - Upgrade `actix-identity` to v0.6.0
+  - Upgrade `actix-session` to v0.8.0
+  - Upgrade `chrono` to v0.4.31
+  - Upgrade `marc` to v3.1.1
+
+### Fixed
+  - [#513](https://github.com/thoth-pub/thoth/issues/513) - Expand DOI regex to include angle brackets
+
 ## [[0.11.6]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.6) - 2023-09-08
 ### Security
   - Upgrade `chrono` to v0.4.30

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.11.6"
+version = "0.11.7"
 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.11.6", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.11.6", path = "thoth-api-server" }
-thoth-app-server = { version = "0.11.6", path = "thoth-app-server" }
-thoth-errors = { version = "0.11.6", path = "thoth-errors" }
-thoth-export-server = { version = "0.11.6", path = "thoth-export-server" }
+thoth-api = { version = "0.11.7", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "0.11.7", path = "thoth-api-server" }
+thoth-app-server = { version = "0.11.7", path = "thoth-app-server" }
+thoth-errors = { version = "0.11.7", path = "thoth-errors" }
+thoth-export-server = { version = "0.11.7", path = "thoth-export-server" }
 clap = { version = "4.4.2", features = ["cargo", "env"] }
 dialoguer = { version = "0.10.4", 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.11.6"
+version = "0.11.7"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,12 +9,12 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.11.6", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.11.6", path = "../thoth-errors" }
+thoth-api = { version = "0.11.7", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.11.7", path = "../thoth-errors" }
 actix-web = "4.4.0"
 actix-cors = "0.6.4"
-actix-identity = "0.5.2"
-actix-session = { version = "0.7.2", features = ["cookie-session"] }
+actix-identity = "0.6.0"
+actix-session = { version = "0.8.0", features = ["cookie-session"] }
 env_logger = "0.10.0"
 juniper = "0.15.11"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/thoth-api/Cargo.toml b/thoth-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.11.6"
+version = "0.11.7"
 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" }
 backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web"]
 
 [dependencies]
-thoth-errors = { version = "0.11.6", path = "../thoth-errors" }
+thoth-errors = { version = "0.11.7", path = "../thoth-errors" }
 actix-web = { version = "4.4.0", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"
-chrono = { version = "0.4.30", features = ["serde"] }
+chrono = { version = "0.4.31", features = ["serde"] }
 diesel = { version = "2.1.1", features = ["postgres", "uuid", "chrono", "r2d2", "64-column-tables", "serde_json"], optional = true }
 diesel-derive-enum = { version = "2.1.0", features = ["postgres"], optional = true }
 diesel-derive-newtype = "2.1.0"

diff --git a/thoth-api/migrations/v0.11.7/down.sql b/thoth-api/migrations/v0.11.7/down.sql
@@ -0,0 +1,11 @@
+ALTER TABLE work DROP CONSTRAINT work_doi_check;
+ALTER TABLE work ADD CONSTRAINT work_doi_check
+  CHECK (doi ~ '^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]\/:a-zA-Z0-9]+$');
+
+ALTER TABLE reference DROP CONSTRAINT reference_doi_check;
+ALTER TABLE reference ADD CONSTRAINT reference_doi_check
+  CHECK (doi ~ '^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]\/:a-zA-Z0-9]+$');
+
+ALTER TABLE institution DROP CONSTRAINT institution_institution_doi_check;
+ALTER TABLE institution ADD CONSTRAINT institution_institution_doi_check
+  CHECK (institution_doi ~ '^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]\/:a-zA-Z0-9]+$');
diff --git a/thoth-api/migrations/v0.11.7/up.sql b/thoth-api/migrations/v0.11.7/up.sql
@@ -0,0 +1,11 @@
+ALTER TABLE work DROP CONSTRAINT work_doi_check;
+ALTER TABLE work ADD CONSTRAINT work_doi_check
+  CHECK (doi ~ '^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]<>\/:a-zA-Z0-9]+$');
+
+ALTER TABLE reference DROP CONSTRAINT reference_doi_check;
+ALTER TABLE reference ADD CONSTRAINT reference_doi_check
+  CHECK (doi ~ '^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]<>\/:a-zA-Z0-9]+$');
+
+ALTER TABLE institution DROP CONSTRAINT institution_institution_doi_check;
+ALTER TABLE institution ADD CONSTRAINT institution_institution_doi_check
+  CHECK (institution_doi ~ '^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]<>\/:a-zA-Z0-9]+$');
diff --git a/thoth-api/src/model/mod.rs b/thoth-api/src/model/mod.rs
@@ -46,7 +46,7 @@ pub enum WeightUnit {
     feature = "backend",
     derive(DieselNewType, juniper::GraphQLScalarValue),
     graphql(
-        description = r#"Digital Object Identifier. Expressed as `^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]\/:a-zA-Z0-9]+$`"#
+        description = r#"Digital Object Identifier. Expressed as `^https:\/\/doi\.org\/10\.\d{4,9}\/[-._\;\(\)\[\]<>\/:a-zA-Z0-9]+$`"#
     )
 )]
 #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
@@ -144,7 +144,7 @@ impl FromStr for Doi {
             // and captures the identifier segment starting with the "10." directory indicator
             // Corresponds to database constraints although regex syntax differs slightly
             // (e.g. `;()/` do not need to be escaped here)
-            r"^(?i:(?:https?://)?(?:www\.)?(?:dx\.)?doi\.org/)?(10\.\d{4,9}/[-._;()\[\]/:a-zA-Z0-9]+$)").unwrap();
+            r"^(?i:(?:https?://)?(?:www\.)?(?:dx\.)?doi\.org/)?(10\.\d{4,9}/[-._;()\[\]<>/:a-zA-Z0-9]+$)").unwrap();
         }
         if input.is_empty() {
             Err(ThothError::DoiEmptyError)
@@ -703,6 +703,10 @@ fn test_doi_fromstr() {
     assert!(Doi::from_str("https://doi-org/10.12345/Test-Suffix.01").is_err());
     assert!(Doi::from_str("10.https://doi.org/12345/Test-Suffix.01").is_err());
     assert!(Doi::from_str("http://dx.doi.org/10.2990/1471-5457(2005)24[2:tmpwac]2.0.co;2").is_ok());
+    assert!(Doi::from_str(
+        "https://doi.org/10.1002/(SICI)1098-2736(199908)36:6<637::AID-TEA4>3.0.CO;2-9"
+    )
+    .is_ok());
 }
 
 #[test]

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.11.6"
+version = "0.11.7"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 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.11.6"
+version = "0.11.7"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -20,7 +20,7 @@ wasm-pack = "0.12.1"
 
 [dependencies]
 anyhow = "1.0.32"
-chrono = { version = "0.4.30", features = ["serde"] }
+chrono = { version = "0.4.31", features = ["serde"] }
 gloo-storage = "0.2.1"
 gloo-timers = "0.2.4"
 log = "0.4.20"
@@ -41,5 +41,5 @@ 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.6", path = "../thoth-api"  }
-thoth-errors = { version = "0.11.6", path = "../thoth-errors" }
+thoth-api = { version = "0.11.7", path = "../thoth-api"  }
+thoth-errors = { version = "0.11.7", path = "../thoth-errors" }
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.11.6",
+  "version": "0.11.7",
   "icons": [
       {
         "src": "\/android-icon-36x36.png",

diff --git a/thoth-app/src/component/about.rs b/thoth-app/src/component/about.rs
@@ -34,6 +34,11 @@ impl Component for AboutComponent {
                         <li>{ "Toby Steiner (COO)" }</li>
                         <li>{ "Javier Arias (CTO)" }</li>
                         <li>{ "Ross Higman (Software Engineer)" }</li>
+                        <li>{ "Hannah Hillen (Metadata & Publisher Outreach Specialist)" }</li>
+                    </ul>
+                    <p class="title is-5">{ "Consultants" }</p>
+                    <ul>
+                        <li>{ "Amanda Ramalho (Thoth Representative, Latin America)" }</li>
                     </ul>
                     <p>{ "Support us through the " }<a href={ "https://www.openbookcollective.org/packages/20/info/" }>{ "Open Book Collective" }</a>{ "." }</p>
                     <p>{ "Contact us at " }<a href={ "mailto:info@thoth.pub" }>{ "info@thoth.pub" }</a>{ "." }</p>

diff --git a/thoth-client/Cargo.toml b/thoth-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-client"
-version = "0.11.6"
+version = "0.11.7"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,10 +9,10 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = {version = "0.11.6", path = "../thoth-api" }
-thoth-errors = {version = "0.11.6", path = "../thoth-errors" }
+thoth-api = {version = "0.11.7", path = "../thoth-api" }
+thoth-errors = {version = "0.11.7", path = "../thoth-errors" }
 graphql_client = "0.13.0"
-chrono = { version = "0.4.30", features = ["serde"] }
+chrono = { version = "0.4.31", features = ["serde"] }
 reqwest = { version = "0.11", features = ["json"] }
 reqwest-middleware = "0.2.3"
 reqwest-retry = "0.2.3"

diff --git a/thoth-errors/Cargo.toml b/thoth-errors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-errors"
-version = "0.11.6"
+version = "0.11.7"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -21,7 +21,7 @@ actix-web = "4.4.0"
 diesel = "2.1.1"
 csv = "1.2.2"
 juniper = "0.15.11"
-marc = { version = "3.1.0", features = ["xml"] }
+marc = { version = "3.1.1", features = ["xml"] }
 phf = { version = "0.11", features = ["macros"] }
 reqwest-middleware = "0.2.3"
 xml-rs = "0.8.17"
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.11.6"
+version = "0.11.7"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,19 +9,19 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.11.6", path = "../thoth-api" }
-thoth-errors = { version = "0.11.6", path = "../thoth-errors" }
-thoth-client = { version = "0.11.6", path = "../thoth-client" }
+thoth-api = { version = "0.11.7", path = "../thoth-api" }
+thoth-errors = { version = "0.11.7", path = "../thoth-errors" }
+thoth-client = { version = "0.11.7", path = "../thoth-client" }
 actix-web = "4.4.0"
 actix-cors = "0.6.4"
 cc_license = "0.1.0"
-chrono = { version = "0.4.30", features = ["serde"] }
+chrono = { version = "0.4.31", features = ["serde"] }
 csv = "1.2.2"
 env_logger = "0.10.0"
 futures = "0.3.28"
 lazy_static = "1.4.0"
 log = "0.4.20"
-marc = { version = "3.1.0", features = ["xml"] }
+marc = { version = "3.1.1", features = ["xml"] }
 paperclip = { version = "0.8.1", features = ["actix-base", "actix4", "uuid0", "v2"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"