amorfo77/inja
1
0
Fork 0
mirror of https://github.com/pantor/inja.git synced 2026-04-03 14:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix search directory for string templates

Browse Source
This commit is contained in:
pantor
2022-06-20 11:43:45 +02:00
parent 4526fb4007
commit 771e47f6da
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/inja/environment.hpp
View File

@@ -33,7 +33,7 @@ protected:
std::string output_path;
public:
Environment(): Environment("") {}
Environment(): Environment("./") {}
explicit Environment(const std::string& global_path): input_path(global_path), output_path(global_path) {}
@@ -95,7 +95,7 @@ public:
Template parse(std::string_view input) {
Parser parser(parser_config, lexer_config, template_storage, function_storage);
return parser.parse(input);
return parser.parse(input, input_path);
}
Template parse_template(const std::string& filename) {

4
include/inja/parser.hpp
View File

@@ -631,10 +631,6 @@ public:
return result;
}
Template parse(std::string_view input) {
return parse(input, "./");
}
void parse_into_template(Template& tmpl, std::string_view filename) {
std::string_view path = filename.substr(0, filename.find_last_of("/\\") + 1);

8
single_include/inja/inja.hpp
View File

@@ -2045,10 +2045,6 @@ public:
return result;
}
Template parse(std::string_view input) {
return parse(input, "./");
}
void parse_into_template(Template& tmpl, std::string_view filename) {
std::string_view path = filename.substr(0, filename.find_last_of("/\\") + 1);
@@ -2735,7 +2731,7 @@ protected:
std::string output_path;
public:
Environment(): Environment("") {}
Environment(): Environment("./") {}
explicit Environment(const std::string& global_path): input_path(global_path), output_path(global_path) {}
@@ -2797,7 +2793,7 @@ public:
Template parse(std::string_view input) {
Parser parser(parser_config, lexer_config, template_storage, function_storage);
return parser.parse(input);
return parser.parse(input, input_path);
}
Template parse_template(const std::string& filename) {

17
test/test-files.cpp
View File

@@ -69,12 +69,23 @@ TEST_CASE("global-path") {
}
}
TEST_CASE("include-without-local-files") {
TEST_CASE("include-files") {
inja::Environment env {test_file_directory};
env.set_search_included_templates_in_files(false);
inja::json data;
data["name"] = "Jeff";
CHECK_THROWS_WITH(env.render_file_with_json_file("html/template.txt", "html/data.json"),
SUBCASE("from text") {
CHECK(env.render_file("include.txt", data) == "Answer: Hello Jeff.");
CHECK(env.render("Answer: {% include \"simple.txt\" %}", data) == "Answer: Hello Jeff.");
CHECK_NOTHROW(env.render_file_with_json_file("html/template.txt", "html/data.json"));
}
SUBCASE("without local files") {
env.set_search_included_templates_in_files(false);
CHECK_THROWS_WITH(env.render_file_with_json_file("html/template.txt", "html/data.json"),
"[inja.exception.render_error] (at 3:14) include 'header.txt' not found");
}
}
TEST_CASE("include-in-memory-and-file-template") {