Added Config class

Author: Databean

include/Config.h

@@ -0,0 +1,50 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include <map>
+#include <string>
+#include <utility>
+#include <fstream>
+
+#include "Util.h"
+
+class ConfigValue {
+private:
+	std::string value;
+public:
+	ConfigValue(const std::string& val);
+	ConfigValue(const ConfigValue&) = default;
+	ConfigValue(ConfigValue&&) = default;
+	~ConfigValue() = default;
+	ConfigValue& operator=(const ConfigValue&) = default;
+	ConfigValue& operator=(ConfigValue&&) = default;
+	
+	operator int() const;
+	operator float() const;
+	operator std::string() const;
+	operator Coordinate() const;
+	operator ScreenCoordinate() const;
+};
+
+class Config {
+private:
+	std::map<std::string, ConfigValue> values;
+	
+	void init(std::istream& in);
+public:
+	Config(std::istream& source);
+	Config(std::fstream&& source);
+	Config(const std::string& filename);
+	Config(const Config&) = default;
+	Config(Config&&) = default;
+	~Config() = default;
+	Config& operator=(const Config&) = default;
+	Config& operator=(Config&&) = default;
+	
+	const ConfigValue& operator[](const std::string& name) const;
+};
+
+const Config& getConfigFile(const std::string& filename);
+const Config& getGraphicsConfig();
+
+#endif

src/Config.cpp

@@ -0,0 +1,114 @@
+#include "Config.h"
+
+#include <sstream>
+#include <stdexcept>
+
+#include "Util.h"
+
+using std::string;
+using std::stringstream;
+using std::runtime_error;
+using std::istream;
+using std::fstream;
+
+ConfigValue::ConfigValue(const string& value) : value(value) {
+	
+}
+
+ConfigValue::operator int() const {
+	return fromString<int>(value);
+}
+
+ConfigValue::operator float() const {
+	return fromString<float>(value);
+}
+
+ConfigValue::operator string() const {
+	return value;
+}
+
+ConfigValue::operator Coordinate() const {
+	stringstream stream(value);
+	Coordinate ret;
+	char c = stream.get();
+	if(c != '(') {
+		throw runtime_error("Attempt to read a coordinate out of a non-coordinate value");
+	}
+	stream >> ret.first;
+	c = stream.get();
+	if(c != ',') {
+		throw runtime_error("Attempt to read a coordinate out of a non-coordinate value");
+	}
+	stream >> ret.second;
+	return ret;
+}
+
+ConfigValue::operator ScreenCoordinate() const {
+	stringstream stream(value);
+	ScreenCoordinate ret;
+	char c = stream.get();
+	if(c != '(') {
+		throw runtime_error("Attempt to read a coordinate out of a non-coordinate value");
+	}
+	stream >> ret.first;
+	c = stream.get();
+	if(c != ',') {
+		throw runtime_error("Attempt to read a coordinate out of a non-coordinate value");
+	}
+	stream >> ret.second;
+	return ret;
+}
+
+Config::Config(istream& source) {
+	init(source);
+}
+
+Config::Config(fstream&& source) {
+	init(source);
+}
+
+Config::Config(const string& filename) {
+	fstream source(filename, fstream::in);
+	init(source);
+}
+
+void Config::init(istream& source) {
+	string line;
+	while(source) {
+		std::getline(source, line);
+		if(line[0] == '#' || line.find('=') == string::npos) {
+			continue;
+		}
+		string name = line.substr(0, line.find('='));
+		string value = line.substr(line.find('=') + 1);
+		values.insert(std::make_pair(name, ConfigValue(value)));
+	}
+}
+
+const ConfigValue& Config::operator[](const string& name) const {
+	auto it = values.find(name);
+	if(it == values.end()) {
+		throw runtime_error("No such key in the config");
+	} else {
+		return it->second;
+	}
+}
+
+const Config& getConfigFile(const std::string& filename) {
+	static std::map<std::string, Config> configs;
+	
+	auto it = configs.find(filename);
+	if(it == configs.end()) {
+		fstream file(filename);
+		if(!file) {
+			throw runtime_error("Cannot open file " + filename);
+		}
+		return configs.insert(std::make_pair(filename, Config(file))).first->second;
+	} else {
+		return it->second;
+	}
+}
+
+const Config& getGraphicsConfig() {
+	return getConfigFile("resources/graphics.conf");
+}

tests/testConfig.cpp

@@ -0,0 +1,63 @@
+#include "UnitTest++.h"
+#include "Config.h"
+
+using std::string;
+using std::stringstream;
+
+TEST(readOneString) {
+	stringstream file("variable=value");
+	Config config(file);
+	
+	CHECK((string)config["variable"] == "value");
+}
+
+TEST(readTwoStrings) {
+	stringstream file("var_a=val_a\nvar_b=val_b\n");
+	Config config(file);
+	
+	CHECK((string)config["var_a"] == "val_a");
+	CHECK((string)config["var_b"] == "val_b");
+}
+
+TEST(readIntAndString) {
+	stringstream file("string=hello\nint=5\n");
+	Config config(file);
+	
+	CHECK((string)config["string"] == "hello");
+	CHECK((int)config["int"] == 5);
+}
+
+TEST(readFloat) {
+	stringstream file("float=5.0\n");
+	Config config(file);
+	
+	CHECK((float)config["float"] == 5.0f);
+}
+
+TEST(readCommentsEmptyLines) {
+	stringstream file("#this is a string\nstring=hello\n#we just had a string\n\n\n\n\n");
+	Config config(file);
+	
+	CHECK((string)config["string"] == "hello");
+}
+
+TEST(readInvalid) {
+	stringstream file("variable=value");
+	Config config(file);
+	
+	CHECK_THROW((string)config["string"] == "hello", std::runtime_error);
+}
+
+TEST(readCoordinate) {
+	stringstream file("coord=(1,2)");
+	Config config(file);
+	
+	CHECK(Coordinate({1, 2}) == (Coordinate)config["coord"]);
+}
+
+TEST(readScreenCoordinate) {
+	stringstream file("coord=(1.5,2.5)");
+	Config config(file);
+	
+	CHECK(ScreenCoordinate({1.5, 2.5}) == (ScreenCoordinate)config["coord"]);
+}