Merge pull request #2 from auscyber/main

make types better
tascord · Jul 31, 2024 · f0ca8d9 · f0ca8d9
2 parents 7dd18b4 + 4337142
commit f0ca8d9
Show file tree

Hide file tree

Showing 10 changed files with 1,206 additions and 324 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -2,9 +2,9 @@ name: Rust
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always
@@ -14,12 +14,12 @@ jobs:
     runs-on: ubuntu-latest
     environment: test
     steps:
-    - uses: actions/checkout@v3
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      env:
-        DEVID: ${{ secrets.DEVID }}
-        KEY: ${{ secrets.KEY }}
-        QUIET: true
-      run: cargo test -- --nocapture
+      - uses: actions/checkout@v3
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        env:
+          DEVID: ${{ secrets.DEVID }}
+          KEY: ${{ secrets.KEY }}
+          QUIET: true
+        run: cargo test -- --nocapture
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,15 +10,26 @@ repository = "https://github.com/tascord/ptvrs"
 
 [dependencies]
 anyhow = "1.0.81"
-chrono = "0.4.35"
+chrono = { version = "0.4.35", features = ["serde"] }
 colored = "2.1.0"
+derive_more = "0.99.18"
 dotenv = "0.15.0"
 hex = "0.4.3"
 hmac = "0.12.1"
+itertools = "0.13.0"
 once_cell = "1.19.0"
 reqwest = { version = "0.12.0", features = ["json"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
 sha1 = "0.10.6"
 to_and_fro = "0.5.0"
 tokio = { version = "1.36.0", features = ["full"] }
+url-escape = "0.1.1"
+
+[dev-dependencies]
+futures = "0.3.30"
+ptvrs-macros = { path = "ptvrs-macros" }
+
+
+[workspace]
+members = ["ptvrs-macros"]
diff --git a/README.md b/README.md
@@ -25,13 +25,13 @@
 | **Outlets**       | [/outlets](https://docs.rs/ptv/latest/ptv/struct.Client.html#method.outlets)                                                 | 🟦      |                                   |
 |                   | [/outlets/location/{}/{}](https://docs.rs/ptv/latest/ptv/struct.Client.html#method.outlets_lat_long)                         | 🟦      |                                   |
 | **Patterns**      | [/pattern/run/{}/route_type/{}](https://docs.rs/ptv/latest/ptv/struct.Client.html#method.patterns_run_route)                 | 🟦      |                                   |
+| **Search**        | /search/{}                                                                                                                   | 🟦      |                                   |
 | **Routes**        | [/routes](https://docs.rs/ptv/latest/ptv/struct.Client.html#method.routes)                                                   | 🟨      | Types not yet concrete. See docs. |
 |                   | [/routes/{}](https://docs.rs/ptv/latest/ptv/struct.Client.html#method.routes_id)                                             | 🟨      | "                                 |
 | **Runs**          | [/runs/{}](https://docs.rs/ptv/latest/ptv/struct.Client.html#method.runs_ref)                                                | 🟨      | "                                 |
 |                   | [/runs/route/{}](https://docs.rs/ptv/latest/ptv/struct.Client.html#method.runs_id)                                           | 🟨      | "                                 |
 |                   | [/runs/{}/route_type/{}](https://docs.rs/ptv/latest/ptv/struct.Client.html#method.runs_ref_type)                             | 🟨      | "                                 |
 |                   | [/runs/route/{}/route_type/{}](https://docs.rs/ptv/latest/ptv/struct.Client.html#method.runs_id_type)                        | 🟨      | "                                 |
-| **Search**        | /search/{}                                                                                                                   | ❌      | Not implemented                   |
-| **Stops**         | /stops/{}/route_type/{}                                                                                                      | ❌      | "                                 |
-|                   | /stops/route/{}/route_type/{}                                                                                                | ❌      | "                                 |
+| **Stops**         | /stops/{}/route_type/{}                                                                                                      | 🟨      | "                                 |
+|                   | /stops/route/{}/route_type/{}                                                                                                | ❌      | Not Implemented                   |
 |                   | /stops/location/{}/{}                                                                                                        | ❌      | "                                 |
diff --git a/ptvrs-macros/Cargo.toml b/ptvrs-macros/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "ptvrs-macros"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+proc-macro2 = "1.0.86"
+quote = "1.0.36"
+syn = { version = "2.0.70", features = ["full"] }
+
+[lib]
+proc-macro = true