Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added register_local_helper_rc to RenderContext. #383

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 13 additions & 15 deletions examples/decorator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,19 @@ fn format_decorator(
.unwrap_or("".to_owned());
rc.register_local_helper(
"format",
Box::new(
move |h: &Helper,
_: &Handlebars,
_: &Context,
_: &mut RenderContext,
out: &mut dyn Output| {
// get parameter from helper or throw an error
let param = h
.param(0)
.ok_or(RenderError::new("Param 0 is required for format helper."))?;
let rendered = format!("{} {}", param.value().render(), suffix);
out.write(rendered.as_ref())?;
Ok(())
},
),
move |h: &Helper,
_: &Handlebars,
_: &Context,
_: &mut RenderContext,
out: &mut dyn Output| {
// get parameter from helper or throw an error
let param = h
.param(0)
.ok_or(RenderError::new("Param 0 is required for format helper."))?;
let rendered = format!("{} {}", param.value().render(), suffix);
out.write(rendered.as_ref())?;
Ok(())
},
);
Ok(())
}
Expand Down
4 changes: 2 additions & 2 deletions src/decorators/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub type DecoratorResult = Result<(), RenderError>;
/// // your helper logic
/// Ok(())
/// };
/// rc.register_local_helper("distance", Box::new(new_helper));
/// rc.register_local_helper("distance", new_helper);
/// Ok(())
/// }
/// ```
Expand Down Expand Up @@ -274,7 +274,7 @@ mod test {
Ok(())
};

rc.register_local_helper("distance", Box::new(new_helper));
rc.register_local_helper("distance", new_helper);
Ok(())
},
),
Expand Down
32 changes: 32 additions & 0 deletions src/helpers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,38 @@ impl<
}
}

impl<T> HelperDef for std::rc::Rc<T>
where
T: HelperDef,
{
fn call<'reg: 'rc, 'rc>(
&self,
h: &Helper<'reg, 'rc>,
r: &'reg Registry<'reg>,
ctx: &'rc Context,
rc: &mut RenderContext<'reg, 'rc>,
out: &mut dyn Output,
) -> HelperResult {
(**self).call(h, r, ctx, rc, out)
}
}

impl<T> HelperDef for std::sync::Arc<T>
where
T: HelperDef,
{
fn call<'reg: 'rc, 'rc>(
&self,
h: &Helper<'reg, 'rc>,
r: &'reg Registry<'reg>,
ctx: &'rc Context,
rc: &mut RenderContext<'reg, 'rc>,
out: &mut dyn Output,
) -> HelperResult {
(**self).call(h, r, ctx, rc, out)
}
}

mod block_util;
pub(crate) mod helper_boolean;
mod helper_each;
Expand Down
11 changes: 7 additions & 4 deletions src/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,14 +189,17 @@ impl<'reg: 'rc, 'rc> RenderContext<'reg, 'rc> {
/// Register a helper in this render context.
/// This is a feature provided by Decorator where you can create
/// temporary helpers.
pub fn register_local_helper(
pub fn register_local_helper<H>(
&mut self,
name: &str,
def: Box<dyn HelperDef + 'rc>,
) -> Option<Rc<dyn HelperDef + 'rc>> {
def: H,
) -> Option<Rc<dyn HelperDef + 'rc>>
where
H: HelperDef + 'rc,
{
self.inner_mut()
.local_helpers
.insert(name.to_string(), def.into())
.insert(name.to_string(), Rc::from(def))
}

/// Remove a helper from render context
Expand Down