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.

Sign up for GitHub

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

Jump to bottom

Fix bug where nested scopes don't resolve parent context #95

Closed
wants to merge 1 commit into from
Closed

Fix bug where nested scopes don't resolve parent context #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,18 @@ mod test {
"27".to_string());
assert_eq!(ctx.navigate(".", "this.titles[0]/../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "titles.[0]/../../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "this.titles.[0]/../../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "titles[1]/../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "this.titles[1]/../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "titles.[1]/../../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "this.titles.[1]/../../age").render(),
"27".to_string());

}

Expand Down Expand Up @@ -422,7 +434,18 @@ mod test {
"27".to_string());
assert_eq!(ctx.navigate(".", "this.titles[0]/../age").render(),
"27".to_string());

assert_eq!(ctx.navigate(".", "titles.[0]/../../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "this.titles.[0]/../../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "titles[1]/../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "this.titles[1]/../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "titles.[1]/../../age").render(),
"27".to_string());
assert_eq!(ctx.navigate(".", "this.titles.[1]/../../age").render(),
"27".to_string());
}

#[test]
Expand Down
44 changes: 42 additions & 2 deletions src/helpers/helper_each.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,14 @@ impl HelperDef for EachHelper {
debug!("each value {:?}", new_path);
rc.set_path(new_path);
}

let current_path = rc.get_path().clone();
let local_path_root = rc.get_local_path_root().to_string().clone();
let current_template = rc.current_template.clone();
try!(t.render(c, r, rc));
rc.set_path(current_path);
rc.set_local_path_root(local_path_root);
rc.current_template = current_template;
}
Ok(())
}
Expand All @@ -67,8 +74,13 @@ impl HelperDef for EachHelper {
let new_path = format!("{}/{}.[{}]", path, inner_path, k);
rc.set_path(new_path);
}

let current_path = rc.get_path().clone();
let local_path_root = rc.get_local_path_root().to_string().clone();
let current_template = rc.current_template.clone();
try!(t.render(c, r, rc));
rc.set_path(current_path);
rc.set_local_path_root(local_path_root);
rc.current_template = current_template;
}

Ok(())
Expand Down Expand Up @@ -121,7 +133,13 @@ impl HelperDef for EachHelper {
debug!("each value {:?}", new_path);
rc.set_path(new_path);
}
let current_path = rc.get_path().clone();
let local_path_root = rc.get_local_path_root().to_string().clone();
let current_template = rc.current_template.clone();
try!(t.render(c, r, rc));
rc.set_path(current_path);
rc.set_local_path_root(local_path_root);
rc.current_template = current_template;
}
Ok(())
}
Expand All @@ -139,8 +157,13 @@ impl HelperDef for EachHelper {
debug!("each value {:?}", new_path);
rc.set_path(new_path);
}

let current_path = rc.get_path().clone();
let local_path_root = rc.get_local_path_root().to_string().clone();
let current_template = rc.current_template.clone();
try!(t.render(c, r, rc));
rc.set_path(current_path);
rc.set_local_path_root(local_path_root);
rc.current_template = current_template;
}

Ok(())
Expand Down Expand Up @@ -239,6 +262,23 @@ mod test {
assert_eq!(r1.ok().unwrap(), "100:200".to_string());
}

#[test]
#[cfg(all(feature = "rustc_ser_type", not(feature = "serde_type")))]
fn test_nested_each_with_parent_if() {
let json_str = r#"{"a": [{"b": true}], "b": [[1, 2, 3],[4, 5]]}"#;

let data = Json::from_str(json_str).unwrap();
let t0 = Template::compile("{{#each b}}{{#if ../../a}}{{#each this}}{{this}}{{/each}}{{/if}}{{/each}}"
.to_string())
.ok()
.unwrap();

let mut handlebars = Registry::new();
handlebars.register_template("t0", t0);

let r1 = handlebars.render("t0", &data);
assert_eq!(r1.ok().unwrap(), "12345".to_string());
}
#[test]
fn test_nested_array() {
let t0 = Template::compile("{{#each this.[0]}}{{this}}{{/each}}".to_owned()).ok().unwrap();
Expand Down