Merge pull request #357 from YuukiToriyama/release/v0.1.7

release/v0.1.7をmainブランチにマージ

.github/workflows/code-quality-check.yaml

@@ -0,0 +1,23 @@
+name: Code quality check
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-all-crates: true
+          shared-key: 'code-quality'
+          cache-provider: 'github'
+      - name: Setup clippy
+        run: rustup component add clippy
+      - name: Code review with clippy
+        uses: giraffate/clippy-action@v1
+        with:
+          reporter: 'github-pr-review'
+          filter_mode: 'nofilter'
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/run-test.yaml

@@ -0,0 +1,49 @@
+name: Unit test & Integration test
+
+on:
+  pull_request:
+  push:
+    branches: [ 'main' ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-all-crates: true
+          shared-key: 'test-on-pr'
+          key: 'main'
+          save-if: ${{ github.ref == 'refs/heads/main' }} # mainブランチにコミットが追加された時のみキャッシュを保存する
+      - name: Test core
+        working-directory: core
+        run: |
+          cargo test
+          cargo test --features=blocking
+      - name: Integration test
+        working-directory: tests
+        run: cargo test
+
+  run-tests-wasm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-all-crates: true
+          shared-key: 'wasm-pack'
+          key: 'main'
+          save-if: ${{ github.ref == 'refs/heads/main' }} # mainブランチにコミットが追加された時のみキャッシュを保存する
+          cache-provider: 'github'
+      - name: Install wasm-pack
+        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+      - name: Run wasm-pack test for core(japanese-address-parser)
+        working-directory: core
+        run: wasm-pack test --firefox --headless
+      - name: Build check for wasm crate
+        working-directory: wasm
+        run: wasm-pack build --target web --scope toriyama

Cargo.toml

@@ -8,7 +8,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.1.5"
+version = "0.1.7"
 edition = "2021"
 description = "A Rust Library to parse japanese addresses."
 repository = "https://github.com/YuukiToriyama/japanese-address-parser"
@@ -18,6 +18,8 @@ keywords = ["parser", "geo", "wasm"]
 categories = ["parser-implementations", "wasm"]
 
 [workspace.dependencies]
+serde = { version = "1.0.192", features = ["derive"] }
+tokio = { version = "1.38.0", features = ["rt", "macros"] }
 wasm-bindgen = "0.2.92"
 wasm-bindgen-futures = "0.4.42"
 wasm-bindgen-test = "0.3.42"

README.md

@@ -3,7 +3,7 @@
 [![Docs](https://docs.rs/japanese-address-parser/badge.svg)](https://docs.rs/japanese-address-parser)
 [![Crates.io (latest)](https://img.shields.io/crates/v/japanese-address-parser)](https://crates.io/crates/japanese-address-parser)
 ![Rust Version](https://img.shields.io/badge/rust%20version-%3E%3D1.73.0-orange)
-[![Unit test & Code check](https://github.com/YuukiToriyama/japanese-address-parser/actions/workflows/code-check.yaml/badge.svg)](https://github.com/YuukiToriyama/japanese-address-parser/actions/workflows/code-check.yaml)
+[![Unit test & Integration test](https://github.com/YuukiToriyama/japanese-address-parser/actions/workflows/run-test.yaml/badge.svg?branch=main)](https://github.com/YuukiToriyama/japanese-address-parser/actions/workflows/run-test.yaml)
 
 A Rust Library to parse japanese addresses.
 

core/Cargo.toml

@@ -16,17 +16,20 @@ crate-type = ["rlib", "cdylib"]
 
 [features]
 default = []
-blocking = []
+blocking = ["reqwest/blocking"]
 
 [dependencies]
 itertools = "0.13.0"
 js-sys = "0.3.67"
 nom = "7.1.3"
 rapidfuzz = "0.5.0"
 regex = "1.10.2"
-reqwest = { version = "0.12.3", default-features = false, features = ["json", "rustls-tls", "blocking"] }
-serde = { version = "1.0.192", features = ["derive"] }
+serde.workspace = true
+reqwest = { version = "0.12.5", default-features = false, features = ["json", "rustls-tls"] }
 
 [dev-dependencies]
-tokio = { version = "1.38.0", features = ["rt", "macros"] }
+tokio.workspace = true
 wasm-bindgen-test = { workspace = true }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+mockito = "1.4.0" # mockitoがwasm32に対応していないため

core/src/api.rs

@@ -1,10 +1,10 @@
-pub mod city_master_api;
-pub mod prefecture_master_api;
+pub use crate::repository::geolonia::city_master_api;
+pub use crate::repository::geolonia::prefecture_master_api;
 
-use crate::api::city_master_api::CityMasterApi;
-use crate::api::prefecture_master_api::PrefectureMasterApi;
-use crate::entity::{City, Prefecture};
-use crate::err::Error;
+use crate::domain::geolonia::entity::{City, Prefecture};
+use crate::domain::geolonia::error::Error;
+use crate::repository::geolonia::city_master_api::CityMasterApi;
+use crate::repository::geolonia::prefecture_master_api::PrefectureMasterApi;
 
 #[derive(Default)]
 pub struct AsyncApi {

core/src/domain.rs

@@ -0,0 +1 @@
+pub mod geolonia;

core/src/domain/geolonia.rs

@@ -0,0 +1,2 @@
+pub mod entity;
+pub mod error;