Merge branch 'release/v0.9.1'

thoth-pub · Oct 27, 2022 · 57f7752 · 57f7752
2 parents c766db7 + 281819a
commit 57f7752
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 63 deletions.
diff --git a/.github/workflows/build_test_and_check.yml b/.github/workflows/build_test_and_check.yml
@@ -32,18 +32,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version: '12.19.0'
+        node-version: '16.16.0'
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
     - uses: jetli/wasm-pack-action@v0.3.0
       with:
-        version: 'v0.9.1'
+        version: 'v0.10.3'
     - name: Install rollup
-      run: sudo npm install -g rollup@2.28.2
+      run: sudo npm install -g rollup@2.77.2
     - name: Compile WASM
       run: wasm-pack build thoth-app/ --target web --release
     - name: Pack APP
@@ -56,18 +56,18 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version: '12.19.0'
+        node-version: '16.16.0'
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
     - uses: jetli/wasm-pack-action@v0.3.0
       with:
-        version: 'v0.9.1'
+        version: 'v0.10.3'
     - name: Install rollup
-      run: sudo npm install -g rollup@2.28.2
+      run: sudo npm install -g rollup@2.77.2
     - name: Compile WASM
       run: wasm-pack build thoth-app/ --target web --release
     - name: Pack APP
@@ -85,18 +85,18 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version: '12.19.0'
+        node-version: '16.16.0'
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
     - uses: jetli/wasm-pack-action@v0.3.0
       with:
-        version: 'v0.9.1'
+        version: 'v0.10.3'
     - name: Install rollup
-      run: sudo npm install -g rollup@2.28.2
+      run: sudo npm install -g rollup@2.77.2
     - name: Compile WASM
       run: wasm-pack build thoth-app/ --target web --release
     - name: Pack APP
@@ -114,7 +114,7 @@ jobs:
   format_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
             toolchain: stable

diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -14,12 +14,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Build
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: false
           tags: openbookpublishers/thoth:latest

diff --git a/.github/workflows/docker_build_and_push_to_dockerhub.yml b/.github/workflows/docker_build_and_push_to_dockerhub.yml
@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           # list of Docker images to use as base name for tags
           images: |
@@ -23,17 +23,17 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: true
           tags: ${{ steps.meta.outputs.tags }}

diff --git a/.github/workflows/docker_build_dev.yml b/.github/workflows/docker_build_dev.yml
@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Build
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: false
           tags: openbookpublishers/thoth:latest

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.9.1]](https://github.com/thoth-pub/thoth/releases/tag/v0.9.1) - 2022-10-27
+### Changed
+  - [#449](https://github.com/thoth-pub/thoth/pull/449) - Update EBSCO Host ONIX price type code
+
 ## [[0.9.0]](https://github.com/thoth-pub/thoth/releases/tag/v0.9.0) - 2022-10-24
 ### Added
   - [#333](https://github.com/thoth-pub/thoth/issues/333) - Add references to schema

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.9.0"
+version = "0.9.1"
 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.0", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.9.0", path = "thoth-api-server" }
-thoth-app-server = { version = "0.9.0", path = "thoth-app-server" }
-thoth-errors = { version = "0.9.0", path = "thoth-errors" }
-thoth-export-server = { version = "0.9.0", path = "thoth-export-server" }
+thoth-api = { version = "0.9.1", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "0.9.1", path = "thoth-api-server" }
+thoth-app-server = { version = "0.9.1", path = "thoth-app-server" }
+thoth-errors = { version = "0.9.1", path = "thoth-errors" }
+thoth-export-server = { version = "0.9.1", path = "thoth-export-server" }
 clap = "2.33.3"
 dialoguer = "0.7.1"
 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.9.0"
+version = "0.9.1"
 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.0", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.9.0", path = "../thoth-errors" }
+thoth-api = { version = "0.9.1", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.9.1", path = "../thoth-errors" }
 actix-web = "4.0.1"
 actix-cors = "0.6.0"
 actix-identity = "0.4.0"

diff --git a/thoth-api/Cargo.toml b/thoth-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.9.0"
+version = "0.9.1"
 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.0", path = "../thoth-errors" }
+thoth-errors = { version = "0.9.1", path = "../thoth-errors" }
 actix-web = { version = "4.0.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.9.0"
+version = "0.9.1"
 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.9.0"
+version = "0.9.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -38,5 +38,5 @@ serde = { version = "1.0.115", features = ["derive"] }
 serde_json = "1.0"
 url = "2.1.1"
 uuid = { version = "0.7", features = ["serde", "v4"] }
-thoth-api = { version = "0.9.0", path = "../thoth-api"  }
-thoth-errors = { version = "0.9.0", path = "../thoth-errors" }
+thoth-api = { version = "0.9.1", path = "../thoth-api"  }
+thoth-errors = { version = "0.9.1", 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.9.0",
+  "version": "0.9.1",
   "icons": [
       {
         "src": "\/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.9.0"
+version = "0.9.1"
 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.0", path = "../thoth-api" }
-thoth-errors = {version = "0.9.0", path = "../thoth-errors" }
+thoth-api = {version = "0.9.1", path = "../thoth-api" }
+thoth-errors = {version = "0.9.1", path = "../thoth-errors" }
 graphql_client = "0.11.0"
 chrono = { version = "0.4", features = ["serde"] }
 reqwest = { version = "0.11", features = ["json"] }

diff --git a/thoth-errors/Cargo.toml b/thoth-errors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-errors"
-version = "0.9.0"
+version = "0.9.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 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.9.0"
+version = "0.9.1"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,9 +9,9 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.9.0", path = "../thoth-api" }
-thoth-errors = { version = "0.9.0", path = "../thoth-errors" }
-thoth-client = { version = "0.9.0", path = "../thoth-client" }
+thoth-api = { version = "0.9.1", path = "../thoth-api" }
+thoth-errors = { version = "0.9.1", path = "../thoth-errors" }
+thoth-client = { version = "0.9.1", path = "../thoth-client" }
 actix-web = "4.0.1"
 actix-cors = "0.6.0"
 chrono = { version = "0.4", features = ["serde"] }

diff --git a/thoth-export-server/src/xml/onix21_ebsco_host.rs b/thoth-export-server/src/xml/onix21_ebsco_host.rs
@@ -402,9 +402,9 @@ impl XmlElementBlock<Onix21EbscoHost> for Work {
                     })?;
                     // EBSCO Host require the price point for Open Access titles to be listed as "0.01 USD".
                     write_element_block("Price", w, |w| {
-                        // 02 RRP including tax
+                        // 01 RRP excluding tax (price code requested by EBSCO)
                         write_element_block("PriceTypeCode", w, |w| {
-                            w.write(XmlEvent::Characters("02")).map_err(|e| e.into())
+                            w.write(XmlEvent::Characters("01")).map_err(|e| e.into())
                         })?;
                         write_element_block("PriceAmount", w, |w| {
                             w.write(XmlEvent::Characters("0.01")).map_err(|e| e.into())
@@ -1059,7 +1059,7 @@ mod tests {
         assert!(output
             .contains(r#"    <AudienceRestrictionNote>Open access</AudienceRestrictionNote>"#));
         assert!(output.contains(r#"    <Price>"#));
-        assert!(output.contains(r#"      <PriceTypeCode>02</PriceTypeCode>"#));
+        assert!(output.contains(r#"      <PriceTypeCode>01</PriceTypeCode>"#));
         assert!(output.contains(r#"      <PriceAmount>0.01</PriceAmount>"#));
         assert!(output.contains(r#"      <CurrencyCode>USD</CurrencyCode>"#));