|
@@ -1110,37 +1110,78 @@ tests() ->
|
|
|
[],
|
|
|
<<"baz">>}
|
|
|
]},
|
|
|
- {"regroup", [
|
|
|
- {"Ordered", <<"{% regroup people by gender as gender_list %}{% for gender in gender_list %}{{ gender.grouper }}\n{% for item in gender.list %}{{ item.first_name }}\n{% endfor %}{% endfor %}{% endregroup %}">>,
|
|
|
- [{people, [[{first_name, "George"}, {gender, "Male"}], [{first_name, "Bill"}, {gender, "Male"}],
|
|
|
- [{first_name, "Margaret"}, {gender, "Female"}], [{first_name, "Condi"}, {gender, "Female"}]]}],
|
|
|
- <<"Male\nGeorge\nBill\nFemale\nMargaret\nCondi\n">>},
|
|
|
- {"Unordered", <<"{% regroup people by gender as gender_list %}{% for gender in gender_list %}{{ gender.grouper }}\n{% for item in gender.list %}{{ item.first_name }}\n{% endfor %}{% endfor %}{% endregroup %}">>,
|
|
|
- [{people, [[{first_name, "George"}, {gender, "Male"}],
|
|
|
- [{first_name, "Margaret"}, {gender, "Female"}],
|
|
|
- [{first_name, "Condi"}, {gender, "Female"}],
|
|
|
- [{first_name, "Bill"}, {gender, "Male"}]
|
|
|
- ]}],
|
|
|
- <<"Male\nGeorge\nFemale\nMargaret\nCondi\nMale\nBill\n">>},
|
|
|
- {"NestedOrdered", <<"{% regroup people by name.last as lastname_list %}{% for lastname in lastname_list %}{{ lastname.grouper }}\n{% for item in lastname.list %}{{ item.name.first }}\n{% endfor %}{% endfor %}{% endregroup %}">>,
|
|
|
- [{people, [[{name, [{first,"George"},{last,"Costanza"}]}],
|
|
|
- [{name, [{first,"Margaret"},{last,"Costanza"}]}],
|
|
|
- [{name, [{first,"Bill"},{last,"Buffalo"}]}],
|
|
|
- [{name, [{first,"Condi"},{last,"Buffalo"}]}]]}],
|
|
|
- <<"Costanza\nGeorge\nMargaret\nBuffalo\nBill\nCondi\n">>},
|
|
|
- {"NestedUnordered", <<"{% regroup people by name.last as lastname_list %}{% for lastname in lastname_list %}{{ lastname.grouper }}\n{% for item in lastname.list %}{{ item.name.first }}\n{% endfor %}{% endfor %}{% endregroup %}">>,
|
|
|
- [{people, [[{name, [{first,"George"},{last,"Costanza"}]}],
|
|
|
- [{name, [{first,"Bill"},{last,"Buffalo"}]}],
|
|
|
- [{name, [{first,"Margaret"},{last,"Costanza"}]}],
|
|
|
- [{name, [{first,"Condi"},{last,"Buffalo"}]}]]}],
|
|
|
- <<"Costanza\nGeorge\nBuffalo\nBill\nCostanza\nMargaret\nBuffalo\nCondi\n">>},
|
|
|
- {"Filter", <<"{% regroup people|dictsort:\"name.last\" by name.last as lastname_list %}{% for lastname in lastname_list %}{{ lastname.grouper }}\n{% for item in lastname.list %}{{ item.name.first }}\n{% endfor %}{% endfor %}{% endregroup %}">>,
|
|
|
- [{people, [[{name, [{first,"George"},{last,"Costanza"}]}],
|
|
|
- [{name, [{first,"Bill"},{last,"Buffalo"}]}],
|
|
|
- [{name, [{first,"Margaret"},{last,"Costanza"}]}],
|
|
|
- [{name, [{first,"Condi"},{last,"Buffalo"}]}]]}],
|
|
|
- <<"Buffalo\nBill\nCondi\nCostanza\nGeorge\nMargaret\n">>}
|
|
|
- ]},
|
|
|
+ {"regroup .. endregroup",
|
|
|
+ [{"Ordered",
|
|
|
+ <<"{% regroup people by gender as gender_list %}{% for gender in gender_list %}{{ gender.grouper }}\n{% for item in gender.list %}{{ item.first_name }}\n{% endfor %}{% endfor %}{% endregroup %}">>,
|
|
|
+ [{people, [[{first_name, "George"}, {gender, "Male"}], [{first_name, "Bill"}, {gender, "Male"}],
|
|
|
+ [{first_name, "Margaret"}, {gender, "Female"}], [{first_name, "Condi"}, {gender, "Female"}]]}],
|
|
|
+ <<"Male\nGeorge\nBill\nFemale\nMargaret\nCondi\n">>},
|
|
|
+ {"Unordered",
|
|
|
+ <<"{% regroup people by gender as gender_list %}{% for gender in gender_list %}{{ gender.grouper }}\n{% for item in gender.list %}{{ item.first_name }}\n{% endfor %}{% endfor %}{% endregroup %}">>,
|
|
|
+ [{people, [[{first_name, "George"}, {gender, "Male"}],
|
|
|
+ [{first_name, "Margaret"}, {gender, "Female"}],
|
|
|
+ [{first_name, "Condi"}, {gender, "Female"}],
|
|
|
+ [{first_name, "Bill"}, {gender, "Male"}]
|
|
|
+ ]}],
|
|
|
+ <<"Male\nGeorge\nFemale\nMargaret\nCondi\nMale\nBill\n">>},
|
|
|
+ {"NestedOrdered",
|
|
|
+ <<"{% regroup people by name.last as lastname_list %}{% for lastname in lastname_list %}{{ lastname.grouper }}\n{% for item in lastname.list %}{{ item.name.first }}\n{% endfor %}{% endfor %}{% endregroup %}">>,
|
|
|
+ [{people, [[{name, [{first,"George"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Margaret"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Bill"},{last,"Buffalo"}]}],
|
|
|
+ [{name, [{first,"Condi"},{last,"Buffalo"}]}]]}],
|
|
|
+ <<"Costanza\nGeorge\nMargaret\nBuffalo\nBill\nCondi\n">>},
|
|
|
+ {"NestedUnordered",
|
|
|
+ <<"{% regroup people by name.last as lastname_list %}{% for lastname in lastname_list %}{{ lastname.grouper }}\n{% for item in lastname.list %}{{ item.name.first }}\n{% endfor %}{% endfor %}{% endregroup %}">>,
|
|
|
+ [{people, [[{name, [{first,"George"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Bill"},{last,"Buffalo"}]}],
|
|
|
+ [{name, [{first,"Margaret"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Condi"},{last,"Buffalo"}]}]]}],
|
|
|
+ <<"Costanza\nGeorge\nBuffalo\nBill\nCostanza\nMargaret\nBuffalo\nCondi\n">>},
|
|
|
+ {"Filter",
|
|
|
+ <<"{% regroup people|dictsort:\"name.last\" by name.last as lastname_list %}{% for lastname in lastname_list %}{{ lastname.grouper }}\n{% for item in lastname.list %}{{ item.name.first }}\n{% endfor %}{% endfor %}{% endregroup %}">>,
|
|
|
+ [{people, [[{name, [{first,"George"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Bill"},{last,"Buffalo"}]}],
|
|
|
+ [{name, [{first,"Margaret"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Condi"},{last,"Buffalo"}]}]]}],
|
|
|
+ <<"Buffalo\nBill\nCondi\nCostanza\nGeorge\nMargaret\n">>}
|
|
|
+ ]},
|
|
|
+ {"regroup",
|
|
|
+ [{"Ordered",
|
|
|
+ <<"{% regroup people by gender as gender_list %}{% for gender in gender_list %}{{ gender.grouper }}\n{% for item in gender.list %}{{ item.first_name }}\n{% endfor %}{% endfor %}">>,
|
|
|
+ [{people, [[{first_name, "George"}, {gender, "Male"}], [{first_name, "Bill"}, {gender, "Male"}],
|
|
|
+ [{first_name, "Margaret"}, {gender, "Female"}], [{first_name, "Condi"}, {gender, "Female"}]]}],
|
|
|
+ <<"Male\nGeorge\nBill\nFemale\nMargaret\nCondi\n">>},
|
|
|
+ {"Unordered",
|
|
|
+ <<"{% regroup people by gender as gender_list %}{% for gender in gender_list %}{{ gender.grouper }}\n{% for item in gender.list %}{{ item.first_name }}\n{% endfor %}{% endfor %}">>,
|
|
|
+ [{people, [[{first_name, "George"}, {gender, "Male"}],
|
|
|
+ [{first_name, "Margaret"}, {gender, "Female"}],
|
|
|
+ [{first_name, "Condi"}, {gender, "Female"}],
|
|
|
+ [{first_name, "Bill"}, {gender, "Male"}]
|
|
|
+ ]}],
|
|
|
+ <<"Male\nGeorge\nFemale\nMargaret\nCondi\nMale\nBill\n">>},
|
|
|
+ {"NestedOrdered",
|
|
|
+ <<"{% regroup people by name.last as lastname_list %}{% for lastname in lastname_list %}{{ lastname.grouper }}\n{% for item in lastname.list %}{{ item.name.first }}\n{% endfor %}{% endfor %}">>,
|
|
|
+ [{people, [[{name, [{first,"George"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Margaret"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Bill"},{last,"Buffalo"}]}],
|
|
|
+ [{name, [{first,"Condi"},{last,"Buffalo"}]}]]}],
|
|
|
+ <<"Costanza\nGeorge\nMargaret\nBuffalo\nBill\nCondi\n">>},
|
|
|
+ {"NestedUnordered",
|
|
|
+ <<"{% regroup people by name.last as lastname_list %}{% for lastname in lastname_list %}{{ lastname.grouper }}\n{% for item in lastname.list %}{{ item.name.first }}\n{% endfor %}{% endfor %}">>,
|
|
|
+ [{people, [[{name, [{first,"George"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Bill"},{last,"Buffalo"}]}],
|
|
|
+ [{name, [{first,"Margaret"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Condi"},{last,"Buffalo"}]}]]}],
|
|
|
+ <<"Costanza\nGeorge\nBuffalo\nBill\nCostanza\nMargaret\nBuffalo\nCondi\n">>},
|
|
|
+ {"Filter",
|
|
|
+ <<"{% regroup people|dictsort:\"name.last\" by name.last as lastname_list %}{% for lastname in lastname_list %}{{ lastname.grouper }}\n{% for item in lastname.list %}{{ item.name.first }}\n{% endfor %}{% endfor %}">>,
|
|
|
+ [{people, [[{name, [{first,"George"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Bill"},{last,"Buffalo"}]}],
|
|
|
+ [{name, [{first,"Margaret"},{last,"Costanza"}]}],
|
|
|
+ [{name, [{first,"Condi"},{last,"Buffalo"}]}]]}],
|
|
|
+ <<"Buffalo\nBill\nCondi\nCostanza\nGeorge\nMargaret\n">>}
|
|
|
+ ]},
|
|
|
{"spaceless", [
|
|
|
{"Beginning", <<"{% spaceless %} <b>foo</b>{% endspaceless %}">>, [], <<"<b>foo</b>">>},
|
|
|
{"Middle", <<"{% spaceless %}<b>foo</b> <b>bar</b>{% endspaceless %}">>, [], <<"<b>foo</b><b>bar</b>">>},
|
|
@@ -1289,7 +1330,7 @@ tests() ->
|
|
|
?GRP_ERROR_REPORTING_COMPILER_OPTS,
|
|
|
{error,
|
|
|
[error_info(
|
|
|
- [{{1,3},erlydtl_scanner,{eof, in_code}}] )],
|
|
|
+ [{{1,3},erlydtl_scanner,{eof, in_code}}] )],
|
|
|
[]
|
|
|
}
|
|
|
},
|
|
@@ -1299,7 +1340,7 @@ tests() ->
|
|
|
?GRP_ERROR_REPORTING_COMPILER_OPTS,
|
|
|
{error,
|
|
|
[error_info(
|
|
|
- [{{1,3},erlydtl_scanner,{eof, in_comment}}] )],
|
|
|
+ [{{1,3},erlydtl_scanner,{eof, in_comment}}] )],
|
|
|
[]
|
|
|
}
|
|
|
}
|