chore: update cmakelists version, add GetEvalValue test and delete AB…

…ACData (#172) Signed-off-by: stonexx <[email protected]>
casbin · Nov 27, 2021 · 00d8414 · 00d8414
1 parent f9d1a33
commit 00d8414
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 534 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ endif()
 
 project(
     casbin
-    VERSION 1.38.0
+    VERSION 1.43.0
     DESCRIPTION "An authorization library that supports access control models like ACL, RBAC, ABAC in C/C++"
     HOMEPAGE_URL https://github.com/casbin/casbin-cpp
     LANGUAGES CXX C

diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -18,7 +18,6 @@ set(SOURCES
     main.cpp
     py_cached_enforcer.cpp
     py_enforcer.cpp
-    py_abac_data.cpp
     py_model.cpp
     py_config.cpp
     py_synced_enforcer.cpp

diff --git a/bindings/python/main.cpp b/bindings/python/main.cpp
@@ -36,7 +36,6 @@ PYBIND11_MODULE(pycasbin, m) {
 
     bindPyEnforcer(m);
     bindPyCachedEnforcer(m);
-    bindABACData(m);
     bindPyModel(m);
     bindPyConfig(m);
     bindPySyncedEnforcer(m);

diff --git a/bindings/python/py_abac_data.cpp b/bindings/python/py_abac_data.cpp
diff --git a/bindings/python/py_casbin.h b/bindings/python/py_casbin.h
@@ -20,7 +20,6 @@ namespace py = pybind11;
 
 void bindPyEnforcer(py::module &m);
 void bindPyCachedEnforcer(py::module &m);
-void bindABACData(py::module &m);
 void bindPyModel(py::module &m);
 void bindPyConfig(py::module &m);
 void bindPySyncedEnforcer(py::module& m);

diff --git a/casbin/CMakeLists.txt b/casbin/CMakeLists.txt
@@ -13,7 +13,6 @@
 #  limitations under the License.
 
 set(CASBIN_SOURCE_FILES
-    abac_data.cpp
     enforcer.cpp
     enforcer_cached.cpp
     enforcer_synced.cpp

diff --git a/casbin/abac_data.cpp b/casbin/abac_data.cpp
diff --git a/casbin/abac_data.h b/casbin/abac_data.h
diff --git a/casbin/attribute_types.h b/casbin/attribute_types.h
diff --git a/casbin/data_types.h b/casbin/data_types.h
@@ -19,11 +19,10 @@
 #include <initializer_list>
 #include <unordered_map>
 #include <nlohmann/json.hpp>
-#include "abac_data.h"
 
 namespace casbin {
 
-typedef std::variant<std::string, std::shared_ptr<ABACData>, std::shared_ptr<nlohmann::json>> Data;
+typedef std::variant<std::string, std::shared_ptr<nlohmann::json>> Data;
 typedef std::vector<Data> DataVector;
 typedef std::initializer_list<Data> DataList;
 typedef std::unordered_map<std::string, Data> DataMap;