talexander/duster
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Integrated new_breadcrumbs into exists and not exists, and partially integrated it into partials.

Browse Source
This commit is contained in:
Tom Alexander 2020-05-25 16:03:00 -04:00
parent 32c047a9b9
commit 17121aa85b
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/renderer/renderer.rs
View File

@ -250,29 +250,58 @@ impl<'a> DustRenderer<'a> {
} }
} }
DustTag::DTExists(container) => { DustTag::DTExists(container) => {
let new_breadcrumbs =
Self::new_breadcrumbs(breadcrumbs, None, &container.explicit_context, None);
let val = walk_path(breadcrumbs, &container.path.keys); let val = walk_path(breadcrumbs, &container.path.keys);
return if val.map(|v| v.is_truthy()).unwrap_or(false) { return if val.map(|v| v.is_truthy()).unwrap_or(false) {
self.render_maybe_body(&container.contents, breadcrumbs, blocks) self.render_maybe_body(
&container.contents,
new_breadcrumbs.as_ref().unwrap_or(breadcrumbs),
blocks,
)
} else { } else {
self.render_maybe_body(&container.else_contents, breadcrumbs, blocks) self.render_maybe_body(
&container.else_contents,
new_breadcrumbs.as_ref().unwrap_or(breadcrumbs),
blocks,
)
}; };
} }
DustTag::DTNotExists(container) => { DustTag::DTNotExists(container) => {
let new_breadcrumbs =
Self::new_breadcrumbs(breadcrumbs, None, &container.explicit_context, None);
let val = walk_path(breadcrumbs, &container.path.keys); let val = walk_path(breadcrumbs, &container.path.keys);
return if !val.map(|v| v.is_truthy()).unwrap_or(false) { return if !val.map(|v| v.is_truthy()).unwrap_or(false) {
self.render_maybe_body(&container.contents, breadcrumbs, blocks) self.render_maybe_body(
&container.contents,
new_breadcrumbs.as_ref().unwrap_or(breadcrumbs),
blocks,
)
} else { } else {
self.render_maybe_body(&container.else_contents, breadcrumbs, blocks) self.render_maybe_body(
&container.else_contents,
new_breadcrumbs.as_ref().unwrap_or(breadcrumbs),
blocks,
)
}; };
} }
DustTag::DTPartial(partial) => { DustTag::DTPartial(partial) => {
let partial_name = self.render_partial_name(&partial.name, breadcrumbs, blocks)?; let partial_name = self.render_partial_name(&partial.name, breadcrumbs, blocks)?;
if partial.params.is_empty() { if partial.params.is_empty() {
let rendered_content = let new_breadcrumbs =
self.render_template(&partial_name, breadcrumbs, Some(blocks))?; Self::new_breadcrumbs(breadcrumbs, None, &partial.explicit_context, None);
let rendered_content = self.render_template(
&partial_name,
new_breadcrumbs.as_ref().unwrap_or(breadcrumbs),
Some(blocks),
)?;
return Ok(rendered_content); return Ok(rendered_content);
} else { } else {
let injected_context = ParametersContext::new(breadcrumbs, &partial.params); let injected_context = ParametersContext::new(breadcrumbs, &partial.params);
// TODO: need to add a special case where the
// injected context is added 1 behind the existing
// breadcrumbs when new_context_element does not
// exist.
let mut new_breadcrumbs = breadcrumbs.clone(); let mut new_breadcrumbs = breadcrumbs.clone();
new_breadcrumbs.insert(new_breadcrumbs.len() - 1, &injected_context); new_breadcrumbs.insert(new_breadcrumbs.len() - 1, &injected_context);
let rendered_content = let rendered_content =