fix travis, more tests

src/inja.hpp

@@ -13,7 +13,7 @@
 
 
 namespace inja {
-	
+
 using json = nlohmann::json;
 using string = std::string;
 
@@ -30,7 +30,7 @@ inline string join_strings(std::vector<string> vector, string delimiter) {
 
 struct SearchMatch {
 	SearchMatch() { }
-	
+
 	SearchMatch(std::smatch match, size_t offset): match(match), offset(offset) {
 		position = offset + match.position();
 		length = match.length();
@@ -41,10 +41,10 @@ struct SearchMatch {
 		prefix = match.prefix();
 		suffix = match.suffix();
 	}
-	
+
 	std::smatch match;
 	size_t offset;
-	
+
 	string outer, inner, prefix, suffix;
 	size_t position, end_position;
 	int length;
@@ -53,7 +53,7 @@ struct SearchMatch {
 
 struct SearchMatchVector: public SearchMatch {
 	SearchMatchVector(): SearchMatch() { }
-	
+
 	SearchMatchVector(std::smatch match, size_t offset, int inner_group, int regex_number): SearchMatch(match, offset), regex_number(regex_number) {
 		inner = match.str(inner_group);
 	}
@@ -63,7 +63,7 @@ struct SearchMatchVector: public SearchMatch {
 
 struct SearchClosedMatch: public SearchMatch {
 	SearchClosedMatch(): SearchMatch() { }
-	
+
 	SearchClosedMatch(string input, SearchMatch open_match, SearchMatch close_match): SearchMatch(), open_match(open_match), close_match(close_match) {
 		position = open_match.position;
 		length = close_match.end_position - open_match.position;
@@ -74,18 +74,18 @@ struct SearchClosedMatch: public SearchMatch {
 		prefix = open_match.prefix;
 		suffix = close_match.suffix;
 	}
-	
+
 	SearchMatch open_match, close_match;
 };
 
 inline SearchMatch search(string input, std::regex regex, size_t position) {
 	auto first = input.cbegin();
 	auto last = input.cend();
-	
+
 	if (position >= input.length()) {
 		return SearchMatch();
 	}
-				
+
 	std::smatch match;
 	std::regex_search(first + position, last, match, regex);
 	return SearchMatch(match, position);
@@ -99,21 +99,20 @@ inline SearchMatchVector search(string input, std::vector<string> regex_patterns
 			regex_mark_counts.push_back(i);
 		}
 	}
-	
-	// TODO use search(...)
+
 	string regex_pattern = "(" + join_strings(regex_patterns, ")|(") + ")";
 	std::regex regex(regex_pattern);
-	
+
 	auto first = input.cbegin();
 	auto last = input.cend();
 
 	if (position >= input.length()) {
 		return SearchMatchVector();
 	}
-	
+
 	std::smatch match;
 	std::regex_search(first + position, last, match, regex);
-	
+
 	int number_regex = -1;
 	int number_inner = 1;
 	for (int i = 1; i < match.size(); i++) {
@@ -123,25 +122,25 @@ inline SearchMatchVector search(string input, std::vector<string> regex_patterns
 			break;
 		}
 	}
-			
+
 	return SearchMatchVector(match, position, number_inner, number_regex);
 }
 
 inline SearchClosedMatch search_closed_match_on_level(string input, std::regex regex_statement, std::regex regex_level_up, std::regex regex_level_down, std::regex regex_search, SearchMatch open_match) {
-		
+
 	int level = 0;
 	size_t current_position = open_match.end_position;
 	SearchMatch statement_match = search(input, regex_statement, current_position);
 	while (statement_match.found) {
 		current_position = statement_match.end_position;
-		
+
 		if (level == 0 && std::regex_match(statement_match.inner, regex_search)) break;
 		if (std::regex_match(statement_match.inner, regex_level_up)) level += 1;
 		else if (std::regex_match(statement_match.inner, regex_level_down)) level -= 1;
-			
+
 		statement_match = search(input, regex_statement, current_position);
 	}
-	
+
 	return SearchClosedMatch(input, open_match, statement_match);
 }
 
@@ -150,7 +149,8 @@ inline SearchClosedMatch search_closed_match(string input, std::regex regex_stat
 }
 
 
-namespace Parser {
+class Parser {
+public:
 	enum Type {
 		String,
 		Loop,
@@ -160,7 +160,7 @@ namespace Parser {
 		Comment,
 		Variable
 	};
-}
+};
 
 
 class Environment {
@@ -169,30 +169,30 @@ class Environment {
 	std::regex regex_expression;
 	std::regex regex_comment;
 	std::vector<string> regex_pattern_delimiters;
-	
+
 	string global_path;
-	
-		
+
+
 public:
 	Environment(): Environment("./") { }
-	
+
 	Environment(string global_path): global_path(global_path) {
 		const string regex_pattern_statement = "\\(\\%\\s*(.+?)\\s*\\%\\)";
 		const string regex_pattern_line_statement = "^##\\s*(.+)\\s*$";
 		const string regex_pattern_expression = "\\{\\{\\s*(.+?)\\s*\\}\\}";
 		const string regex_pattern_comment = "\\{#\\s*(.*?)\\s*#\\}";
-		
+
 		regex_statement = std::regex(regex_pattern_statement);
 		regex_line_statement = std::regex(regex_pattern_line_statement);
 		regex_expression = std::regex(regex_pattern_expression);
 		regex_comment = std::regex(regex_pattern_comment);
 		regex_pattern_delimiters = { regex_pattern_statement, regex_pattern_expression, regex_pattern_comment };
 	}
-	
+
 
 	json parse_level(string input) {
 		json result;
-		
+
 		size_t current_position = 0;
 		SearchMatchVector statement_match = search(input, regex_pattern_delimiters, current_position);
 		while (statement_match.found) {
@@ -200,24 +200,24 @@ public:
 			if (!statement_match.prefix.empty()) {
 				result += {{"type", Parser::Type::String}, {"text", statement_match.prefix}};
 			}
-			
+
 			// Regex matched a statement "(% ... %)"
 			if (statement_match.regex_number == 0) {
 				const std::regex regex_loop_open("for (.*)");
 				const std::regex regex_loop_close("endfor");
-				
+
 				const std::regex regex_include("include \"(.*)\"");
-				
+
 				const std::regex regex_condition_open("if (.*)");
 				const std::regex regex_condition_else_if("else if (.*)");
 				const std::regex regex_condition_else("else");
 				const std::regex regex_condition_close("endif");
-				
+
 				std::smatch inner_statement_match;
 				// Loop
 				if (std::regex_match(statement_match.inner, inner_statement_match, regex_loop_open)) {
 					SearchClosedMatch loop_match = search_closed_match(input, regex_statement, regex_loop_open, regex_loop_close, statement_match);
-					
+
 					current_position = loop_match.end_position;
 					string loop_command = inner_statement_match.str(0);
 					result += {{"type", Parser::Type::Loop}, {"command", loop_command}, {"inner", loop_match.inner}};
@@ -232,30 +232,30 @@ public:
 				else if (std::regex_match(statement_match.inner, inner_statement_match, regex_condition_open)) {
 					string if_command = inner_statement_match.str(0);
 					json condition_result = {{"type", Parser::Type::Condition}, {"children", json::array()}};
-					
-					
+
+
 					SearchMatch condition_match = statement_match;
-					
+
 					SearchClosedMatch else_if_match = search_closed_match_on_level(input, regex_statement, regex_condition_open, regex_condition_close, regex_condition_else_if, condition_match);
 					while (else_if_match.found) {
 						condition_match = else_if_match.close_match;
-						
+
 						condition_result["children"] += {{"type", Parser::Type::ConditionBranch}, {"command", else_if_match.open_match.inner}, {"inner", else_if_match.inner}};
-							
+
 						else_if_match = search_closed_match_on_level(input, regex_statement, regex_condition_open, regex_condition_close, regex_condition_else_if, condition_match);
 					}
-					
+
 					SearchClosedMatch else_match = search_closed_match_on_level(input, regex_statement, regex_condition_open, regex_condition_close, regex_condition_else, condition_match);
 					if (else_match.found) {
 						condition_match = else_match.close_match;
-						
+
 						condition_result["children"] += {{"type", Parser::Type::ConditionBranch}, {"command", else_match.open_match.inner}, {"inner", else_match.inner}};
 					}
-					
+
 					SearchClosedMatch last_if_match = search_closed_match(input, regex_statement, regex_condition_open, regex_condition_close, condition_match);
 
 					condition_result["children"] += {{"type", Parser::Type::ConditionBranch}, {"command", last_if_match.open_match.inner}, {"inner", last_if_match.inner}};
-					
+
 					current_position = last_if_match.end_position;
 					result += condition_result;
 				}
@@ -268,16 +268,16 @@ public:
 			else if (statement_match.regex_number == 2) {
 				result += {{"type", Parser::Type::Comment}, {"text", statement_match.inner}};
 			}
-			
+
 			statement_match = search(input, regex_pattern_delimiters, current_position);
 		}
 		if (current_position < input.length()) {
 			result += {{"type", Parser::Type::String}, {"text", input.substr(current_position)}};
 		}
-		
+
 		return result;
 	}
-	
+
 	json parse_tree(json current_element) {
 		if (current_element.find("inner") != current_element.end()) {
 			current_element["children"] = parse_level(current_element["inner"]);
@@ -290,41 +290,45 @@ public:
 		}
 		return current_element;
 	}
-	
+
 	json parse(string input) {
 		return parse_tree({{"inner", input}})["children"];
 	}
-	
-	
+
+
 	json parse_variable(string input, json data) {
+		return parse_variable(input, data, true);
+	}
+
+	json parse_variable(string input, json data, bool throw_error) {
 		// Json Raw Data
 		if ( json::accept(input) ) {
 			return json::parse(input);
 		}
-		
+
 		// TODO Implement filter and functions
 
 		if (input[0] != '/') input.insert(0, "/");
-		
+
 		json::json_pointer ptr(input);
 		json result = data[ptr];
-		
-		if (result.is_null()) throw std::runtime_error("JSON pointer found no element.");
+
+		if (throw_error && result.is_null()) throw std::runtime_error("JSON pointer found no element.");
 		return result;
 	}
-	
+
 	bool parse_condition(string condition, json data) {
-		const std::regex regex_condition_not("not (.*)");
-		const std::regex regex_condition_equal("(.*) == (.*)");
-		const std::regex regex_condition_greater("(.*) > (.*)");
-		const std::regex regex_condition_less("(.*) < (.*)");
-		const std::regex regex_condition_greater_equal("(.*) >= (.*)");
-		const std::regex regex_condition_less_equal("(.*) <= (.*)");
-		const std::regex regex_condition_different("(.*) != (.*)");
-		const std::regex regex_condition_in("(.*) in (.*)");
-		
+		const std::regex regex_condition_not("not (.+)");
+		const std::regex regex_condition_equal("(.+) == (.+)");
+		const std::regex regex_condition_greater("(.+) > (.+)");
+		const std::regex regex_condition_less("(.+) < (.+)");
+		const std::regex regex_condition_greater_equal("(.+) >= (.+)");
+		const std::regex regex_condition_less_equal("(.+) <= (.+)");
+		const std::regex regex_condition_different("(.+) != (.+)");
+		const std::regex regex_condition_in("(.+) in (.+)");
+
 		std::smatch match_condition;
-		if (std::regex_match(condition, match_condition, regex_condition_equal)) {
+		if (std::regex_match(condition, match_condition, regex_condition_not)) {
 			return !parse_condition(match_condition.str(1), data);
 		}
 		else if (std::regex_match(condition, match_condition, regex_condition_equal)) {
@@ -362,51 +366,52 @@ public:
 			json list = parse_variable(match_condition.str(2), data);
 			return (std::find(list.begin(), list.end(), item) != list.end());
 		}
-		
-		try {
-			return parse_variable(condition, data);
-		}
-		catch (...) {
-			return false;
-		}
+
+		json var = parse_variable(condition, data, false);
+		if (var.empty()) return false;
+		else if (var.is_boolean()) return var;
+		else if (var.is_number()) return (var != 0);
+		else if (var.is_string()) return (var != "");
+		return false;
 	}
-	
+
 	string render_json(json data) {
 		if (data.is_string()) {
 			return data;
-		} else {
+		}
+		else {
 			std::stringstream ss;
 			ss << data;
 			return ss.str();
 		}
 	}
-	
-	string render_tree(json input, json data, string path) {		
-		string result = "";		
+
+	string render_tree(json input, json data, string path) {
+		string result = "";
 		for (auto element: input) {
 			switch ( (Parser::Type) element["type"] ) {
     			case Parser::Type::String: {
 					result += element["text"];
-             		break;
+          break;
 				}
     			case Parser::Type::Variable: {
 					json variable = parse_variable(element["command"], data);
 					result += render_json(variable);
-             		break;
+          break;
 				}
 				case Parser::Type::Include: {
 					result += render_template(path + element["filename"].get<string>(), data);
 					break;
-				}	
+				}
 				case Parser::Type::Loop: {
 					const std::regex regex_loop_list("for (\\w+) in (.+)");
-					
+
 					string command = element["command"].get<string>();
 					std::smatch match_command;
 					if (std::regex_match(command, match_command, regex_loop_list)) {
 						string item_name = match_command.str(1);
 						string list_name = match_command.str(2);
-						
+
 						json list = parse_variable(list_name, data);
 						for (int i = 0; i < list.size(); i++) {
 							json data_loop = data;
@@ -418,23 +423,29 @@ public:
 							result += render_tree(element["children"], data_loop, path);
 						}
 					}
+					else {
+						throw std::runtime_error("Unknown loop in renderer.");
+					}
 					break;
 				}
 				case Parser::Type::Condition: {
 					const std::regex regex_condition("(if|else if|else) ?(.*)");
-					
+
 					for (auto branch: element["children"]) {
 						string command = branch["command"].get<string>();
 						std::smatch match_command;
 						if (std::regex_match(command, match_command, regex_condition)) {
 							string condition_type = match_command.str(1);
 							string condition = match_command.str(2);
-																			
+
 							if (parse_condition(condition, data) || condition_type == "else") {
 								result += render_tree(branch["children"], data, path);
 								break;
 							}
 						}
+						else {
+							throw std::runtime_error("Unknown condition in renderer.");
+						}
 					}
 					break;
 				}
@@ -443,39 +454,39 @@ public:
 				}
 				default: {
 					throw std::runtime_error("Unknown type in renderer.");
-				}	
+				}
 		 	}
 		}
 		return result;
-	} 
-		
+	}
+
 	string render(string input, json data, string path) {
 		json parsed = parse(input);
 		return render_tree(parsed, data, path);
 	}
-	
-	
+
+
 	string render(string input, json data) {
 		return render(input, data, "./");
 	}
-	
+
 	string render_template(string filename, json data) {
 		string text = load_file(filename);
-		string path = filename.substr(0, filename.find_last_of("/\\") + 1); // Include / itself
+		string path = filename.substr(0, filename.find_last_of("/\\") + 1);
 		return render(text, data, path);
 	}
-	
+
 	string render_template_with_json_file(string filename, string filename_data) {
 		json data = load_json(filename_data);
 		return render_template(filename, data);
 	}
-	
+
 	string load_file(string filename) {
 		std::ifstream file(global_path + filename);
 		string text((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
 		return text;
 	}
-	
+
 	json load_json(string filename) {
 		std::ifstream file(global_path + filename);
 		json j;
@@ -490,4 +501,4 @@ inline string render(string input, json data) {
 
 } // namespace inja
 
-#endif // PANTOR_INJA_HPP
+#endif // PANTOR_INJA_HPP