7 files changed, 231 insertions, 1 deletions
diff --git a/Swiften/Disco/CapsManager.cpp b/Swiften/Disco/CapsManager.cpp
index a9920a2..43c2805 100644
--- a/Swiften/Disco/CapsManager.cpp
+++ b/Swiften/Disco/CapsManager.cpp
@@ -12,7 +12,7 @@
 #include "Swiften/Disco/CapsStorage.h"
 #include "Swiften/Disco/CapsInfoGenerator.h"
 #include "Swiften/Elements/CapsInfo.h"
-#include "Swiften/Queries/Requests/GetDiscoInfoRequest.h"
+#include "Swiften/Disco/GetDiscoInfoRequest.h"
 
 namespace Swift {
 
diff --git a/Swiften/Disco/DiscoInfoResponder.cpp b/Swiften/Disco/DiscoInfoResponder.cpp
new file mode 100644
index 0000000..154eded
--- /dev/null
+++ b/Swiften/Disco/DiscoInfoResponder.cpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include "Swiften/Disco/DiscoInfoResponder.h"
+#include "Swiften/Queries/IQRouter.h"
+#include "Swiften/Elements/DiscoInfo.h"
+
+namespace Swift {
+
+DiscoInfoResponder::DiscoInfoResponder(IQRouter* router) : GetResponder<DiscoInfo>(router) {
+}
+
+void DiscoInfoResponder::setDiscoInfo(const DiscoInfo& info) {
+	info_ = info;
+}
+
+void DiscoInfoResponder::setDiscoInfo(const String& node, const DiscoInfo& info) {
+	DiscoInfo newInfo(info);
+	newInfo.setNode(node);
+	nodeInfo_[node] = newInfo;
+}
+
+bool DiscoInfoResponder::handleGetRequest(const JID& from, const String& id, boost::shared_ptr<DiscoInfo> info) {
+	if (info->getNode().isEmpty()) {
+		sendResponse(from, id, boost::shared_ptr<DiscoInfo>(new DiscoInfo(info_)));
+	}
+	else {
+		std::map<String,DiscoInfo>::const_iterator i = nodeInfo_.find(info->getNode());
+		if (i != nodeInfo_.end()) {
+			sendResponse(from, id, boost::shared_ptr<DiscoInfo>(new DiscoInfo((*i).second)));
+		}
+		else {
+			sendError(from, id, ErrorPayload::ItemNotFound, ErrorPayload::Cancel);
+		}
+	}
+	return true;
+}
+
+}
diff --git a/Swiften/Disco/DiscoInfoResponder.h b/Swiften/Disco/DiscoInfoResponder.h
new file mode 100644
index 0000000..4a7d271
--- /dev/null
+++ b/Swiften/Disco/DiscoInfoResponder.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#ifndef SWIFTEN_DiscoInfoResponder_H
+#define SWIFTEN_DiscoInfoResponder_H
+
+#include <map>
+
+#include "Swiften/Queries/GetResponder.h"
+#include "Swiften/Elements/DiscoInfo.h"
+
+namespace Swift {
+	class IQRouter;
+
+	class DiscoInfoResponder : public GetResponder<DiscoInfo> {
+		public:
+			DiscoInfoResponder(IQRouter* router);
+
+			void setDiscoInfo(const DiscoInfo& info);
+			void setDiscoInfo(const String& node, const DiscoInfo& info);
+
+		private:
+			virtual bool handleGetRequest(const JID& from, const String& id, boost::shared_ptr<DiscoInfo> payload);
+
+		private:
+			DiscoInfo info_;
+			std::map<String, DiscoInfo> nodeInfo_;
+	};
+}
+
+#endif
diff --git a/Swiften/Disco/GetDiscoInfoRequest.h b/Swiften/Disco/GetDiscoInfoRequest.h
new file mode 100644
index 0000000..d1ed279
--- /dev/null
+++ b/Swiften/Disco/GetDiscoInfoRequest.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include "Swiften/Queries/GenericRequest.h"
+#include "Swiften/Elements/DiscoInfo.h"
+
+namespace Swift {
+	class GetDiscoInfoRequest : public GenericRequest<DiscoInfo>, public Shared<GetDiscoInfoRequest> {
+		public:
+			static ref create(const JID& jid, IQRouter* router) {
+				return ref(new GetDiscoInfoRequest(jid, router));
+			}
+
+			static ref create(const JID& jid, const String& node, IQRouter* router) {
+				return ref(new GetDiscoInfoRequest(jid, node, router));
+			}
+
+		private:
+			GetDiscoInfoRequest(const JID& jid, IQRouter* router) :
+					GenericRequest<DiscoInfo>(IQ::Get, jid, boost::shared_ptr<DiscoInfo>(new DiscoInfo()), router) {
+			}
+
+			GetDiscoInfoRequest(const JID& jid, const String& node, IQRouter* router) :
+					GenericRequest<DiscoInfo>(IQ::Get, jid, boost::shared_ptr<DiscoInfo>(new DiscoInfo()), router) {
+				getPayloadGeneric()->setNode(node);
+			}
+	};
+}
diff --git a/Swiften/Disco/GetDiscoItemsRequest.h b/Swiften/Disco/GetDiscoItemsRequest.h
new file mode 100644
index 0000000..ed565ac
--- /dev/null
+++ b/Swiften/Disco/GetDiscoItemsRequest.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2010 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include "Swiften/Queries/GenericRequest.h"
+#include "Swiften/Elements/DiscoItems.h"
+
+namespace Swift {
+	class GetDiscoItemsRequest : public GenericRequest<DiscoItems>, public Shared<GetDiscoItemsRequest> {
+		public:
+			static ref create(const JID& jid, IQRouter* router) {
+				return ref(new GetDiscoItemsRequest(jid, router));
+			}
+
+		private:
+			GetDiscoItemsRequest(const JID& jid, IQRouter* router) :
+					GenericRequest<DiscoItems>(IQ::Get, jid, boost::shared_ptr<DiscoItems>(new DiscoItems()), router) {
+			}
+	};
+}
diff --git a/Swiften/Disco/SConscript b/Swiften/Disco/SConscript
index 9da3fb3..d07d490 100644
--- a/Swiften/Disco/SConscript
+++ b/Swiften/Disco/SConscript
@@ -6,5 +6,6 @@ objects = swiften_env.StaticObject([
 			"EntityCapsManager.cpp",
 			"CapsStorage.cpp",
 			"CapsFileStorage.cpp",
+			"DiscoInfoResponder.cpp",
 		])
 swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp b/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
new file mode 100644
index 0000000..a9e85c0
--- /dev/null
+++ b/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <typeinfo>
+
+#include "Swiften/Disco/DiscoInfoResponder.h"
+#include "Swiften/Queries/IQRouter.h"
+#include "Swiften/Queries/DummyIQChannel.h"
+
+using namespace Swift;
+
+class DiscoInfoResponderTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(DiscoInfoResponderTest);
+		CPPUNIT_TEST(testHandleRequest_GetToplevelInfo);
+		CPPUNIT_TEST(testHandleRequest_GetNodeInfo);
+		CPPUNIT_TEST(testHandleRequest_GetInvalidNodeInfo);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		DiscoInfoResponderTest() {}
+
+		void setUp() {
+			channel_ = new DummyIQChannel();
+			router_ = new IQRouter(channel_);
+		}
+
+		void tearDown() {
+			delete router_;
+			delete channel_;
+		}
+
+		void testHandleRequest_GetToplevelInfo() {
+			DiscoInfoResponder testling(router_);
+			testling.start();
+			DiscoInfo discoInfo;
+			discoInfo.addFeature("foo");
+			testling.setDiscoInfo(discoInfo);
+
+			boost::shared_ptr<DiscoInfo> query(new DiscoInfo());
+			channel_->onIQReceived(IQ::createRequest(IQ::Get, JID("foo@bar.com"), "id-1", query));
+
+			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
+			boost::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
+			CPPUNIT_ASSERT(payload);
+			CPPUNIT_ASSERT_EQUAL(String(""), payload->getNode());
+			CPPUNIT_ASSERT(payload->hasFeature("foo"));
+
+			testling.stop();
+		}
+
+		void testHandleRequest_GetNodeInfo() {
+			DiscoInfoResponder testling(router_); 
+			testling.start();
+			DiscoInfo discoInfo;
+			discoInfo.addFeature("foo");
+			testling.setDiscoInfo(discoInfo);
+			DiscoInfo discoInfoBar;
+			discoInfoBar.addFeature("bar");
+			testling.setDiscoInfo("bar-node", discoInfoBar);
+
+			boost::shared_ptr<DiscoInfo> query(new DiscoInfo());
+			query->setNode("bar-node");
+			channel_->onIQReceived(IQ::createRequest(IQ::Get, JID("foo@bar.com"), "id-1", query));
+
+			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
+			boost::shared_ptr<DiscoInfo> payload(channel_->iqs_[0]->getPayload<DiscoInfo>());
+			CPPUNIT_ASSERT(payload);
+			CPPUNIT_ASSERT_EQUAL(String("bar-node"), payload->getNode());
+			CPPUNIT_ASSERT(payload->hasFeature("bar"));
+
+			testling.stop();
+		}
+
+		void testHandleRequest_GetInvalidNodeInfo() {
+			DiscoInfoResponder testling(router_); 
+
+			boost::shared_ptr<DiscoInfo> query(new DiscoInfo());
+			query->setNode("bar-node");
+			channel_->onIQReceived(IQ::createRequest(IQ::Get, JID("foo@bar.com"), "id-1", query));
+
+			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(channel_->iqs_.size()));
+			boost::shared_ptr<ErrorPayload> payload(channel_->iqs_[0]->getPayload<ErrorPayload>());
+			CPPUNIT_ASSERT(payload);
+		}
+
+	private:
+		IQRouter* router_;
+		DummyIQChannel* channel_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(DiscoInfoResponderTest);