fix: convert test

Author: RAprogramm

.hooks/pre-commit

@@ -1,19 +1,24 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Ensure nightly rustfmt is available
+echo "🔧 Ensuring nightly rustfmt is available..."
 if ! rustup toolchain list | grep -q "^nightly"; then
   rustup toolchain install nightly >/dev/null
 fi
 rustup component add rustfmt --toolchain nightly >/dev/null
 
-echo "🧹 Running cargo fmt check..."
+echo "🧹 Checking formatting with rustfmt..."
 cargo +nightly fmt --all -- --check
 
-echo "🧐 Running cargo clippy..."
+echo "🔍 Running clippy (all features, all targets)..."
 cargo clippy --workspace --all-targets --all-features -- -D warnings
 
-# echo "📦 Running sqlx prepare..."
+echo "🧪 Running tests (all features)..."
+cargo test --workspace --all-features
+
+# Uncomment if you want to validate SQLx offline data
+# echo "📦 Validating SQLx prepare..."
 # cargo sqlx prepare --check --workspace
 
 echo "✅ All checks passed!"
+

Makefile.toml

@@ -1,14 +1,19 @@
 # Makefile.toml for cargo-make
 # Usage:
-#   cargo make ci
-#   TAG=v0.1.1 cargo make release
-#   CARGO_REGISTRY_TOKEN=... TAG=v0.1.1 cargo make publish
-
-[config]
-default_task = "ci"
+#   cargo make             # pretty help (default)
+#   cargo make ci          # fmt, clippy, tests, package
+#   TAG=v0.3.0 cargo make release
+#   CARGO_REGISTRY_TOKEN=... TAG=v0.3.0 cargo make publish
 
 [env]
-ALL_FEATURES = "true"
+ALL_FEATURES = "true" # toggle --all-features for clippy/test
+
+# ------- Default task (no root 'default_task' key) -------
+
+[tasks.default]
+category = "Meta"
+description = "Default task -> help"
+run_task = "help"
 
 # ------- Core checks -------
 
@@ -22,29 +27,29 @@ description = "Check rustfmt formatting for the entire workspace"
 [tasks.clippy]
 category = "Lint"
 clear = true
+script_runner = "bash"
 script = ['''
-  #!/usr/bin/env bash
   set -euo pipefail
   if [ "${ALL_FEATURES}" = "true" ]; then
     cargo clippy --workspace --all-targets --all-features -- -D warnings
   else
     cargo clippy --workspace --all-targets -- -D warnings
   fi
-  ''']
+''']
 description = "Run clippy for all targets; fail on warnings"
 
 [tasks.test]
 category = "Test"
 clear = true
+script_runner = "bash"
 script = ['''
-  #!/usr/bin/env bash
   set -euo pipefail
   if [ "${ALL_FEATURES}" = "true" ]; then
     cargo test --workspace --all-features --no-fail-fast
   else
     cargo test --workspace --no-fail-fast
   fi
-  ''']
+''']
 description = "Run tests (optionally with all features)"
 
 [tasks.package]
@@ -63,28 +68,28 @@ description = "Run fmt, clippy, tests, and packaging checks"
 
 [tasks.check_tag_env]
 clear = true
+script_runner = "bash"
 script = ['''
-  #!/usr/bin/env bash
   set -euo pipefail
   if [ -z "${TAG:-}" ]; then
-    echo "TAG env var is required, e.g. TAG=v0.1.1"
+    echo "TAG env var is required, e.g. TAG=v0.3.0"
     exit 1
   fi
-  ''']
+''']
 description = "Ensure TAG env var is provided (e.g. TAG=v1.2.3)"
 
 [tasks.ensure_tag_matches_version]
 clear = true
+script_runner = "bash"
 script = [
   '''
-  #!/usr/bin/env bash
   set -euo pipefail
   TAG="${TAG#refs/tags/}"
 
   if command -v jq >/dev/null 2>&1; then
     FILE_VER="$(cargo metadata --no-deps --format-version=1 | jq -r '.packages[0].version')"
   else
