3 files changed, 121 insertions, 7 deletions
diff --git a/SwifTools/Linkify.cpp b/SwifTools/Linkify.cpp
index 906026d..8ecbb09 100644
--- a/SwifTools/Linkify.cpp
+++ b/SwifTools/Linkify.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -49,4 +49,55 @@ std::string Linkify::linkify(const std::string& input) {
 	return std::string(result.str());
 }
 
+std::pair<std::vector<std::string>, size_t> Linkify::splitLink(const std::string& input) {
+	std::vector<std::string> result;
+	std::pair<std::vector<std::string>, size_t> pair;
+	std::vector<char> currentURL;
+	bool inURL = false;
+	size_t urlStartsAt = 0;
+	for (size_t i = 0; i < input.size(); ++i) {
+		char c = input[i];
+		if (inURL) {
+			if (c != ' ' && c != '\t' && c != '\n' && !(c == '*' && i == input.size() - 1 && input[0] == '*')) {
+				// Keep parsing
+			}
+			else {
+				std::string url(input.substr(urlStartsAt, i - urlStartsAt));
+				result.push_back(url);
+				inURL = false;
+				size_t remaining = input.size() - i;
+				if (remaining > 0) {
+					result.push_back(input.substr(i, remaining));
+				}
+				pair.first = result;
+				pair.second = urlStartsAt == 0 ? 0 : 1;
+				return pair;
+			}
+		}
+		else {
+			if (boost::regex_match(input.substr(i, 8), linkifyRegexp)) {
+				urlStartsAt = i;
+				inURL = true;
+				if (i > 0) {
+					result.push_back(input.substr(0, i));
+				}
+			}
+			else {
+				// Just keep swimming
+			}
+		}
+	}
+	if (urlStartsAt > 0 || inURL) {
+		std::string url(input.substr(urlStartsAt, input.size() - urlStartsAt));
+		result.push_back(url);
+		pair.first = result;
+		pair.second = urlStartsAt == 0 ? 0 : 1;
+	}
+	else {
+		pair.first.push_back(input);
+		pair.second = 1;
+	}
+	return pair;
+}
+
 }
diff --git a/SwifTools/Linkify.h b/SwifTools/Linkify.h
index ebe232f..0a9c132 100644
--- a/SwifTools/Linkify.h
+++ b/SwifTools/Linkify.h
@@ -1,15 +1,27 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
+#include <vector>
 #include <string>
 
 namespace Swift {
 	namespace Linkify {
 		std::string linkify(const std::string&);
+		/**
+		 * Parse the string for a URI. The string will be split by the URI, and the segments plus index of the URI returned.
+		 * If no URI is found the index will be result.size() (i.e. an invalid index)
+		 *
+		 * Examples:
+		 * "not a URI" -> <<"not a URI">, -1>
+		 * "http://swift.im" -> <<"http://swift.im">, 0
+		 * " See http://swift.im" -> <<" See ", "http://swift.im">, 1>
+		 * "Right, http://swift.im it is" -> <<"Right, ", "http://swift.im", " it is">, 1>
+ 		 */
+		std::pair<std::vector<std::string>, size_t> splitLink(const std::string& text);
 	}
 }
diff --git a/SwifTools/UnitTest/LinkifyTest.cpp b/SwifTools/UnitTest/LinkifyTest.cpp
index 5df1a96..c464b50 100644
--- a/SwifTools/UnitTest/LinkifyTest.cpp
+++ b/SwifTools/UnitTest/LinkifyTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -32,6 +32,12 @@ class LinkifyTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testLinkify_NewLine);
 		CPPUNIT_TEST(testLinkify_Tab);
 		CPPUNIT_TEST(testLinkify_Action);
+
+		CPPUNIT_TEST(testLinkify_SplitNone);
+		CPPUNIT_TEST(testLinkify_SplitAll);
+		CPPUNIT_TEST(testLinkify_SplitFirst);
+		CPPUNIT_TEST(testLinkify_SplitSecond);
+		CPPUNIT_TEST(testLinkify_SplitMiddle);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -181,12 +187,57 @@ class LinkifyTest : public CppUnit::TestFixture {
 		}
 
 		void testLinkify_Action() {
-				std::string result = Linkify::linkify("*http://swift.im*");
+			std::string result = Linkify::linkify("*http://swift.im*");
+
+			CPPUNIT_ASSERT_EQUAL(
+					std::string("*<a href=\"http://swift.im\">http://swift.im</a>*"),
+					result);
+		}
 
-				CPPUNIT_ASSERT_EQUAL(
-						std::string("*<a href=\"http://swift.im\">http://swift.im</a>*"),
-						result);
+		void checkResult(const std::string& testling, size_t expectedIndex, std::string expectedSplit[]) {
+			std::pair<std::vector<std::string>, size_t> result = Linkify::splitLink(testling);
+			CPPUNIT_ASSERT_EQUAL(expectedIndex, result.second);
+			for (size_t i = 0; i < result.first.size(); i++) {
+				CPPUNIT_ASSERT_EQUAL(expectedSplit[i], result.first[i]);
 			}
+		}
+
+		void testLinkify_SplitNone() {
+			std::string testling = "http this ain't";
+			size_t expectedIndex = 1;
+			std::string expectedSplit[] = {"http this ain't"};
+			checkResult(testling, expectedIndex, expectedSplit);
+		}
+
+		void testLinkify_SplitAll() {
+			std::string testling = "http://swift.im";
+			size_t expectedIndex = 0;
+			std::string expectedSplit[] = {"http://swift.im"};
+			checkResult(testling, expectedIndex, expectedSplit);
+		}
+
+		void testLinkify_SplitFirst() {
+			std::string testling = "http://swift.im is a link";
+			size_t expectedIndex = 0;
+			std::string expectedSplit[] = {"http://swift.im", " is a link"};
+			checkResult(testling, expectedIndex, expectedSplit);
+		}
+
+		void testLinkify_SplitSecond() {
+			std::string testling = "this is a link: http://swift.im";
+			size_t expectedIndex = 1;
+			std::string expectedSplit[] = {"this is a link: ", "http://swift.im"};
+			checkResult(testling, expectedIndex, expectedSplit);
+		}
+
+		void testLinkify_SplitMiddle() {
+			std::string testling = "Shove a link like http://swift.im in the middle";
+			size_t expectedIndex = 1;
+			std::string expectedSplit[] = {"Shove a link like ","http://swift.im", " in the middle"};
+			checkResult(testling, expectedIndex, expectedSplit);
+		}
+
+
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(LinkifyTest);