Merge branch 'release/v0.8.6'

thoth-pub · Jul 1, 2022 · 1c5814c · 1c5814c
2 parents 9c2c6f9 + 72c95cf
commit 1c5814c
Show file tree

Hide file tree

Showing 32 changed files with 1,641 additions and 123 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[0.8.6]](https://github.com/thoth-pub/thoth/releases/tag/v0.8.6) - 2022-07-01
+### Added
+  - [#390](https://github.com/thoth-pub/thoth/pull/390) - Implement OverDrive ONIX 3.0 specification
+
+### Fixed
+  - [#392](https://github.com/thoth-pub/thoth/issues/392) - Fix encoding of print ISBN in JSTOR ONIX output
+
 ## [[0.8.5]](https://github.com/thoth-pub/thoth/releases/tag/v0.8.5) - 2022-05-30
 ### Added
   - [#287](https://github.com/thoth-pub/thoth/issues/287) - Allow editing contributions (and affiliations)
@@ -17,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [[0.8.4]](https://github.com/thoth-pub/thoth/releases/tag/v0.8.4) - 2022-05-11
 ### Added
   - [#29](https://github.com/thoth-pub/thoth/issues/29) - Implement CrossRef DOI Deposit specification
-  - [#72](https://github.com/thoth-pub/thoth/issues/72) - Implement CrossRef Google Books ONIX 3.0 specification
+  - [#72](https://github.com/thoth-pub/thoth/issues/72) - Implement Google Books ONIX 3.0 specification
 
 ### Changed
   - [#356](https://github.com/thoth-pub/thoth/issues/356) - Upgrade actix to v4

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.8.5"
+version = "0.8.6"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 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.8.5", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.8.5", path = "thoth-api-server" }
-thoth-app-server = { version = "0.8.5", path = "thoth-app-server" }
-thoth-errors = { version = "0.8.5", path = "thoth-errors" }
-thoth-export-server = { version = "0.8.5", path = "thoth-export-server" }
+thoth-api = { version = "0.8.6", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "0.8.6", path = "thoth-api-server" }
+thoth-app-server = { version = "0.8.6", path = "thoth-app-server" }
+thoth-errors = { version = "0.8.6", path = "thoth-errors" }
+thoth-export-server = { version = "0.8.6", path = "thoth-export-server" }
 clap = "2.33.3"
 dialoguer = "0.7.1"
 dotenv = "0.9.0"

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://www.openbookpublishers.com/shopimages/thoth-logo.png" height="400" />
+  <img src="https://cdn.openbookpublishers.com/thoth_logo_1141bc9a6b.png" height="400" />
 
   <h1>Thoth</h1>
 

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.8.5"
+version = "0.8.6"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 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.8.5", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.8.5", path = "../thoth-errors" }
+thoth-api = { version = "0.8.6", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.8.6", path = "../thoth-errors" }
 actix-web = "4.0.1"
 actix-cors = "0.6.0"
 actix-identity = "0.4.0"

diff --git a/thoth-api-server/README.md b/thoth-api-server/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://www.openbookpublishers.com/shopimages/thoth-logo.png" height="400" />
+  <img src="https://cdn.openbookpublishers.com/thoth_logo_1141bc9a6b.png" height="400" />
 
   <h1>Thoth Client</h1>
 

diff --git a/thoth-api/Cargo.toml b/thoth-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.8.5"
+version = "0.8.6"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 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.8.5", path = "../thoth-errors" }
+thoth-errors = { version = "0.8.6", path = "../thoth-errors" }
 actix-web = { version = "4.0.1", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"

diff --git a/thoth-api/README.md b/thoth-api/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://www.openbookpublishers.com/shopimages/thoth-logo.png" height="400" />
+  <img src="https://cdn.openbookpublishers.com/thoth_logo_1141bc9a6b.png" height="400" />
 
   <h1>Thoth API</h1>
 

diff --git a/thoth-api/src/model/mod.rs b/thoth-api/src/model/mod.rs
@@ -384,7 +384,7 @@ where
 #[macro_export]
 macro_rules! crud_methods {
     ($table_dsl:expr, $entity_dsl:expr) => {
-        fn from_id(db: &crate::db::PgPool, entity_id: &Uuid) -> ThothResult<Self> {
+        fn from_id(db: &$crate::db::PgPool, entity_id: &Uuid) -> ThothResult<Self> {
             use diesel::{QueryDsl, RunQueryDsl};
 
             let connection = db.get().unwrap();
@@ -394,7 +394,7 @@ macro_rules! crud_methods {
             }
         }
 
-        fn create(db: &crate::db::PgPool, data: &Self::NewEntity) -> ThothResult<Self> {
+        fn create(db: &$crate::db::PgPool, data: &Self::NewEntity) -> ThothResult<Self> {
             use diesel::RunQueryDsl;
 
             let connection = db.get().unwrap();
@@ -411,7 +411,7 @@ macro_rules! crud_methods {
         /// history entity record.
         fn update(
             &self,
-            db: &crate::db::PgPool,
+            db: &$crate::db::PgPool,
             data: &Self::PatchEntity,
             account_id: &Uuid,
         ) -> ThothResult<Self> {
@@ -432,7 +432,7 @@ macro_rules! crud_methods {
             })
         }
 
-        fn delete(self, db: &crate::db::PgPool) -> ThothResult<Self> {
+        fn delete(self, db: &$crate::db::PgPool) -> ThothResult<Self> {
             use diesel::{QueryDsl, RunQueryDsl};
 
             let connection = db.get().unwrap();

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.8.5"
+version = "0.8.6"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"

diff --git a/thoth-app-server/README.md b/thoth-app-server/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://www.openbookpublishers.com/shopimages/thoth-logo.png" height="400" />
+  <img src="https://cdn.openbookpublishers.com/thoth_logo_1141bc9a6b.png" height="400" />
 
   <h1>Thoth Client</h1>
 

diff --git a/thoth-app/Cargo.toml b/thoth-app/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app"
-version = "0.8.5"
+version = "0.8.6"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -33,5 +33,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.8.5", path = "../thoth-api"  }
-thoth-errors = { version = "0.8.5", path = "../thoth-errors" }
+thoth-api = { version = "0.8.6", path = "../thoth-api"  }
+thoth-errors = { version = "0.8.6", path = "../thoth-errors" }
diff --git a/thoth-app/README.md b/thoth-app/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://www.openbookpublishers.com/shopimages/thoth-logo.png" height="400" />
+  <img src="https://cdn.openbookpublishers.com/thoth_logo_1141bc9a6b.png" height="400" />
 
   <h1>Thoth APP</h1>
 

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.8.5",
+  "version": "0.8.6",
   "icons": [
       {
         "src": "\/android-icon-36x36.png",

diff --git a/thoth-app/src/component/mod.rs b/thoth-app/src/component/mod.rs
@@ -1,8 +1,8 @@
 #[macro_export]
 macro_rules! pagination_helpers {
     ($component:ident, $pagination_text:ident, $search_text:ident) => {
-        use crate::string::$pagination_text;
-        use crate::string::$search_text;
+        use $crate::string::$pagination_text;
+        use $crate::string::$search_text;
 
         impl $component {
             fn search_text(&self) -> String {
@@ -36,11 +36,11 @@ macro_rules! pagination_helpers {
                         <a class="pagination-previous"
                             onclick=self.link.callback(|_| Msg::PreviousPage)
                             disabled=self.is_previous_disabled()
-                        >{ crate::string::PREVIOUS_PAGE_BUTTON }</a>
+                        >{ $crate::string::PREVIOUS_PAGE_BUTTON }</a>
                         <a class="pagination-next"
                             onclick=self.link.callback(|_| Msg::NextPage)
                             disabled=self.is_next_disabled()
-                        >{ crate::string::NEXT_PAGE_BUTTON }</a>
+                        >{ $crate::string::NEXT_PAGE_BUTTON }</a>
                         <div class="pagination-list">
                             <div class="field" style="width: 80%">
                                 <p class="control is-expanded has-icons-left">
@@ -102,10 +102,10 @@ macro_rules! pagination_component {
         use yewtil::future::LinkFuture;
         use yewtil::NeqAssign;
 
-        use crate::component::utils::Loader;
-        use crate::component::utils::Reloader;
-        use crate::models::{EditRoute, CreateRoute, MetadataTable};
-        use crate::route::AppRoute;
+        use $crate::component::utils::Loader;
+        use $crate::component::utils::Reloader;
+        use $crate::models::{EditRoute, CreateRoute, MetadataTable};
+        use $crate::route::AppRoute;
 
         pub struct $component {
             limit: i32,

diff --git a/thoth-app/src/models/mod.rs b/thoth-app/src/models/mod.rs
@@ -16,7 +16,7 @@ macro_rules! graphql_query_builder {
         use yewtil::fetch::Json;
         use yewtil::fetch::MethodBody;
 
-        use crate::THOTH_GRAPHQL_API;
+        use $crate::THOTH_GRAPHQL_API;
 
         pub type $fetch = Fetch<$request, $response_body>;
         pub type $fetch_action = FetchAction<$response_body>;
@@ -51,7 +51,7 @@ macro_rules! graphql_query_builder {
             }
 
             fn headers(&self) -> Vec<(String, String)> {
-                use crate::service::account::AccountService;
+                use $crate::service::account::AccountService;
 
                 let account_service = AccountService::new();
                 let json = ("Content-Type".into(), "application/json".into());

diff --git a/thoth-app/src/models/work/mod.rs b/thoth-app/src/models/work/mod.rs
@@ -122,6 +122,7 @@ pub trait DisplayWork {
     fn onix_oapen_endpoint(&self) -> String;
     fn onix_jstor_endpoint(&self) -> String;
     fn onix_google_books_endpoint(&self) -> String;
+    fn onix_overdrive_endpoint(&self) -> String;
     fn onix_ebsco_host_endpoint(&self) -> String;
     fn csv_endpoint(&self) -> String;
     fn kbart_endpoint(&self) -> String;
@@ -162,6 +163,13 @@ impl DisplayWork for WorkWithRelations {
         )
     }
 
+    fn onix_overdrive_endpoint(&self) -> String {
+        format!(
+            "{}/specifications/onix_3.0::overdrive/work/{}",
+            THOTH_EXPORT_API, &self.work_id
+        )
+    }
+
     fn onix_ebsco_host_endpoint(&self) -> String {
         format!(
             "{}/specifications/onix_2.1::ebsco_host/work/{}",
@@ -410,6 +418,12 @@ impl DisplayWork for WorkWithRelations {
                                             >
                                             {"ONIX 3.0 (Google Books)"}
                                             </a>
+                                            <a
+                                                href={self.onix_overdrive_endpoint()}
+                                                class="dropdown-item"
+                                            >
+                                            {"ONIX 3.0 (OverDrive)"}
+                                            </a>
                                             <a
                                                 href={self.onix_ebsco_host_endpoint()}
                                                 class="dropdown-item"

diff --git a/thoth-client/Cargo.toml b/thoth-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-client"
-version = "0.8.5"
+version = "0.8.6"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 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.8.5", path = "../thoth-api" }
-thoth-errors = {version = "0.8.5", path = "../thoth-errors" }
+thoth-api = {version = "0.8.6", path = "../thoth-api" }
+thoth-errors = {version = "0.8.6", path = "../thoth-errors" }
 graphql_client = "0.9.0"
 chrono = { version = "0.4", features = ["serde"] }
 reqwest = { version = "0.11", features = ["json"] }

diff --git a/thoth-client/README.md b/thoth-client/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://www.openbookpublishers.com/shopimages/thoth-logo.png" height="400" />
+  <img src="https://cdn.openbookpublishers.com/thoth_logo_1141bc9a6b.png" height="400" />
 
   <h1>Thoth Client</h1>
 

diff --git a/thoth-errors/Cargo.toml b/thoth-errors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-errors"
-version = "0.8.5"
+version = "0.8.6"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"

diff --git a/thoth-errors/README.md b/thoth-errors/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://www.openbookpublishers.com/shopimages/thoth-logo.png" height="400" />
+  <img src="https://cdn.openbookpublishers.com/thoth_logo_1141bc9a6b.png" height="400" />
 
   <h1>Thoth Errors</h1>