-    FILE_VER="$(cargo metadata --no-deps --format-version=1 | sed -n 's/.*\"version\":\"\\([^\"]*\\)\".*/\\1/p' | head -n1)"
+    FILE_VER="$(cargo metadata --no-deps --format-version=1 | sed -n 's/.*"version":"\([^"]*\)".*/\1/p' | head -n1)"
   fi
 
   if [ -z "${FILE_VER}" ]; then
@@ -98,48 +103,48 @@ script = [
   fi
 
   echo "Tag ${TAG} matches Cargo.toml version v${FILE_VER}"
-  ''',
+''',
 ]
 dependencies = ["check_tag_env"]
 description = "Ensure git tag matches Cargo.toml version"
 
 [tasks.check_token]
 clear = true
+script_runner = "bash"
 script = ['''
-  #!/usr/bin/env bash
   set -euo pipefail
   if [ -z "${CARGO_REGISTRY_TOKEN:-}" ]; then
     echo "CARGO_REGISTRY_TOKEN is required to publish."
     exit 1
   fi
-  ''']
+''']
 description = "Ensure crates.io token is present in env"
 
 # ------- Publish & Release -------
 
 [tasks.publish]
 category = "Release"
 clear = true
+script_runner = "bash"
 script = ['''
-  #!/usr/bin/env bash
   set -euo pipefail
   cargo publish --locked --token "${CARGO_REGISTRY_TOKEN}"
-  ''']
+''']
 dependencies = ["check_token", "ensure_tag_matches_version", "ci"]
 description = "Publish crate to crates.io after checks and tag/version verification"
 
 [tasks.tag]
 category = "Release"
 clear = true
+script_runner = "bash"
 script = [
   '''
-  #!/usr/bin/env bash
   set -euo pipefail
 
   if command -v jq >/dev/null 2>&1; then
     VER="$(cargo metadata --no-deps --format-version=1 | jq -r '.packages[0].version')"
   else
-    VER="$(cargo metadata --no-deps --format-version=1 | sed -n 's/.*\"version\":\"\\([^\"]*\\)\".*/\\1/p' | head -n1)"
+    VER="$(cargo metadata --no-deps --format-version=1 | sed -n 's/.*"version":"\([^"]*\)".*/\1/p' | head -n1)"
   fi
 
   if [ -z "${VER}" ]; then
@@ -156,7 +161,7 @@ script = [
 
   git tag "${TAG}"
   echo "Created tag ${TAG}. You can push it with: git push origin ${TAG}"
-  ''',
+''',
 ]
 description = "Create git tag vX.Y.Z from Cargo.toml version (does not push)"
 
@@ -190,21 +195,16 @@ description = "Install git pre-commit hook from .hooks/"
 script_runner = "bash"
 script = [
   'set -euo pipefail',
-  'if [ ! -f .hooks/pre-commit ]; then echo "❌ .hooks/pre-commit не найден!"; exit 1; fi',
+  'if [ ! -f .hooks/pre-commit ]; then echo "❌ .hooks/pre-commit not found!"; exit 1; fi',
   'echo "🔗 Linking .hooks/pre-commit to .git/hooks/pre-commit..."',
   'mkdir -p .git/hooks',
   'ln -sf ../../.hooks/pre-commit .git/hooks/pre-commit',
   'chmod +x .hooks/pre-commit',
-  'echo "✅ pre-commit hook установлен."',
+  'echo "✅ pre-commit hook installed."',
 ]
 
 # ------- Pretty Help -------
 
-[tasks.default]
-category = "Meta"
-description = "Default task -> ci"
-run_task = "ci"
-
 [tasks.help]
 clear = true
 category = "Meta"
@@ -214,7 +214,6 @@ script = [
   '''
   set -euo pipefail
 
-  # Enable colors if terminal supports it and NO_COLOR is not set
   if [ -t 1 ] && [ -z "${NO_COLOR:-}" ]; then
     BOLD="\033[1m"; DIM="\033[2m"; RESET="\033[0m"
     BLUE="\033[34m"; CYAN="\033[36m"; GREEN="\033[32m"; YELLOW="\033[33m"; MAGENTA="\033[35m"
@@ -223,14 +222,13 @@ script = [
   fi
 
   hr() { printf "%s\n" "──────────────────────────────────────────────────────────────────────────────"; }
-  pad() { printf "%-*s" "$2" "$1"; }
   row() { printf "  %b%s%b  %b%s%b\n" "$GREEN" "$1" "$RESET" "$DIM" "$2" "$RESET"; }
 
-  # Extract crate info
   if command -v jq >/dev/null 2>&1; then
-    VER="$(cargo metadata --no-deps --format-version=1 | jq -r '.packages[0].version')"
-    MSRV="$(cargo metadata --no-deps --format-version=1 | jq -r '.packages[0].rust_version // "unknown"')"
-    NAME="$(cargo metadata --no-deps --format-version=1 | jq -r '.packages[0].name')"
+    META="$(cargo metadata --no-deps --format-version=1)"
+    VER="$(printf "%s" "$META" | jq -r '.packages[0].version')"
+    MSRV="$(printf "%s" "$META" | jq -r '.packages[0].rust_version // "unknown"')"
+    NAME="$(printf "%s" "$META" | jq -r '.packages[0].name')"
   else
     META="$(cargo metadata --no-deps --format-version=1)"
     VER="$(printf "%s" "$META" | sed -n 's/.*\"version\":\"\\([^\"]*\\)\".*/\\1/p' | head -n1)"
@@ -255,7 +253,7 @@ script = [
 
   printf "%b%s%b\n" "$BOLD$MAGENTA" "Formatting" "$RESET"
   row "cargo make fmt"                 "Check formatting (stable)"
-  row "cargo make format"              "Format with nightly rustfmt (unstable_features)"
+  row "cargo make format"              "Format with nightly rustfmt (unstable features)"
   echo
 
   printf "%b%s%b\n" "$BOLD$MAGENTA" "Lint & Tests" "$RESET"
@@ -279,15 +277,15 @@ script = [
   echo
 
   printf "%b%s%b\n" "$BOLD$DIM" "Tips:" "$RESET"
-  printf "  • Keep %bCargo.lock%b committed (CI uses %bCARGO_LOCKED=1%b)\n" "$BOLD" "$RESET" "$BOLD" "$RESET"
+  printf "  • Keep %bCargo.lock%b committed\n" "$BOLD" "$RESET"
   printf "  • Tag must exactly match version: %bv%s%b\n" "$BOLD" "${VER}" "$RESET"
   echo
-  ''',
+''',
 ]
 
-
+# Alias
 [tasks.h]
 clear = true
 run_task = "help"
-description = "Alias: help"
 category = "Meta"
+description = "Alias: help"

README.md

@@ -10,7 +10,7 @@ Small, pragmatic error model for API-heavy Rust services.
 Core is framework-agnostic; integrations are opt-in via feature flags.  
 Stable categories, conservative HTTP mapping, no `unsafe`.
 
-- Core types: `AppError`, `AppErrorKind`, `AppResult`, `ErrorResponse`
+- Core types: `AppError`, `AppErrorKind`, `AppResult`, `AppCode`, `ErrorResponse`
 - Optional Axum/Actix integration
 - Optional OpenAPI schema (via `utoipa`)
 - Conversions from `sqlx`, `reqwest`, `redis`, `validator`, `config`, `tokio`
@@ -27,23 +27,26 @@ Stable categories, conservative HTTP mapping, no `unsafe`.
   - `serde_json` (JSON details)
   - `openapi` (schemas via `utoipa`)
   - `sqlx`, `reqwest`, `redis`, `validator`, `config`, `tokio`, `multipart` (error conversions)
-- **Clean wire contract.** A small `ErrorResponse { status, message, details? }` payload for HTTP, with optional OpenAPI schema. No leaking of internal sources into the response.
+- **Clean wire contract.** A small `ErrorResponse { status, code, message, details?, retry?, www_authenticate? }` payload for HTTP, with optional OpenAPI schema. No leaking of internal sources.
 - **One log at the boundary.** Use `tracing` once when converting to HTTP, avoiding duplicate logs and keeping fields stable (`kind`, `status`, `message`).
 - **Less boilerplate.** Built-in `From<...>` conversions for common libs and a compact prelude for handler signatures.
 - **Consistent across a workspace.** Share the same error surface between services and crates, making clients and tests simpler.
 
+> *Since v0.3.0: stable AppCode enum and extended ErrorResponse with retry/authentication metadata*
+
+
 ---
 
 ## Installation
 
 ```toml
 [dependencies]
 # lean core, no extra deps
-masterror = { version = "0.2", default-features = false }
+masterror = { version = "0.3", default-features = false }
 
 # Or with features:
 # JSON + Axum/Actix + common integrations
-# masterror = { version = "0.2", features = [
+# masterror = { version = "0.3", features = [
 #   "axum", "actix", "serde_json", "openapi",
 #   "sqlx", "reqwest", "redis", "validator", "config", "tokio"
 # ] }
@@ -82,14 +85,19 @@ fn do_work(flag: bool) -> AppResult<()> {
 
 `ErrorResponse` is a wire-level payload for HTTP APIs. You can build it directly or convert from `AppError`:
 
+
 ```rust
-use masterror::{AppError, AppErrorKind, ErrorResponse};
+use masterror::{AppError, AppErrorKind, AppCode, ErrorResponse};
 
-let app_err = AppError::new(AppErrorKind::NotFound, "User not found");
-let resp: ErrorResponse = (&app_err).into();
-assert_eq!(resp.status, 404);
+let app_err = AppError::new(AppErrorKind::Unauthorized, "Token expired");
+let resp: ErrorResponse = (&app_err).into()
+    .with_retry_after_secs(30)
+    .with_www_authenticate(r#"Bearer realm="api", error="invalid_token""#);
+
+assert_eq!(resp.status, 401);
 ```
 
+
 ---
 
 ## Web framework integrations
@@ -124,10 +132,12 @@ async fn err() -> AppResult<&'static str> {
     Err(AppError::forbidden("No access"))
 }
 
+
 #[get("/payload")]
 async fn payload() -> impl Responder {
-    ErrorResponse::new(422, "Validation failed")
+    ErrorResponse::new(422, AppCode::Validation, "Validation failed")
 }
+
 ```
 
 ---
@@ -138,7 +148,7 @@ Enable `openapi` to derive an OpenAPI schema for `ErrorResponse` (via `utoipa`).
 
 ```toml
 [dependencies]
-masterror = { version = "0.2", features = ["openapi", "serde_json"] }
+masterror = { version = "0.3", features = ["openapi", "serde_json"] }
 utoipa = "5"
 ```
 
@@ -180,13 +190,13 @@ All mappings are conservative and avoid leaking internals:
 Minimal core:
 
 ```toml
-masterror = { version = "0.2", default-features = false }
+masterror = { version = "0.3", default-features = false }
 ```
 
 API service (Axum + JSON + common deps):
 
 ```toml
-masterror = { version = "0.2", features = [
+masterror = { version = "0.3", features = [
   "axum", "serde_json", "openapi",
   "sqlx", "reqwest", "redis", "validator", "config", "tokio"
 ] }
@@ -195,12 +205,23 @@ masterror = { version = "0.2", features = [
 API service (Actix + JSON + common deps):
 
 ```toml
-masterror = { version = "0.2", features = [
+masterror = { version = "0.3", features = [
   "actix", "serde_json", "openapi",
   "sqlx", "reqwest", "redis", "validator", "config", "tokio"
 ] }
 ```
 
+---
+
+## Migration from 0.2.x to 0.3.0
+
+- Replace `ErrorResponse::new(status, "msg")` with
+  `ErrorResponse::new(status, AppCode::<Variant>, "msg")`
+- Use `.with_retry_after_secs(...)` and `.with_www_authenticate(...)`
+  if you want to surface HTTP headers.
+- `ErrorResponse::new_legacy` is provided temporarily as a deprecated shim.
+
+
 ---
 
 ## Versioning and MSRV