From fe9d101bd019f91fe8c99c29721ccb0e6e90c92c Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 14 Jul 2026 16:31:08 -0400 Subject: [PATCH] Name change (#3) Reviewed-on: http://git.kundeng.us/phoenix/simodels/pulls/3 --- .gitea/workflows/tag_release.yaml | 2 +- .gitea/workflows/workflow.yaml | 12 +++---- Cargo.lock | 56 +++++++++++++++---------------- Cargo.toml | 6 ++-- LICENSE.md | 22 ++++++++++++ README.md | 5 +-- src/token.rs | 4 +-- tests/tests.rs | 6 ++-- 8 files changed, 68 insertions(+), 45 deletions(-) create mode 100644 LICENSE.md diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 5931a87..2547b01 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -20,7 +20,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 components: cargo - uses: Swatinem/rust-cache@v2 diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 81996c5..aa960c9 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -1,4 +1,4 @@ -name: Rust Build +name: simodels Build on: push: @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v6 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 - uses: Swatinem/rust-cache@v2 - run: cargo check @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v6 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 - uses: Swatinem/rust-cache@v2 - run: cargo test @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@v6 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 - uses: Swatinem/rust-cache@v2 - run: rustup component add rustfmt - run: cargo fmt --all -- --check @@ -55,7 +55,7 @@ jobs: - uses: actions/checkout@v6 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 - uses: Swatinem/rust-cache@v2 - run: rustup component add clippy - run: cargo clippy -- -D warnings @@ -67,6 +67,6 @@ jobs: - uses: actions/checkout@v6 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: 1.96.1 + toolchain: 1.97 - uses: Swatinem/rust-cache@v2 - run: cargo build diff --git a/Cargo.lock b/Cargo.lock index bac92b0..ec4192c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,9 +43,9 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "cc" -version = "1.2.66" +version = "1.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" +checksum = "e17dd265a7d0f31ef544e1b20e03add05d3b45b491b633b10d67145d2acc1a38" dependencies = [ "find-msvc-tools", "shlex", @@ -190,20 +190,6 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" -[[package]] -name = "icarus_models" -version = "0.11.3" -dependencies = [ - "josekit", - "rand", - "serde", - "serde_json", - "tempfile", - "time", - "utoipa", - "uuid", -] - [[package]] name = "indexmap" version = "2.14.0" @@ -264,9 +250,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "memchr" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "miniz_oxide" @@ -388,9 +374,9 @@ checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "regex" -version = "1.12.4" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" +checksum = "2a0e75113e14dc5acb068cd0786884f214f1312650a3d36d269f5c4f3cdee8a2" dependencies = [ "aho-corasick", "memchr", @@ -400,9 +386,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db" dependencies = [ "aho-corasick", "memchr", @@ -486,9 +472,23 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "simd-adler32" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" + +[[package]] +name = "simodels" +version = "0.11.3" +dependencies = [ + "josekit", + "rand", + "serde", + "serde_json", + "tempfile", + "time", + "utoipa", + "uuid", +] [[package]] name = "slab" @@ -602,9 +602,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.23.4" +version = "1.23.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" +checksum = "ea5fab0d6c3c01ae70085a09cb03d4c7a1d6314e2b3e075392783396d724ca0a" dependencies = [ "getrandom", "js-sys", @@ -680,6 +680,6 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" diff --git a/Cargo.toml b/Cargo.toml index b83250b..dae3361 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "icarus_models" +name = "simodels" version = "0.11.3" edition = "2024" rust-version = "1.95" -description = "models used for the icarus project" +description = "models used for the soaricarus project" license = "MIT" [dependencies] @@ -11,7 +11,7 @@ serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } rand = { version = "0.10.2" } time = { version = "0.3.53", features = ["formatting", "macros", "parsing", "serde"] } -uuid = { version = "1.23.4", features = ["v4", "serde"] } +uuid = { version = "1.23.5", features = ["v4", "serde"] } josekit = { version = "0.10.3" } utoipa = { version = "5.5.0", features = ["uuid", "time"] } diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..1ba694a --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,22 @@ +Copyright (c) 2026 Kun Deng. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 5e931ed..2b7ac19 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ -A library containing commonly used structs, functions, enums, constants and other code -that is used throughout the icarus projects. Code from this library serves as the model +# simodels +Library containing commonly used structs, functions, enums, constants and other code +that is used throughout the soaricarus projects. Code from this library serves as the model for other projects in the icarus project. diff --git a/src/token.rs b/src/token.rs index d359e1d..3e013a5 100644 --- a/src/token.rs +++ b/src/token.rs @@ -164,9 +164,9 @@ mod tests { fn test_resource() -> TokenResource { TokenResource { - issuer: String::from("icarus_auth_test"), + issuer: String::from("soaricarus_auth_test"), message: String::from("Authorization"), - audiences: vec![String::from("icarus_test")], + audiences: vec![String::from("soaricarus_test")], id: uuid::Uuid::nil(), } } diff --git a/tests/tests.rs b/tests/tests.rs index 10b468c..a987be5 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -33,8 +33,8 @@ mod song_tests { use tempfile::tempdir; use crate::utils; - use icarus_models::song; - use icarus_models::types; + use simodels::song; + use simodels::types; #[test] fn test_song_to_data() { @@ -157,7 +157,7 @@ mod song_tests { #[cfg(test)] mod album_tests { use crate::utils; - use icarus_models::album; + use simodels::album; #[test] fn parse_album() {