Fixed #7 #8

Author: sea5kg

README.md

@@ -14,6 +14,7 @@ Classes for data validation
 - `new WSJCppValidatorJWT()` - validate format of JWT
 - `new WSJCppValidatorDate()` - validate format date like 'YYYY-MM-DD'
 - `new WSJCppValidatorTimeH24()` - validate format date like 'HH:mm:ss' (24 hours)
+- `new WSJCppValidatorDateTime()` - validate format date like 'YYYY-MM-DD\THH:mm:ss'
 - `new WSJCppValidatorBase64()` - validate format of base64
 - `new WSJCppValidatorNumber()` - validate format of number
 - `new WSJCppValidatorHex()` - validate hex value
@@ -22,6 +23,8 @@ Classes for data validation
 
 Just include this files:
 
+- src/wsjcpp_core/wsjcpp_core.h
+- src/wsjcpp_core/wsjcpp_core.cpp
 - src/wsjcpp_validators.h
 - src/wsjcpp_validators.cpp
 

src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp

@@ -421,44 +421,6 @@ std::string WSJCppCore::createUuid() {
 
 // ---------------------------------------------------------------------
 
-bool WSJCppCore::isIPv4(const 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(const std::string& str) {
-    unsigned char buf[sizeof(struct in6_addr)];
-    bool isValid = inet_pton(AF_INET6, str.c_str(), buf);
-    return isValid;
-}
-
-// ---------------------------------------------------------------------
-
 unsigned long WSJCppCore::convertVoidToULong(void *p) {
     unsigned long ret = *(unsigned long *)p;
     return ret;

src.wsjcpp/wsjcpp_core/wsjcpp_core.h

@@ -49,8 +49,6 @@ class WSJCppCore {
 
         static void initRandom();
         static std::string createUuid();
-        static bool isIPv4(const std::string& str);
-        static bool isIPv6(const std::string& str);
 
         static unsigned long convertVoidToULong(void *p);
         static std::string getPointerAsHex(void *p);

src/main.cpp

@@ -17,7 +17,7 @@ int main(int argc, char* argv[]) {
     WSJCppLog::setPrefixLogFile("wsjcpp_validators");
     WSJCppLog::setLogDirectory(".wsjcpp/logs");
 
-    WSJCppLog::info(TAG, "Hello");
+    // WSJCppLog::info(TAG, "Hello");
     WSJCppCore::init(
         argc, argv, 
         std::string(WSJCPP_NAME),
@@ -32,28 +32,36 @@ int main(int argc, char* argv[]) {
     std::string sArg1(argv[1]);
 
     std::vector<WSJCppValidatorStringBase *> vValidators;
-    vValidators.push_back(new WSJCppValidatorStringLength(5, 100));
-    vValidators.push_back(new WSJCppValidatorStringLength(1, 5));
+    // vValidators.push_back(new WSJCppValidatorStringLength(5, 100));
+    // vValidators.push_back(new WSJCppValidatorStringLength(1, 5));
     vValidators.push_back(new WSJCppValidatorEmail());
     vValidators.push_back(new WSJCppValidatorUUID());
     vValidators.push_back(new WSJCppValidatorStringListBase("lang", {"en", "de", "ru"}));
     vValidators.push_back(new WSJCppValidatorStringRegexpBase("testre", "^[a-zA-Z]+$"));
     vValidators.push_back(new WSJCppValidatorJWT());
     vValidators.push_back(new WSJCppValidatorDate());
     vValidators.push_back(new WSJCppValidatorTimeH24());
+    vValidators.push_back(new WSJCppValidatorDateTime());
+    // vValidators.push_back(new WSJCppValidatorURL());
     vValidators.push_back(new WSJCppValidatorBase64());
     vValidators.push_back(new WSJCppValidatorNumber());
     vValidators.push_back(new WSJCppValidatorHex());
 
+    std::string sResult = "";
     for (int i = 0; i < vValidators.size(); i++) {
         WSJCppValidatorStringBase *pValidator = vValidators[i];
         std::string sError;
+        if (sResult.size() > 0) {
+            sResult += ",";
+        }
         if (pValidator->isValid(sArg1, sError)) {
-            WSJCppLog::ok(TAG, "ok -> [" + pValidator->getTypeName() + "]: '" + sArg1 + "'");
+            sResult += " +" + pValidator->getTypeName();
+            // WSJCppLog::ok(TAG, "ok -> [" + pValidator->getTypeName() + "]: '" + sArg1 + "'");
         } else {
-            WSJCppLog::err(TAG, "fail -> [" + pValidator->getTypeName() + "]: '" + sArg1 + "' - " + sError);
+            sResult += " -" + pValidator->getTypeName();
+            // WSJCppLog::err(TAG, "fail -> [" + pValidator->getTypeName() + "]: '" + sArg1 + "' - " + sError);
         }
     }
-
+    std::cout << sResult << std::endl;
     return 0;
 }