Removed .wsjcpp/* and updated wsjcpp-core

Author: sea5kg

.gitignore

@@ -1,5 +1,6 @@
 wsjcpp-geoip
 tmp/*
+.wsjcpp/*
 
 # Prerequisites
 *.d

.wsjcpp/cache/https___github_com_wsjcpp_wsjcpp_core_master/wsjcpp.hold.yml

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 add_definitions(-DWSJCPP_VERSION="v0.0.1")
-add_definitions(-DWSJCPP_NAME="wsjcpp-storages")
+add_definitions(-DWSJCPP_NAME="wsjcpp-geoip")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(MACOSX TRUE)
@@ -14,7 +14,7 @@ set (WSJCPP_LIBRARIES "")
 set (WSJCPP_INCLUDE_DIRS "")
 set (WSJCPP_SOURCES "")
 
-# wsjcpp/wsjcpp-core:v0.0.3
+# wsjcpp/wsjcpp-core:v0.0.4
 list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_wsjcpp_core/")
 list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.cpp")
 list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_wsjcpp_core/wsjcpp_core.h")

.wsjcpp/logs/wsjcpp_20200126_152547.log

@@ -17,16 +17,16 @@ std::string UnitTestBase::name() {
 void UnitTestBase::compareS(bool &bTestSuccess, const std::string &sPoint,
     const std::string &sValue, const std::string &sExpected) {
     if (sValue != sExpected) {
-        WSJCppLog::err(TAG, sPoint + ", expeceted '" + sExpected + "', but got '" + sValue + "'");
+        WSJCppLog::err(TAG, " {" + sPoint + "} Expected '" + sExpected + "', but got '" + sValue + "'");
         bTestSuccess = false;
     }
 }
 
 // ---------------------------------------------------------------------
 
-bool UnitTestBase::compareD(bool &bTestSuccess, const std::string &sPoint, double nValue, double nExpected) {
+bool UnitTestBase::compareN(bool &bTestSuccess, const std::string &sPoint, int nValue, int nExpected) {
     if (nValue != nExpected) {
-        WSJCppLog::err(TAG, " {" + sPoint + "} Expeceted '" + std::to_string(nExpected) + "', but got '" + std::to_string(nValue) + "'");
+        WSJCppLog::err(TAG, " {" + sPoint + "} Expected '" + std::to_string(nExpected) + "', but got '" + std::to_string(nValue) + "'");
         bTestSuccess = false;
         return false;
     }
@@ -35,9 +35,9 @@ bool UnitTestBase::compareD(bool &bTestSuccess, const std::string &sPoint, doubl
 
 // ---------------------------------------------------------------------
 
-bool UnitTestBase::compareN(bool &bTestSuccess, const std::string &sPoint, int nValue, int nExpected) {
+bool UnitTestBase::compareD(bool &bTestSuccess, const std::string &sPoint, double nValue, double nExpected) {
     if (nValue != nExpected) {
-        WSJCppLog::err(TAG, " {" + sPoint + "} Expeceted '" + std::to_string(nExpected) + "', but got '" + std::to_string(nValue) + "'");
+        WSJCppLog::err(TAG, " {" + sPoint + "} Expected '" + std::to_string(nExpected) + "', but got '" + std::to_string(nValue) + "'");
         bTestSuccess = false;
         return false;
     }
@@ -48,7 +48,7 @@ bool UnitTestBase::compareN(bool &bTestSuccess, const std::string &sPoint, int n
 
 void UnitTestBase::compareB(bool &bTestSuccess, const std::string &sPoint, bool bValue, bool bExpected) {
     if (bValue != bExpected) {
-        WSJCppLog::err(TAG, sPoint + ", expeceted '" + (bExpected ? "true" : "false") + "', but got '" + (bValue ? "true" : "false") + "'");
+        WSJCppLog::err(TAG, " {" + sPoint + "} Expected '" + (bExpected ? "true" : "false") + "', but got '" + (bValue ? "true" : "false") + "'");
         bTestSuccess = false;
     }
 }
@@ -59,7 +59,7 @@ std::vector<UnitTestBase*> *g_pUnitTests = NULL;
 
 void UnitTests::initGlobalVariables() {
     if (g_pUnitTests == NULL) {
-        // WSJCppLog::info(std::string(), "Create handlers map");
+        // Log::info(std::string(), "Create handlers map");
         g_pUnitTests = new std::vector<UnitTestBase*>();
     }
 }
@@ -80,7 +80,7 @@ void UnitTests::addUnitTest(const std::string &sTestName, UnitTestBase* pUnitTes
         WSJCppLog::err(sTestName, "Already registered");
     } else {
         g_pUnitTests->push_back(pUnitTest);
-        // WSJCppLog::info(sCmd, "Registered");
+        // Log::info(sCmd, "Registered");
     }
 }
 

.wsjcpp/logs/wsjcpp_20200126_152555.log

@@ -1,4 +1,5 @@
 #include <string>
+#include <wsjcpp_core.h>
 #include <unit_tests.h>
 
 int main(int argc, char** argv) {

.wsjcpp/logs/wsjcpp_20200126_152829.log

@@ -3,7 +3,7 @@ cmake_cxx_standard: 11
 cmake_minimum_required: 3.0
 
 name: wsjcpp/wsjcpp-core
-version: v0.0.3
+version: v0.0.4
 description: Basic Utils for wsjcpp
 issues: https://github.com/wsjcpp/wsjcpp-core/issues
 repositories:
@@ -29,15 +29,28 @@ distribution:
     target-file: wsjcpp_core.h
     sha1: "1d76447c6880f43f9afeca89111ec64d3574ccb7"
     type: "source-code"
-  - source-file: unit-tests.wsjcpp/src/unit_tests.h
-    target-file: unit_tests.h
-    sha1: ""
+  - source-file: "src/unit_tests.cpp"
+    target-file: "unit_tests.cpp"
     type: "unit-tests"
-  - source-file: unit-tests.wsjcpp/src/unit_tests.cpp
-    target-file: unit_tests.cpp
-    sha1: ""
+    sha1: "a36d71646ddd6041346909c0481a59299f01f898"
+  - source-file: "src/unit_tests.h"
+    target-file: "unit_tests.h"
     type: "unit-tests"
-  - source-file: unit-tests.wsjcpp/src/unit_tests_main.cpp
-    target-file: unit_tests_main.cpp
-    sha1: ""
+    sha1: "a20248c9801c53519ad847aa19d80460289a5dd1"
+  - source-file: "src/unit_tests_main.cpp"
+    target-file: "unit_tests_main.cpp"
     type: "unit-tests"
+    sha1: "81a2b3d7328575c0087fa43000b05a96e278da07"
+
+unit-tests:
+  cases:
+    - name: CoreNormalizePath
+      description: Check function normalizePath
+    - name: CoreUuid
+      description: Check test generate uuid function
+    - name: CoreExtractFilename
+      description: Check function extract filenane from path
+    - name: IPv4
+      description: Check function isIPv4
+    - name: IPv6
+      description: Check function isIPv6

src.wsjcpp/CMakeLists.txt

@@ -16,6 +16,9 @@
 #include <cstdint>
 #include <unistd.h>
 #include <streambuf>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
 
 // ---------------------------------------------------------------------
 
@@ -408,6 +411,44 @@ std::string WSJCppCore::createUuid() {
     return sRet;
 }
 
+// ---------------------------------------------------------------------
+
+bool WSJCppCore::isIPv4(std::string& str) {
+    int n = 0;
+    std::string s[4] = {"", "", "", ""};
+    for (int i = 0; i < str.length(); i++) {
+        char c = str[i];
+        if (n > 3) {
+            return false;
+        }
+        if (c >= '0' && c <= '9') {
+            s[n] += c;
+        } else if (c == '.') {
+            n++;
+        } else {
+            return false;
+        }
+    }
+    for (int i = 0; i < 4; i++) {
+        if (s[i].length() > 3) {
+            return false;
+        }
+        int p = std::stoi(s[i]);
+        if (p > 255 || p < 0) {
+            return false;
+        }
+    }
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+bool WSJCppCore::isIPv6(std::string& str) {
+    unsigned char buf[sizeof(struct in6_addr)];
+    bool isValid = inet_pton(AF_INET6, str.c_str(), buf);
+    return isValid;
+}
+
 // ---------------------------------------------------------------------
 // WSJCppLog