Merge branch 'release/v0.4.7'

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to thoth will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [[0.4.7]](https://github.com/thoth-pub/thoth/releases/tag/v0.4.7) - 2021-10-04
+### Added
+  - [#43](https://github.com/thoth-pub/thoth/issues/43), [#49](https://github.com/thoth-pub/thoth/issues/49) - Implement EBSCO Host's ONIX 2.1 specification
+  - [#44](https://github.com/thoth-pub/thoth/issues/44) - Implement JSTOR's ONIX 3.0 specification
+  - [#253](https://github.com/thoth-pub/thoth/issues/253) - Implement Project MUSE ONIX specification tests
+
+### Changed
+  - [#242](https://github.com/thoth-pub/thoth/issues/242) - Move API models to object-specific subdirectories
+  - [#274](https://github.com/thoth-pub/thoth/issues/274) - Add width/height units to CSV specification
+  - [#263](https://github.com/thoth-pub/thoth/issues/263) - Add `Doi`, `Isbn` and `Orcid` types to client schema
+
 ## [[0.4.6]](https://github.com/thoth-pub/thoth/releases/tag/v0.4.6) - 2021-09-02
 ### Added
   - [#88](https://github.com/thoth-pub/thoth/issues/88) - Implement KBART specification
@@ -15,7 +26,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
   - [#271](https://github.com/thoth-pub/thoth/issues/271) - Make filter parameter optional in `subjectCount`
 
-
 ## [[0.4.5]](https://github.com/thoth-pub/thoth/releases/tag/v0.4.5) - 2021-08-12
 ### Added
   - [#259](https://github.com/thoth-pub/thoth/issues/259) - Units selection dropdown to Work and NewWork pages, which updates the Width/Height display on change

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "0.4.6"
+version = "0.4.7"
 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.4.6", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.4.6", path = "thoth-api-server" }
-thoth-app-server = { version = "0.4.6", path = "thoth-app-server" }
-thoth-errors = { version = "0.4.6", path = "thoth-errors" }
-thoth-export-server = { version = "0.4.6", path = "thoth-export-server" }
+thoth-api = { version = "0.4.7", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "0.4.7", path = "thoth-api-server" }
+thoth-app-server = { version = "0.4.7", path = "thoth-app-server" }
+thoth-errors = { version = "0.4.7", path = "thoth-errors" }
+thoth-export-server = { version = "0.4.7", path = "thoth-export-server" }
 clap = "2.33.3"
 dialoguer = "0.7.1"
 dotenv = "0.9.0"

diesel.toml

@@ -5,13 +5,13 @@
 file = "src/schema.rs"
 import_types = [
   "diesel::sql_types::*",
-  "crate::contribution::model::Contribution_type",
-  "crate::work::model::Work_type",
-  "crate::work::model::Work_status",
-  "crate::publication::model::Publication_type",
-  "crate::language::model::Language_relation",
-  "crate::language::model::Language_code",
-  "crate::series::model::Series_type",
-  "crate::price::model::Currency_code",
-  "crate::subject::model::Subject_type"
+  "crate::model::contribution::Contribution_type",
+  "crate::model::work::Work_type",
+  "crate::model::work::Work_status",
+  "crate::model::publication::Publication_type",
+  "crate::model::language::Language_relation",
+  "crate::model::language::Language_code",
+  "crate::model::series::Series_type",
+  "crate::model::price::Currency_code",
+  "crate::model::subject::Subject_type"
 ]

thoth-api-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "0.4.6"
+version = "0.4.7"
 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.4.6", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.4.6", path = "../thoth-errors" }
+thoth-api = { version = "0.4.7", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.4.7", path = "../thoth-errors" }
 actix-web = "3.3.2"
 actix-cors = "0.5.4"
 actix-identity = "0.3.1"

thoth-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.4.6"
+version = "0.4.7"
 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.4.6", path = "../thoth-errors" }
+thoth-errors = { version = "0.4.7", path = "../thoth-errors" }
 actix-web = { version = "3.3.2", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"

thoth-api/src/account/service.rs

@@ -10,7 +10,7 @@ use crate::account::model::NewPublisherAccount;
 use crate::account::model::PublisherAccount;
 use crate::account::util::verify;
 use crate::db::PgPool;
-use crate::publisher::model::Publisher;
+use crate::model::publisher::Publisher;
 use thoth_errors::{ThothError, ThothResult};
 
 pub fn login(user_email: &str, user_password: &str, pool: &PgPool) -> ThothResult<Account> {

thoth-api/src/graphql/model.rs

@@ -6,27 +6,27 @@ use uuid::Uuid;
 
 use crate::account::model::AccountAccess;
 use crate::account::model::DecodedToken;
-use crate::contribution::model::*;
-use crate::contributor::model::*;
 use crate::db::PgPool;
-use crate::funder::model::*;
-use crate::funding::model::*;
-use crate::imprint::model::*;
-use crate::issue::model::*;
-use crate::language::model::*;
+use crate::model::contribution::*;
+use crate::model::contributor::*;
+use crate::model::funder::*;
+use crate::model::funding::*;
+use crate::model::imprint::*;
+use crate::model::issue::*;
+use crate::model::language::*;
+use crate::model::price::*;
+use crate::model::publication::*;
+use crate::model::publisher::*;
+use crate::model::series::*;
+use crate::model::subject::*;
+use crate::model::work::*;
 use crate::model::Convert;
 use crate::model::Crud;
 use crate::model::Doi;
 use crate::model::Isbn;
 use crate::model::LengthUnit;
 use crate::model::Orcid;
 use crate::model::Timestamp;
-use crate::price::model::*;
-use crate::publication::model::*;
-use crate::publisher::model::*;
-use crate::series::model::*;
-use crate::subject::model::*;
-use crate::work::model::*;
 use thoth_errors::{ThothError, ThothResult};
 
 use super::utils::Direction;

thoth-api/src/lib.rs

@@ -14,26 +14,13 @@ extern crate dotenv;
 extern crate juniper;
 
 pub mod account;
-pub mod contribution;
-pub mod contributor;
 #[cfg(feature = "backend")]
 pub mod db;
-pub mod funder;
-pub mod funding;
 pub mod graphql;
-pub mod imprint;
-pub mod issue;
-pub mod language;
 #[macro_use]
 pub mod model;
-pub mod price;
-pub mod publication;
-pub mod publisher;
 #[cfg(feature = "backend")]
 mod schema;
-pub mod series;
-pub mod subject;
-pub mod work;
 
 macro_rules! apis {
     ($($name:ident => $content:expr,)*) => (

thoth-api/src/contribution/crud.rs → thoth-api/src/model/contribution/crud.rs

@@ -1,4 +1,4 @@
-use super::model::{
+use super::{
     Contribution, ContributionField, ContributionHistory, ContributionType, NewContribution,
     NewContributionHistory, PatchContribution,
 };
@@ -159,7 +159,7 @@ impl Crud for Contribution {
     }
 
     fn publisher_id(&self, db: &crate::db::PgPool) -> ThothResult<Uuid> {
-        crate::work::model::Work::from_id(db, &self.work_id)?.publisher_id(db)
+        crate::model::work::Work::from_id(db, &self.work_id)?.publisher_id(db)
     }
 
     crud_methods!(contribution::table, contribution::dsl::contribution);

thoth-api/src/contribution/model.rs → thoth-api/src/model/contribution/mod.rs

@@ -3,12 +3,12 @@ use strum::Display;
 use strum::EnumString;
 use uuid::Uuid;
 
+use crate::model::work::WorkWithRelations;
 use crate::model::Timestamp;
 #[cfg(feature = "backend")]
 use crate::schema::contribution;
 #[cfg(feature = "backend")]
 use crate::schema::contribution_history;
-use crate::work::model::WorkWithRelations;
 
 #[cfg_attr(feature = "backend", derive(DbEnum, juniper::GraphQLEnum))]
 #[cfg_attr(feature = "backend", DieselType = "Contribution_type")]
@@ -216,3 +216,6 @@ fn test_contributiontype_fromstr() {
     assert!(ContributionType::from_str("Juggler").is_err());
     assert!(ContributionType::from_str("Supervisor").is_err());
 }
+
+#[cfg(feature = "backend")]
+pub mod crud;

thoth-api/src/contributor/crud.rs → thoth-api/src/model/contributor/crud.rs

@@ -1,4 +1,4 @@
-use super::model::{
+use super::{
     Contributor, ContributorField, ContributorHistory, ContributorOrderBy, NewContributor,
     NewContributorHistory, PatchContributor,
 };

thoth-api/src/contributor/model.rs → thoth-api/src/model/contributor/mod.rs

@@ -172,3 +172,6 @@ fn test_contributorfield_fromstr() {
     assert!(ContributorField::from_str("Biography").is_err());
     assert!(ContributorField::from_str("Institution").is_err());
 }
+
+#[cfg(feature = "backend")]
+pub mod crud;

thoth-api/src/funder/crud.rs → thoth-api/src/model/funder/crud.rs

@@ -1,4 +1,4 @@
-use super::model::{
+use super::{
     Funder, FunderField, FunderHistory, FunderOrderBy, NewFunder, NewFunderHistory, PatchFunder,
 };
 use crate::graphql::utils::Direction;

thoth-api/src/funder/model.rs → thoth-api/src/model/funder/mod.rs

@@ -146,3 +146,6 @@ fn test_funderfield_fromstr() {
     assert!(FunderField::from_str("Website").is_err());
     assert!(FunderField::from_str("Fundings").is_err());
 }
+
+#[cfg(feature = "backend")]
+pub mod crud;

thoth-api/src/funding/crud.rs → thoth-api/src/model/funding/crud.rs

@@ -1,6 +1,4 @@
-use super::model::{
-    Funding, FundingField, FundingHistory, NewFunding, NewFundingHistory, PatchFunding,
-};
+use super::{Funding, FundingField, FundingHistory, NewFunding, NewFundingHistory, PatchFunding};
 use crate::graphql::model::FundingOrderBy;
 use crate::graphql::utils::Direction;
 use crate::model::{Crud, DbInsert, HistoryEntry};
@@ -136,7 +134,7 @@ impl Crud for Funding {
     }
 
     fn publisher_id(&self, db: &crate::db::PgPool) -> ThothResult<Uuid> {
-        crate::work::model::Work::from_id(db, &self.work_id)?.publisher_id(db)
+        crate::model::work::Work::from_id(db, &self.work_id)?.publisher_id(db)
     }
 
     crud_methods!(funding::table, funding::dsl::funding);

thoth-api/src/funding/model.rs → thoth-api/src/model/funding/mod.rs

@@ -1,13 +1,13 @@
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
-use crate::funder::model::Funder;
+use crate::model::funder::Funder;
+use crate::model::work::WorkWithRelations;
 use crate::model::Timestamp;
 #[cfg(feature = "backend")]
 use crate::schema::funding;
 #[cfg(feature = "backend")]
 use crate::schema::funding_history;
-use crate::work::model::WorkWithRelations;
 
 #[cfg_attr(
     feature = "backend",
@@ -114,3 +114,6 @@ pub struct NewFundingHistory {
     pub account_id: Uuid,
     pub data: serde_json::Value,
 }
+
+#[cfg(feature = "backend")]
+pub mod crud;

thoth-api/src/imprint/crud.rs → thoth-api/src/model/imprint/crud.rs

@@ -1,4 +1,4 @@
-use super::model::{
+use super::{
     Imprint, ImprintField, ImprintHistory, ImprintOrderBy, NewImprint, NewImprintHistory,
     PatchImprint,
 };