From 9f9971f4cf88cc3627e08c714dd130553b6ab1a1 Mon Sep 17 00:00:00 2001
From: Sergio Benitez <sb@sergio.bz>
Date: Thu, 28 Dec 2017 20:52:03 -0800
Subject: [PATCH] Tidy up handlebars example.

---
 examples/handlebars_templates/src/main.rs     | 23 +++++++++++--------
 .../templates/index.html.hbs                  |  6 ++---
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/examples/handlebars_templates/src/main.rs b/examples/handlebars_templates/src/main.rs
index 20ea8e9a..b9bf9aa3 100644
--- a/examples/handlebars_templates/src/main.rs
+++ b/examples/handlebars_templates/src/main.rs
@@ -9,8 +9,8 @@ extern crate rocket;
 
 use rocket::Request;
 use rocket::response::Redirect;
-use rocket_contrib::Template;
-use rocket_contrib::handlebars::{Helper, Handlebars, RenderContext, RenderError, JsonRender};
+use rocket_contrib::{Template, handlebars};
+use handlebars::{Helper, Handlebars, RenderContext, RenderError, JsonRender};
 
 #[derive(Serialize)]
 struct TemplateContext {
@@ -27,7 +27,7 @@ fn index() -> Redirect {
 fn get(name: String) -> Template {
     let context = TemplateContext {
         name: name,
-        items: vec!["One", "Two", "Three"].iter().map(|s| s.to_string()).collect()
+        items: vec!["One".into(), "Two".into(), "Three".into()],
     };
 
     Template::render("index", &context)
@@ -40,20 +40,23 @@ fn not_found(req: &Request) -> Template {
     Template::render("error/404", &map)
 }
 
-fn echo_helper(h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> Result<(), RenderError> {
-    if let Some(p0) = h.param(0) {
-        rc.writer.write(p0.value().render().into_bytes().as_ref())?;
-    };
+type HelperResult = Result<(), RenderError>;
+
+fn wow_helper(h: &Helper, _: &Handlebars, rc: &mut RenderContext) -> HelperResult {
+    if let Some(param) = h.param(0) {
+        write!(rc.writer, "<b><i>{}</i></b>", param.value().render())?;
+    }
+
     Ok(())
 }
 
 fn rocket() -> rocket::Rocket {
     rocket::ignite()
         .mount("/", routes![index, get])
-        .attach(Template::custom(|engines| {
-            engines.handlebars.register_helper("echo", Box::new(echo_helper));
-        }))
         .catch(catchers![not_found])
+        .attach(Template::custom(|engines| {
+            engines.handlebars.register_helper("wow", Box::new(wow_helper));
+        }))
 }
 
 fn main() {
diff --git a/examples/handlebars_templates/templates/index.html.hbs b/examples/handlebars_templates/templates/index.html.hbs
index 90ebf069..e74f8bfe 100644
--- a/examples/handlebars_templates/templates/index.html.hbs
+++ b/examples/handlebars_templates/templates/index.html.hbs
@@ -9,11 +9,11 @@
     <h3>Here are your items:</h3>
     <ul>
       {{#each items}}
-      <li>{{this}}</li>
+         <li>{{this}}</li>
       {{/each}}
     </ul>
 
-    <p>Try going to <a href="/hello/YourName">/hello/YourName</a></p>
-    <p>You can define custom helper like <b>{{echo "this"}}</b>.</p>
+    <p>Try going to <a href="/hello/YourName">/hello/YourName</a>.</p>
+    <p>Also, check {{ wow "this" }} (custom helper) out!</p>
   </body>
 </html>