Skip to content

Commit cdb77bc

Browse files
ja573ja573
committed
Merge branch 'release/v0.2.5'
2 parents e86dbc8 + 921c68b commit cdb77bc

8 files changed

Lines changed: 63 additions & 24 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to thoth will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [[0.2.5]](https://github.com/thoth-pub/thoth/releases/tag/v0.2.5) - 2020-11-13
8+
### Added
9+
- New BISAC codes
10+
711
## [[0.2.4]](https://github.com/thoth-pub/thoth/releases/tag/v0.2.4) - 2020-11-10
812
### Added
913
- Implemented pricing CRUD in APP

‎Cargo.lock‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth"
3-
version = "0.2.4"
3+
version = "0.2.5"
44
authors = ["Javier Arias <javi@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -16,8 +16,8 @@ maintenance = { status = "actively-developed" }
1616
members = ["thoth-api", "thoth-app", "thoth-client"]
1717

1818
[dependencies]
19-
thoth-api = {version = "0.2.4", path = "thoth-api", features = ["backend"] }
20-
thoth-client = {version = "0.2.4", path = "thoth-client" }
19+
thoth-api = {version = "0.2.5", path = "thoth-api", features = ["backend"] }
20+
thoth-client = {version = "0.2.5", path = "thoth-client" }
2121
actix-http = "1.0.1"
2222
actix-rt = "1.0.0"
2323
actix-web = "3.0.0"

‎thoth-api/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api"
3-
version = "0.2.4"
3+
version = "0.2.5"
44
authors = ["Javier Arias <javi@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"

‎thoth-api/src/subject/model.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11190,7 +11190,7 @@ static BISAC_CODES: Map<&'static str, &'static str> = phf_map! {
1119011190
"SOC026010" => "Social Science / Sociology / Marriage & Family",
1119111191
"SOC026020" => "Social Science / Sociology / Rural",
1119211192
"SOC026030" => "Social Science / Sociology / Urban",
11193-
"SOC026040" => "SOCIAL SCIENCE / Sociology / Social Theory",
11193+
"SOC026040" => "Social Science / Sociology / Social Theory",
1119411194
"SOC027000" => "Social Science / Statistics",
1119511195
"SOC028000" => "Social Science / Women's Studies",
1119611196
"SOC029000" => "Social Science / People with Disabilities",
@@ -11227,6 +11227,10 @@ static BISAC_CODES: Map<&'static str, &'static str> = phf_map! {
1122711227
"SOC060000" => "Social Science / Sexual Abuse & Harassment",
1122811228
"SOC061000" => "Social Science / Body Language & Nonverbal Communication",
1122911229
"SOC062000" => "Social Science / Indigenous Studies",
11230+
"SOC063000" => "Social Science / Privacy & Surveillance",
11231+
"SOC064000" => "Social Science / LGBT Studies / General",
11232+
"SOC064010" => "Social Science / LGBT Studies / Bisexual Studies",
11233+
"SOC064020" => "Social Science / LGBT Studies / Transgender Studies",
1123011234
"SPO000000" => "Sports & Recreation / General",
1123111235
"SPO001000" => "Sports & Recreation / Air Sports",
1123211236
"SPO002000" => "Sports & Recreation / Archery",

‎thoth-app/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app"
3-
version = "0.2.4"
3+
version = "0.2.5"
44
authors = ["Javier Arias <javi@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -30,4 +30,4 @@ wasm-logger = "0.2.0"
3030
stdweb = "0.4.20"
3131
serde = { version = "1.0.115", features = ["derive"] }
3232
url = "2.1.1"
33-
thoth-api = { version = "0.2.4", path = "../thoth-api" }
33+
thoth-api = { version = "0.2.5", path = "../thoth-api" }

‎thoth-app/src/models/work/mod.rs‎

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -312,33 +312,64 @@ impl FromStr for License {
312312
| "http://creativecommons.org/licenses/by/2.0/"
313313
| "http://creativecommons.org/licenses/by/2.5/"
314314
| "http://creativecommons.org/licenses/by/3.0/"
315-
| "http://creativecommons.org/licenses/by/4.0/" => License::By,
315+
| "http://creativecommons.org/licenses/by/4.0/"
316+
| "https://creativecommons.org/licenses/by/1.0/"
317+
| "https://creativecommons.org/licenses/by/2.0/"
318+
| "https://creativecommons.org/licenses/by/2.5/"
319+
| "https://creativecommons.org/licenses/by/3.0/"
320+
| "https://creativecommons.org/licenses/by/4.0/" => License::By,
316321
"http://creativecommons.org/licenses/by-sa/1.0/"
317322
| "http://creativecommons.org/licenses/by-sa/2.0/"
318323
| "http://creativecommons.org/licenses/by-sa/2.5/"
319324
| "http://creativecommons.org/licenses/by-sa/3.0/"
320-
| "http://creativecommons.org/licenses/by-sa/4.0/" => License::BySa,
325+
| "http://creativecommons.org/licenses/by-sa/4.0/"
326+
| "https://creativecommons.org/licenses/by-sa/1.0/"
327+
| "https://creativecommons.org/licenses/by-sa/2.0/"
328+
| "https://creativecommons.org/licenses/by-sa/2.5/"
329+
| "https://creativecommons.org/licenses/by-sa/3.0/"
330+
| "https://creativecommons.org/licenses/by-sa/4.0/" => License::BySa,
321331
"http://creativecommons.org/licenses/by-nd/1.0/"
322332
| "http://creativecommons.org/licenses/by-nd/2.0/"
323333
| "http://creativecommons.org/licenses/by-nd/2.5/"
324334
| "http://creativecommons.org/licenses/by-nd/3.0/"
325-
| "http://creativecommons.org/licenses/by-nd/4.0/" => License::ByNd,
335+
| "http://creativecommons.org/licenses/by-nd/4.0/"
336+
| "https://creativecommons.org/licenses/by-nd/1.0/"
337+
| "https://creativecommons.org/licenses/by-nd/2.0/"
338+
| "https://creativecommons.org/licenses/by-nd/2.5/"
339+
| "https://creativecommons.org/licenses/by-nd/3.0/"
340+
| "https://creativecommons.org/licenses/by-nd/4.0/" => License::ByNd,
326341
"http://creativecommons.org/licenses/by-nc/1.0/"
327342
| "http://creativecommons.org/licenses/by-nc/2.0/"
328343
| "http://creativecommons.org/licenses/by-nc/2.5/"
329344
| "http://creativecommons.org/licenses/by-nc/3.0/"
330-
| "http://creativecommons.org/licenses/by-nc/4.0/" => License::ByNc,
345+
| "http://creativecommons.org/licenses/by-nc/4.0/"
346+
| "https://creativecommons.org/licenses/by-nc/1.0/"
347+
| "https://creativecommons.org/licenses/by-nc/2.0/"
348+
| "https://creativecommons.org/licenses/by-nc/2.5/"
349+
| "https://creativecommons.org/licenses/by-nc/3.0/"
350+
| "https://creativecommons.org/licenses/by-nc/4.0/" => License::ByNc,
331351
"http://creativecommons.org/licenses/by-nc-sa/1.0/"
332352
| "http://creativecommons.org/licenses/by-nc-sa/2.0/"
333353
| "http://creativecommons.org/licenses/by-nc-sa/2.5/"
334354
| "http://creativecommons.org/licenses/by-nc-sa/3.0/"
335-
| "http://creativecommons.org/licenses/by-nc-sa/4.0/" => License::ByNcSa,
355+
| "http://creativecommons.org/licenses/by-nc-sa/4.0/"
356+
| "https://creativecommons.org/licenses/by-nc-sa/1.0/"
357+
| "https://creativecommons.org/licenses/by-nc-sa/2.0/"
358+
| "https://creativecommons.org/licenses/by-nc-sa/2.5/"
359+
| "https://creativecommons.org/licenses/by-nc-sa/3.0/"
360+
| "https://creativecommons.org/licenses/by-nc-sa/4.0/" => License::ByNcSa,
336361
"http://creativecommons.org/licenses/by-nc-nd/1.0/"
337362
| "http://creativecommons.org/licenses/by-nc-nd/2.0/"
338363
| "http://creativecommons.org/licenses/by-nc-nd/2.5/"
339364
| "http://creativecommons.org/licenses/by-nc-nd/3.0/"
340-
| "http://creativecommons.org/licenses/by-nc-nd/4.0/" => License::ByNcNd,
341-
"https://creativecommons.org/publicdomain/zero/1.0/" => License::Zero,
365+
| "http://creativecommons.org/licenses/by-nc-nd/4.0/"
366+
| "https://creativecommons.org/licenses/by-nc-nd/1.0/"
367+
| "https://creativecommons.org/licenses/by-nc-nd/2.0/"
368+
| "https://creativecommons.org/licenses/by-nc-nd/2.5/"
369+
| "https://creativecommons.org/licenses/by-nc-nd/3.0/"
370+
| "https://creativecommons.org/licenses/by-nc-nd/4.0/" => License::ByNcNd,
371+
"http://creativecommons.org/publicdomain/zero/1.0/"
372+
| "https://creativecommons.org/publicdomain/zero/1.0/" => License::Zero,
342373
_other => License::Undefined,
343374
};
344375
Ok(license)

‎thoth-client/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-client"
3-
version = "0.2.4"
3+
version = "0.2.5"
44
authors = ["Javier Arias <javi@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,7 +9,7 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = {version = "0.2.4", path = "../thoth-api" }
12+
thoth-api = {version = "0.2.5", path = "../thoth-api" }
1313
graphql_client = "0.9.0"
1414
chrono = { version = "0.4", features = ["serde"] }
1515
reqwest = { version = "0.10", features = ["json"] }

0 commit comments

Comments
 (0)