Added some basic (nonworking) tests

David-OConnor · David-OConnor · commit 03ec71d6942f · 2019-01-07T08:30:53.000-05:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,7 +60,6 @@ features = [
     "InputEvent",
 ]
 
-
 [workspace]
 members = [
     "examples/counter",
diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml
@@ -4,7 +4,6 @@ version = "0.1.0"
 authors = ["David O'Connor <david.alan.oconnor@gmail.com>"]
 edition = "2018"
 
-
 [lib]
 crate-type = ["cdylib"]
 
diff --git a/examples/counter/pkg/counter.js b/examples/counter/pkg/counter.js
@@ -511,7 +511,7 @@ __exports.__wbindgen_cb_drop = function(i) {
     return 0;
 };
 
-__exports.__wbindgen_closure_wrapper528 = function(a, b, _ignored) {
+__exports.__wbindgen_closure_wrapper594 = function(a, b, _ignored) {
     const f = wasm.__wbg_function_table.get(2);
     const d = wasm.__wbg_function_table.get(3);
     const cb = function(arg0) {
diff --git a/examples/counter/pkg/counter_bg.wasm b/examples/counter/pkg/counter_bg.wasm
diff --git a/examples/homepage/README.md b/examples/homepage/README.md
@@ -1,4 +1,4 @@
 The Seed homepage, also serving as an example. Includes
- simple interactions, markdown elements, basic routing, and lots of view markup.
+ simple interactions, markdown elements, basic routing, and view markup.
 
 # [Homepage repo](https://github.com/David-OConnor/seed-homepage)
diff --git a/examples/server_integration/Cargo.toml b/examples/server_integration/Cargo.toml
@@ -1,17 +1,13 @@
 [package]
 name = "backend"
 version = "0.1.0"
-authors = ["DavidOConnor <david.alan.oconnor@gmail.com>"]
+authors = ["Your Name <email@address.com>"]
 edition = "2018"
 
 [dependencies]
 rocket = "^0.4.0-rc.1"
-serde = { version = "^1.0.80", features = ['derive'] }
 serde_json = "^1.0.33"
 
 rocket_cors = "^0.4.0"
 
-# For experimenting with joining data structures across client and server
-seed = "^0.2.1"
-
 shared = { path = "shared" }
diff --git a/examples/server_integration/frontend b/examples/server_integration/frontend
diff --git a/examples/server_integration/frontend/Cargo.toml b/examples/server_integration/frontend/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "frontend"
+version = "0.1.0"
+authors = ["Your Name <email@address.com>"]
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+seed = "^0.2.1"
+wasm-bindgen = "^0.2.29"
+web-sys = "^0.3.6"
+shared = { path = "../shared"}
diff --git a/examples/server_integration/frontend/build.ps1 b/examples/server_integration/frontend/build.ps1
@@ -0,0 +1,2 @@
+cargo build --target wasm32-unknown-unknown
+wasm-bindgen target/wasm32-unknown-unknown/debug/frontend.wasm --no-modules --out-dir ./pkg
diff --git a/examples/server_integration/frontend/build.sh b/examples/server_integration/frontend/build.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+cargo build --target wasm32-unknown-unknown
+wasm-bindgen target/wasm32-unknown-unknown/debug/frontend.wasm --no-modules --out-dir ./pkg
diff --git a/examples/server_integration/frontend/index.html b/examples/server_integration/frontend/index.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+    <meta name="description" content="">
+
+    <link rel="icon" type="image/png" href="./public/favicon.png">
+
+    <!--<link rel="stylesheet" type="text/css" href="./style.css">-->
+
+    <title>A Title</title>
+
+</head>
+<body>
+<section id="main"></section>
+
+<script src='./pkg/frontend.js'></script>
+
+<script>
+    // the `wasm_bindgen` global is set to the exports of the Rust module
+    const { render } = wasm_bindgen;
+    // we'll defer our execution until the wasm is ready to go
+    function run() {
+        render();
+    }
+    // here we tell bindgen the path to the wasm file so it can run
+    // initialization and return to us a promise when it's done
+    wasm_bindgen('./pkg/frontend_bg.wasm')
+        .then(run)
+        .catch(console.error);
+</script>
+
+</body>
+</html>
diff --git a/examples/server_integration/frontend/pkg/.keep b/examples/server_integration/frontend/pkg/.keep
diff --git a/examples/server_integration/frontend/serve.py b/examples/server_integration/frontend/serve.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+
+import http.server
+import os
+import socketserver
+import urllib
+
+PORT = 8000
+
+
+class Handler(http.server.SimpleHTTPRequestHandler):
+    # Allow SPA routing by redirecting subpaths.
+    def do_GET(self):
+        urlparts = urllib.parse.urlparse(self.path)
+        request_file_path = urlparts.path.strip('/')
+
+        if not os.path.exists(request_file_path):
+            self.path = 'index.html'
+
+        return http.server.SimpleHTTPRequestHandler.do_GET(self)
+
+
+handler = Handler
+# Add support for the WASM mime type.
+handler.extensions_map.update({
+    '.wasm': 'application/wasm',
+})
+
+socketserver.TCPServer.allow_reuse_address = True
+with socketserver.TCPServer(("", PORT), handler) as httpd:
+    httpd.allow_reuse_address = True
+    print("Serving at port", PORT)
+    httpd.serve_forever()
diff --git a/examples/server_integration/frontend/src/lib.rs b/examples/server_integration/frontend/src/lib.rs
@@ -0,0 +1,68 @@
+#[macro_use]
+extern crate seed;
+use seed::prelude::*;
+
+use shared::Data;
+
+
+// Model
+
+#[derive(Clone)]
+struct Model {
+    pub data: Data,
+}
+
+impl Default for Model {
+    fn default() -> Self {
+        Self {
+           data: Data {val: 0, text: "".into()}
+        }
+    }
+}
+
+fn get_data(state: seed::App<Msg, Model>) {
+    let url = "http://localhost:8001/data";
+    let callback = move |json: JsValue| {
+        let data: Data = json.into_serde().unwrap();
+        state.update(Msg::Replace(data));
+    };
+
+    seed::get(url, None, Box::new(callback));
+}
+
+
+// Update
+
+#[derive(Clone)]
+enum Msg {
+    GetData(seed::App<Msg, Model>),
+    Replace(Data),
+}
+
+fn update(msg: Msg, model: Model) -> Model {
+    match msg {
+        Msg::GetData(state) => {
+            get_data(state);
+            model
+        },
+        Msg::Replace(data) => Model {data}
+    }
+}
+
+
+// View
+
+fn view(state: seed::App<Msg, Model>, model: Model) -> El<Msg> {
+    div![
+        h1![ format!("Val: {} Text: {}", model.data.val, model.data.text) ],
+        button![ 
+            raw_ev("click", move |_| Msg::GetData(state.clone())), 
+            "Update data"
+        ]
+    ]
+}
+
+#[wasm_bindgen]
+pub fn render() {
+    seed::run(Model::default(), update, view, "main", None, None);
+}
diff --git a/examples/server_integration/shared/Cargo.toml b/examples/server_integration/shared/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "shared"
 version = "0.1.0"
-authors = ["DavidOConnor <david.alan.oconnor@gmail.com>"]
+authors = ["Your Name <email@address.com>"]
 edition = "2018"
 
 [dependencies]
diff --git a/examples/server_integration/src/main.rs b/examples/server_integration/src/main.rs
@@ -6,9 +6,6 @@ use rocket::http::Method;
 use rocket_cors;
 use rocket_cors::{AllowedHeaders, AllowedOrigins};
 
-use serde::{Serialize, Deserialize};
-use serde_json;
-
 use shared::Data;
 
 
diff --git a/examples/server_interaction/Cargo.toml b/examples/server_interaction/Cargo.toml
@@ -4,7 +4,6 @@ version = "0.1.0"
 authors = ["David O'Connor <david.alan.oconnor@gmail.com>"]
 edition = "2018"
 
-
 [lib]
 crate-type = ["cdylib"]
 
diff --git a/examples/server_interaction/README.md b/examples/server_interaction/README.md
@@ -1,4 +1,4 @@
-## Communicating with a server with HTTP requests
+## Communicating with a server using HTTP requests
 
 Using web-sys's fetch, and Serde's [de]serializiation. Demonstrates sending and receiving
 Get and Post requests using web_sys's Fetch API, and updating state outside of the element
diff --git a/examples/todomvc/pkg/todomvc.js b/examples/todomvc/pkg/todomvc.js
@@ -599,9 +599,9 @@ __exports.__wbindgen_cb_drop = function(i) {
     return 0;
 };
 
-__exports.__wbindgen_closure_wrapper422 = function(a, b, _ignored) {
-    const f = wasm.__wbg_function_table.get(2);
-    const d = wasm.__wbg_function_table.get(3);
+__exports.__wbindgen_closure_wrapper408 = function(a, b, _ignored) {
+    const f = wasm.__wbg_function_table.get(20);
+    const d = wasm.__wbg_function_table.get(21);
     const cb = function(arg0) {
         this.cnt++;
         let a = this.a;
diff --git a/examples/todomvc/pkg/todomvc_bg.wasm b/examples/todomvc/pkg/todomvc_bg.wasm
diff --git a/src/dom_types.rs b/src/dom_types.rs
@@ -386,10 +386,10 @@ pub struct Style {
 }
 
 impl Style {
-    // todo avoid Dry code between this and Attrs.
     pub fn new(vals: HashMap<String, String>) -> Self {
         let mut new_vals = HashMap::new();
         for (key, val) in vals.into_iter() {
+            // Handle automatic conversion to string with "px" appended, for integers.
             let val_backup = val.clone();
             match val.parse::<u32>() {
                 Ok(_) => new_vals.insert(key, val_backup + "px"),
@@ -407,11 +407,13 @@ impl Style {
     /// Output style as a string, as would be set in the DOM as the attribute value
     /// for 'style'. Eg: "display: flex; font-size: 1.5em"
     pub fn to_string(&self) -> String {
-        self.vals
-            .iter()
-            .map(|(k,v)|format!("{}:{}",k,v))
-            .collect::<Vec<_>>()
-            .join(";")
+        if self.vals.keys().len() > 0 {
+            self.vals
+                .iter()
+                .map(|(k, v)| format!("{}:{}", k, v))
+                .collect::<Vec<_>>()
+                .join(";")
+        } else { String::new() }
     }
 
     pub fn add(&mut self, key: &str, val: &str) {
@@ -785,7 +787,6 @@ impl<Ms: Clone + 'static> El<Ms> {
         self.text = Some(text.into())
     }
 
-    // todo do we need this method?
     /// Output the HTML of this node, including all its children, recursively.
     fn _html(&self) -> String {
         let text = self.text.clone().unwrap_or_default();
@@ -946,3 +947,28 @@ pub fn will_unmount(mut actions: impl FnMut(&web_sys::Element) + 'static) -> Wil
     WillUnmount { actions: Box::new(closure) }
 }
 
+
+#[cfg(test)]
+pub mod tests {
+    use super::*;
+
+    use crate as seed;  // required for macros to work.
+    use crate::prelude::*;
+    use crate::{div};
+
+    #[derive(Clone)]
+    enum  Msg {
+        Placeholder
+    }
+
+    // todo 'cannot call wasm-bindgen imported functions on non-wasm targets' error
+    #[test]
+    #[wasm_bindgen]  // todo ?
+    pub fn single() {
+        let expected = "<div>\ntest\n</div>";
+
+        let mut el: El<Msg> = div![ "test" ];
+        crate::vdom::setup_els(&crate::util::document(), &mut el, 0, 0);
+        assert_eq!(expected, el.el_ws.unwrap().inner_html());
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -7,6 +7,7 @@ pub mod fetch;
 pub mod routing;
 pub mod shortcuts;
 pub mod storage;
+mod util;
 mod vdom;
 mod websys_bridge;
 
@@ -30,14 +31,6 @@ pub use crate::{
     vdom::{App, run} // todo app temp?
 };
 
-/// Convenience function to access the web_sys DOM document.
-pub fn document() -> web_sys::Document {
-    web_sys::window()
-        .expect("Can't find window")
-        .document()
-        .expect("Can't find document")
-}
-
 /// Create an element flagged in a way that it will not be rendered. Useful
 /// in ternary operations.
 pub fn empty<Ms: Clone>() -> dom_types::El<Ms> {
@@ -85,5 +78,6 @@ pub mod prelude {
     };
 
     pub use wasm_bindgen::prelude::*;
+//    pub use wasm_bindgen_macro::wasm_bindgen;
 
 }
diff --git a/src/routing.rs b/src/routing.rs
@@ -2,15 +2,12 @@ use std::collections::HashMap;
 
 use wasm_bindgen::{closure::Closure, JsCast, JsValue};
 
+use crate::util;
 
-/// Convenience function to avoid repeating expect logic.
-fn make_window() -> web_sys::Window {
-    web_sys::window().expect("Can't find the global Window.")
-}
 
 /// A convenience function to prevent repetitions
 fn get_path() -> String {
-    let path = make_window().location().pathname().expect("Can't find pathname");
+    let path = util::window().location().pathname().expect("Can't find pathname");
     path[1..path.len()].to_string()
 }
 
@@ -30,7 +27,7 @@ pub fn update_popstate_listener<Ms, Mdl>(app: &crate::vdom::App<Ms, Mdl>, routes
     where Ms: Clone +'static, Mdl: Clone + 'static
 {
 
-    let window = make_window();
+    let window = util::window();
     if let Some(ps_closure) = app.data.popstate_closure.borrow().as_ref() {
         (window.as_ref() as &web_sys::EventTarget)
             .remove_event_listener_with_callback("popstate", ps_closure.as_ref().unchecked_ref())
@@ -66,7 +63,7 @@ pub fn update_popstate_listener<Ms, Mdl>(app: &crate::vdom::App<Ms, Mdl>, routes
 
 //pub fn push<Ms: Clone + 'static>(path: &str, message: Ms) {
 pub fn push_route(path: &str) {
-    let history = make_window().history().expect("Can't find history");
+    let history = util::window().history().expect("Can't find history");
     // The second parameter, title, is currently unused by Firefox at least.
     // The first, an arbitrary state object, we could possibly use.
     // todo: Look into using state/events
diff --git a/src/util.rs b/src/util.rs
diff --git a/src/vdom.rs b/src/vdom.rs

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ features = [`
`60`	`60`	`"InputEvent",`
`61`	`61`	`]`
`62`	`62`
`63`		`-`
`64`	`63`	`[workspace]`
`65`	`64`	`members = [`
`66`	`65`	`"examples/counter",`
-Original file line number
+Diff line change
 authors = ["David O'Connor <[email protected]>"]
 edition = "2018"
+-
 [lib]
 crate-type = ["cdylib"]
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+cargo build --target wasm32-unknown-unknown`
	`2`	`+wasm-bindgen target/wasm32-unknown-unknown/debug/frontend.wasm --no-modules --out-dir ./pkg`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/usr/bin/env bash`
	`2`	`+cargo build --target wasm32-unknown-unknown`
	`3`	`+wasm-bindgen target/wasm32-unknown-unknown/debug/frontend.wasm --no-modules --out-dir ./pkg`