Add support for <before/> to ResultSet

Change-Id: I46bd9f24fc887b180cee3c2aa75a6c9e1761473b
author: Edwin Mons <edwin.mons@isode.com> 2014-05-09 14:25:29 (GMT)
committer: Edwin Mons <edwin.mons@isode.com> 2014-05-12 08:49:36 (GMT)
commit: 634555e64572531fece2a955d1168a88c7979d09 (patch)
tree: 4a7d50488d4adf60b24091e6308e7d4c30b350e7
parent: afa4aa4a38991fc219d71604baab4d64a2082629 (diff)
download: swift-contrib-634555e64572531fece2a955d1168a88c7979d09.zip
swift-contrib-634555e64572531fece2a955d1168a88c7979d09.tar.bz2
6 files changed, 40 insertions, 0 deletions
diff --git a/Sluift/ElementConvertors/ResultSetConvertor.cpp b/Sluift/ElementConvertors/ResultSetConvertor.cpp
index a4ebbf1..bd517b3 100644
--- a/Sluift/ElementConvertors/ResultSetConvertor.cpp
+++ b/Sluift/ElementConvertors/ResultSetConvertor.cpp
@@ -21,78 +21,87 @@ ResultSetConvertor::ResultSetConvertor(LuaElementConvertors* convertors) :
 ResultSetConvertor::~ResultSetConvertor() {
 }
 
 boost::shared_ptr<ResultSet> ResultSetConvertor::doConvertFromLua(lua_State* L) {
 	boost::shared_ptr<ResultSet> result = boost::make_shared<ResultSet>();
 	lua_getfield(L, -1, "max_items");
 	if (lua_isstring(L, -1)) {
 		result->setMaxItems(boost::numeric_cast<int>(lua_tonumber(L, -1)));
 	}
 	lua_pop(L, 1);
 	lua_getfield(L, -1, "count");
 	if (lua_isnumber(L, -1)) {
 		result->setCount(boost::numeric_cast<int>(lua_tonumber(L, -1)));
 	}
 	lua_pop(L, 1);
 	lua_getfield(L, -1, "first_id_index");
 	if (lua_isstring(L, -1)) {
 		result->setFirstIDIndex(boost::numeric_cast<int>(lua_tonumber(L, -1)));
 	}
 	lua_pop(L, 1);
 	lua_getfield(L, -1, "first_id");
 	if (lua_isstring(L, -1)) {
 		result->setFirstID(std::string(lua_tostring(L, -1)));
 	}
 	lua_pop(L, 1);
 	lua_getfield(L, -1, "last_id");
 	if (lua_isstring(L, -1)) {
 		result->setLastID(std::string(lua_tostring(L, -1)));
 	}
 	lua_pop(L, 1);
 	lua_getfield(L, -1, "after");
 	if (lua_isstring(L, -1)) {
 		result->setAfter(std::string(lua_tostring(L, -1)));
 	}
 	lua_pop(L, 1);
+	lua_getfield(L, -1, "before");
+	if (lua_isstring(L, -1)) {
+		result->setBefore(std::string(lua_tostring(L, -1)));
+	}
+	lua_pop(L, 1);
 	return result;
 }
 
 void ResultSetConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<ResultSet> payload) {
 	lua_createtable(L, 0, 0);
 	if (payload->getMaxItems()) {
 		lua_pushnumber(L, *payload->getMaxItems());
 		lua_setfield(L, -2, "max_items");
 	}
 	if (payload->getCount()) {
 		lua_pushnumber(L, *payload->getCount());
 		lua_setfield(L, -2, "count");
 	}
 	if (payload->getFirstIDIndex()) {
 		lua_pushnumber(L, *payload->getFirstIDIndex());
 		lua_setfield(L, -2, "first_id_index");
 	}
 	if (payload->getFirstID()) {
 		lua_pushstring(L, (*payload->getFirstID()).c_str());
 		lua_setfield(L, -2, "first_id");
 	}
 	if (payload->getLastID()) {
 		lua_pushstring(L, (*payload->getLastID()).c_str());
 		lua_setfield(L, -2, "last_id");
 	}
 	if (payload->getAfter()) {
 		lua_pushstring(L, (*payload->getAfter()).c_str());
 		lua_setfield(L, -2, "after");
 	}
+	if (payload->getBefore()) {
+		lua_pushstring(L, (*payload->getBefore()).c_str());
+		lua_setfield(L, -2, "before");
+	}
 }
 
 boost::optional<LuaElementConvertor::Documentation> ResultSetConvertor::getDocumentation() const {
 	return Documentation(
 		"ResultSet",
 		"This table has the following fields:\n\n"
 		"- `max_items`: number (Optional)\n"
 		"- `count`: number (Optional)\n"
 		"- `first_id_index`: number (Optional)\n"
 		"- `first_id`: string (Optional)\n"
 		"- `last_id`: string (Optional)\n"
 		"- `after`: string (Optional)\n"
 	);
 }
