Skip to content

Commit a3daf14

Browse files
ja573ja573
committed
Merge branch 'release/v0.11.14'
2 parents d29813e + 4662491 commit a3daf14

File tree

16 files changed

+134
-32
lines changed

16 files changed

+134
-32
lines changed

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [[0.11.14]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.14) - 2024-01-18
10+
### Changed
11+
- [#467](https://github.com/thoth-pub/thoth/issues/467), [#403](https://github.com/thoth-pub/thoth/issues/403), [#536](https://github.com/thoth-pub/thoth/issues/536) - Expand the list of location platforms with: GoogleBooks, InternetArchive, ScienceOpen, and Scielo
12+
- [526](https://github.com/thoth-pub/thoth/issues/526) - Added Brendan to About page
13+
914
## [[0.11.13]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.13) - 2024-01-08
1015
### Changed
1116
- Upgrade rust to `1.75.0` in production and development `Dockerfile`

‎Cargo.lock

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth"
3-
version = "0.11.13"
3+
version = "0.11.14"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
1616
members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
1717

1818
[dependencies]
19-
thoth-api = { version = "0.11.13", path = "thoth-api", features = ["backend"] }
20-
thoth-api-server = { version = "0.11.13", path = "thoth-api-server" }
21-
thoth-app-server = { version = "0.11.13", path = "thoth-app-server" }
22-
thoth-errors = { version = "0.11.13", path = "thoth-errors" }
23-
thoth-export-server = { version = "0.11.13", path = "thoth-export-server" }
19+
thoth-api = { version = "0.11.14", path = "thoth-api", features = ["backend"] }
20+
thoth-api-server = { version = "0.11.14", path = "thoth-api-server" }
21+
thoth-app-server = { version = "0.11.14", path = "thoth-app-server" }
22+
thoth-errors = { version = "0.11.14", path = "thoth-errors" }
23+
thoth-export-server = { version = "0.11.14", path = "thoth-export-server" }
2424
clap = { version = "4.4.7", features = ["cargo", "env"] }
2525
dialoguer = { version = "0.11.0", features = ["password"] }
2626
dotenv = "0.15.0"

‎thoth-api-server/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api-server"
3-
version = "0.11.13"
3+
version = "0.11.14"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = { version = "0.11.13", path = "../thoth-api", features = ["backend"] }
13-
thoth-errors = { version = "0.11.13", path = "../thoth-errors" }
12+
thoth-api = { version = "0.11.14", path = "../thoth-api", features = ["backend"] }
13+
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
1414
actix-web = "4.4.1"
1515
actix-cors = "0.7.0"
1616
actix-identity = "0.6.0"

‎thoth-api/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api"
3-
version = "0.11.13"
3+
version = "0.11.14"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
1616
backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web"]
1717

1818
[dependencies]
19-
thoth-errors = { version = "0.11.13", path = "../thoth-errors" }
19+
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
2020
actix-web = { version = "4.4.1", optional = true }
2121
argon2rs = "0.2.5"
2222
isbn2 = "0.4.0"

‎thoth-api/migrations/v0.11.14/down.sql

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
UPDATE location SET location_platform = 'Other' WHERE location_platform IN (
2+
'Google Books',
3+
'Internet Archive',
4+
'ScienceOpen',
5+
'SciELO'
6+
);
7+
8+
-- Drop the default and unique constraint, otherwise it won't be able to cast to text
9+
ALTER TABLE location ALTER COLUMN location_platform DROP DEFAULT;
10+
DROP INDEX location_uniq_platform_idx;
11+
12+
ALTER TABLE location ALTER COLUMN location_platform TYPE text;
13+
DROP TYPE location_platform;
14+
CREATE TYPE location_platform AS ENUM (
15+
'Project MUSE',
16+
'OAPEN',
17+
'DOAB',
18+
'JSTOR',
19+
'EBSCO Host',
20+
'OCLC KB',
21+
'ProQuest KB',
22+
'ProQuest ExLibris',
23+
'EBSCO KB',
24+
'JISC KB',
25+
'Other'
26+
);
27+
ALTER TABLE location ALTER location_platform TYPE location_platform USING location_platform::location_platform;
28+
ALTER TABLE location
29+
ALTER COLUMN location_platform SET DEFAULT 'Other'::location_platform;
30+
31+
CREATE UNIQUE INDEX location_uniq_platform_idx
32+
ON location (publication_id, location_platform)
33+
WHERE NOT location_platform = 'Other'::location_platform;

‎thoth-api/migrations/v0.11.14/up.sql

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ALTER TYPE location_platform ADD VALUE 'Google Books';
2+
ALTER TYPE location_platform ADD VALUE 'Internet Archive';
3+
ALTER TYPE location_platform ADD VALUE 'ScienceOpen';
4+
ALTER TYPE location_platform ADD VALUE 'SciELO';

‎thoth-api/src/model/location/mod.rs

+35
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,18 @@ pub enum LocationPlatform {
4848
#[cfg_attr(feature = "backend", db_rename = "JISC KB")]
4949
#[strum(serialize = "JISC KB")]
5050
JiscKb,
51+
#[cfg_attr(feature = "backend", db_rename = "Google Books")]
52+
#[strum(serialize = "Google Books")]
53+
GoogleBooks,
54+
#[cfg_attr(feature = "backend", db_rename = "Internet Archive")]
55+
#[strum(serialize = "Internet Archive")]
56+
InternetArchive,
57+
#[cfg_attr(feature = "backend", db_rename = "ScienceOpen")]
58+
#[strum(serialize = "ScienceOpen")]
59+
ScienceOpen,
60+
#[cfg_attr(feature = "backend", db_rename = "SciELO")]
61+
#[strum(serialize = "SciELO")]
62+
Scielo,
5163
#[cfg_attr(feature = "backend", db_rename = "Other")]
5264
#[default]
5365
Other,
@@ -161,6 +173,13 @@ fn test_locationplatform_display() {
161173
);
162174
assert_eq!(format!("{}", LocationPlatform::EbscoKb), "EBSCO KB");
163175
assert_eq!(format!("{}", LocationPlatform::JiscKb), "JISC KB");
176+
assert_eq!(format!("{}", LocationPlatform::GoogleBooks), "Google Books");
177+
assert_eq!(
178+
format!("{}", LocationPlatform::InternetArchive),
179+
"Internet Archive"
180+
);
181+
assert_eq!(format!("{}", LocationPlatform::ScienceOpen), "ScienceOpen");
182+
assert_eq!(format!("{}", LocationPlatform::Scielo), "SciELO");
164183
assert_eq!(format!("{}", LocationPlatform::Other), "Other");
165184
}
166185

@@ -207,6 +226,22 @@ fn test_locationplatform_fromstr() {
207226
LocationPlatform::from_str("JISC KB").unwrap(),
208227
LocationPlatform::JiscKb
209228
);
229+
assert_eq!(
230+
LocationPlatform::from_str("Google Books").unwrap(),
231+
LocationPlatform::GoogleBooks
232+
);
233+
assert_eq!(
234+
LocationPlatform::from_str("Internet Archive").unwrap(),
235+
LocationPlatform::InternetArchive
236+
);
237+
assert_eq!(
238+
LocationPlatform::from_str("ScienceOpen").unwrap(),
239+
LocationPlatform::ScienceOpen
240+
);
241+
assert_eq!(
242+
LocationPlatform::from_str("SciELO").unwrap(),
243+
LocationPlatform::Scielo
244+
);
210245
assert_eq!(
211246
LocationPlatform::from_str("Other").unwrap(),
212247
LocationPlatform::Other

‎thoth-app-server/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app-server"
3-
version = "0.11.13"
3+
version = "0.11.14"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"

‎thoth-app/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app"
3-
version = "0.11.13"
3+
version = "0.11.14"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -41,5 +41,5 @@ uuid = { version = "0.8.2", features = ["serde", "v4"] }
4141
# `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
4242
# https://docs.rs/getrandom/latest/getrandom/#webassembly-support
4343
getrandom = { version = "0.2", features = ["js"] }
44-
thoth-api = { version = "0.11.13", path = "../thoth-api" }
45-
thoth-errors = { version = "0.11.13", path = "../thoth-errors" }
44+
thoth-api = { version = "0.11.14", path = "../thoth-api" }
45+
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }

‎thoth-app/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"start_url": "/?homescreen=1",
1010
"background_color": "#ffffff",
1111
"theme_color": "#ffdd57",
12-
"version": "0.11.13",
12+
"version": "0.11.14",
1313
"icons": [
1414
{
1515
"src": "\/android-icon-36x36.png",

‎thoth-app/src/component/about.rs

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ impl Component for AboutComponent {
3434
<li>{ "Toby Steiner (COO)" }</li>
3535
<li>{ "Javier Arias (CTO)" }</li>
3636
<li>{ "Ross Higman (Software Engineer)" }</li>
37+
<li>{ "Brendan O'Connell (Software Engineer)" }</li>
3738
<li>{ "Hannah Hillen (Metadata & Publisher Outreach Specialist)" }</li>
3839
</ul>
3940
<p class="title is-5">{ "Consultants" }</p>

‎thoth-client/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-client"
3-
version = "0.11.13"
3+
version = "0.11.14"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = {version = "0.11.13", path = "../thoth-api" }
13-
thoth-errors = {version = "0.11.13", path = "../thoth-errors" }
12+
thoth-api = {version = "0.11.14", path = "../thoth-api" }
13+
thoth-errors = {version = "0.11.14", path = "../thoth-errors" }
1414
graphql_client = "0.13.0"
1515
chrono = { version = "0.4.31", features = ["serde"] }
1616
reqwest = { version = "0.11", features = ["json"] }

‎thoth-client/assets/schema.json

+24
Original file line numberDiff line numberDiff line change
@@ -17502,6 +17502,30 @@
1750217502
"isDeprecated": false,
1750317503
"name": "JISC_KB"
1750417504
},
17505+
{
17506+
"deprecationReason": null,
17507+
"description": null,
17508+
"isDeprecated": false,
17509+
"name": "GOOGLE_BOOKS"
17510+
},
17511+
{
17512+
"deprecationReason": null,
17513+
"description": null,
17514+
"isDeprecated": false,
17515+
"name": "INTERNET_ARCHIVE"
17516+
},
17517+
{
17518+
"deprecationReason": null,
17519+
"description": null,
17520+
"isDeprecated": false,
17521+
"name": "SCIENCE_OPEN"
17522+
},
17523+
{
17524+
"deprecationReason": null,
17525+
"description": null,
17526+
"isDeprecated": false,
17527+
"name": "SCIELO"
17528+
},
1750517529
{
1750617530
"deprecationReason": null,
1750717531
"description": null,

‎thoth-errors/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-errors"
3-
version = "0.11.13"
3+
version = "0.11.14"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"

‎thoth-export-server/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-export-server"
3-
version = "0.11.13"
3+
version = "0.11.14"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,9 +9,9 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = { version = "0.11.13", path = "../thoth-api" }
13-
thoth-errors = { version = "0.11.13", path = "../thoth-errors" }
14-
thoth-client = { version = "0.11.13", path = "../thoth-client" }
12+
thoth-api = { version = "0.11.14", path = "../thoth-api" }
13+
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
14+
thoth-client = { version = "0.11.14", path = "../thoth-client" }
1515
actix-web = "4.4.1"
1616
actix-cors = "0.7.0"
1717
cc_license = "0.1.0"

0 commit comments

Comments
 (0)