Merge branch 'release/v0.12.6'

thoth-pub · Jun 17, 2024 · a178ea8 · a178ea8
2 parents eea2282 + e951738
commit a178ea8
Show file tree

Hide file tree

Showing 17 changed files with 108 additions and 36 deletions.
diff --git a/.github/workflows/build_test_and_check.yml b/.github/workflows/build_test_and_check.yml
@@ -33,18 +33,45 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Build binary
         run: cargo build -vv
   test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Run tests
         run: cargo test --workspace -vv
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Run linting
         run: cargo clippy --all --all-targets --all-features -- -D warnings
   format_check:

diff --git a/.github/workflows/run_migrations.yml b/.github/workflows/run_migrations.yml
@@ -41,6 +41,15 @@ jobs:
           - 5432:5432
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Build binary
         run: cargo build -vv
       - name: Run migrations

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[0.12.6]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.6) - 2024-06-17
+### Fixed
+  - [#513](https://github.com/thoth-pub/thoth/issues/513) - Expand DOI regex to include `+`, `[`, and `]`
+
+### Changed
+  - [607](https://github.com/thoth-pub/thoth/pull/607) - Upgrade rust to `1.79.0` in production and development `Dockerfile`
+
+### Added
+  - [607](https://github.com/thoth-pub/thoth/pull/607) - Add caching steps to Github actions
+
 ## [[0.12.5]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.5) - 2024-05-07
 ### Changed
   - [601](https://github.com/thoth-pub/thoth/pull/601) - Upgrade rust to `1.78.0` in production and development `Dockerfile`

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.5"
+version = "0.12.6"
 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.5", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "=0.12.5", path = "thoth-api-server" }
-thoth-app-server = { version = "=0.12.5", path = "thoth-app-server" }
-thoth-errors = { version = "=0.12.5", path = "thoth-errors" }
-thoth-export-server = { version = "=0.12.5", path = "thoth-export-server" }
+thoth-api = { version = "=0.12.6", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "=0.12.6", path = "thoth-api-server" }
+thoth-app-server = { version = "=0.12.6", path = "thoth-app-server" }
+thoth-errors = { version = "=0.12.6", path = "thoth-errors" }
+thoth-export-server = { version = "=0.12.6", 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/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG MUSL_IMAGE=clux/muslrust:1.78.0-stable
+ARG MUSL_IMAGE=clux/muslrust:1.79.0-stable
 
 FROM ${MUSL_IMAGE} as build
 

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,4 +1,4 @@
-ARG RUST_VERSION=1.78.0
+ARG RUST_VERSION=1.79.0
 
 FROM rust:${RUST_VERSION}
 

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.5"
+version = "0.12.6"
 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.5", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "=0.12.5", path = "../thoth-errors" }
+thoth-api = { version = "=0.12.6", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "=0.12.6", 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.5"
+version = "0.12.6"
 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.5", path = "../thoth-errors" }
+thoth-errors = { version = "=0.12.6", path = "../thoth-errors" }
 actix-web = { version = "4.5.1", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"

diff --git a/thoth-api/migrations/v0.12.6/down.sql b/thoth-api/migrations/v0.12.6/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.12.6/up.sql b/thoth-api/migrations/v0.12.6/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)
@@ -707,6 +707,10 @@ fn test_doi_fromstr() {
         "https://doi.org/10.1002/(SICI)1098-2736(199908)36:6<637::AID-TEA4>3.0.CO;2-9"
     )
     .is_ok());
+    assert!(Doi::from_str(
+        "https://doi.org/10.1002/(sici)1096-8644(1996)23+<91::aid-ajpa4>3.0.co;2-c"
+    )
+    .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.12.5"
+version = "0.12.6"
 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.5"
+version = "0.12.6"
 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.5", path = "../thoth-api"  }
-thoth-errors = { version = "=0.12.5", path = "../thoth-errors" }
+thoth-api = { version = "=0.12.6", path = "../thoth-api"  }
+thoth-errors = { version = "=0.12.6", path = "../thoth-errors" }
 
 [build-dependencies]
 dotenv = "0.15.0"
diff --git a/thoth-client/Cargo.toml b/thoth-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-client"
-version = "0.12.5"
+version = "0.12.6"
 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.5", path = "../thoth-api" }
-thoth-errors = {version = "=0.12.5", path = "../thoth-errors" }
+thoth-api = {version = "=0.12.6", path = "../thoth-api" }
+thoth-errors = {version = "=0.12.6", 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.5", path = "../thoth-api", features = ["backend"] }
+thoth-api = { version = "=0.12.6", 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.5"
+version = "0.12.6"
 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.5"
+version = "0.12.6"
 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.5", path = "../thoth-api" }
-thoth-errors = { version = "=0.12.5", path = "../thoth-errors" }
-thoth-client = { version = "=0.12.5", path = "../thoth-client" }
+thoth-api = { version = "=0.12.6", path = "../thoth-api" }
+thoth-errors = { version = "=0.12.6", path = "../thoth-errors" }
+thoth-client = { version = "=0.12.6", path = "../thoth-client" }
 actix-web = "4.5.1"
 actix-cors = "0.7.0"
 cc_license = "0.1.0"