Skip to content

Commit 0e34566

Browse files
committed
Merge branch 'release/v0.2.6'
2 parents cdb77bc + 5a49fd2 commit 0e34566

28 files changed

+5244
-3526
lines changed

.travis.yml

-6
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,3 @@ script:
2525
- cargo test --workspace --verbose
2626
- cargo clippy --all --all-targets --all-features -- -D warnings
2727
- cargo fmt --all -- --check
28-
deploy:
29-
provider: cargo
30-
token:
31-
secure: eMaJ0DbEt7H8xn3738DL3h+rE8FfN3OG5dIABn9pgv+VhrgDgqBI8OQ4l7PCNaq9x+imYCxdGtknkJSWTyWM/X1QBT3M3l1thmMuEpTa9vAMxPCpMZjr9gOgLjtysKLR0ALrUdsCtHKv61CkUyYtP5q5KJaeWZTsMrj3iyL0uWkw2H27hp2sjY0JIkFhLxQAz6ad9Hfg+k2Pq9NgACBUQbOKYj+zqgrfQXFhGXYdBmUh78qNC0aYJSFjSUK3b9y8PFY62gEc2sZ6orrTn4/uUEp5lknw5ZbMMMq8QsntwpfA8F8HYhTf99gAH9uj0KJlp5fO0MhkM3jNSXSavioLEApE1PjBTWtOPEQ4SIHMbvXIVcJzpA4iW0XErbKzXpMoyPV9iW1Dyk42BiUgHOuh1mcfne/zrnTJEbzIoxMcMZRz1uZO0/oONVKiklT3UKbU7yxhR6K8bp+NLZWwh8YDk8PwxkhSIBTKbEbT5FTgq3wofVGw8svVJ9Q9NU/q+wxAiJFW6id187X3IsGi38NDZDCQjTMsSwi+j0GYsCikH/aqGdhuAjPWyOxu0biyUNp5xdupctF2gk6L+UZFZnfOPly6rX/jj5X5or2hlUDphDfPocKs8eqa/B6lhCfUdX0LYCiwTnsg0TlNUmf5S2RnrMvfpM7xKhB/t3MgdvNoOzE=
32-
on:
33-
tags: true

CHANGELOG.md

+4
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.6]](https://github.com/thoth-pub/thoth/releases/tag/v0.2.6) - 2020-11-13
8+
### Changed
9+
- Fix pricing functionality ommitted in previous release
10+
711
## [[0.2.5]](https://github.com/thoth-pub/thoth/releases/tag/v0.2.5) - 2020-11-13
812
### Added
913
- New BISAC codes

Cargo.lock

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

Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth"
3-
version = "0.2.5"
3+
version = "0.2.6"
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.5", path = "thoth-api", features = ["backend"] }
20-
thoth-client = {version = "0.2.5", path = "thoth-client" }
19+
thoth-api = {version = "0.2.6", path = "thoth-api", features = ["backend"] }
20+
thoth-client = {version = "0.2.6", 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

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

thoth-api/src/errors.rs

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ pub type Result<T> = std::result::Result<T, failure::Error>;
1010
pub enum ThothError {
1111
#[fail(display = "{} is not a valid {} code", _0, _1)]
1212
InvalidSubjectCode(String, String),
13+
#[fail(display = "{} is not a valid Currency Code", _0)]
14+
InvalidCurrencyCode(String),
1315
#[fail(display = "{} is not a valid Language Code", _0)]
1416
InvalidLanguageCode(String),
1517
#[fail(display = "{} is not a valid Work Type", _0)]

thoth-api/src/graphql/model.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1838,6 +1838,10 @@ impl Price {
18381838
self.price_id
18391839
}
18401840

1841+
pub fn publication_id(&self) -> Uuid {
1842+
self.publication_id
1843+
}
1844+
18411845
pub fn currency_code(&self) -> &CurrencyCode {
18421846
&self.currency_code
18431847
}

0 commit comments

Comments
 (0)