update examples

Justfile

@@ -119,13 +119,9 @@ plugin:
   reset
   cargo run --bin tek_plugin
 
-edn01:
+edn:
   reset
-  cd edn && cargo run --example edn01
+  cargo run --example edn
-
-edn02:
-  reset
-  cd edn && cargo run --example edn02
 
 test:
   reset

edn/examples/edn02.rs

@@ -1,31 +0,0 @@
-use tek_tui::{*, tek_layout::{*, tek_engine::*}};
-use tek_edn::*;
-use std::sync::{Arc, RwLock};
-
-const EDN: &'static str = include_str!("edn02.edn");
-
-fn main () -> Usually<()> {
-    let state = Arc::new(RwLock::new(Example));
-    Tui::new().unwrap().run(&state)?;
-    Ok(())
-}
-
-pub struct Example;
-
-impl EdnViewData<Tui> for &Example {
-    fn get_content <'a> (&'a self, sym: &'a str) -> RenderBox<'a, Tui> {
-        Box::new(Thunk::new(move||match sym {
-            ":hello" => "Hello",
-            ":world" => "world",
-            _ => ""
-        }))
-    }
-}
-
-impl Content<TuiOut> for Example {
-    fn content (&self) -> impl Render<TuiOut> {
-        EdnView::new(self, EDN).unwrap()
-    }
-}
-
-impl Handle<TuiIn> for Example {}

edn/src/edn_view.rs

@@ -9,6 +9,7 @@ pub type EdnCallback<'a, Output, State> =
 pub type EdnRenderCallback<'a, Output, State> =
     Box<EdnCallback<'a, Output, State>>;
 
+/// Provides values to the template
 pub trait EdnViewData<E: Output> {
     fn get_bool    (&self, _sym: EdnItem<&str>) -> bool { false }
     fn get_unit    (&self, _sym: EdnItem<&str>) -> E::Unit { 0.into() }
@@ -25,9 +26,11 @@ pub enum EdnView<E: Output, T: EdnViewData<E>> {
 }
 
 impl<E: Output, T: EdnViewData<E>> EdnView<E, T> {
-    pub fn new (context: T, source: &str) -> Usually<Self> {
+    pub fn new (state: T, source: &str) -> Self {
-        let layout = EdnItem::read_one(&source)?.0;
+        match EdnItem::read_one(&source) {
-        Ok(Self::Ok(context, layout))
+            Ok((layout, _)) => Self::Ok(state, layout),
+            Err(error) => Self::Err(format!("{error}"))
+        }
     }
 }
 

examples/edn.rs

@@ -16,8 +16,8 @@ fn main () -> Usually<()> {
 
 pub struct Example(usize);
 
-impl EdnViewData<Tui> for &Example {
+impl EdnViewData<TuiOut> for &Example {
-    fn get_content <'a> (&'a self, sym: EdnItem<&'a str>) -> RenderBox<'a, Tui> {
+    fn get_content <'a> (&'a self, sym: EdnItem<&'a str>) -> RenderBox<'a, TuiOut> {
         Box::new(Thunk::new(move||match sym {
             EdnItem::Sym(":hello-world") => "Hello world!",
             EdnItem::Sym(":hello") => "Hello",
@@ -30,9 +30,8 @@ impl EdnViewData<Tui> for &Example {
 impl Content<TuiOut> for Example {
     fn content (&self) -> impl Render<TuiOut> {
         Bsp::a(
-            &format!("{}", self.0),
+            Push::xy(1, 1, Align::n(format!("Example {}/{}:", self.0 + 1, EDN.len()))),
             EdnView::new(self, EDN[self.0])
-                .unwrap_or_else(|e|format!("Failed to render {}: {e}", self.0))
         )
     }
 }

src/groovebox/groovebox_tui.rs

@@ -8,7 +8,7 @@ const EDN: &'static str = include_str!("groovebox.edn");
 
 impl Content<TuiOut> for Groovebox {
     fn content (&self) -> impl Render<TuiOut> {
-        self.size.of(EdnView::new(self, EDN).expect("failed to build view"))
+        self.size.of(EdnView::new(self, EDN))
     }
 }