(self, writer: &mut W) -> std::fmt::Result {
+/// Render::render_into(rsx! { {self.title}
}, writer)
/// }
/// }
///
-/// let rendered = html! { };
+/// let rendered = html! { };
///
-/// assert_eq!(rendered, r#"Hello world!
"#);
+/// assert_eq!(rendered, r#"Hello world!
"#);
/// ```
///
/// ### Values are always surrounded by curly braces
@@ -71,10 +71,10 @@ use syn::parse_macro_input;
/// # use render_macros::html;
/// # use pretty_assertions::assert_eq;
/// let rendered = html! {
-///
+///
/// };
///
-/// assert_eq!(rendered, r#""#);
+/// assert_eq!(rendered, r#""#);
/// ```
///
/// ### Custom components can't accept dashed-separated values
@@ -96,13 +96,13 @@ use syn::parse_macro_input;
/// # #![feature(proc_macro_hygiene)]
/// # use render_macros::html;
/// # use pretty_assertions::assert_eq;
-/// let class = "some_class";
+/// let class = "someclass";
///
/// let rendered = html! {
///
/// };
///
-/// assert_eq!(rendered, r#""#);
+/// assert_eq!(rendered, r#""#);
/// ```
///
/// ### Punning is not supported for dashed-delimited attributes
@@ -120,7 +120,7 @@ use syn::parse_macro_input;
#[proc_macro]
pub fn html(input: TokenStream) -> TokenStream {
let el = proc_macro2::TokenStream::from(rsx(input));
- let result = quote! { ::render::Renderable::render(#el) };
+ let result = quote! { ::render::Render::render(#el) };
TokenStream::from(result)
}
@@ -132,7 +132,7 @@ pub fn rsx(input: TokenStream) -> TokenStream {
TokenStream::from(result)
}
-/// A syntactic sugar for implementing [`Renderable`](../render/trait.Renderable.html) conveniently
+/// A syntactic sugar for implementing [`Render`](../render/trait.Render.html) conveniently
/// using functions.
///
/// This attribute should be above a stand-alone function definition that returns a
@@ -140,34 +140,34 @@ pub fn rsx(input: TokenStream) -> TokenStream {
///
/// ```rust
/// # #![feature(proc_macro_hygiene)]
-/// # use render_macros::{component, html};
+/// # use render_macros::{component, rsx};
/// #
/// #[component]
-/// fn UserFn(name: String) -> String {
-/// html! { {format!("Hello, {}", name)}
}
+/// fn UserFn(name: String) {
+/// rsx! { {format!("Hello, {}", name)}
}
/// }
/// ```
///
-/// Practically, this is exactly the same as using the [Renderable](../render/trait.Renderable.html) trait:
+/// Practically, this is exactly the same as using the [Render](../render/trait.Render.html) trait:
///
/// ```rust
/// # #![feature(proc_macro_hygiene)]
-/// # use render_macros::{component, html};
-/// # use render::Renderable;
+/// # use render_macros::{component, rsx, html};
+/// # use render::Render;
/// # use pretty_assertions::assert_eq;
/// #
/// #[derive(Debug)]
/// struct User { name: String }
///
-/// impl render::Renderable for User {
-/// fn render(self) -> String {
-/// html! { {format!("Hello, {}", self.name)}
}
+/// impl render::Render for User {
+/// fn render_into(self, writer: &mut W) -> std::fmt::Result {
+/// Render::render_into(rsx! { {format!("Hello, {}", self.name)}
}, writer)
/// }
/// }
///
/// # #[component]
-/// # fn UserFn(name: String) -> String {
-/// # html! { {format!("Hello, {}", name)}
}
+/// # fn UserFn(name: String) {
+/// # rsx! { {format!("Hello, {}", name)}
}
/// # }
/// #
/// # let from_fn = html! {
@@ -183,5 +183,5 @@ pub fn rsx(input: TokenStream) -> TokenStream {
#[proc_macro_attribute]
pub fn component(_attr: TokenStream, item: TokenStream) -> TokenStream {
let f = parse_macro_input!(item as syn::ItemFn);
- function_component::to_component(f)
+ function_component::create_function_component(f)
}
diff --git a/render_tests/src/lib.rs b/render_tests/src/lib.rs
index 1a0caa3..f111048 100644
--- a/render_tests/src/lib.rs
+++ b/render_tests/src/lib.rs
@@ -1,81 +1,17 @@
#![feature(proc_macro_hygiene)]
-use render::html::HTML5Doctype;
-use render::{component, html, rsx, Renderable};
-
-#[derive(Debug)]
-struct Hello<'a, T: Renderable> {
- world: &'a str,
- yes: i32,
- children: T,
-}
-
-impl<'a, T: Renderable> Renderable for Hello<'a, T> {
- fn render(self) -> String {
- html! {
-
- {format!("{}", self.world)}
-
- {format!("A number: {}", self.yes)}
- {self.children}
-
- }
- }
-}
-
-pub fn it_works() -> String {
- let world = "hello";
- let other_value = rsx! {
- {format!("hello world?")}
- };
- let value = html! {
- <>
-
-
- {format!("HEY!")}
- {other_value}
-
-
- };
- value
-}
-
-#[component]
-pub fn Layout<'a, Children: Renderable>(title: &'a str, children: Children) -> String {
- html! {
-
- {title}
-
- {children}
-
-
- }
-}
-
-#[component]
-pub fn SomeComponent(name: String) -> String {
- html! {
- {format!("Hello, {}", name)}
- }
-}
-
-#[test]
-pub fn verify_works() {
- println!("{}", it_works());
-}
-
#[test]
pub fn works_with_dashes() {
use pretty_assertions::assert_eq;
- let value = html! { };
- assert_eq!(value, r#""#);
+ let value = render::html! { };
+ assert_eq!(value, r#""#);
}
#[test]
pub fn works_with_raw() {
use pretty_assertions::assert_eq;
- use render::raw;
+ use render::{html, raw};
let actual = html! {
{raw!("")}
@@ -83,3 +19,52 @@ pub fn works_with_raw() {
assert_eq!(actual, "
");
}
+
+mod kaki {
+ // A simple HTML 5 doctype declaration
+ use render::html::HTML5Doctype;
+ use render::{
+ // A macro to create components
+ component,
+ // A macro to compose components in JSX fashion
+ rsx,
+ // A trait for custom components
+ Render,
+ };
+
+ // This can be any layout we want
+ #[component]
+ fn Page<'a, Children: Render>(title: &'a str, children: Children) {
+ rsx! {
+ <>
+
+
+ {title}
+
+ {children}
+
+
+
+ }
+ }
+
+ #[test]
+ fn test() {
+ use pretty_assertions::assert_eq;
+ let actual = render::html! {
+
+ {format!("Welcome, {}", "Gal")}
+
+ };
+ let expected = concat!(
+ "",
+ "",
+ "Home",
+ "",
+ "Welcome, Gal",
+ "",
+ ""
+ );
+ assert_eq!(actual, expected);
+ }
+}