added file type support

Author: danielepanozzo

.vscode/launch.json

@@ -6,9 +6,9 @@
         "type": "cppdbg",
         "request": "launch",
         "program": "/home/daniele/git/simple-json-validator/build/tests/unit_tests",
-        "args": [],
+        "args": ["debug"],
         "stopAtEntry": false,
-        "cwd": "${workspaceFolder}",
+        "cwd": "/home/daniele/git/simple-json-validator/build/",
         "environment": [],
         "externalConsole": false,
         "MIMode": "gdb",

.vscode/settings.json

@@ -0,0 +1,66 @@
+{
+    "files.associations": {
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "codecvt": "cpp",
+        "condition_variable": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "forward_list": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "future": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "shared_mutex": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "thread": "cpp",
+        "typeinfo": "cpp",
+        "valarray": "cpp",
+        "variant": "cpp"
+    }
+}

CMakeLists.txt

@@ -123,8 +123,8 @@ target_link_libraries(sjv PUBLIC nlohmann::json)
 # Compiler options
 ################################################################################
 
-# Use C++14
-target_compile_features(sjv PUBLIC cxx_std_14)
+# Use C++17
+target_compile_features(sjv PUBLIC cxx_std_17)
 
 ################################################################################
 # Tests

src/sjv/sjv.cpp

@@ -1,6 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 #include <sjv/sjv.h>
 #include <iostream>
+#include <filesystem> // C++17
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace sjv
@@ -50,7 +51,15 @@ namespace sjv
                 if (verify_rule(input, i))
                     count++;
 
-            if (count != 1)
+            if (count == 0)
+            {
+                std::cout << "ERROR: No valid rules in this list:" << std::endl;
+                for (auto i : matching_rules)
+                    std::cout << i << std::endl;
+                return false;
+            }
+
+            if (count > 1)
             {
                 std::cout << "ERROR: Multiple valid rules in this list, only one should be valid:" << std::endl;
                 for (auto i : matching_rules)
@@ -80,6 +89,10 @@ namespace sjv
             return true;
         else if (type == "float")
             return verify_rule_float(input, rule);
+        else if (type == "int")
+            return verify_rule_float(input, rule);
+        else if (type == "file")
+            return verify_rule_file(input, rule);
         else
         {
             std::cout << "ERROR: Unknown type " << std::endl;
@@ -89,7 +102,26 @@ namespace sjv
     };
     bool sjv::verify_rule_file(const json &input, const json &rule)
     {
-        return false;
+        assert(rule.at("type") == "file");
+
+        std::string p_str = cwd + "/" + string(input);
+        std::filesystem::path p = std::filesystem::path(p_str);
+
+        if (!std::filesystem::is_regular_file(p))
+            return false;
+
+        if (rule.contains("extensions"))
+        {
+            std::string ext = p.extension();
+            int count = 0;
+            for (auto e : rule["extensions"])
+                if (e == ext)
+                    count++;
+            if (count != 1)
+                return false;
+        }
+
+        return true;
     };
     bool sjv::verify_rule_float(const json &input, const json &rule)
     {
@@ -101,11 +133,25 @@ namespace sjv
         if (rule.contains("min") && input < rule["min"])
             return false;
 
+        if (rule.contains("max") && input > rule["max"])
+            return false;
+
         return true;
     };
     bool sjv::verify_rule_int(const json &input, const json &rule)
     {
-        return false;
+        assert(rule.at("type") == "int");
+
+        if (!input.is_number_integer())
+            return false;
+
+        if (rule.contains("min") && input < rule["min"])
+            return false;
+
+        if (rule.contains("max") && input > rule["max"])
+            return false;
+
+        return true;
     };
     bool sjv::verify_rule_path(const json &input, const json &rule)
     {

tags.md

@@ -0,0 +1,10 @@
+# Tags supported for each type
+
+## float,int: 
+
+* min
+* max
+
+## file
+
+* extensions

tests/test_validator.cpp

@@ -5,6 +5,7 @@
 #include <fstream>
 #include <vector>
 #include <ctime>
+#include <filesystem>
 //////////////////////////////////////////////////////////////////////////
 
 using namespace sjv;
@@ -85,3 +86,40 @@ TEST_CASE("min_bound_numeric", "[validator]")
 
     REQUIRE(!sjv.verify_json(input,rules));
 }
+
+TEST_CASE("file_type", "[validator]")
+{
+    json input = R"( 
+        {
+            "file1": "CMakeCach.txt"
+        }
+        )"_json;
+
+    json rules = R"( 
+        [
+        {
+            "pointer": "/",
+            "type": "skip_check"
+        },
+        {
+            "pointer": "/file1/",
+            "type": "file",
+            "extensions": [".txt"]
+        }
+        ]
+        )"_json;
+
+    sjv::sjv sjv;
+    sjv.cwd = std::filesystem::current_path();
+
+    REQUIRE(!sjv.verify_json(input,rules));
+
+    input["file1"] = "CMakeCache.txt";
+
+    REQUIRE(sjv.verify_json(input,rules));
+
+    rules[1]["extensions"][0] = ".msh";
+
+    REQUIRE(!sjv.verify_json(input,rules));
+
+}