Skip to content

Commit

Permalink
(feat) block param for with [#42]
Browse files Browse the repository at this point in the history 
Signed-off-by: Ning Sun <[email protected]>
  • Loading branch information
@sunng87
sunng87 committed Sep 10, 2016
1 parent f138ffb commit 3e359ff
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 126 deletions.
14 changes: 14 additions & 0 deletions src/context.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,20 @@ impl JsonRender for Json {
}
}

#[cfg(all(feature = "rustc_ser_type", not(feature = "serde_type")))]
pub fn to_json<T>(src: &T) -> Json
where T: ToJson
{
src.to_json()
}

#[cfg(feature = "serde_type")]
pub fn to_json<T>(src: &T) -> Json
where T: Serialize
{
value::to_value(src)
}

impl JsonTruthy for Json {
fn is_truthy(&self) -> bool {
match *self {
Expand Down
132 changes: 11 additions & 121 deletions src/helpers/helper_each.rs
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
use std::collections::BTreeMap;

#[cfg(all(feature = "rustc_ser_type", not(feature = "serde_type")))]
use serialize::json::{Json, ToJson};
use serialize::json::Json;
#[cfg(feature = "serde_type")]
use serde_json::value::{self, Value as Json};
use serde_json::value::Value as Json;

use helpers::HelperDef;
use registry::Registry;
use context::{Context, JsonTruthy};
use context::{Context, JsonTruthy, to_json};
use render::{Renderable, RenderContext, RenderError, Helper};

#[derive(Clone, Copy)]
pub struct EachHelper;

impl HelperDef for EachHelper {
#[cfg(all(feature = "rustc_ser_type", not(feature = "serde_type")))]
fn call(&self,
c: &Context,
h: &Helper,
Expand All @@ -40,9 +39,9 @@ impl HelperDef for EachHelper {
let len = list.len();
for i in 0..len {
let mut local_rc = rc.derive();
local_rc.set_local_var("@first".to_string(), (i == 0usize).to_json());
local_rc.set_local_var("@last".to_string(), (i == len - 1).to_json());
local_rc.set_local_var("@index".to_string(), i.to_json());
local_rc.set_local_var("@first".to_string(), to_json(&(i == 0usize)));
local_rc.set_local_var("@last".to_string(), to_json(&(i == len - 1)));
local_rc.set_local_var("@index".to_string(), to_json(&i));

if let Some(inner_path) = value.path() {
let new_path = format!("{}/{}.[{}]",
Expand All @@ -55,7 +54,7 @@ impl HelperDef for EachHelper {

if let Some(block_param) = h.block_param() {
let mut map = BTreeMap::new();
map.insert(block_param.to_string(), list[i].to_json());
map.insert(block_param.to_string(), to_json(&list[i]));
local_rc.push_block_context(&map);
}

Expand All @@ -71,12 +70,12 @@ impl HelperDef for EachHelper {
let mut first: bool = true;
for k in obj.keys() {
let mut local_rc = rc.derive();
local_rc.set_local_var("@first".to_string(), first.to_json());
local_rc.set_local_var("@first".to_string(), to_json(&first));
if first {
first = false;
}

local_rc.set_local_var("@key".to_string(), k.to_json());
local_rc.set_local_var("@key".to_string(), to_json(k));

if let Some(inner_path) = value.path() {
let new_path = format!("{}/{}.[{}]",
Expand All @@ -88,8 +87,8 @@ impl HelperDef for EachHelper {

if let Some((bp_key, bp_val)) = h.block_param_pair() {
let mut map = BTreeMap::new();
map.insert(bp_key.to_string(), k.to_json());
map.insert(bp_val.to_string(), obj.get(k).unwrap().to_json());
map.insert(bp_key.to_string(), to_json(k));
map.insert(bp_val.to_string(), to_json(obj.get(k).unwrap()));
local_rc.push_block_context(&map);
}

Expand Down Expand Up @@ -119,115 +118,6 @@ impl HelperDef for EachHelper {
None => Ok(()),
}
}

#[cfg(feature = "serde_type")]
fn call(&self,
c: &Context,
h: &Helper,
r: &Registry,
rc: &mut RenderContext)
-> Result<(), RenderError> {
let value = try!(h.param(0)
.ok_or_else(|| RenderError::new("Param not found for helper \"each\"")));

let template = h.template();

match template {
Some(t) => {
rc.promote_local_vars();
if let Some(path_root) = value.path_root() {
let local_path_root = format!("{}/{}", rc.get_path(), path_root);
rc.set_local_path_root(local_path_root);
}

debug!("each value {:?}", value.value());
let rendered = match (value.value().is_truthy(), value.value()) {
(true, &Json::Array(ref list)) => {
let len = list.len();
for i in 0..len {
let mut local_rc = rc.derive();
local_rc.set_local_var("@first".to_string(),
value::to_value(&(i == 0usize)));
local_rc.set_local_var("@last".to_string(),
value::to_value(&(i == len - 1)));
local_rc.set_local_var("@index".to_string(), value::to_value(&i));

if let Some(inner_path) = value.path() {
let new_path = format!("{}/{}.[{}]",
local_rc.get_path(),
inner_path,
i);
debug!("each value {:?}", new_path);
local_rc.set_path(new_path);
}

if let Some(block_param) = h.block_param() {
let mut map = BTreeMap::new();
map.insert(block_param.to_string(), value::to_value(&list[i]));
local_rc.push_block_context(&map);
}

try!(t.render(c, r, &mut local_rc));

if h.block_param().is_some() {
local_rc.pop_block_context();
}
}
Ok(())
}
(true, &Json::Object(ref obj)) => {
let mut first: bool = true;
for k in obj.keys() {
let mut local_rc = rc.derive();
local_rc.set_local_var("@first".to_string(), value::to_value(&first));
if first {
first = false;
}

local_rc.set_local_var("@key".to_string(), value::to_value(&k));
if let Some(inner_path) = value.path() {
let new_path = format!("{}/{}.[{}]",
local_rc.get_path(),
inner_path,
k);
debug!("each value {:?}", new_path);
local_rc.set_path(new_path);
}

if let Some((bp_key, bp_val)) = h.block_param_pair() {
let mut map = BTreeMap::new();
map.insert(bp_key.to_string(), value::to_value(&k));
map.insert(bp_val.to_string(),
value::to_value(&obj.get(k).unwrap()));
local_rc.push_block_context(&map);
}

try!(t.render(c, r, &mut local_rc));

if h.block_param().is_some() {
local_rc.pop_block_context();
}
}

Ok(())
}
(false, _) => {
if let Some(else_template) = h.inverse() {
try!(else_template.render(c, r, rc));
}
Ok(())
}
_ => {
Err(RenderError::new(format!("Param type is not iterable: {:?}", template)))
}
};
// rc.set_path(path);
rc.demote_local_vars();
rendered
}
None => Ok(()),
}
}
}

pub static EACH_HELPER: EachHelper = EachHelper;
Expand Down
30 changes: 25 additions & 5 deletions src/helpers/helper_with.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use std::collections::BTreeMap;

use helpers::HelperDef;
use registry::Registry;
use context::{Context, JsonTruthy};
use context::{Context, JsonTruthy, to_json};
use render::{Renderable, RenderContext, RenderError, Helper};

#[derive(Clone, Copy)]
Expand Down Expand Up @@ -35,6 +37,12 @@ impl HelperDef for WithHelper {
let new_path = format!("{}/{}", path, inner_path);
rc.set_path(new_path);
}

if let Some(block_param) = h.block_param() {
let mut map = BTreeMap::new();
map.insert(block_param.to_string(), to_json(param.value()));
rc.push_block_context(&map);
}
}

let rendered = match template {
Expand All @@ -44,6 +52,9 @@ impl HelperDef for WithHelper {

rc.set_path(path);
rc.demote_local_vars();
if not_empty {
rc.pop_block_context();
}
rendered
}
}
Expand Down Expand Up @@ -129,7 +140,7 @@ mod test {
}

#[test]
fn test_with_in_each(){
fn test_with_in_each() {
let addr = Address {
city: "Beijing".to_string(),
country: "China".to_string(),
Expand All @@ -156,9 +167,18 @@ mod test {

let people = vec![person, person2];

let t0 = Template::compile("{{#each this}}{{#with addr}}{{city}}{{/with}}{{/each}}".to_string()).ok().unwrap();
let t1 = Template::compile("{{#each this}}{{#with addr}}{{../age}}{{/with}}{{/each}}".to_string()).ok().unwrap();
let t2 = Template::compile("{{#each this}}{{#with addr}}{{@../index}}{{/with}}{{/each}}".to_string()).ok().unwrap();
let t0 = Template::compile("{{#each this}}{{#with addr}}{{city}}{{/with}}{{/each}}"
.to_string())
.ok()
.unwrap();
let t1 = Template::compile("{{#each this}}{{#with addr}}{{../age}}{{/with}}{{/each}}"
.to_string())
.ok()
.unwrap();
let t2 = Template::compile("{{#each this}}{{#with addr}}{{@../index}}{{/with}}{{/each}}"
.to_string())
.ok()
.unwrap();

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

0 comments on commit 3e359ff

Please sign in to comment.