amorfo77/inja
1
0
Fork 0
mirror of https://github.com/pantor/inja.git synced 2026-04-01 13:52:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix input/output path and add corresponding tests

Browse Source
This commit is contained in:
pantor
2018-01-18 17:47:11 +01:00
parent b6d88d603e
commit b8a6fa5ebb
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/inja.hpp
View File

@@ -705,7 +705,8 @@ public:
@brief Environment class
*/
class Environment {
const std::string global_path;
const std::string input_path;
const std::string output_path;
ElementNotation elementNotation = ElementNotation::Pointer;
@@ -713,7 +714,8 @@ class Environment {
public:
Environment(): Environment("./") { }
explicit Environment(const std::string& global_path): global_path(global_path), parser() { }
explicit Environment(const std::string& global_path): input_path(global_path), output_path(global_path), parser() { }
explicit Environment(const std::string& input_path, const std::string& output_path): input_path(input_path), output_path(output_path), parser() { }
void setStatement(const std::string& open, const std::string& close) {
parser.regex_map_delimiters[Parsed::Delimiter::Statement] = Regex{open + "\\s*(.+?)\\s*" + close};
@@ -743,7 +745,7 @@ public:
}
Template parse_template(const std::string& filename) {
Template parsed = parser.parse_template(global_path + filename);
Template parsed = parser.parse_template(input_path + filename);
parsed.elementNotation = elementNotation;
return parsed;
}
@@ -763,7 +765,7 @@ public:
}
void write(const std::string& filename, json data, const std::string& filename_out) {
std::ofstream file(global_path + filename_out);
std::ofstream file(output_path + filename_out);
file << render_template(filename, data);
file.close();
}
@@ -774,11 +776,11 @@ public:
}
std::string load_global_file(const std::string& filename) {
return parser.load_file(global_path + filename);
return parser.load_file(input_path + filename);
}
json load_json(const std::string& filename) {
std::ifstream file(global_path + filename);
std::ifstream file(input_path + filename);
json j;
file >> j;
return j;

22
test/src/unit-files.cpp
View File

@@ -33,3 +33,25 @@ TEST_CASE("complete-files") {
}
}
}
TEST_CASE("global-path") {
inja::Environment env = inja::Environment("data/");
json data;
data["name"] = "Jeff";
SECTION("Files should be written") {
env.write("simple.txt", data, "result.txt");
CHECK( env.load_global_file("result.txt") == "Hello Jeff." );
}
}
TEST_CASE("input-output-path") {
inja::Environment env = inja::Environment("data/", "results/");
json data;
data["name"] = "Jeff";
SECTION("Files should be written") {
env.write("simple.txt", data, "result.txt");
CHECK( env.load_global_file("../results/result.txt") == "Hello Jeff." );
}
}