diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fbc1e07..96321d28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [[0.13.3]](https://github.com/thoth-pub/thoth/releases/tag/v0.13.3) - 2024-12-02 +### Changed + - [660](https://github.com/thoth-pub/thoth/pull/660) - Upgrade rust to `1.83.0` in production `Dockerfile` + - [660](https://github.com/thoth-pub/thoth/pull/660) - Use latest tag in development `Dockerfile` + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `rustls` to v0.23.19 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `chrono` to v0.4.38 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `uuid` to v0.11.0 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `diesel` to v2.2.5 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `paperclip` to v0.9.4 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `regex` to v1.11.1 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `xml-rs` to v0.8.23 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `futures` to v0.3.31 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `web-sys` to v0.3.72 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `wasm-bindgen` to v0.2.95 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `log` to v0.4.22 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `thiserror` to v2.0.3 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `reqwest-middleware` to v0.4.0 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `reqwest-retry` to v0.7.0 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `trunk` to v0.21.4 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `actix-identity` to v0.8.0 + - [658](https://github.com/thoth-pub/thoth/pull/658) - Upgrade `actix-session` to v0.10.1 + +## Removed + - Remove redundant dependencies in thoth-app: `anyhow`, `log`, `url` + ## [[0.13.2]](https://github.com/thoth-pub/thoth/releases/tag/v0.13.2) - 2024-11-26 ### Added - [656](https://github.com/thoth-pub/thoth/pull/656) - Add database indexes to common attributes to improve performance diff --git a/Cargo.lock b/Cargo.lock index 853a8846..a4352968 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "actix-codec" @@ -27,7 +27,7 @@ checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" dependencies = [ "actix-utils", "actix-web", - "derive_more", + "derive_more 0.99.18", "futures-util", "log", "once_cell", @@ -50,7 +50,7 @@ dependencies = [ "brotli", "bytes", "bytestring", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "flate2", "futures-core", @@ -75,15 +75,15 @@ dependencies = [ [[package]] name = "actix-identity" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c99b7a5614b72a78f04aa2021e5370fc1aef2475fffeffc0c1266b99007062" +checksum = "23b8ddc6f6a8b19c4016aaa13519968da9969bc3bc1c1c883cdb0f25dd6c8cf7" dependencies = [ "actix-service", "actix-session", "actix-utils", "actix-web", - "derive_more", + "derive_more 1.0.0", "futures-core", "serde", "tracing", @@ -96,7 +96,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -154,15 +154,16 @@ dependencies = [ [[package]] name = "actix-session" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b671404ec72194d8af58c2bdaf51e3c477a0595056bd5010148405870dda8df2" +checksum = "efe6976a74f34f1b6d07a6c05aadc0ed0359304a7781c367fa5b4029418db08f" dependencies = [ "actix-service", "actix-utils", "actix-web", "anyhow", - "derive_more", + "derive_more 1.0.0", + "rand", "serde", "serde_json", "tracing", @@ -198,7 +199,7 @@ dependencies = [ "bytestring", "cfg-if", "cookie", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "futures-core", "futures-util", @@ -229,24 +230,18 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -342,9 +337,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -357,43 +352,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "anymap" @@ -446,13 +441,13 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -470,28 +465,28 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets", ] [[package]] @@ -593,30 +588,24 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bytestring" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" +checksum = "e465647ae23b2823b0753f50decb2d5a86d2bb2cac04788fafd1f80e45378e5f" dependencies = [ "bytes", ] -[[package]] -name = "cargo-husky" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad" - [[package]] name = "cc" -version = "1.1.15" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -671,18 +660,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -692,9 +681,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "codegen" @@ -707,9 +696,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "combine" @@ -809,9 +798,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -838,9 +827,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" dependencies = [ "csv-core", "itoa", @@ -887,7 +876,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -898,7 +887,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -950,7 +939,28 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.76", + "syn 2.0.89", +] + +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "unicode-xid", ] [[package]] @@ -961,7 +971,7 @@ checksum = "65f152f4b8559c4da5d574bafc7af85454d706b4c5fe8b530d508cacbb6807ea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -973,15 +983,15 @@ dependencies = [ "console", "shell-words", "tempfile", - "thiserror", + "thiserror 1.0.69", "zeroize", ] [[package]] name = "diesel" -version = "2.2.3" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e13bab2796f412722112327f3e575601a3e9cdcbe426f0d30dbf43f3f5dc71" +checksum = "cbf9649c05e0a9dbd6d0b0b8301db5182b972d0fd02f0a7c6736cf632d7c0fd5" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -1003,7 +1013,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -1014,7 +1024,7 @@ checksum = "d5adf688c584fe33726ce0e2898f608a2a92578ac94a4a92fcecf73214fe0716" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -1027,7 +1037,7 @@ dependencies = [ "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -1047,7 +1057,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -1061,6 +1071,17 @@ dependencies = [ "subtle", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "dotenv" version = "0.15.0" @@ -1078,7 +1099,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -1095,9 +1116,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1143,18 +1164,18 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1243,7 +1264,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -1311,9 +1332,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gloo" @@ -1430,7 +1451,7 @@ dependencies = [ "js-sys", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "web-sys", ] @@ -1445,7 +1466,7 @@ dependencies = [ "js-sys", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "web-sys", ] @@ -1514,7 +1535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" dependencies = [ "combine 3.8.1", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1568,7 +1589,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.4.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -1577,9 +1598,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -1587,7 +1608,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.4.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -1602,9 +1623,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -1689,9 +1710,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1707,14 +1728,14 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body", "httparse", @@ -1760,9 +1781,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -1779,9 +1800,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1800,6 +1821,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1808,19 +1947,30 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "impl-more" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" +checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" [[package]] name = "indexmap" @@ -1835,12 +1985,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.2", "serde", ] @@ -1867,9 +2017,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is_terminal_polyfill" @@ -1899,9 +2049,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" @@ -1914,9 +2064,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1948,7 +2098,7 @@ dependencies = [ "fnv", "futures", "graphql-parser", - "indexmap 2.4.0", + "indexmap 2.6.0", "juniper_codegen", "serde", "smartstring", @@ -1965,7 +2115,7 @@ checksum = "760dbe46660494d469023d661e8d268f413b2cb68c999975dcc237407096a693" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", "url", ] @@ -1983,9 +2133,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" [[package]] name = "linux-raw-sys" @@ -1993,6 +2143,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "local-channel" version = "0.1.5" @@ -2078,15 +2234,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2178,18 +2325,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opaque-debug" @@ -2208,11 +2355,22 @@ dependencies = [ "serde_json", ] +[[package]] +name = "openapiv3-paper" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f21aa89c0b45d63c9a4976b0de5dcf4e041defc2cd9720820f0012f0046a0bc" +dependencies = [ + "indexmap 2.6.0", + "serde", + "serde_json", +] + [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -2231,7 +2389,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -2242,9 +2400,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -2254,14 +2412,14 @@ dependencies = [ [[package]] name = "paperclip" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd8369d5ed760936fdc16ccdc429b59d58faaed3ef8a212ac27b8076f855b4" +checksum = "0a5f716236005663601c6a37562df63c1ff26d8d5ed24297b60fb8c64ffae237" dependencies = [ "anyhow", "itertools", "once_cell", - "openapiv3", + "openapiv3-paper", "paperclip-actix", "paperclip-core", "paperclip-macros", @@ -2270,7 +2428,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", "url", ] @@ -2307,7 +2465,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", "uuid", ] @@ -2372,7 +2530,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.7", "smallvec", "windows-targets", ] @@ -2429,7 +2587,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -2443,9 +2601,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2455,9 +2613,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "polyval" @@ -2488,9 +2646,9 @@ dependencies = [ [[package]] name = "pq-sys" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24ff9e4cf6945c988f0db7005d87747bf72864965c3529d259ad155ac41d584" +checksum = "f6cc05d7ea95200187117196eee9edd0644424911821aeb28a18ce60ea0b8793" dependencies = [ "vcpkg", ] @@ -2538,14 +2696,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -2632,18 +2790,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2653,9 +2811,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -2670,22 +2828,22 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", + "h2 0.4.7", "http 1.1.0", "http-body", "http-body-util", @@ -2719,24 +2877,24 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" +checksum = "d1ccd3b55e711f91a9885a2fa6fbbb2e39db1776420b062efc058c6410f7e5e3" dependencies = [ "anyhow", "async-trait", "http 1.1.0", "reqwest", "serde", - "thiserror", + "thiserror 1.0.69", "tower-service", ] [[package]] name = "reqwest-retry" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83df1aaec00176d0fabb65dea13f832d2a446ca99107afc17c5d2d4981221d0" +checksum = "29c73e4195a6bfbcb174b790d9b3407ab90646976c55de58a6515da25d851178" dependencies = [ "anyhow", "async-trait", @@ -2748,6 +2906,7 @@ dependencies = [ "reqwest", "reqwest-middleware", "retry-policies", + "thiserror 1.0.69", "tokio", "tracing", "wasm-timer", @@ -2800,18 +2959,18 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -2822,9 +2981,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.14" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "once_cell", "rustls-pki-types", @@ -2844,9 +3003,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" @@ -2861,9 +3020,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" @@ -2873,11 +3032,11 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2891,9 +3050,9 @@ dependencies = [ [[package]] name = "scoped-tls-hkt" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ddc765d3410d9f6c6ca071bf0b67f6b01e3ec4595dc3892f02677e75819dddc" +checksum = "e9603871ffe5df3ac39cb624790c296dbd47a400d202f56bf3e414045099524d" [[package]] name = "scoped_threadpool" @@ -2922,9 +3081,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -2938,9 +3097,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -2959,20 +3118,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -2982,9 +3141,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3007,7 +3166,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -3065,7 +3224,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -3103,9 +3262,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3117,6 +3276,12 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -3167,7 +3332,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -3189,9 +3354,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -3200,13 +3365,24 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "system-configuration" version = "0.6.1" @@ -3230,9 +3406,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -3243,29 +3419,48 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] name = "thoth" -version = "0.13.2" +version = "0.13.3" dependencies = [ - "cargo-husky", "clap", "dialoguer", "dotenv", @@ -3278,7 +3473,7 @@ dependencies = [ [[package]] name = "thoth-api" -version = "0.13.2" +version = "0.13.3" dependencies = [ "actix-web", "argon2rs", @@ -3307,7 +3502,7 @@ dependencies = [ [[package]] name = "thoth-api-server" -version = "0.13.2" +version = "0.13.3" dependencies = [ "actix-cors", "actix-http", @@ -3325,23 +3520,19 @@ dependencies = [ [[package]] name = "thoth-app" -version = "0.13.2" +version = "0.13.3" dependencies = [ - "anyhow", "chrono", "dotenv", - "getrandom", "gloo-storage 0.3.0", "gloo-timers 0.3.0", - "log", "reqwest", "semver", "serde", "serde_json", - "thiserror", + "thiserror 2.0.3", "thoth-api", "thoth-errors", - "url", "uuid", "wasm-bindgen", "wasm-logger", @@ -3354,7 +3545,7 @@ dependencies = [ [[package]] name = "thoth-app-server" -version = "0.13.2" +version = "0.13.3" dependencies = [ "actix-cors", "actix-web", @@ -3364,7 +3555,7 @@ dependencies = [ [[package]] name = "thoth-client" -version = "0.13.2" +version = "0.13.3" dependencies = [ "chrono", "graphql_client", @@ -3380,7 +3571,7 @@ dependencies = [ [[package]] name = "thoth-errors" -version = "0.13.2" +version = "0.13.3" dependencies = [ "actix-web", "chrono", @@ -3395,7 +3586,7 @@ dependencies = [ "reqwest-middleware", "serde", "serde_json", - "thiserror", + "thiserror 2.0.3", "uuid", "xml-rs", "yewtil", @@ -3403,7 +3594,7 @@ dependencies = [ [[package]] name = "thoth-export-server" -version = "0.13.2" +version = "0.13.3" dependencies = [ "actix-cors", "actix-web", @@ -3459,20 +3650,15 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.8.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" version = "1.41.1" @@ -3499,7 +3685,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] @@ -3525,9 +3711,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -3559,11 +3745,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -3578,9 +3764,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -3590,20 +3776,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -3622,39 +3808,27 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] -name = "unicode-normalization" -version = "0.1.23" +name = "unicode-width" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] -name = "unicode-width" -version = "0.1.13" +name = "unicode-xid" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "universal-hash" @@ -3689,15 +3863,27 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -3706,12 +3892,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "serde", + "wasm-bindgen", ] [[package]] @@ -3749,9 +3936,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -3762,24 +3949,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -3789,9 +3976,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3799,22 +3986,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-logger" @@ -3844,9 +4031,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -3997,18 +4184,30 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "xml-rs" -version = "0.8.21" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" +checksum = "af310deaae937e48a26602b730250b4949e125f468f11e6990be3e5304ddd96f" [[package]] name = "xmlparser" @@ -4037,7 +4236,7 @@ dependencies = [ "serde", "serde_json", "slab", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4122,7 +4321,7 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_urlencoded", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "web-sys", "yew 0.19.3", @@ -4155,6 +4354,30 @@ dependencies = [ "yew 0.18.0", ] +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -4173,7 +4396,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.89", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", ] [[package]] @@ -4182,6 +4426,28 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "zstd" version = "0.13.2" diff --git a/Cargo.toml b/Cargo.toml index 867a3d64..71cf6e67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth" -version = "0.13.2" +version = "0.13.3" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" @@ -15,14 +15,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.13.2", path = "thoth-api", features = ["backend"] } -thoth-api-server = { version = "=0.13.2", path = "thoth-api-server" } -thoth-app-server = { version = "=0.13.2", path = "thoth-app-server" } -thoth-errors = { version = "=0.13.2", path = "thoth-errors" } -thoth-export-server = { version = "=0.13.2", path = "thoth-export-server" } -clap = { version = "4.5.16", features = ["cargo", "env"] } +thoth-api = { version = "=0.13.3", path = "thoth-api", features = ["backend"] } +thoth-api-server = { version = "=0.13.3", path = "thoth-api-server" } +thoth-app-server = { version = "=0.13.3", path = "thoth-app-server" } +thoth-errors = { version = "=0.13.3", path = "thoth-errors" } +thoth-export-server = { version = "=0.13.3", path = "thoth-export-server" } +clap = { version = "4.5.21", features = ["cargo", "env"] } dialoguer = { version = "0.11.0", features = ["password"] } dotenv = "0.15.0" - -[dev-dependencies] -cargo-husky = { version = "1.5.0", default-features = false, features = ["prepush-hook", "run-cargo-check", "run-cargo-test", "run-cargo-clippy", "run-cargo-fmt"] } diff --git a/Dockerfile b/Dockerfile index 87bffc39..f78b7515 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG MUSL_IMAGE=clux/muslrust:1.82.0-stable +ARG MUSL_IMAGE=clux/muslrust:1.83.0-stable FROM ${MUSL_IMAGE} as build diff --git a/Dockerfile.dev b/Dockerfile.dev index 31dfb0b0..7e043cc3 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,8 +1,6 @@ -ARG RUST_VERSION=1.82.0 +FROM rust -FROM rust:${RUST_VERSION} - -ENV TRUNK_VERSION=0.20.3 +ENV TRUNK_VERSION=0.21.4 ARG THOTH_GRAPHQL_API=http://localhost:8000 ARG THOTH_EXPORT_API=http://localhost:8181 diff --git a/thoth-api-server/Cargo.toml b/thoth-api-server/Cargo.toml index 0183bde9..7f28b883 100644 --- a/thoth-api-server/Cargo.toml +++ b/thoth-api-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-api-server" -version = "0.13.2" +version = "0.13.3" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" @@ -9,15 +9,15 @@ repository = "https://github.com/thoth-pub/thoth" readme = "README.md" [dependencies] -thoth-api = { version = "=0.13.2", path = "../thoth-api", features = ["backend"] } -thoth-errors = { version = "=0.13.2", path = "../thoth-errors" } +thoth-api = { version = "=0.13.3", path = "../thoth-api", features = ["backend"] } +thoth-errors = { version = "=0.13.3", path = "../thoth-errors" } actix-web = "4.9" actix-cors = "0.7.0" actix-http = "3.9.0" -actix-identity = "0.7.1" -actix-session = { version = "0.9.0", features = ["cookie-session"] } +actix-identity = "0.8.0" +actix-session = { version = "0.10.1", features = ["cookie-session"] } env_logger = "0.11.5" futures-util = "0.3.31" -log = "0.4.21" +log = "0.4.22" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/thoth-api/Cargo.toml b/thoth-api/Cargo.toml index d6fc4723..6223db1b 100644 --- a/thoth-api/Cargo.toml +++ b/thoth-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-api" -version = "0.13.2" +version = "0.13.3" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" @@ -15,13 +15,13 @@ maintenance = { status = "actively-developed" } backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web", "jsonwebtoken", "deadpool-redis"] [dependencies] -thoth-errors = { version = "=0.13.2", path = "../thoth-errors" } -actix-web = { version = "4.8", optional = true } +thoth-errors = { version = "=0.13.3", path = "../thoth-errors" } +actix-web = { version = "4.9", optional = true } argon2rs = "0.2.5" isbn2 = "0.4.0" -chrono = { version = "0.4.31", features = ["serde"] } +chrono = { version = "0.4.38", features = ["serde"] } deadpool-redis = { version = "0.18.0", optional = true } -diesel = { version = "2.2.3", features = ["postgres", "uuid", "chrono", "r2d2", "64-column-tables", "serde_json"], optional = true } +diesel = { version = "2.2.5", features = ["postgres", "uuid", "chrono", "r2d2", "64-column-tables", "serde_json"], optional = true } diesel-derive-enum = { version = "2.1.0", features = ["postgres"], optional = true } diesel-derive-newtype = "2.1.2" diesel_migrations = { version = "2.2.0", features = ["postgres"], optional = true } @@ -36,7 +36,7 @@ regex = "1.10.6" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" strum = { version = "0.26.3", features = ["derive"] } -uuid = { version = "1.10.0", features = ["serde", "v4"] } +uuid = { version = "1.11.0", features = ["serde", "v4"] } [dev-dependencies] tokio = { version = "1.41", features = ["macros"] } diff --git a/thoth-app-server/Cargo.toml b/thoth-app-server/Cargo.toml index ecc630fe..aded1c0d 100644 --- a/thoth-app-server/Cargo.toml +++ b/thoth-app-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-app-server" -version = "0.13.2" +version = "0.13.3" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" diff --git a/thoth-app-server/build.rs b/thoth-app-server/build.rs index 5ec8a4b8..a8c71617 100644 --- a/thoth-app-server/build.rs +++ b/thoth-app-server/build.rs @@ -2,7 +2,7 @@ use dotenv::dotenv; use std::env; use std::process::{exit, Command}; -const TRUNK_VERSION: &str = "0.20.3"; +const TRUNK_VERSION: &str = "0.21.4"; fn is_wasm_target_installed() -> bool { let output = Command::new("rustup") diff --git a/thoth-app/Cargo.toml b/thoth-app/Cargo.toml index 63f2fcd1..0ed15267 100644 --- a/thoth-app/Cargo.toml +++ b/thoth-app/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-app" -version = "0.13.2" +version = "0.13.3" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" @@ -13,30 +13,24 @@ build = "build.rs" maintenance = { status = "actively-developed" } [dependencies] -anyhow = "1.0.86" -chrono = { version = "0.4.31", features = ["serde"] } +chrono = { version = "0.4.38", features = ["serde"] } gloo-storage = "0.3.0" gloo-timers = "0.3.0" -log = "0.4.20" -thiserror = "1.0.63" +thiserror = "2.0" yew = "0.19.3" yew-agent = "0.1.0" yew-router = "0.16.0" yewtil = { version = "0.4.0", features = ["fetch"] } -wasm-bindgen = "0.2.93" +wasm-bindgen = "0.2.95" wasm-logger = "0.2.0" -web-sys = { version = "0.3.57", features = ["HtmlInputElement", "HtmlSelectElement", "HtmlTextAreaElement"] } +web-sys = { version = "0.3.72", features = ["HtmlInputElement", "HtmlSelectElement", "HtmlTextAreaElement"] } reqwest = { version = "0.12", features = ["json"] } semver = "1.0.23" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -url = "2.1.1" -uuid = { version = "1.10.0", features = ["serde", "v4"] } -# `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm -# https://docs.rs/getrandom/latest/getrandom/#webassembly-support -getrandom = { version = "0.2", features = ["js"] } -thoth-api = { version = "=0.13.2", path = "../thoth-api" } -thoth-errors = { version = "=0.13.2", path = "../thoth-errors" } +uuid = { version = "1.11.0", features = ["serde", "v4", "js"] } +thoth-api = { version = "=0.13.3", path = "../thoth-api" } +thoth-errors = { version = "=0.13.3", path = "../thoth-errors" } [build-dependencies] dotenv = "0.15.0" diff --git a/thoth-app/Trunk.toml b/thoth-app/Trunk.toml index 8dedcbf2..00f61278 100644 --- a/thoth-app/Trunk.toml +++ b/thoth-app/Trunk.toml @@ -14,5 +14,5 @@ dist = "pkg" [tools] # Default wasm-bindgen version to download. -wasm_bindgen = "0.2.93" - +wasm_bindgen = "0.2.95" +wasm_opt = "version_119" diff --git a/thoth-app/index.html b/thoth-app/index.html index 025e6cc2..65acecae 100644 --- a/thoth-app/index.html +++ b/thoth-app/index.html @@ -30,7 +30,7 @@ - +
diff --git a/thoth-client/Cargo.toml b/thoth-client/Cargo.toml index 006295a8..9a5639e8 100644 --- a/thoth-client/Cargo.toml +++ b/thoth-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-client" -version = "0.13.2" +version = "0.13.3" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" @@ -10,16 +10,16 @@ readme = "README.md" build = "build.rs" [dependencies] -thoth-api = {version = "=0.13.2", path = "../thoth-api" } -thoth-errors = {version = "=0.13.2", path = "../thoth-errors" } +thoth-api = {version = "=0.13.3", path = "../thoth-api" } +thoth-errors = {version = "=0.13.3", path = "../thoth-errors" } graphql_client = "0.14.0" chrono = { version = "0.4.38", features = ["serde"] } reqwest = { version = "0.12", features = ["json"] } -reqwest-middleware = { version = "0.3.3", features = ["json"] } -reqwest-retry = "0.6.1" +reqwest-middleware = { version = "0.4.0", features = ["json"] } +reqwest-retry = "0.7.0" serde = "1.0" serde_json = "1.0" -uuid = { version = "1.10.0", features = ["serde"] } +uuid = { version = "1.11.0", features = ["serde"] } [build-dependencies] -thoth-api = { version = "=0.13.2", path = "../thoth-api", features = ["backend"] } +thoth-api = { version = "=0.13.3", path = "../thoth-api", features = ["backend"] } diff --git a/thoth-errors/Cargo.toml b/thoth-errors/Cargo.toml index 88f1dcf9..6e3a19c0 100644 --- a/thoth-errors/Cargo.toml +++ b/thoth-errors/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-errors" -version = "0.13.2" +version = "0.13.3" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" @@ -9,22 +9,22 @@ repository = "https://github.com/thoth-pub/thoth" readme = "README.md" [dependencies] -chrono = "0.4.31" -thiserror = "1.0" +chrono = "0.4.38" +thiserror = "2.0" reqwest = { version = "0.12", features = ["json"] } serde = "1.0" serde_json = "1.0" -uuid = { package = "uuid", version = "1.10.0", features = ["serde", "v4"] } +uuid = { package = "uuid", version = "1.11.0", features = ["serde", "v4"] } yewtil = { version = "0.4.0", features = ["fetch"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] actix-web = "4.9" deadpool-redis = "0.18.0" dialoguer = { version = "0.11.0", features = ["password"] } -diesel = "2.2.3" +diesel = "2.2.5" csv = "1.3.0" juniper = "0.16.1" marc = { version = "3.1.1", features = ["xml"] } phf = { version = "0.11", features = ["macros"] } -reqwest-middleware = "0.3.3" +reqwest-middleware = "0.4.0" xml-rs = "0.8.19" diff --git a/thoth-export-server/Cargo.toml b/thoth-export-server/Cargo.toml index 2032d11c..e5cffdb6 100644 --- a/thoth-export-server/Cargo.toml +++ b/thoth-export-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-export-server" -version = "0.13.2" +version = "0.13.3" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" @@ -10,27 +10,27 @@ readme = "README.md" build = "build.rs" [dependencies] -thoth-api = { version = "=0.13.2", path = "../thoth-api" } -thoth-errors = { version = "=0.13.2", path = "../thoth-errors" } -thoth-client = { version = "=0.13.2", path = "../thoth-client" } +thoth-api = { version = "=0.13.3", path = "../thoth-api" } +thoth-errors = { version = "=0.13.3", path = "../thoth-errors" } +thoth-client = { version = "=0.13.3", path = "../thoth-client" } actix-web = "4.9" actix-cors = "0.7.0" cc_license = "0.1.0" -chrono = { version = "0.4.31", features = ["serde"] } +chrono = { version = "0.4.38", features = ["serde"] } csv = "1.3.0" env_logger = "0.11.5" -futures = "0.3.30" +futures = "0.3.31" lazy_static = "1.5.0" -log = "0.4.20" +log = "0.4.22" marc = { version = "3.1.1", features = ["xml"] } -paperclip = { version = "0.9.2", features = ["actix4", "uuid1", "v3"] } +paperclip = { version = "0.9.4", features = ["actix4", "uuid1", "v3"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -uuid = { version = "1.10.0", features = ["serde"] } -xml-rs = "0.8.19" +uuid = { version = "1.11.0", features = ["serde"] } +xml-rs = "0.8.23" [dev-dependencies] -regex = "1.10.6" +regex = "1.11.1" [build-dependencies] dotenv = "0.15.0" diff --git a/thoth-export-server/src/xml/marc21xml_thoth.rs b/thoth-export-server/src/xml/marc21xml_thoth.rs index dcef0080..bdd4e889 100644 --- a/thoth-export-server/src/xml/marc21xml_thoth.rs +++ b/thoth-export-server/src/xml/marc21xml_thoth.rs @@ -40,7 +40,7 @@ mod tests { fn test_generate_marc_xml_single_work() { let work = test_work(); let current_date = Utc::now().format("%y%m%d").to_string(); - let expected = format!("\n\n 02443nam 22005532 4500\n 00000000-0000-0000-aaaa-000000000001\n m o d \n cr n \n {current_date}t20102010 ob 001 0 eng d\n \n LCCN010101\n \n \n 9783161484100\n (PDF)\n \n \n 9789295055025\n (XML)\n \n \n 9781402894626\n (Hardback)\n \n \n 10.00001/BOOK.0001\n doi\n \n \n OCLC010101\n worldcat\n \n \n UkCbTOM\n eng\n local\n \n \n eng\n spa\n \n \n JA85\n \n \n AAB\n bicssc\n \n \n AAA000000\n bisacsh\n \n \n JWA\n thema\n \n \n Author, Sole,\n author.\n Thoth University.\n (orcid)0000000200000001\n https://orcid.org/0000-0002-0000-0001\n \n \n Book Title :\n Book Subtitle /\n Sole Author; edited by Only Editor; translated by Translator.\n \n \n Second edition.\n \n \n León, Spain :\n OA Editions,\n 2010.\n \n \n ©2010\n \n \n 1 online resource.\n \n \n text\n txt\n rdacontent\n \n \n computer\n c\n rdamedia\n \n \n online resource\n cr\n rdacarrier\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n Please note that in this book the mathematical formulas are encoded in MathML.\n \n \n Includes bibliography (pages 165-170) and index.\n \n \n Introduction;Chapter 1;Chapter 2;Bibliography; Index\n \n \n Open Access\n Unrestricted online access\n star\n \n \n Loremipsumdolor sit amet\n \n \n Funding Institution\n JA0001\n Funding Programme\n Funding Project\n \n \n Mode of access: World Wide Web.\n \n \n The text of this book is licensed under a Creative Commons Attribution 4.0 International license (CC BY 4.0). For more detailed information consult the publisher's website.\n https://creativecommons.org/licenses/by/4.0/\n \n \n Metadata licensed under CC0 Public Domain Dedication.\n \n \n keyword1\n \n \n keyword2\n \n \n Editor, Only,\n editor.\n (orcid)0000000200000004\n https://orcid.org/0000-0002-0000-0004\n \n \n Translator,\n translator.\n COPIM.\n \n \n OA Editions,\n publisher.\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n https://doi.org/10.00001/book.0001\n Connect to e-book\n \n \n https://www.book.com/cover.jpg\n Connect to cover image\n \n \n https://creativecommons.org/publicdomain/zero/1.0/\n CC0 Metadata License\n \n"); + let expected = format!("\n\n 02443nam 22005532 4500\n 00000000-0000-0000-aaaa-000000000001\n m o d \n cr n \n {current_date}t20102010 ob 001 0 eng d\n \n LCCN010101\n \n \n 9783161484100\n (PDF)\n \n \n 9789295055025\n (XML)\n \n \n 9781402894626\n (Hardback)\n \n \n 10.00001/BOOK.0001\n doi\n \n \n OCLC010101\n worldcat\n \n \n UkCbTOM\n eng\n local\n \n \n eng\n spa\n \n \n JA85\n \n \n AAB\n bicssc\n \n \n AAA000000\n bisacsh\n \n \n JWA\n thema\n \n \n Author, Sole,\n author.\n Thoth University.\n (orcid)0000000200000001\n https://orcid.org/0000-0002-0000-0001\n \n \n Book Title :\n Book Subtitle /\n Sole Author; edited by Only Editor; translated by Translator.\n \n \n Second edition.\n \n \n León, Spain :\n OA Editions,\n 2010.\n \n \n ©2010\n \n \n 1 online resource.\n \n \n text\n txt\n rdacontent\n \n \n computer\n c\n rdamedia\n \n \n online resource\n cr\n rdacarrier\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n Please note that in this book the mathematical formulas are encoded in MathML.\n \n \n Includes bibliography (pages 165-170) and index.\n \n \n Introduction;Chapter 1;Chapter 2;Bibliography; Index\n \n \n Open Access\n Unrestricted online access\n star\n \n \n Loremipsumdolor sit amet\n \n \n Funding Institution\n JA0001\n Funding Programme\n Funding Project\n \n \n Mode of access: World Wide Web.\n \n \n The text of this book is licensed under a Creative Commons Attribution 4.0 International license (CC BY 4.0). For more detailed information consult the publisher's website.\n https://creativecommons.org/licenses/by/4.0/\n \n \n Metadata licensed under CC0 Public Domain Dedication.\n \n \n keyword1\n \n \n keyword2\n \n \n Editor, Only,\n editor.\n (orcid)0000000200000004\n https://orcid.org/0000-0002-0000-0004\n \n \n Translator,\n translator.\n COPIM.\n \n \n OA Editions,\n publisher.\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n https://doi.org/10.00001/book.0001\n Connect to e-book\n \n \n https://www.book.com/cover.jpg\n Connect to cover image\n \n \n https://creativecommons.org/publicdomain/zero/1.0/\n CC0 Metadata License\n \n"); assert_eq!(Marc21XmlThoth {}.generate(&[work]), Ok(expected)) } @@ -49,7 +49,7 @@ mod tests { fn test_generate_marc_xml_multiple_works() { let works = &[test_work(), test_work()]; let current_date = Utc::now().format("%y%m%d").to_string(); - let expected = format!("\n\n \n 02443nam 22005532 4500\n 00000000-0000-0000-aaaa-000000000001\n m o d \n cr n \n {current_date}t20102010 ob 001 0 eng d\n \n LCCN010101\n \n \n 9783161484100\n (PDF)\n \n \n 9789295055025\n (XML)\n \n \n 9781402894626\n (Hardback)\n \n \n 10.00001/BOOK.0001\n doi\n \n \n OCLC010101\n worldcat\n \n \n UkCbTOM\n eng\n local\n \n \n eng\n spa\n \n \n JA85\n \n \n AAB\n bicssc\n \n \n AAA000000\n bisacsh\n \n \n JWA\n thema\n \n \n Author, Sole,\n author.\n Thoth University.\n (orcid)0000000200000001\n https://orcid.org/0000-0002-0000-0001\n \n \n Book Title :\n Book Subtitle /\n Sole Author; edited by Only Editor; translated by Translator.\n \n \n Second edition.\n \n \n León, Spain :\n OA Editions,\n 2010.\n \n \n ©2010\n \n \n 1 online resource.\n \n \n text\n txt\n rdacontent\n \n \n computer\n c\n rdamedia\n \n \n online resource\n cr\n rdacarrier\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n Please note that in this book the mathematical formulas are encoded in MathML.\n \n \n Includes bibliography (pages 165-170) and index.\n \n \n Introduction;Chapter 1;Chapter 2;Bibliography; Index\n \n \n Open Access\n Unrestricted online access\n star\n \n \n Loremipsumdolor sit amet\n \n \n Funding Institution\n JA0001\n Funding Programme\n Funding Project\n \n \n Mode of access: World Wide Web.\n \n \n The text of this book is licensed under a Creative Commons Attribution 4.0 International license (CC BY 4.0). For more detailed information consult the publisher's website.\n https://creativecommons.org/licenses/by/4.0/\n \n \n Metadata licensed under CC0 Public Domain Dedication.\n \n \n keyword1\n \n \n keyword2\n \n \n Editor, Only,\n editor.\n (orcid)0000000200000004\n https://orcid.org/0000-0002-0000-0004\n \n \n Translator,\n translator.\n COPIM.\n \n \n OA Editions,\n publisher.\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n https://doi.org/10.00001/book.0001\n Connect to e-book\n \n \n https://www.book.com/cover.jpg\n Connect to cover image\n \n \n https://creativecommons.org/publicdomain/zero/1.0/\n CC0 Metadata License\n \n \n \n 02443nam 22005532 4500\n 00000000-0000-0000-aaaa-000000000001\n m o d \n cr n \n {current_date}t20102010 ob 001 0 eng d\n \n LCCN010101\n \n \n 9783161484100\n (PDF)\n \n \n 9789295055025\n (XML)\n \n \n 9781402894626\n (Hardback)\n \n \n 10.00001/BOOK.0001\n doi\n \n \n OCLC010101\n worldcat\n \n \n UkCbTOM\n eng\n local\n \n \n eng\n spa\n \n \n JA85\n \n \n AAB\n bicssc\n \n \n AAA000000\n bisacsh\n \n \n JWA\n thema\n \n \n Author, Sole,\n author.\n Thoth University.\n (orcid)0000000200000001\n https://orcid.org/0000-0002-0000-0001\n \n \n Book Title :\n Book Subtitle /\n Sole Author; edited by Only Editor; translated by Translator.\n \n \n Second edition.\n \n \n León, Spain :\n OA Editions,\n 2010.\n \n \n ©2010\n \n \n 1 online resource.\n \n \n text\n txt\n rdacontent\n \n \n computer\n c\n rdamedia\n \n \n online resource\n cr\n rdacarrier\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n Please note that in this book the mathematical formulas are encoded in MathML.\n \n \n Includes bibliography (pages 165-170) and index.\n \n \n Introduction;Chapter 1;Chapter 2;Bibliography; Index\n \n \n Open Access\n Unrestricted online access\n star\n \n \n Loremipsumdolor sit amet\n \n \n Funding Institution\n JA0001\n Funding Programme\n Funding Project\n \n \n Mode of access: World Wide Web.\n \n \n The text of this book is licensed under a Creative Commons Attribution 4.0 International license (CC BY 4.0). For more detailed information consult the publisher's website.\n https://creativecommons.org/licenses/by/4.0/\n \n \n Metadata licensed under CC0 Public Domain Dedication.\n \n \n keyword1\n \n \n keyword2\n \n \n Editor, Only,\n editor.\n (orcid)0000000200000004\n https://orcid.org/0000-0002-0000-0004\n \n \n Translator,\n translator.\n COPIM.\n \n \n OA Editions,\n publisher.\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n https://doi.org/10.00001/book.0001\n Connect to e-book\n \n \n https://www.book.com/cover.jpg\n Connect to cover image\n \n \n https://creativecommons.org/publicdomain/zero/1.0/\n CC0 Metadata License\n \n \n"); + let expected = format!("\n\n \n 02443nam 22005532 4500\n 00000000-0000-0000-aaaa-000000000001\n m o d \n cr n \n {current_date}t20102010 ob 001 0 eng d\n \n LCCN010101\n \n \n 9783161484100\n (PDF)\n \n \n 9789295055025\n (XML)\n \n \n 9781402894626\n (Hardback)\n \n \n 10.00001/BOOK.0001\n doi\n \n \n OCLC010101\n worldcat\n \n \n UkCbTOM\n eng\n local\n \n \n eng\n spa\n \n \n JA85\n \n \n AAB\n bicssc\n \n \n AAA000000\n bisacsh\n \n \n JWA\n thema\n \n \n Author, Sole,\n author.\n Thoth University.\n (orcid)0000000200000001\n https://orcid.org/0000-0002-0000-0001\n \n \n Book Title :\n Book Subtitle /\n Sole Author; edited by Only Editor; translated by Translator.\n \n \n Second edition.\n \n \n León, Spain :\n OA Editions,\n 2010.\n \n \n ©2010\n \n \n 1 online resource.\n \n \n text\n txt\n rdacontent\n \n \n computer\n c\n rdamedia\n \n \n online resource\n cr\n rdacarrier\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n Please note that in this book the mathematical formulas are encoded in MathML.\n \n \n Includes bibliography (pages 165-170) and index.\n \n \n Introduction;Chapter 1;Chapter 2;Bibliography; Index\n \n \n Open Access\n Unrestricted online access\n star\n \n \n Loremipsumdolor sit amet\n \n \n Funding Institution\n JA0001\n Funding Programme\n Funding Project\n \n \n Mode of access: World Wide Web.\n \n \n The text of this book is licensed under a Creative Commons Attribution 4.0 International license (CC BY 4.0). For more detailed information consult the publisher's website.\n https://creativecommons.org/licenses/by/4.0/\n \n \n Metadata licensed under CC0 Public Domain Dedication.\n \n \n keyword1\n \n \n keyword2\n \n \n Editor, Only,\n editor.\n (orcid)0000000200000004\n https://orcid.org/0000-0002-0000-0004\n \n \n Translator,\n translator.\n COPIM.\n \n \n OA Editions,\n publisher.\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n https://doi.org/10.00001/book.0001\n Connect to e-book\n \n \n https://www.book.com/cover.jpg\n Connect to cover image\n \n \n https://creativecommons.org/publicdomain/zero/1.0/\n CC0 Metadata License\n \n \n \n 02443nam 22005532 4500\n 00000000-0000-0000-aaaa-000000000001\n m o d \n cr n \n {current_date}t20102010 ob 001 0 eng d\n \n LCCN010101\n \n \n 9783161484100\n (PDF)\n \n \n 9789295055025\n (XML)\n \n \n 9781402894626\n (Hardback)\n \n \n 10.00001/BOOK.0001\n doi\n \n \n OCLC010101\n worldcat\n \n \n UkCbTOM\n eng\n local\n \n \n eng\n spa\n \n \n JA85\n \n \n AAB\n bicssc\n \n \n AAA000000\n bisacsh\n \n \n JWA\n thema\n \n \n Author, Sole,\n author.\n Thoth University.\n (orcid)0000000200000001\n https://orcid.org/0000-0002-0000-0001\n \n \n Book Title :\n Book Subtitle /\n Sole Author; edited by Only Editor; translated by Translator.\n \n \n Second edition.\n \n \n León, Spain :\n OA Editions,\n 2010.\n \n \n ©2010\n \n \n 1 online resource.\n \n \n text\n txt\n rdacontent\n \n \n computer\n c\n rdamedia\n \n \n online resource\n cr\n rdacarrier\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n Please note that in this book the mathematical formulas are encoded in MathML.\n \n \n Includes bibliography (pages 165-170) and index.\n \n \n Introduction;Chapter 1;Chapter 2;Bibliography; Index\n \n \n Open Access\n Unrestricted online access\n star\n \n \n Loremipsumdolor sit amet\n \n \n Funding Institution\n JA0001\n Funding Programme\n Funding Project\n \n \n Mode of access: World Wide Web.\n \n \n The text of this book is licensed under a Creative Commons Attribution 4.0 International license (CC BY 4.0). For more detailed information consult the publisher's website.\n https://creativecommons.org/licenses/by/4.0/\n \n \n Metadata licensed under CC0 Public Domain Dedication.\n \n \n keyword1\n \n \n keyword2\n \n \n Editor, Only,\n editor.\n (orcid)0000000200000004\n https://orcid.org/0000-0002-0000-0004\n \n \n Translator,\n translator.\n COPIM.\n \n \n OA Editions,\n publisher.\n \n \n Name of series ;\n vol. 11.\n 8765-4321\n 1234-5678\n \n \n https://doi.org/10.00001/book.0001\n Connect to e-book\n \n \n https://www.book.com/cover.jpg\n Connect to cover image\n \n \n https://creativecommons.org/publicdomain/zero/1.0/\n CC0 Metadata License\n \n \n"); assert_eq!(Marc21XmlThoth {}.generate(works), Ok(expected)) } diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs index 34c5870c..040dde98 100644 --- a/thoth-export-server/src/xml/onix3_thoth.rs +++ b/thoth-export-server/src/xml/onix3_thoth.rs @@ -1553,7 +1553,7 @@ mod tests { println!("{output}"); assert_eq!( output, - r#" + r#" 1 A01 @@ -1589,7 +1589,7 @@ mod tests { println!("{output}"); assert_eq!( output, - r#" + r#" 2 B01 @@ -1779,7 +1779,7 @@ mod tests { println!("{output}"); assert_eq!( output, - r#" + r#" 10 @@ -2019,7 +2019,7 @@ mod tests { println!("{output}"); assert_eq!( output, - r#" + r#" 34 @@ -2035,7 +2035,7 @@ mod tests { println!("{output}"); assert_eq!( output, - r#" + r#" 34 @@ -2088,7 +2088,7 @@ mod tests { println!("{output}"); assert_eq!( output, - r#" + r#" 49 @@ -2106,7 +2106,7 @@ mod tests { println!("{output}"); assert_eq!( output, - r#" + r#" 01