Moved spawn_local to lib file. Updated server_integration example to match new fetch API.

Author: David-OConnor

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "seed"
-version = "0.2.1"
+version = "0.2.2"
 description = "A Rust framework for creating web apps, using WebAssembly"
 authors = ["DavidOConnor <[email protected]>"]
 license = "MIT"
@@ -14,7 +14,6 @@ edition = "2018"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
-#proc-macro = true
 
 [dev-dependencies]
 wasm-bindgen-test = "^0.2.29" # NOTE: keep in sync with wasm-bindgen version

README.md

@@ -2,6 +2,8 @@
 
 **A Rust framework for creating web apps**
 
+
+[![Build Status](https://travis-ci.org/rustwasm/wasm-bindgen.svg?branch=master)](https://travis-ci.org/David-OConnor/seed)
 [![](https://meritbadge.herokuapp.com/seed)](https://crates.io/crates/seed)
 [![](https://img.shields.io/crates/d/seed.svg)](https://crates.io/crates/seed)
 [![API Documentation on docs.rs](https://docs.rs/seed/badge.svg)](https://docs.rs/seed)

examples/counter/pkg/counter.js

@@ -511,7 +511,7 @@ __exports.__wbindgen_cb_drop = function(i) {
     return 0;
 };
 
-__exports.__wbindgen_closure_wrapper594 = function(a, b, _ignored) {
+__exports.__wbindgen_closure_wrapper592 = function(a, b, _ignored) {
     const f = wasm.__wbg_function_table.get(2);
     const d = wasm.__wbg_function_table.get(3);
     const cb = function(arg0) {

examples/counter/pkg/counter_bg.wasm

@@ -5,6 +5,7 @@ authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [dependencies]
+futures = "^0.1.20"
 rocket = "^0.4.0-rc.1"
 serde_json = "^1.0.33"
 

examples/server_integration/Cargo.toml

@@ -5,10 +5,11 @@ authors = ["Your Name <[email protected]>"]
 edition = "2018"
 
 [lib]
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-seed = "^0.2.1"
+futures = "^0.1.20"
+seed = { path = "../../../"}
 wasm-bindgen = "^0.2.29"
 web-sys = "^0.3.6"
 shared = { path = "../shared"}

examples/server_integration/frontend/Cargo.toml

@@ -1,10 +1,14 @@
 #[macro_use]
 extern crate seed;
+use seed::{Request, Method, spawn_local};
 use seed::prelude::*;
 
+use futures::Future;
+
 use shared::Data;
 
 
+
 // Model
 
 #[derive(Clone)]
@@ -20,14 +24,15 @@ impl Default for Model {
     }
 }
 
-fn get_data(state: seed::App<Msg, Model>) {
+fn get_data(state: seed::App<Msg, Model>) -> impl Future<Item = (), Error = JsValue>  {
     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));
+        Request::new(url)
+        .method(Method::Get)
+        .fetch_json()
+        .map(move |json| {
+            state.update(Msg::Replace(json));
+        })
 }
 
 
@@ -42,7 +47,7 @@ enum Msg {
 fn update(msg: Msg, model: Model) -> Model {
     match msg {
         Msg::GetData(state) => {
-            get_data(state);
+            spawn_local(get_data(state));
             model
         },
         Msg::Replace(data) => Model {data}

examples/server_integration/frontend/src/lib.rs

@@ -15,6 +15,4 @@ web-sys = "^0.3.6"
 serde = { version = "^1.0.83", features = ['derive'] }
 serde_json = "^1.0.33"
 
-# todo temp
 futures = "^0.1.20"
-wasm-bindgen-futures = "0.3.6"

examples/server_interaction/Cargo.toml

@@ -4,24 +4,12 @@
 #[macro_use]
 extern crate seed;
 use seed::prelude::*;
-use seed::{Request, Method};
-use wasm_bindgen_futures::future_to_promise;
+use seed::{Request, Method, spawn_local};
 use serde::{Serialize, Deserialize};
 
-// todo
-use wasm_bindgen_futures;
 use futures::Future;
 
 
-
-fn spawn_local<F>(future: F) where F: Future<Item = (), Error = JsValue> + 'static {
-    future_to_promise(future.map(|_| JsValue::UNDEFINED).map_err(|err| {
-        web_sys::console::error_1(&err);
-        err
-    }));
-}
-
-
 // Model
 
 #[derive(Clone, Serialize, Deserialize)]
@@ -56,14 +44,11 @@ struct ServerResponse {
 
 #[derive(Clone)]
 struct Model {
-//        data: Data,
     data: Branch,
 }
 
-
 fn get_data(state: seed::App<Msg, Model>) -> impl Future<Item = (), Error = JsValue> {
     let url = "https://api.github.com/repos/david-oconnor/seed/branches/master";
-//    let url = "https://seed-example.herokuapp.com/data";
 
     Request::new(url)
         .method(Method::Get)
@@ -74,7 +59,6 @@ fn get_data(state: seed::App<Msg, Model>) -> impl Future<Item = (), Error = JsVa
 }
 
 fn send() -> impl Future<Item = (), Error = JsValue> {
-//    let url = "http://127.0.0.1:8001/api/contact";
     let url = "https://infinitea.herokuapp.com/api/contact";
 
     let message = Message {
@@ -98,7 +82,6 @@ impl Default for Model {
     fn default() -> Self {
         Self {
             data: Branch{ name: "Test".into(), commit: Commit{sha: "123".into()} }
-//            data: Data {val: 0, text: "".into()}
         }
     }
 }
@@ -108,7 +91,6 @@ impl Default for Model {
 
 #[derive(Clone)]
 enum Msg {
-//        Replace(Data),
     Replace(Branch),
     GetData(seed::App<Msg, Model>),
     Send,
@@ -117,8 +99,10 @@ enum Msg {
 fn update(msg: Msg, model: Model) -> Model {
     match msg {
         Msg::Replace(data) => Model {data},
-        Msg::GetData(app) => {
-            spawn_local(get_data(app));
+        // Msg::GetData is unused in this example, but could be used when
+        // updating state from an event.
+        Msg::GetData(state) => {
+            spawn_local(get_data(state));
             model
         },
         Msg::Send => {

examples/server_interaction/src/lib.rs

@@ -599,9 +599,9 @@ __exports.__wbindgen_cb_drop = function(i) {
     return 0;
 };
 
-__exports.__wbindgen_closure_wrapper408 = function(a, b, _ignored) {
-    const f = wasm.__wbg_function_table.get(20);
-    const d = wasm.__wbg_function_table.get(21);
+__exports.__wbindgen_closure_wrapper353 = function(a, b, _ignored) {
+    const f = wasm.__wbg_function_table.get(2);
+    const d = wasm.__wbg_function_table.get(3);
     const cb = function(arg0) {
         this.cnt++;
         let a = this.a;

examples/todomvc/pkg/todomvc.js

@@ -950,8 +950,14 @@ pub fn will_unmount(mut actions: impl FnMut(&web_sys::Element) + 'static) -> Wil
 
 #[cfg(test)]
 pub mod tests {
+    #![feature(custom_attribute)]
+    use wasm_bindgen_test::wasm_bindgen_test_configure;
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    use wasm_bindgen_test::*;
     use super::*;
 
+
     use crate as seed;  // required for macros to work.
     use crate::prelude::*;
     use crate::{div};
@@ -962,8 +968,7 @@ pub mod tests {
     }
 
     // todo 'cannot call wasm-bindgen imported functions on non-wasm targets' error
-    #[test]
-    #[wasm_bindgen]  // todo ?
+    #[wasm_bindgen_test]
     pub fn single() {
         let expected = "<div>\ntest\n</div>";
 

examples/todomvc/pkg/todomvc_bg.wasm

@@ -8,6 +8,7 @@
 use futures::{Future, Poll};
 use wasm_bindgen::JsValue;
 use wasm_bindgen_futures::JsFuture;
+use wasm_bindgen_futures::future_to_promise;
 use web_sys;
 
 use serde::Serialize;
@@ -224,3 +225,10 @@ impl<A> Drop for AbortFuture<A> {
         self.controller.abort();
     }
 }
+
+pub fn spawn_local<F>(future: F) where F: Future<Item = (), Error = JsValue> + 'static {
+    future_to_promise(future.map(|_| JsValue::UNDEFINED).map_err(|err| {
+        web_sys::console::error_1(&err);
+        err
+    }));
+}

src/dom_types.rs

@@ -17,18 +17,16 @@ use wasm_bindgen::{closure::Closure, JsCast};
 
 //// todos:
 // todo local storage
-// todo maybe?? High-level css-grid and flex api?
+// todo High-level css-grid and flex api?
 // todo Async conflicts with events stepping on each other ?
-// todo keyed elements??
-// todo: Msg as copy type?
+// todo keyed elements?
 
 pub use crate::{
-    //    dom_types::{did_mount, did_update, will_unmount},  // todo: Here or in prelude?
     dom_types::{Listener},
-    fetch::{Method, Request},
+    fetch::{Method, Request, spawn_local},
     websys_bridge::{to_input, to_kbevent, to_mouse_event, to_select, to_textarea, to_html_el},
     routing::push_route,
-    vdom::{App, run} // todo app temp?
+    vdom::{App, run}
 };
 
 /// Create an element flagged in a way that it will not be rendered. Useful

src/fetch.rs

@@ -537,7 +537,6 @@ pub mod tests {
 
     #[wasm_bindgen_test]
     fn el_added() {
-        // todo macros not working here.
         let old_vdom: El<Msg> = div![ "text", vec![
             li![ "child1" ],
         ] ];
@@ -568,7 +567,6 @@ pub mod tests {
 
         assert_eq!(2 + 2, 4);
     }
-<<<<<<< HEAD
 
     #[test]
     fn el_removed() {
@@ -578,6 +576,4 @@ pub mod tests {
     fn el_changed() {
     }
 }
-=======
-}
->>>>>>> d98c94cc9894e19fc257751e6b925d3028a0886c
+