Added main

Author: sea5kg

.gitignore

@@ -1,3 +1,6 @@
+wsjcpp-validators
+tmp/*
+
 # Prerequisites
 *.d
 

.travis.yml

@@ -16,6 +16,8 @@ addons:
 
 # Build steps
 script:
+  - ./build_simple.sh
+  - ./wsjcpp-validators [email protected]
   - cd unit-tests.wsjcpp
   - ./build_simple.sh
   - ./unit-tests

CMakeLists.txt

@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(wsjcpp-validators)
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/src.wsjcpp/CMakeLists.txt)
+
+set(CMAKE_CXX_STANDARD 11)
+set(EXECUTABLE_OUTPUT_PATH ${wsjcpp-validators_SOURCE_DIR})
+
+# Sources
+
+# include header dirs
+list (APPEND WSJCPP_INCLUDE_DIRS "src")
+
+list (APPEND WSJCPP_SOURCES "src/wsjcpp_validators.h")
+list (APPEND WSJCPP_SOURCES "src/wsjcpp_validators.cpp")
+list (APPEND WSJCPP_SOURCES "src/main.cpp")
+
+include_directories(${WSJCPP_INCLUDE_DIRS})
+
+add_executable ("wsjcpp-validators" ${WSJCPP_SOURCES})
+
+target_link_libraries("wsjcpp-validators" -lpthread ${WSJCPP_LIBRARIES} )
+
+install(
+    TARGETS
+        "wsjcpp-validators"
+    RUNTIME DESTINATION
+        /usr/bin
+)

README.md

@@ -4,6 +4,14 @@
 
 Classes for data validation
 
+## Completed classes
+
+- `new WJSCppValidatorStringRegexpBase("testre", "^[a-zA-Z]+$")` - validate value by regular expression
+- `new WJSCppValidatorStringListBase("lang", {"en", "de", "ru"})` - validate value from a list
+- `new WJSCppValidatorEmail()` - validate format email
+- `new WJSCppValidatorUUID()` - validate format uuid
+- `new WJSCppValidatorStringLength(1,100)` - validate min length and max length
+
 ## Integrate to your project
 
 Just include this files:
@@ -20,6 +28,7 @@ $ wsjcpp install https://github.com/wsjcpp/wsjcpp-validators:master
 ## Example usage 
 
 ``` cpp
+
 WJSCppValidatorUUID *pValidatorUUID = new WJSCppValidatorUUID();
 std::string sError = "";
 if (!pValidatorUUID->isValid("abcdef01-ABCD-EF23-1000-000000000001", sError)) {
@@ -29,7 +38,7 @@ if (!pValidatorUUID->isValid("abcdef01-ABCD-EF23-1000-000000000001", sError)) {
 
 ## Example for yuor implementations
 
-```
+``` cpp
 class WJSCppValidatorUUID : public WJSCppValidatorStringRegexpBase {
     public:
         WJSCppValidatorUUID() 

build_simple.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ ! -d tmp ]; then
+	mkdir -p tmp
+fi
+
+cd tmp
+cmake ..
+make
+

src/main.cpp

@@ -0,0 +1,53 @@
+#include <string.h>
+#include <iostream>
+#include <algorithm>
+#include <wsjcpp_core.h>
+#include <wsjcpp_validators.h>
+
+int main(int argc, char* argv[]) {
+    std::string TAG = "MAIN";
+
+    if (!WSJCppCore::dirExists(".wsjcpp")) {
+        WSJCppCore::makeDir(".wsjcpp");
+    }
+    std::string appLogPath = ".wsjcpp/logs";
+    if (!WSJCppCore::dirExists(appLogPath)) {
+        WSJCppCore::makeDir(appLogPath);
+    }
+    WSJCppLog::setPrefixLogFile("wsjcpp_validators");
+    WSJCppLog::setLogDirectory(".wsjcpp/logs");
+
+    WSJCppLog::info(TAG, "Hello");
+    WSJCppCore::init(
+        argc, argv, 
+        std::string(WSJCPP_NAME),
+        std::string(WSJCPP_VERSION),
+        "Evgenii Sopov",
+        ""
+    );
+    if (argc != 2) {
+        std::cout << "Usage " << argv[0] << " something" << std::endl;
+        return -1;
+    }
+    std::string sArg1(argv[1]);
+
+    std::vector<WJSCppValidatorStringBase *> vValidators;
+    vValidators.push_back(new WJSCppValidatorStringLength(5, 100));
+    vValidators.push_back(new WJSCppValidatorStringLength(1, 5));
+    vValidators.push_back(new WJSCppValidatorEmail());
+    vValidators.push_back(new WJSCppValidatorUUID());
+    vValidators.push_back(new WJSCppValidatorStringListBase("lang", {"en", "de", "ru"}));
+    vValidators.push_back(new WJSCppValidatorStringRegexpBase("testre", "^[a-zA-Z]+$"));
+
+    for (int i = 0; i < vValidators.size(); i++) {
+        WJSCppValidatorStringBase *pValidator = vValidators[i];
+        std::string sError;
+        if (pValidator->isValid(sArg1, sError)) {
+            WSJCppLog::ok(TAG, "ok -> [" + pValidator->getTypeName() + "]: '" + sArg1 + "'");
+        } else {
+            WSJCppLog::err(TAG, "fail -> [" + pValidator->getTypeName() + "]: '" + sArg1 + "' - " + sError);
+        }
+    }
+
+    return 0;
+}

src/wsjcpp_validators.cpp

@@ -34,7 +34,7 @@ WJSCppValidatorStringRegexpBase::WJSCppValidatorStringRegexpBase(const std::stri
 
 bool WJSCppValidatorStringRegexpBase::isValid(const std::string &sValue, std::string &sError) {
     if (!std::regex_match(sValue, m_rxValidator)) {
-        sError = "Value must have " + getTypeName();
+        sError = getTypeName() + " - Value must match regular expression " + m_sValidator;
         return false;
     }
     return true;