5 files changed, 157 insertions, 0 deletions
diff --git a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
index e20c06d..5052e67 100644
--- a/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
+++ b/Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp
@@ -17,6 +17,7 @@
 #include "Swiften/Parser/PayloadParsers/StartSessionParser.h"
 #include "Swiften/Parser/PayloadParsers/StatusParser.h"
 #include "Swiften/Parser/PayloadParsers/StatusShowParser.h"
+#include "Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h"
 #include "Swiften/Parser/PayloadParsers/RosterParser.h"
 #include "Swiften/Parser/PayloadParsers/SoftwareVersionParser.h"
 #include "Swiften/Parser/PayloadParsers/StorageParser.h"
@@ -54,6 +55,7 @@ FullPayloadParserFactoryCollection::FullPayloadParserFactoryCollection() {
 	factories_.push_back(shared_ptr<PayloadParserFactory>(new GenericPayloadParserFactory<ErrorParser>("error")));
 	factories_.push_back(shared_ptr<PayloadParserFactory>(new GenericPayloadParserFactory<SoftwareVersionParser>("query", "jabber:iq:version")));
 	factories_.push_back(shared_ptr<PayloadParserFactory>(new GenericPayloadParserFactory<StorageParser>("storage", "storage:bookmarks")));
+	factories_.push_back(shared_ptr<PayloadParserFactory>(new GenericPayloadParserFactory<RosterItemExchangeParser>("x", "http://jabber.org/protocol/rosterx")));
 	factories_.push_back(shared_ptr<PayloadParserFactory>(new GenericPayloadParserFactory<RosterParser>("query", "jabber:iq:roster")));
 	factories_.push_back(shared_ptr<PayloadParserFactory>(new GenericPayloadParserFactory<DiscoInfoParser>("query", "http://jabber.org/protocol/disco#info")));
 	factories_.push_back(shared_ptr<PayloadParserFactory>(new GenericPayloadParserFactory<DiscoItemsParser>("query", "http://jabber.org/protocol/disco#items")));
diff --git a/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.cpp b/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.cpp
new file mode 100644
index 0000000..7d59cc3
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2011 Jan Kaluza
+ * Licensed under the Simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include "Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h"
+#include "Swiften/Parser/SerializingParser.h"
+
+namespace Swift {
+
+RosterItemExchangeParser::RosterItemExchangeParser() : level_(TopLevel), inItem_(false) {
+}
+
+void RosterItemExchangeParser::handleStartElement(const std::string& element, const std::string& /*ns*/, const AttributeMap& attributes) {
+	if (level_ == PayloadLevel) {
+		if (element == "item") {
+			inItem_ = true;
+
+			currentItem_ = RosterItemExchangePayload::Item();
+
+			currentItem_.jid = JID(attributes.getAttribute("jid"));
+			currentItem_.name = attributes.getAttribute("name");
+
+			std::string action = attributes.getAttribute("action");
+			if (action == "add") {
+				currentItem_.action = RosterItemExchangePayload::Add;
+			}
+			else if (action == "modify") {
+				currentItem_.action = RosterItemExchangePayload::Modify;
+			}
+			else if (action == "delete") {
+				currentItem_.action = RosterItemExchangePayload::Delete;
+			}
+			else {
+				// Add is default action according to XEP
+				currentItem_.action = RosterItemExchangePayload::Add;
+			}
+		}
+	}
+	else if (level_ == ItemLevel) {
+		if (element == "group") {
+			currentText_ = "";
+		}
+	}
+	++level_;
+}
+
+void RosterItemExchangeParser::handleEndElement(const std::string& element, const std::string& /*ns*/) {
+	--level_;
+	if (level_ == PayloadLevel) {
+		if (inItem_) {
+			getPayloadInternal()->addItem(currentItem_);
+			inItem_ = false;
+		}
+	}
+	else if (level_ == ItemLevel) {
+		if (element == "group") {
+			currentItem_.groups.push_back(currentText_);
+		}
+	}
+}
+
+void RosterItemExchangeParser::handleCharacterData(const std::string& data) {
+	currentText_ += data;
+}
+
+}
diff --git a/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h b/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h
new file mode 100644
index 0000000..3d6b8f4
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2011 Jan Kaluza
+ * Licensed under the Simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include "Swiften/Elements/RosterItemExchangePayload.h"
+#include "Swiften/Parser/GenericPayloadParser.h"
+
+namespace Swift {
+	class SerializingParser;
+
+	class RosterItemExchangeParser : public GenericPayloadParser<RosterItemExchangePayload> {
+		public:
+			RosterItemExchangeParser();
+
+			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes);
+			virtual void handleEndElement(const std::string& element, const std::string&);
+			virtual void handleCharacterData(const std::string& data);
+
+		private:
+			enum Level { 
+				TopLevel = 0, 
+				PayloadLevel = 1,
+				ItemLevel = 2
+			};
+			int level_;
+			bool inItem_;
+			RosterItemExchangePayload::Item currentItem_;
+			std::string currentText_;
+	};
+}
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/RosterItemExchangeParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/RosterItemExchangeParserTest.cpp
new file mode 100644
index 0000000..ceba45f
--- /dev/null
+++ b/Swiften/Parser/PayloadParsers/UnitTest/RosterItemExchangeParserTest.cpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2011 Jan Kaluza
+ * Licensed under the Simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h"
+#include "Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h"
+
+using namespace Swift;
+
+class RosterItemExchangeParserTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(RosterItemExchangeParserTest);
+		CPPUNIT_TEST(testParse);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		void testParse() {
+			PayloadsParserTester parser;
+			CPPUNIT_ASSERT(parser.parse(
+				"<x xmlns=\"http://jabber.org/protocol/rosterx\">"
+					"<item action=\"add\" jid=\"foo@bar.com\" name=\"Foo @ Bar\">"
+						"<group>Group 1</group>"
+						"<group>Group 2</group>"
+					"</item>"
+					"<item action=\"modify\" jid=\"baz@blo.com\" name=\"Baz\"/>"
+				"</x>"));
+
+			RosterItemExchangePayload* payload = dynamic_cast<RosterItemExchangePayload*>(parser.getPayload().get());
+			const RosterItemExchangePayload::RosterItemExchangePayloadItems& items = payload->getItems();
+
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), items.size());
+
+			CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com"), items[0].jid);
+			CPPUNIT_ASSERT_EQUAL(std::string("Foo @ Bar"), items[0].name);
+			CPPUNIT_ASSERT_EQUAL(RosterItemExchangePayload::Add, items[0].action);
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), items[0].groups.size());
+			CPPUNIT_ASSERT_EQUAL(std::string("Group 1"), items[0].groups[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("Group 2"), items[0].groups[1]);
+
+			CPPUNIT_ASSERT_EQUAL(JID("baz@blo.com"), items[1].jid);
+			CPPUNIT_ASSERT_EQUAL(std::string("Baz"), items[1].name);
+			CPPUNIT_ASSERT_EQUAL(RosterItemExchangePayload::Modify, items[1].action);
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), items[1].groups.size());
+		}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(RosterItemExchangeParserTest);
diff --git a/Swiften/Parser/SConscript b/Swiften/Parser/SConscript
index 2bd5aff..03e4208 100644
--- a/Swiften/Parser/SConscript
+++ b/Swiften/Parser/SConscript
@@ -38,6 +38,7 @@ sources = [
 		"PayloadParsers/PrivateStorageParser.cpp",
 		"PayloadParsers/RawXMLPayloadParser.cpp",
 		"PayloadParsers/ResourceBindParser.cpp",
+		"PayloadParsers/RosterItemExchangeParser.cpp",
 		"PayloadParsers/RosterParser.cpp",
 		"PayloadParsers/SecurityLabelParser.cpp",
 		"PayloadParsers/SecurityLabelsCatalogParser.cpp",