Merge branch 'master' into sbromberger/fix-tests

Author: sbromberger

CMakeLists.txt

@@ -14,7 +14,7 @@ cmake_policy(SET CMP0135 NEW)
 endif()
 
 project(CLIPPy
-    VERSION 0.2
+    VERSION 0.5
     DESCRIPTION "Command Line Interface Plus Python"
     LANGUAGES CXX)
 
@@ -93,25 +93,18 @@ FetchContent_MakeAvailable(Boost)
 
 #
 # JSONLogic
-# find_package(jsonlogic QUIET)
-# if (NOT jsonlogic_FOUND)
-#     message(STATUS "jsonlogic not found, doing stuff")
-    set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boost-install) # needed for jsonlogic
-
-    FetchContent_Declare(jsonlogic
-        GIT_REPOSITORY https://github.com/LLNL/jsonlogic.git
-        GIT_TAG v0.2.0
-        SOURCE_SUBDIR cpp
-    )
-    # set(jsonlogic_INCLUDE_DIR ${jsonlogic_SOURCE_DIR}/cpp/include/jsonlogic)
-    FetchContent_MakeAvailable(jsonlogic)
-    message(STATUS "jsonlogic source dir: ${jsonlogic_SOURCE_DIR}")
+set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boost-install) # needed for jsonlogic
 
-    
-# else()
-# message(STATUS "jsonlogic found, weird")
+FetchContent_Declare(jsonlogic
+    GIT_REPOSITORY https://github.com/LLNL/jsonlogic.git
+    GIT_TAG v0.2.0
+    SOURCE_SUBDIR cpp
+)
+# set(jsonlogic_INCLUDE_DIR ${jsonlogic_SOURCE_DIR}/cpp/include/jsonlogic)
+FetchContent_MakeAvailable(jsonlogic)
+message(STATUS "jsonlogic source dir: ${jsonlogic_SOURCE_DIR}")
 
-# endif()
+    
 
 ### Require out-of-source builds
 file(TO_CMAKE_PATH "${PROJECT_BINARY_DIR}/CMakeLists.txt" LOC_PATH)

include/clippy/version.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
 #define CLIPPY_VERSION_MAJOR 0
-#define CLIPPY_VERSION_MINOR 2
+#define CLIPPY_VERSION_MINOR 5
 #define CLIPPY_VERSION_PATCH 0
-#define CLIPPY_VERSION_NAME "0.2.0"
+#define CLIPPY_VERSION_NAME "0.5.0"

test/TestBag/remove_if.cpp

@@ -30,7 +30,9 @@ int main(int argc, char **argv) {
 
   //
   // Expression here
-  auto apply_jl = [&expression](int value) {
+  jsonlogic::logic_rule jlrule = jsonlogic::create_logic(expression["rule"]);
+
+  auto apply_jl = [&jlrule](int value) {
     boostjsn::object data;
     data["value"] = value;
     auto jl_rule_val = expression["rule"];

test/TestGraph/where.cpp

@@ -111,4 +111,4 @@ std::vector<testgraph::node_t> where_nodes(const testgraph::testgraph& g,
   });
 
   return filtered_results;
-}
+}

test/TestSet/remove_if.cpp

@@ -26,15 +26,13 @@ int main(int argc, char **argv) {
   auto expression = clip.get<boostjsn::object>("expression");
   auto the_set = clip.get_state<std::set<int>>(state_name);
 
+  //
   //
   // Expression here
-  auto apply_jl = [&expression](int value) {
-    boostjsn::object data;
-    data["value"] = value;
-    auto jl_rule_val = expression["rule"];
-    auto jlrule = jsonlogic::create_logic(jl_rule_val);
-    auto res = jlrule.apply(jsonlogic::json_accessor(data));
-    return jsonlogic::unpack_value<bool>(res);
+  jsonlogic::logic_rule jlrule = jsonlogic::create_logic(expression["rule"]);
+
+  auto apply_jl = [&jlrule](int value) {
+    return truthy(jlrule.apply(jsonlogic::json_accessor({{"value", value}})));
   };
 
   for (auto first = the_set.begin(), last = the_set.end(); first != last;) {