Fixed #5 add function WSJCppCore::split

Author: sea5kg

.travis.yml

@@ -18,6 +18,7 @@ addons:
 script:
   - mkdir -p tmp
   - cd tmp
+  - cmake ..
   - make
   - cd ../unit-tests.wsjcpp
   - ./build_simple.sh

README.md

@@ -225,6 +225,26 @@ Convert text to upper charaters like "abC" -> "ABC". Worked only with latin alph
 WSJCppCore::replaceAll(std::string& str, const std::string& from, const std::string& to);
 ```
 
+### replaceAll
+
+```
+std::string sWhat = "|1a|2b|3c|4d|";
+std::vector<std::string> vSplitted = WSJCppCore::split(sWhat, "|");
+for (int i = 0; i < vSplitted.size(); i++) {
+    std::cout << vSplitted[i] << std::endl;
+}
+```
+
+Example output:
+```
+
+1a
+2b
+3c
+4d
+
+```
+
 ### createUuid
 
 Generate uuid, but you need to call `WSJCppCore::initRandom();` before it (for example in main() function)

src.wsjcpp/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Automaticly generated by [email protected]
 cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_VERSION="v0.0.6")
+add_definitions(-DWSJCPP_VERSION="v0.0.7")
 add_definitions(-DWSJCPP_NAME="wsjcpp-core")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

src/wsjcpp_core.cpp

@@ -382,14 +382,6 @@ std::string& WSJCppCore::trim(std::string& str, const std::string& chars) {
     return WSJCppCore::ltrim(WSJCppCore::rtrim(str, chars), chars);
 }
 
-// ---------------------------------------------------------------------
-
-std::string& WSJCppCore::to_lower(std::string& str) {
-    WSJCppLog::warn("WSJCppCore::to_lower", "Deprecated function, please use ");
-    std::transform(str.begin(), str.end(), str.begin(), ::tolower);
-    return str;
-}
-
 // ---------------------------------------------------------------------
 // will worked only with latin
 
@@ -423,6 +415,31 @@ void WSJCppCore::replaceAll(std::string& str, const std::string& sFrom, const st
 
 // ---------------------------------------------------------------------
 
+std::vector<std::string> WSJCppCore::split(const std::string& sWhat, const std::string& sDelim) {
+    std::vector<std::string> vRet;
+    int nPos = 0;
+    int nLen = sWhat.length();
+    int nDelimLen = sDelim.length();
+    while (nPos < nLen) {
+        std::size_t nFoundPos = sWhat.find(sDelim, nPos);
+        if (nFoundPos != std::string::npos) {
+            std::string sToken = sWhat.substr(nPos, nFoundPos - nPos);
+            vRet.push_back(sToken);
+            nPos = nFoundPos + nDelimLen;
+            if (nFoundPos + nDelimLen == nLen) { // last delimiter
+                vRet.push_back("");
+            }
+        } else {
+            std::string sToken = sWhat.substr(nPos, nLen - nPos);
+            vRet.push_back(sToken);
+            break;
+        }
+    }
+    return vRet;
+}
+
+// ---------------------------------------------------------------------
+
 void WSJCppCore::initRandom() {
     std::srand(std::rand() + std::time(0));
 }

src/wsjcpp_core.h

@@ -44,10 +44,10 @@ class WSJCppCore {
         static std::string& ltrim(std::string& str, const std::string& chars = "\t\n\v\f\r ");
         static std::string& rtrim(std::string& str, const std::string& chars = "\t\n\v\f\r ");
         static std::string& trim(std::string& str, const std::string& chars = "\t\n\v\f\r ");
-        static std::string& to_lower(std::string& str); // deprecated
         static std::string toLower(const std::string &str);
         static std::string toUpper(const std::string& str);
         static void replaceAll(std::string& str, const std::string& from, const std::string& to);
+        static std::vector<std::string> split(const std::string& sWhat, const std::string& sDelim);
 
         static void initRandom();
         static std::string createUuid();

unit-tests.wsjcpp/CMakeLists.txt

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(unit-tests C CXX)
-add_definitions(-DWSJCPP_VERSION="ut-v0.0.6")
+add_definitions(-DWSJCPP_VERSION="ut-v0.0.7")
 add_definitions(-DWSJCPP_NAME="unit-tests-wsjcpp-core")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -19,7 +19,7 @@ set (WSJCPP_SOURCES "")
 find_package(Threads REQUIRED)
 list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 
-# wsjcpp-core:v0.0.6
+# wsjcpp-core:v0.0.7
 list (APPEND WSJCPP_INCLUDE_DIRS "../src")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.cpp")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.h")
@@ -51,6 +51,8 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_encode_uri_compo
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_encode_uri_component.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_uint2_hex_string.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_uint2_hex_string.cpp")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_split.h")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_split.cpp")
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
 

unit-tests.wsjcpp/src/unit_test_split.cpp

@@ -0,0 +1,56 @@
+#include "unit_test_split.h"
+#include <vector>
+#include <wsjcpp_core.h>
+
+REGISTRY_UNIT_TEST(UnitTestSplit)
+
+UnitTestSplit::UnitTestSplit()
+    : WSJCppUnitTestBase("UnitTestSplit") {
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestSplit::init() {
+    // nothing
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestSplit::run() {
+bool bTestSuccess = true;
+
+    struct LTest {
+        LTest(
+            const std::string &sStr,
+            const std::string &sDelim,
+            const std::vector<std::string> &vExpectedVector
+        ) {
+            this->sStr = sStr;
+            this->sDelim = sDelim;
+            this->vExpectedVector = vExpectedVector;
+        };
+        std::string sStr;
+        std::string sDelim;
+        std::vector<std::string> vExpectedVector;
+    };
+    std::vector<LTest> tests;
+    tests.push_back(LTest("1 2 3 4 5", " ", {"1", "2", "3", "4", "5"}));
+    tests.push_back(LTest("|1f|2п|3%^|44354|5kdasjfdre|2", "|", {"", "1f", "2п", "3%^", "44354", "5kdasjfdre", "2"}));
+    tests.push_back(LTest("|1f|2п|3%^|44354|5kdasjfdre|", "|", {"", "1f", "2п", "3%^", "44354", "5kdasjfdre", ""}));
+    tests.push_back(LTest("some1 => some2 => some3", "=>", {"some1 ", " some2 ", " some3"}));
+    tests.push_back(LTest("some1 => some2 => some3 =>", "=>", {"some1 ", " some2 ", " some3 ", ""}));
+
+    for (int i = 0; i < tests.size(); i++) {
+        LTest test = tests[i];
+        std::string sPrefix = "test" + std::to_string(i) + "(\"" + test.sStr + "\")";
+        std::vector<std::string> vSplitted = WSJCppCore::split(test.sStr, test.sDelim);
+        compareN(bTestSuccess, sPrefix + ": size", vSplitted.size(), test.vExpectedVector.size());
+        int nMin = std::min(vSplitted.size(), test.vExpectedVector.size());
+        for (int n = 0; n < nMin; n++) {
+            compareS(bTestSuccess, sPrefix + ", element: " + std::to_string(n), vSplitted[n], test.vExpectedVector[n]);
+        }
+    }
+
+    return bTestSuccess;
+}
+

unit-tests.wsjcpp/src/unit_test_split.h

@@ -0,0 +1,15 @@
+#ifndef UNIT_TEST_SPLIT_H
+#define UNIT_TEST_SPLIT_H
+
+#include <wsjcpp_unit_tests.h>
+
+// Description: TODO
+class UnitTestSplit : public WSJCppUnitTestBase {
+    public:
+        UnitTestSplit();
+        virtual void init();
+        virtual bool run();
+};
+
+#endif // UNIT_TEST_SPLIT_H
+

wsjcpp.yml

@@ -3,7 +3,7 @@ cmake_cxx_standard: 11
 cmake_minimum_required: 3.0
 
 name: wsjcpp-core
-version: v0.0.6
+version: v0.0.7
 description: Basic Utils for wsjcpp
 issues: https://github.com/wsjcpp/wsjcpp-core/issues
 repositories:
@@ -58,3 +58,5 @@ unit-tests:
       description: "Check encoding"
     - name: "Uint2HexString"
       description: "Test convert unsigned int to hex string"
+    - name: "Split"
+      description: "Test split function"