tide-jsx

Tide + JSX

13ca0b5b — Peter John

v0.4.0

Files changed (10) hide show

.github/workflows/rust.yml DELETED Viewed

@@ -1,30 +0,0 @@
-name: Rust
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: hecrj/setup-rust-action@v1
-      with:
-        rust-version: stable
-    - uses: actions/checkout@v1
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
-  fmt:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: hecrj/setup-rust-action@v1
-      with:
-        rust-version: stable
-        components: rustfmt
-    - uses: actions/checkout@v1
-    - name: cargo fmt
-      run: cargo fmt -- --check

.github/workflows/test.yml ADDED Viewed

@@ -0,0 +1,35 @@
+name: Test
+on: [push, pull_request]
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - uses: actions/checkout@master
+      - run: rustup component add rustfmt
+      - run: cargo fmt --all -- --check
+  test:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        rust: [stable]
+        experimental: [false]
+        include:
+          - rust: nightly
+            os: ubuntu-latest
+            experimental: true
+    steps:
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+      - uses: actions/checkout@master
+      - name: Run tests
+        run: |
+          cargo build --verbose
+          cargo test --verbose
+          cargo build --example basic

Cargo.lock CHANGED Viewed

@@ -1465,7 +1465,7 @@ dependencies = [
 [[package]]
 name = "tide-jsx"
-version = "0.3.2"
+version = "0.4.0"
 dependencies = [
  "async-std",
  "pretty_assertions",
@@ -1476,7 +1476,7 @@ dependencies = [
 [[package]]
 name = "tide-jsx-impl"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",

Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "tide-jsx"
-version = "0.3.3"
+version = "0.4.0"
 authors = ["pyrossh", "Gal Schlezinger <gal@spitfire.co.il>"]
 edition = "2021"
 description = "A safe and simple template engine with the ergonomics of JSX"
@@ -12,7 +12,7 @@ license = "MIT"
 [dependencies]
 tide = "0.16.0"
-tide-jsx-impl = { path = "impl", version = "0.2.2" }
+tide-jsx-impl = { path = "impl", version = "0.3.0" }
 [dev-dependencies]
 pretty_assertions = "0.6"

README.md CHANGED Viewed

@@ -104,15 +104,7 @@ use render::{component, rsx, html, Render};
 #[component]
 fn Page<'a, Children: Render>(title: &'a str, children: Children) {
    rsx! {
-     <>
-       <HTML5Doctype />
-       <html>
-         <head><title>{title}</title></head>
-         <body>
-           {children}
-         </body>
-       </html>
-     </>
    }
 }

examples/basic.rs ADDED Viewed

@@ -0,0 +1,45 @@
+use tide::http::mime;
+use tide::utils::After;
+use tide::{Request, Response, log};
+use tide_jsx::{view, rsx, component};
+use tide_jsx::html::HTML5Doctype;
+#[component]
+fn Heading<'title>(title: &'title str) {
+  rsx! { <h1 class={"title"}>{title}</h1> }
+}
+async fn index(_req: Request<()>) -> tide::Result {
+    view! {
+      <>
+       <HTML5Doctype />
+       <html>
+         <head><title>{"Tide JSX"}</title></head>
+         <body>
+             <div>
+              <Heading title={"Hello world"} />
+            </div>
+        </body>
+       </html>
+     </>
+    }
+}
+#[async_std::main]
+async fn main() -> tide::Result<()> {
+    log::start();
+    let mut app = tide::new();
+    app.with(tide::log::LogMiddleware::new());
+    app.with(After(|mut res: Response| async {
+        if let Some(err) = res.error() {
+            let msg = format!("<h1>Error: {:?}</h1>", err);
+            res.set_status(err.status());
+            res.set_content_type(mime::HTML);
+            res.set_body(msg);
+        }
+        Ok(res)
+    }));
+    app.at("/").get(index);
+    app.listen("127.0.0.1:5000").await?;
+    Ok(())
+}

impl/Cargo.lock CHANGED Viewed

@@ -103,7 +103,7 @@ dependencies = [
 [[package]]
 name = "tide-jsx-impl"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "pretty_assertions",
  "proc-macro-error",

impl/Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "tide-jsx-impl"
-version = "0.2.2"
+version = "0.3.0"
 authors = ["pyrossh", "Gal Schlezinger <gal@spitfire.co.il>"]
 edition = "2021"
 description = "The macros needed for `render`"

impl/src/lib.rs CHANGED Viewed

@@ -36,10 +36,10 @@ pub fn rsx(input: TokenStream) -> TokenStream {
 pub fn view(input: TokenStream) -> TokenStream {
     let el = parse_macro_input!(input as Element);
     let result = quote! {
-      ::tide::Response::builder(StatusCode::Ok)
+      Ok(::tide::Response::builder(tide::http::StatusCode::Ok)
             .content_type(::tide::http::mime::HTML)
-            .body(#el.render())
+            .body(::tide_jsx::Render::render(#el))
-            .build()
+            .build())
     };
     TokenStream::from(result)
 }

tests/lib.rs CHANGED Viewed

@@ -153,7 +153,8 @@ fn vec() {
 #[async_std::test]
 async fn render_view() -> std::io::Result<()> {
-    let mut res = view! { <p>{"hello"}</p> };
+    let result = view! { <p>{"hello"}</p> } as tide::Result;
+    let mut res = result.unwrap();
     assert_eq!(res.status(), StatusCode::Ok);
     assert_eq!(res.header("content-type").unwrap().as_str(), tide::http::mime::HTML.to_string());
     assert_eq!(res.take_body().into_string().await.unwrap(), "<p>hello</p>");