Skip to content

Commit c360b19

Browse files
authored
Add capitalize function (#282)
* Add capitalize function * Remove msvc warning
1 parent 0066e60 commit c360b19

File tree

5 files changed

+23
-1
lines changed

5 files changed

+23
-1
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,10 @@ Assignments only set the value within the rendering context; they do not modify
206206
207207
A few functions are implemented within the inja template syntax. They can be called with
208208
```.cpp
209-
// Upper and lower function, for string cases
209+
// Upper, lower and capitalize function, for string cases
210210
render("Hello {{ upper(neighbour) }}!", data); // "Hello PETER!"
211211
render("Hello {{ lower(neighbour) }}!", data); // "Hello peter!"
212+
render("Hello {{ capitalize(neighbour) }}!", data); // "Hello Peter!"
212213
213214
// Range function, useful for loops
214215
render("{% for i in range(4) %}{{ loop.index1 }}{% endfor %}", data); // "1234"

include/inja/function_storage.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class FunctionStorage {
3434
Modulo,
3535
AtId,
3636
At,
37+
Capitalize,
3738
Default,
3839
DivisibleBy,
3940
Even,
@@ -76,6 +77,7 @@ class FunctionStorage {
7677

7778
std::map<std::pair<std::string, int>, FunctionData> function_storage = {
7879
{std::make_pair("at", 2), FunctionData {Operation::At}},
80+
{std::make_pair("capitalize", 1), FunctionData {Operation::Capitalize}},
7981
{std::make_pair("default", 2), FunctionData {Operation::Default}},
8082
{std::make_pair("divisibleBy", 2), FunctionData {Operation::DivisibleBy}},
8183
{std::make_pair("even", 1), FunctionData {Operation::Even}},

include/inja/renderer.hpp

+6
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,12 @@ class Renderer : public NodeVisitor {
309309
data_eval_stack.push(&args[0]->at(args[1]->get<int>()));
310310
}
311311
} break;
312+
case Op::Capitalize: {
313+
auto result = get_arguments<1>(node)[0]->get<json::string_t>();
314+
result[0] = static_cast<char>(::toupper(result[0]));
315+
std::transform(result.begin() + 1, result.end(), result.begin() + 1, [](char c) { return static_cast<char>(::tolower(c)); });
316+
make_result(std::move(result));
317+
} break;
312318
case Op::Default: {
313319
const auto test_arg = get_arguments<1, 0, false>(node)[0];
314320
data_eval_stack.push(test_arg ? test_arg : get_arguments<1, 1>(node)[0]);

single_include/inja/inja.hpp

+8
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ class FunctionStorage {
123123
Modulo,
124124
AtId,
125125
At,
126+
Capitalize,
126127
Default,
127128
DivisibleBy,
128129
Even,
@@ -165,6 +166,7 @@ class FunctionStorage {
165166

166167
std::map<std::pair<std::string, int>, FunctionData> function_storage = {
167168
{std::make_pair("at", 2), FunctionData {Operation::At}},
169+
{std::make_pair("capitalize", 1), FunctionData {Operation::Capitalize}},
168170
{std::make_pair("default", 2), FunctionData {Operation::Default}},
169171
{std::make_pair("divisibleBy", 2), FunctionData {Operation::DivisibleBy}},
170172
{std::make_pair("even", 1), FunctionData {Operation::Even}},
@@ -2378,6 +2380,12 @@ class Renderer : public NodeVisitor {
23782380
data_eval_stack.push(&args[0]->at(args[1]->get<int>()));
23792381
}
23802382
} break;
2383+
case Op::Capitalize: {
2384+
auto result = get_arguments<1>(node)[0]->get<json::string_t>();
2385+
result[0] = std::toupper(result[0]);
2386+
std::transform(result.begin() + 1, result.end(), result.begin() + 1, [](char c) { return static_cast<char>(::tolower(c)); });
2387+
make_result(std::move(result));
2388+
} break;
23812389
case Op::Default: {
23822390
const auto test_arg = get_arguments<1, 0, false>(node)[0];
23832391
data_eval_stack.push(test_arg ? test_arg : get_arguments<1, 1>(node)[0]);

test/test-functions.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ TEST_CASE("functions") {
5858
// [json.exception.type_error.302] type must be string, but is number" );
5959
}
6060

61+
SUBCASE("capitalize") {
62+
CHECK(env.render("{{ capitalize(name) }}", data) == "Peter");
63+
CHECK(env.render("{{ capitalize(city) }}", data) == "New york");
64+
}
65+
6166
SUBCASE("range") {
6267
CHECK(env.render("{{ range(2) }}", data) == "[0,1]");
6368
CHECK(env.render("{{ range(4) }}", data) == "[0,1,2,3]");

0 commit comments

Comments
 (0)