1 files changed, 37 insertions, 0 deletions
diff --git a/Sluift/sluift.cpp b/Sluift/sluift.cpp
index b55649b..2fd1e50 100644
--- a/Sluift/sluift.cpp
+++ b/Sluift/sluift.cpp
@@ -10,18 +10,19 @@
 
 #include <string>
 #include <boost/bind.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/assign/list_of.hpp>
 
 #include "Watchdog.h"
 #include <Sluift/Lua/Check.h>
 #include <Sluift/SluiftClient.h>
+#include <Sluift/SluiftComponent.h>
 #include <Sluift/globals.h>
 #include <Sluift/Lua/Exception.h>
 #include <Sluift/Lua/LuaUtils.h>
 #include <Sluift/Lua/FunctionRegistration.h>
 #include <Swiften/Base/sleep.h>
 #include <Swiften/Base/foreach.h>
 #include <Swiften/Base/IDGenerator.h>
 #include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h>
 #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
@@ -82,18 +83,44 @@ SLUIFT_LUA_FUNCTION_WITH_HELP(
 	lua_setmetatable(L, -3);
 	lua_pop(L, 1);
 
 	*client = new SluiftClient(jid, password, &Sluift::globals.networkFactories, &Sluift::globals.eventLoop);
 	(*client)->setTraceEnabled(getGlobalDebug(L));
 	return 1;
 }
 
 SLUIFT_LUA_FUNCTION_WITH_HELP(
+		Sluift, new_component,
+
+		"Creates a new component.\n\nReturns a @{Component} object.\n",
+
+		"jid  The JID to connect as\n"
+		"passphrase  The passphrase to use\n",
+
+		""
+) {
+	Lua::checkString(L, 1);
+	JID jid(std::string(Lua::checkString(L, 1)));
+	std::string password(Lua::checkString(L, 2));
+
+	SluiftComponent** component = reinterpret_cast<SluiftComponent**>(lua_newuserdata(L, sizeof(SluiftComponent*)));
+
+	lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.coreLibIndex);
+	lua_getfield(L, -1, "Component");
+	lua_setmetatable(L, -3);
+	lua_pop(L, 1);
+
+	*component = new SluiftComponent(jid, password, &Sluift::globals.networkFactories, &Sluift::globals.eventLoop);
+	(*component)->setTraceEnabled(getGlobalDebug(L));
+	return 1;
+}
+
+SLUIFT_LUA_FUNCTION_WITH_HELP(
 		Sluift, sha1,
 		"Compute the SHA-1 hash of given data",
 		"data  the data to hash",
 		""
 ) {
 	static boost::shared_ptr<CryptoProvider> crypto(PlatformCryptoProvider::create());
 	if (!lua_isstring(L, 1)) {
 		throw Lua::Exception("Expected string");
 	}
@@ -402,18 +429,28 @@ SLUIFT_API int luaopen_sluift(lua_State* L) {
 	lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.coreLibIndex);
 	std::vector<std::string> tables = boost::assign::list_of("Client");
 	foreach(const std::string& table, tables) {
 		lua_getfield(L, -1, table.c_str());
 		Lua::FunctionRegistry::getInstance().addFunctionsToTable(L, table);
 		lua_pop(L, 1);
 	}
 	lua_pop(L, 1);
 
+	// Load component metatable
+	lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.coreLibIndex);
+	std::vector<std::string> comp_tables = boost::assign::list_of("Component");
+	foreach(const std::string& table, comp_tables) {
+		lua_getfield(L, -1, table.c_str());
+		Lua::FunctionRegistry::getInstance().addFunctionsToTable(L, table);
+		lua_pop(L, 1);
+	}
+	lua_pop(L, 1);
+
 	// Register documentation for all elements
 	foreach (boost::shared_ptr<LuaElementConvertor> convertor, Sluift::globals.elementConvertor.getConvertors()) {
 		boost::optional<LuaElementConvertor::Documentation> documentation = convertor->getDocumentation();
 		if (documentation) {
 			Lua::registerClassHelp(L, documentation->className, documentation->description);
 		}
 	}
 
 	// Register global documentation