4 files changed, 122 insertions, 0 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
index 1bbcbf2..0f05580 100644
--- a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
+++ b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
@@ -14,6 +14,7 @@
 #include "Swiften/Serializer/PayloadSerializers/PrioritySerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/ErrorSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/RosterSerializer.h"
+#include "Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/MUCOwnerPayloadSerializer.h"
@@ -51,6 +52,7 @@ FullPayloadSerializerCollection::FullPayloadSerializerCollection() {
 	serializers_.push_back(new PrioritySerializer());
 	serializers_.push_back(new ErrorSerializer());
 	serializers_.push_back(new RosterSerializer());
+	serializers_.push_back(new RosterItemExchangeSerializer());
 	serializers_.push_back(new MUCPayloadSerializer());
 	serializers_.push_back(new MUCUserPayloadSerializer());
 	serializers_.push_back(new MUCOwnerPayloadSerializer(this));
diff --git a/Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.cpp b/Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.cpp
new file mode 100644
index 0000000..76c742c
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2011 Jan Kaluza
+ * Licensed under the Simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include "Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.h"
+
+#include <boost/shared_ptr.hpp>
+
+#include "Swiften/Base/foreach.h"
+#include "Swiften/Serializer/XML/XMLTextNode.h"
+#include "Swiften/Serializer/XML/XMLRawTextNode.h"
+#include "Swiften/Serializer/XML/XMLElement.h"
+
+namespace Swift {
+
+RosterItemExchangeSerializer::RosterItemExchangeSerializer() : GenericPayloadSerializer<RosterItemExchangePayload>() {
+}
+
+std::string RosterItemExchangeSerializer::serializePayload(boost::shared_ptr<RosterItemExchangePayload> roster)  const {
+	XMLElement queryElement("x", "http://jabber.org/protocol/rosterx");
+	foreach(const RosterItemExchangePayload::Item& item, roster->getItems()) {
+		boost::shared_ptr<XMLElement> itemElement(new XMLElement("item"));
+		itemElement->setAttribute("jid", item.jid);
+		itemElement->setAttribute("name", item.name);
+
+		switch (item.action) {
+			case RosterItemExchangePayload::Add: itemElement->setAttribute("action", "add"); break;
+			case RosterItemExchangePayload::Modify: itemElement->setAttribute("action", "modify"); break;
+			case RosterItemExchangePayload::Delete: itemElement->setAttribute("action", "delete"); break;
+			default: itemElement->setAttribute("action", "add"); break;
+		}
+
+		foreach(const std::string& group, item.groups) {
+			boost::shared_ptr<XMLElement> groupElement(new XMLElement("group"));
+			groupElement->addNode(boost::shared_ptr<XMLTextNode>(new XMLTextNode(group)));
+			itemElement->addNode(groupElement);
+		}
+
+		queryElement.addNode(itemElement);
+	}
+
+	return queryElement.serialize();
+}
+
+}
diff --git a/Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.h b/Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.h
new file mode 100644
index 0000000..ec2cc13
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2011 Jan Kaluza
+ * Licensed under the Simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include "Swiften/Serializer/GenericPayloadSerializer.h"
+#include "Swiften/Elements/RosterItemExchangePayload.h"
+
+namespace Swift {
+	class RosterItemExchangeSerializer : public GenericPayloadSerializer<RosterItemExchangePayload> {
+		public:
+			RosterItemExchangeSerializer();
+
+			virtual std::string serializePayload(boost::shared_ptr<RosterItemExchangePayload>)  const;
+	};
+}
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp
new file mode 100644
index 0000000..0fb44c9
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp
@@ -0,0 +1,54 @@
+/*
+ * 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/Serializer/PayloadSerializers/RosterItemExchangeSerializer.h"
+
+using namespace Swift;
+
+class RosterItemExchangeSerializerTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(RosterItemExchangeSerializerTest);
+		CPPUNIT_TEST(testSerialize);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		RosterItemExchangeSerializerTest() {}
+
+		void testSerialize() {
+			RosterItemExchangeSerializer testling;
+			boost::shared_ptr<RosterItemExchangePayload> roster(new RosterItemExchangePayload());
+
+			RosterItemExchangePayload::Item item1;
+			item1.jid = JID("foo@bar.com");
+			item1.name = "Foo @ Bar";
+			item1.action = RosterItemExchangePayload::Add;
+			item1.groups.push_back("Group 1");
+			item1.groups.push_back("Group 2");
+			roster->addItem(item1);
+
+			RosterItemExchangePayload::Item item2;
+			item2.jid = JID("baz@blo.com");
+			item2.name = "Baz";
+			item2.action = RosterItemExchangePayload::Modify;
+			roster->addItem(item2);
+
+			std::string expectedResult = 
+				"<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>";
+
+			CPPUNIT_ASSERT_EQUAL(expectedResult, testling.serialize(roster));
+		}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(RosterItemExchangeSerializerTest);