diff --git a/Swiften/Elements/ResultSet.h b/Swiften/Elements/ResultSet.h
index 871b699..e84be35 100644
--- a/Swiften/Elements/ResultSet.h
+++ b/Swiften/Elements/ResultSet.h
@@ -1,44 +1,48 @@
 /*
  * Copyright (c) 2014 Kevin Smith and Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <boost/optional.hpp>
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/Payload.h>
 
 namespace Swift {
 	class SWIFTEN_API ResultSet : public Payload {
 		public:
 			virtual ~ResultSet();
 
 			void setMaxItems(const boost::optional<int>& maxItems) { maxItems_ = maxItems; }
 			const boost::optional<int>& getMaxItems() const { return maxItems_; }
 
 			void setCount(const boost::optional<int>& count) { count_ = count; }
 			const boost::optional<int>& getCount() const { return count_; }
 
 			void setFirstIDIndex(const boost::optional<int>& firstIndex) { firstIndex_ = firstIndex; }
 			const boost::optional<int>& getFirstIDIndex() const { return firstIndex_; }
 
 			void setFirstID(const boost::optional<std::string>& firstID) { firstID_ = firstID; }
 			const boost::optional<std::string>& getFirstID() const { return firstID_; }
 
 			void setLastID(const boost::optional<std::string>& lastID) { lastID_ = lastID; }
 			const boost::optional<std::string>& getLastID() const { return lastID_; }
 
+			void setBefore(const boost::optional<std::string>& before) { before_ = before; }
+			const boost::optional<std::string>& getBefore() const { return before_; }
+
 			void setAfter(const boost::optional<std::string>& after) { after_ = after; }
 			const boost::optional<std::string>& getAfter() const { return after_; }
 
 		private:
 			boost::optional<int> maxItems_;
 			boost::optional<int> count_;
 			boost::optional<int> firstIndex_;
 			boost::optional<std::string> firstID_;
 			boost::optional<std::string> lastID_;
+			boost::optional<std::string> before_;
 			boost::optional<std::string> after_;
 	};
 }
diff --git a/Swiften/Parser/PayloadParsers/ResultSetParser.cpp b/Swiften/Parser/PayloadParsers/ResultSetParser.cpp
index 95960d7..4c8283b 100644
--- a/Swiften/Parser/PayloadParsers/ResultSetParser.cpp
+++ b/Swiften/Parser/PayloadParsers/ResultSetParser.cpp
@@ -15,44 +15,46 @@ using namespace Swift;
 ResultSetParser::ResultSetParser() : level_(TopLevel) {
 }
 
 void ResultSetParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
 	currentText_ = "";
 	if (level_ == PayloadLevel) {
 		if (element == "first" && ns == "http://jabber.org/protocol/rsm") {
 			if (boost::optional<std::string> attributeValue = attributes.getAttributeValue("index")) {
 				try {
 					getPayloadInternal()->setFirstIDIndex(boost::lexical_cast<int>(*attributeValue));
 				} catch(boost::bad_lexical_cast&) {
 				}
 			}
 		}
 	}
 	++level_;
 }
 
 void ResultSetParser::handleEndElement(const std::string& element, const std::string&) {
 	--level_;
 	if (level_ == PayloadLevel) {
 		if (element == "max") {
 			try {
 				getPayloadInternal()->setMaxItems(boost::lexical_cast<int>(currentText_));
 			} catch(boost::bad_lexical_cast&) {
 			}
 		} else if (element == "count") {
 			try {
 				getPayloadInternal()->setCount(boost::lexical_cast<int>(currentText_));
 			} catch(boost::bad_lexical_cast&) {
 			}
 		} else if (element == "first") {
 			getPayloadInternal()->setFirstID(currentText_);
 		} else if (element == "last") {
 			getPayloadInternal()->setLastID(currentText_);
+		} else if (element == "before") {
+			getPayloadInternal()->setBefore(currentText_);
 		} else if (element == "after") {
 			getPayloadInternal()->setAfter(currentText_);
 		}
 	}
 }
 
 void ResultSetParser::handleCharacterData(const std::string& data) {
 	currentText_ += data;
 }
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp
index 68df71b..e345323 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp
@@ -1,65 +1,68 @@
 /*
  * Copyright (c) 2014 Kevin Smith and 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 <Swiften/Parser/PayloadParsers/ResultSetParser.h>
 #include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h>
 
 using namespace Swift;
 
 class ResultSetParserTest : public CppUnit::TestFixture
 {
 		CPPUNIT_TEST_SUITE(ResultSetParserTest);
 		CPPUNIT_TEST(testParse);
 		CPPUNIT_TEST(testParseFirstNoIndex);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void testParse() {
 			PayloadsParserTester parser;
 			CPPUNIT_ASSERT(parser.parse(
 				"<set xmlns=\"http://jabber.org/protocol/rsm\">"
 					"<max>100</max>"
 					"<count>800</count>"
 					"<first index=\"123\">stpeter@jabber.org</first>"
 					"<last>peterpan@neverland.lit</last>"
+					"<before>decaf-badba-dbad1</before>"
 					"<after>09af3-cc343-b409f</after>"
 				"</set>"));
 
 			boost::shared_ptr<ResultSet> payload = parser.getPayload<ResultSet>();
 			CPPUNIT_ASSERT(!!payload);
 			CPPUNIT_ASSERT(payload->getMaxItems());
 			CPPUNIT_ASSERT_EQUAL(100, *payload->getMaxItems());
 			CPPUNIT_ASSERT(payload->getCount());
 			CPPUNIT_ASSERT_EQUAL(800, *payload->getCount());
 			CPPUNIT_ASSERT(payload->getFirstID());
 			CPPUNIT_ASSERT_EQUAL(std::string("stpeter@jabber.org"), *payload->getFirstID());
 			CPPUNIT_ASSERT(payload->getFirstIDIndex());
 			CPPUNIT_ASSERT_EQUAL(123, *payload->getFirstIDIndex());
 			CPPUNIT_ASSERT(payload->getLastID());
 			CPPUNIT_ASSERT_EQUAL(std::string("peterpan@neverland.lit"), *payload->getLastID());
+			CPPUNIT_ASSERT(payload->getBefore());
+			CPPUNIT_ASSERT_EQUAL(std::string("decaf-badba-dbad1"), *payload->getBefore());
 			CPPUNIT_ASSERT(payload->getAfter());
 			CPPUNIT_ASSERT_EQUAL(std::string("09af3-cc343-b409f"), *payload->getAfter());
 		}
 
 		void testParseFirstNoIndex() {
 			PayloadsParserTester parser;
 			CPPUNIT_ASSERT(parser.parse(
 				"<set xmlns=\"http://jabber.org/protocol/rsm\">"
 					"<first>stpeter@jabber.org</first>"
 				"</set>"));
 
 			boost::shared_ptr<ResultSet> payload = parser.getPayload<ResultSet>();
 			CPPUNIT_ASSERT(!!payload);
 			CPPUNIT_ASSERT(payload->getFirstID());
 			CPPUNIT_ASSERT_EQUAL(std::string("stpeter@jabber.org"), *payload->getFirstID());
 			CPPUNIT_ASSERT(!payload->getFirstIDIndex());
 		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ResultSetParserTest);
diff --git a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp
index 86d8830..0f464a4 100644
--- a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp
@@ -13,41 +13,45 @@
 using namespace Swift;
 
 ResultSetSerializer::ResultSetSerializer() {
 }
 
 ResultSetSerializer::~ResultSetSerializer() {
 }
 
 std::string ResultSetSerializer::serializePayload(boost::shared_ptr<ResultSet> payload) const {
 	if (!payload) {
 		return "";
 	}
 
 	XMLElement element("set", "http://jabber.org/protocol/rsm");
 
 	if (payload->getMaxItems()) {
 		element.addNode(boost::make_shared<XMLElement>("max", "", boost::lexical_cast<std::string>(*payload->getMaxItems())));
 	}
 
 	if (payload->getCount()) {
 		element.addNode(boost::make_shared<XMLElement>("count", "", boost::lexical_cast<std::string>(*payload->getCount())));
 	}
 
 	if (payload->getFirstID()) {
 		boost::shared_ptr<XMLElement> firstElement = boost::make_shared<XMLElement>("first", "", *payload->getFirstID());
 		if (payload->getFirstIDIndex()) {
 			firstElement->setAttribute("index", boost::lexical_cast<std::string>(*payload->getFirstIDIndex()));
 		}
 		element.addNode(firstElement);
 	}
 
 	if (payload->getLastID()) {
 		element.addNode(boost::make_shared<XMLElement>("last", "", *payload->getLastID()));
 	}
 
+	if (payload->getBefore()) {
+		element.addNode(boost::make_shared<XMLElement>("before", "", *payload->getBefore()));
+	}
+
 	if (payload->getAfter()) {
 		element.addNode(boost::make_shared<XMLElement>("after", "", *payload->getAfter()));
 	}
 
 	return element.serialize();
 }
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp
index 641b856..354db85 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp
@@ -1,98 +1,116 @@
 /*
  * Copyright (c) 2014 Kevin Smith and Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h>
 #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
 #include <Swiften/Elements/ResultSet.h>
 
 using namespace Swift;
 
 class ResultSetSerializerTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(ResultSetSerializerTest);
 		CPPUNIT_TEST(testSerializeFull);
 		CPPUNIT_TEST(testSerializeMaxItems);
+		CPPUNIT_TEST(testSerializeEmptyBefore);
 		CPPUNIT_TEST(testSerializeFirst);
 		CPPUNIT_TEST(testSerializeFirstWithIndex);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void testSerializeFull() {
 			ResultSetSerializer serializer;
 
 			boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>());
 
 			resultSet->setMaxItems(100);
 			resultSet->setCount(800);
 			resultSet->setFirstIDIndex(123);
 			resultSet->setFirstID(std::string("stpeter@jabber.org"));
 			resultSet->setLastID(std::string("peterpan@neverland.lit"));
 			resultSet->setAfter(std::string("09af3-cc343-b409f"));
+			resultSet->setBefore(std::string("decaf-badba-dbad1"));
 
 			std::string expectedResult = 
 				"<set xmlns=\"http://jabber.org/protocol/rsm\">"
 					"<max>100</max>"
 					"<count>800</count>"
 					"<first index=\"123\">stpeter@jabber.org</first>"
 					"<last>peterpan@neverland.lit</last>"
+					"<before>decaf-badba-dbad1</before>"
 					"<after>09af3-cc343-b409f</after>"
 				"</set>";
 
 			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(resultSet));
 		}
 
 		void testSerializeMaxItems() {
 			ResultSetSerializer serializer;
 
 			boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>());
 
 			resultSet->setMaxItems(100);
 
 			std::string expectedResult = 
 				"<set xmlns=\"http://jabber.org/protocol/rsm\">"
 					"<max>100</max>"
 				"</set>";
 
 			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(resultSet));
 		}
 
+		void testSerializeEmptyBefore() {
+			ResultSetSerializer serializer;
+
+			boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>());
+
+			resultSet->setBefore(std::string());
+
+			std::string expectedResult =
+				"<set xmlns=\"http://jabber.org/protocol/rsm\">"
+					"<before/>"
+				"</set>";
+
+			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(resultSet));
+		}
+
 		void testSerializeFirst() {
 			ResultSetSerializer serializer;
 
 			boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>());
 
 			resultSet->setFirstID(std::string("stpeter@jabber.org"));
 
 			std::string expectedResult = 
 				"<set xmlns=\"http://jabber.org/protocol/rsm\">"
 					"<first>stpeter@jabber.org</first>"
 				"</set>";
 
 			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(resultSet));
 		}
 
 		void testSerializeFirstWithIndex() {
 			ResultSetSerializer serializer;
 
 			boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>());
 
 			resultSet->setFirstID(std::string("stpeter@jabber.org"));
 			resultSet->setFirstIDIndex(123);
 
 			std::string expectedResult = 
 				"<set xmlns=\"http://jabber.org/protocol/rsm\">"
 					"<first index=\"123\">stpeter@jabber.org</first>"
 				"</set>";
 
 			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(resultSet));
 		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ResultSetSerializerTest);
author	Edwin Mons <edwin.mons@isode.com>	2014-05-09 14:25:29 (GMT)
committer	Edwin Mons <edwin.mons@isode.com>	2014-05-12 08:49:36 (GMT)
commit	634555e64572531fece2a955d1168a88c7979d09 (patch)
tree	4a7d50488d4adf60b24091e6308e7d4c30b350e7
parent	afa4aa4a38991fc219d71604baab4d64a2082629 (diff)
download	swift-contrib-634555e64572531fece2a955d1168a88c7979d09.zip swift-contrib-634555e64572531fece2a955d1168a88c7979d09.tar.bz2