Merge pull request #2 from hubertshelley/develop

路由已完成

Author: hubertshelley

.DS_Store

@@ -11,8 +11,8 @@ repos:
       - id: end-of-file-fixer
       - id: mixed-line-ending
       - id: trailing-whitespace
-  - repo: https://gitee.com/hubert22/black
-    rev: 22.10.0
+  - repo: https://github.com/psf/black
+    rev: 23.3.0
     hooks:
       - id: black
   - repo: https://github.com/crate-ci/typos

.pre-commit-config.yaml

@@ -1,18 +1,3 @@
-[package]
-name = "silent"
-edition = "2021"
-authors = ["Hubert Shelley <hubertshelley@163.com>"]
-categories = ["web-programming::web", "web-programming::web-framework"]
-documentation = "https://docs.rs/"
-description = """
-Silent Web Framework
-"""
-homepage = "https://github.com/hubertshelley/silent"
-keywords = ["web", "web-framework"]
-license = "Apache-2.0"
-readme = "./readme.md"
-repository = "https://github.com/hubertshelley/silent"
-version = "0.1.0"
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
+[workspace]
+members = ["silent", "examples/*"]
+default-members = ["silent", ]

Cargo.toml

@@ -35,7 +35,7 @@ targets = [
 db-path = "~/.cargo/advisory-db"
 # The url(s) of the advisory databases to use
 # db-urls = ["https://github.com/rustsec/advisory-db"]
-db-urls = ["https://gitee.com/mirrors_RustSec/advisory-db"]
+db-urls = ["https://github.com/rustsec/advisory-db"]
 # The lint level for security vulnerabilities
 vulnerability = "deny"
 # The lint level for unmaintained crates
@@ -73,11 +73,11 @@ unlicensed = "allow"
 allow = [
     "MIT",
     "Apache-2.0",
-    "Apache-2.0 WITH LLVM-exception",
-    "ISC",
+    #    "Apache-2.0 WITH LLVM-exception",
+    #    "ISC",
     "Unicode-DFS-2016",
-    "BSD-3-Clause",
-    "BSD-2-Clause",
+    #    "BSD-3-Clause",
+    #    "BSD-2-Clause",
 ]
 # List of explicitly disallowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
@@ -196,7 +196,7 @@ unknown-git = "warn"
 # List of URLs for allowed crate registries. Defaults to the crates.io index
 # if not specified. If it is specified but empty, no registries are allowed.
 allow-registry = [
-    # "https://github.com/rust-lang/crates.io-index",
+    "https://github.com/rust-lang/crates.io-index",
     "https://mirrors.ustc.edu.cn/crates.io-index",
 ]
 # List of URLs for allowed Git repositories

deny.toml

@@ -0,0 +1,9 @@
+[package]
+name = "example-hello-world"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+silent = { version = "0.1.0", path = "../../silent" }

examples/hello-world/Cargo.lock

@@ -0,0 +1,7 @@
+use silent::prelude::*;
+
+fn main() {
+    logger::fmt().with_max_level(Level::INFO).init();
+    let route = Route::new("").get(|_req| async { Ok("hello world") });
+    Server::new().bind_route(route).run();
+}

examples/hello-world/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "path_params"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+silent = { version = "0.1.0", path = "../../silent" }

examples/hello-world/src/main.rs

@@ -0,0 +1,29 @@
+use silent::prelude::*;
+
+fn main() {
+    logger::fmt().with_max_level(Level::INFO).init();
+    // 定义路由
+    let route = Route::new("path_params")
+        .append(Route::new("<key:str>/str").get(hello_world))
+        .append(Route::new("<key:int>/int").get(hello_world))
+        .append(Route::new("<key:uuid>/uuid").get(hello_world))
+        .append(Route::new("<key:path>/path").get(hello_world))
+        .append(Route::new("<key:full_path>/full_path").get(hello_world))
+        .append(Route::new("<key:*>/*").get(hello_world))
+        .append(Route::new("<key:**>/**").get(hello_world))
+        .append(Route::new("<key>").get(hello_world))
+        .append(Route::new("<key:other>/other").get(hello_world));
+    println!("{:?}", route);
+    Server::new().bind_route(route).run();
+}
+
+// 定义处理方法
+async fn hello_world(req: Request) -> Result<String, SilentError> {
+    let path_params = req.get_path_params("key").unwrap();
+    match path_params {
+        PathParam::String(str) => Ok(format!("str {}", str)),
+        PathParam::Int(int) => Ok(format!("int {}", int)),
+        PathParam::UUid(uuid) => Ok(format!("uuid {}", uuid)),
+        PathParam::Path(path) => Ok(format!("path {}", path)),
+    }
+}

examples/path_params/Cargo.toml

@@ -6,12 +6,12 @@ Silent 是一个简单的基于Hyper的Web框架，它的目标是提供一个
 
 ### 目标
 
-- [ ] 路由
+- [x] 路由
 - [ ] 中间件
 - [ ] 静态文件
 - [ ] 模板
 - [ ] 数据库
-- [ ] 日志
+- [x] 日志 (使用了tracing)
 - [ ] 配置
 - [ ] 会话
 - [ ] 安全