feat: prepared for new release (#48)

Signed-off-by: Mohit Kumar Singh <[email protected]>
casbin · Aug 20, 2021 · eee526a · eee526a
1 parent 1a1035f
commit eee526a
Show file tree

Hide file tree

Showing 58 changed files with 57 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0
+
+- All basic features are ready for use.
+
 ## 0.0.1
 
-- Initial version
+- Initial version.
diff --git a/examples/abac_model.conf → casbin_examples/abac_model.conf b/examples/abac_model.conf → casbin_examples/abac_model.conf
diff --git a/examples/abac_rule_model.conf → casbin_examples/abac_rule_model.conf b/examples/abac_rule_model.conf → casbin_examples/abac_rule_model.conf
diff --git a/examples/abac_rule_policy.csv → casbin_examples/abac_rule_policy.csv b/examples/abac_rule_policy.csv → casbin_examples/abac_rule_policy.csv
diff --git a/examples/abac_rule_with_domains_model.conf → ...xamples/abac_rule_with_domains_model.conf b/examples/abac_rule_with_domains_model.conf → ...xamples/abac_rule_with_domains_model.conf
diff --git a/examples/abac_rule_with_domains_policy.csv → ...xamples/abac_rule_with_domains_policy.csv b/examples/abac_rule_with_domains_policy.csv → ...xamples/abac_rule_with_domains_policy.csv
diff --git a/examples/basic_inverse_policy.csv → casbin_examples/basic_inverse_policy.csv b/examples/basic_inverse_policy.csv → casbin_examples/basic_inverse_policy.csv
diff --git a/examples/basic_model.conf → casbin_examples/basic_model.conf b/examples/basic_model.conf → casbin_examples/basic_model.conf
diff --git a/examples/basic_model_without_spaces.conf → ..._examples/basic_model_without_spaces.conf b/examples/basic_model_without_spaces.conf → ..._examples/basic_model_without_spaces.conf
diff --git a/examples/basic_policy.csv → casbin_examples/basic_policy.csv b/examples/basic_policy.csv → casbin_examples/basic_policy.csv
diff --git a/examples/basic_with_root_model.conf → casbin_examples/basic_with_root_model.conf b/examples/basic_with_root_model.conf → casbin_examples/basic_with_root_model.conf
diff --git a/examples/basic_without_resources_model.conf → ...amples/basic_without_resources_model.conf b/examples/basic_without_resources_model.conf → ...amples/basic_without_resources_model.conf
diff --git a/examples/basic_without_resources_policy.csv → ...amples/basic_without_resources_policy.csv b/examples/basic_without_resources_policy.csv → ...amples/basic_without_resources_policy.csv
diff --git a/examples/basic_without_users_model.conf → ...n_examples/basic_without_users_model.conf b/examples/basic_without_users_model.conf → ...n_examples/basic_without_users_model.conf
diff --git a/examples/basic_without_users_policy.csv → ...n_examples/basic_without_users_policy.csv b/examples/basic_without_users_policy.csv → ...n_examples/basic_without_users_policy.csv
diff --git a/examples/comment_model.conf → casbin_examples/comment_model.conf b/examples/comment_model.conf → casbin_examples/comment_model.conf
diff --git a/examples/error/error_model.conf → casbin_examples/error/error_model.conf b/examples/error/error_model.conf → casbin_examples/error/error_model.conf
diff --git a/examples/error/error_policy.csv → casbin_examples/error/error_policy.csv b/examples/error/error_policy.csv → casbin_examples/error/error_policy.csv
diff --git a/examples/glob_model.conf → casbin_examples/glob_model.conf b/examples/glob_model.conf → casbin_examples/glob_model.conf
diff --git a/examples/glob_policy.csv → casbin_examples/glob_policy.csv b/examples/glob_policy.csv → casbin_examples/glob_policy.csv
diff --git a/examples/ipmatch_model.conf → casbin_examples/ipmatch_model.conf b/examples/ipmatch_model.conf → casbin_examples/ipmatch_model.conf
diff --git a/examples/ipmatch_policy.csv → casbin_examples/ipmatch_policy.csv b/examples/ipmatch_policy.csv → casbin_examples/ipmatch_policy.csv
diff --git a/examples/keyget2_model.conf → casbin_examples/keyget2_model.conf b/examples/keyget2_model.conf → casbin_examples/keyget2_model.conf
diff --git a/examples/keyget_model.conf → casbin_examples/keyget_model.conf b/examples/keyget_model.conf → casbin_examples/keyget_model.conf
diff --git a/examples/keymatch2_model.conf → casbin_examples/keymatch2_model.conf b/examples/keymatch2_model.conf → casbin_examples/keymatch2_model.conf
diff --git a/examples/keymatch2_policy.csv → casbin_examples/keymatch2_policy.csv b/examples/keymatch2_policy.csv → casbin_examples/keymatch2_policy.csv
diff --git a/examples/keymatch_custom_model.conf → casbin_examples/keymatch_custom_model.conf b/examples/keymatch_custom_model.conf → casbin_examples/keymatch_custom_model.conf
diff --git a/examples/keymatch_model.conf → casbin_examples/keymatch_model.conf b/examples/keymatch_model.conf → casbin_examples/keymatch_model.conf
diff --git a/examples/keymatch_policy.csv → casbin_examples/keymatch_policy.csv b/examples/keymatch_policy.csv → casbin_examples/keymatch_policy.csv
diff --git a/examples/priority_indeterminate_policy.csv → ...xamples/priority_indeterminate_policy.csv b/examples/priority_indeterminate_policy.csv → ...xamples/priority_indeterminate_policy.csv
diff --git a/examples/priority_model.conf → casbin_examples/priority_model.conf b/examples/priority_model.conf → casbin_examples/priority_model.conf
diff --git a/examples/priority_model_explicit.conf → casbin_examples/priority_model_explicit.conf b/examples/priority_model_explicit.conf → casbin_examples/priority_model_explicit.conf
diff --git a/examples/priority_policy.csv → casbin_examples/priority_policy.csv b/examples/priority_policy.csv → casbin_examples/priority_policy.csv
diff --git a/examples/priority_policy_explicit.csv → casbin_examples/priority_policy_explicit.csv b/examples/priority_policy_explicit.csv → casbin_examples/priority_policy_explicit.csv
diff --git a/examples/rbac_model.conf → casbin_examples/rbac_model.conf b/examples/rbac_model.conf → casbin_examples/rbac_model.conf
diff --git a/examples/rbac_model_in_multi_line.conf → ...in_examples/rbac_model_in_multi_line.conf b/examples/rbac_model_in_multi_line.conf → ...in_examples/rbac_model_in_multi_line.conf
diff --git a/examples/rbac_model_matcher_using_in_op.conf → ...mples/rbac_model_matcher_using_in_op.conf b/examples/rbac_model_matcher_using_in_op.conf → ...mples/rbac_model_matcher_using_in_op.conf
diff --git a/examples/rbac_policy.csv → casbin_examples/rbac_policy.csv b/examples/rbac_policy.csv → casbin_examples/rbac_policy.csv
diff --git a/examples/rbac_with_all_pattern_model.conf → ...examples/rbac_with_all_pattern_model.conf b/examples/rbac_with_all_pattern_model.conf → ...examples/rbac_with_all_pattern_model.conf
diff --git a/examples/rbac_with_all_pattern_policy.csv → ...examples/rbac_with_all_pattern_policy.csv b/examples/rbac_with_all_pattern_policy.csv → ...examples/rbac_with_all_pattern_policy.csv
diff --git a/examples/rbac_with_deny_model.conf → casbin_examples/rbac_with_deny_model.conf b/examples/rbac_with_deny_model.conf → casbin_examples/rbac_with_deny_model.conf
diff --git a/examples/rbac_with_deny_policy.csv → casbin_examples/rbac_with_deny_policy.csv b/examples/rbac_with_deny_policy.csv → casbin_examples/rbac_with_deny_policy.csv
diff --git a/examples/rbac_with_domain_pattern_model.conf → ...mples/rbac_with_domain_pattern_model.conf b/examples/rbac_with_domain_pattern_model.conf → ...mples/rbac_with_domain_pattern_model.conf
diff --git a/examples/rbac_with_domain_pattern_policy.csv → ...mples/rbac_with_domain_pattern_policy.csv b/examples/rbac_with_domain_pattern_policy.csv → ...mples/rbac_with_domain_pattern_policy.csv
diff --git a/examples/rbac_with_domains_model.conf → casbin_examples/rbac_with_domains_model.conf b/examples/rbac_with_domains_model.conf → casbin_examples/rbac_with_domains_model.conf
diff --git a/examples/rbac_with_domains_policy.csv → casbin_examples/rbac_with_domains_policy.csv b/examples/rbac_with_domains_policy.csv → casbin_examples/rbac_with_domains_policy.csv
diff --git a/examples/rbac_with_hierarchy_policy.csv → ...n_examples/rbac_with_hierarchy_policy.csv b/examples/rbac_with_hierarchy_policy.csv → ...n_examples/rbac_with_hierarchy_policy.csv
diff --git a/...ac_with_hierarchy_with_domains_policy.csv → ...ac_with_hierarchy_with_domains_policy.csv b/...ac_with_hierarchy_with_domains_policy.csv → ...ac_with_hierarchy_with_domains_policy.csv
diff --git a/examples/rbac_with_not_deny_model.conf → ...in_examples/rbac_with_not_deny_model.conf b/examples/rbac_with_not_deny_model.conf → ...in_examples/rbac_with_not_deny_model.conf
diff --git a/examples/rbac_with_pattern_model.conf → casbin_examples/rbac_with_pattern_model.conf b/examples/rbac_with_pattern_model.conf → casbin_examples/rbac_with_pattern_model.conf
diff --git a/examples/rbac_with_pattern_policy.csv → casbin_examples/rbac_with_pattern_policy.csv b/examples/rbac_with_pattern_policy.csv → casbin_examples/rbac_with_pattern_policy.csv
diff --git a/examples/rbac_with_resource_roles_model.conf → ...mples/rbac_with_resource_roles_model.conf b/examples/rbac_with_resource_roles_model.conf → ...mples/rbac_with_resource_roles_model.conf
diff --git a/examples/rbac_with_resource_roles_policy.csv → ...mples/rbac_with_resource_roles_policy.csv b/examples/rbac_with_resource_roles_policy.csv → ...mples/rbac_with_resource_roles_policy.csv
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: casbin
 description: An authorization library that supports access control models like
   ACL, RBAC, ABAC.
-version: 0.0.1
+version: 0.1.0
 homepage: https://casbin.org/
 repository: https://github.com/casbin/dart-casbin
 documentation: https://casbin.org/docs/en/overview

diff --git a/test/enforcer_test.dart b/test/enforcer_test.dart
@@ -22,7 +22,8 @@ import 'utils/test_utils.dart';
 
 void main() {
   group('test enable enforce with false', () {
-    var e = Enforcer('examples/basic_model.conf', 'examples/basic_policy.csv');
+    var e = Enforcer(
+        'casbin_examples/basic_model.conf', 'casbin_examples/basic_policy.csv');
 
     e.enableEnforce(false);
 
@@ -37,7 +38,8 @@ void main() {
   });
 
   group('test enable enforce with true', () {
-    var e = Enforcer('examples/basic_model.conf', 'examples/basic_policy.csv');
+    var e = Enforcer(
+        'casbin_examples/basic_model.conf', 'casbin_examples/basic_policy.csv');
 
     e.enableEnforce(true);
 
@@ -52,9 +54,9 @@ void main() {
   });
 
   group('test enforcer initialization with adapter', () {
-    var adapter = FileAdapter('examples/basic_policy.csv');
-    var e =
-        Enforcer.fromModelPathAndAdapter('examples/basic_model.conf', adapter);
+    var adapter = FileAdapter('casbin_examples/basic_policy.csv');
+    var e = Enforcer.fromModelPathAndAdapter(
+        'casbin_examples/basic_model.conf', adapter);
 
     testEnforce('test 1', e, 'alice', 'data1', 'read', true);
     testEnforce('test 2', e, 'alice', 'data1', 'write', false);
@@ -68,20 +70,20 @@ void main() {
 
   group('test getModel and setModel', () {
     group('before setting model', () {
-      var e =
-          Enforcer('examples/basic_model.conf', 'examples/basic_policy.csv');
+      var e = Enforcer('casbin_examples/basic_model.conf',
+          'casbin_examples/basic_policy.csv');
       // var e2 = Enforcer(
-      //     'examples/basic_with_root_model.conf', 'examples/basic_policy.csv');
+      //     'casbin_examples/basic_with_root_model.conf', 'casbin_examples/basic_policy.csv');
 
       testEnforce(
           'test before setting Model', e, 'root', 'data1', 'read', false);
     });
 
     group('after setting model', () {
-      var e =
-          Enforcer('examples/basic_model.conf', 'examples/basic_policy.csv');
-      var e2 = Enforcer(
-          'examples/basic_with_root_model.conf', 'examples/basic_policy.csv');
+      var e = Enforcer('casbin_examples/basic_model.conf',
+          'casbin_examples/basic_policy.csv');
+      var e2 = Enforcer('casbin_examples/basic_with_root_model.conf',
+          'casbin_examples/basic_policy.csv');
       e.setModel(e2.getModel());
 
       testEnforce('test after setting Model', e, 'root', 'data1', 'read', true);
@@ -90,20 +92,20 @@ void main() {
 
   group('test getAdapter and setAdapter', () {
     group('before setting adapter', () {
-      var e =
-          Enforcer('examples/basic_model.conf', 'examples/basic_policy.csv');
+      var e = Enforcer('casbin_examples/basic_model.conf',
+          'casbin_examples/basic_policy.csv');
       // var e2 = Enforcer(
-      //     'examples/basic_model.conf', 'examples/basic_inverse_policy.csv');
+      //     'casbin_examples/basic_model.conf', 'casbin_examples/basic_inverse_policy.csv');
 
       testEnforce('test 1', e, 'alice', 'data1', 'read', true);
       testEnforce('test 2', e, 'alice', 'data1', 'write', false);
     });
 
     group('after setting adapter', () {
-      var e =
-          Enforcer('examples/basic_model.conf', 'examples/basic_policy.csv');
-      var e2 = Enforcer(
-          'examples/basic_model.conf', 'examples/basic_inverse_policy.csv');
+      var e = Enforcer('casbin_examples/basic_model.conf',
+          'casbin_examples/basic_policy.csv');
+      var e2 = Enforcer('casbin_examples/basic_model.conf',
+          'casbin_examples/basic_inverse_policy.csv');
       var a2 = e2.getAdapter();
       e.setAdapter(a2);
       e.loadPolicy();
@@ -114,17 +116,17 @@ void main() {
   });
 
   group('test setAdapter from file', () {
-    var e = Enforcer('examples/basic_model.conf');
+    var e = Enforcer('casbin_examples/basic_model.conf');
 
-    var a = FileAdapter('examples/basic_policy.csv');
+    var a = FileAdapter('casbin_examples/basic_policy.csv');
     e.setAdapter(a);
     e.loadPolicy();
 
     testEnforce('test 1', e, 'alice', 'data1', 'read', true);
   });
 
   group('test enforce param validation', () {
-    var e = Enforcer('examples/rbac_model.conf');
+    var e = Enforcer('casbin_examples/rbac_model.conf');
     test('must return false as there are 4 params instead of 3', () {
       assert(
           e.validateEnforce(['alice', 'data1', 'read', 'extra param']), false);
@@ -184,7 +186,7 @@ void main() {
     m.addDef('m', 'm',
         'r.sub == p.sub && keyMatch(r.obj, p.obj) && regexMatch(r.act, p.act)');
 
-    var a = FileAdapter('examples/keymatch_policy.csv');
+    var a = FileAdapter('casbin_examples/keymatch_policy.csv');
 
     var e = Enforcer.fromModelAndAdapter(m, a);
 
@@ -219,7 +221,7 @@ void main() {
     m.addDef('m', 'm',
         'r.sub == p.sub && keyMatch(r.obj, p.obj) && regexMatch(r.act, p.act)');
 
-    var a = FileAdapter('examples/keymatch_policy.csv');
+    var a = FileAdapter('casbin_examples/keymatch_policy.csv');
 
     var e = Enforcer.fromModelAndAdapter(m, a);
 
@@ -237,7 +239,7 @@ void main() {
       m.addDef('m', 'm',
           'r.sub == p.sub && keyMatch(r.obj, p.obj) && regexMatch(r.act, p.act)');
 
-      var a = FileAdapter('examples/keymatch_policy.csv');
+      var a = FileAdapter('casbin_examples/keymatch_policy.csv');
 
       e.setModel(m);
       e.setAdapter(a);
@@ -506,7 +508,8 @@ m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act
   });
 
   test('TestReloadPolicy', () {
-    final e = Enforcer('examples/rbac_model.conf', 'examples/rbac_policy.csv');
+    final e = Enforcer(
+        'casbin_examples/rbac_model.conf', 'casbin_examples/rbac_policy.csv');
 
     e.loadPolicy();
 
@@ -522,8 +525,8 @@ m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act
 
   group('test ABAC Scaling', () {
     final e = Enforcer(
-      'examples/abac_rule_model.conf',
-      'examples/abac_rule_policy.csv',
+      'casbin_examples/abac_rule_model.conf',
+      'casbin_examples/abac_rule_policy.csv',
     );
 
     final sub1 = AbacTest('alice', 16);

diff --git a/test/logger/logger_test.dart b/test/logger/logger_test.dart
@@ -68,8 +68,8 @@ void main() {
     });
     group('test logPolicy', () {
       final enf = Enforcer.fromModelPathAndPolicyFile(
-        'examples/basic_model.conf',
-        'examples/basic_policy.csv',
+        'casbin_examples/basic_model.conf',
+        'casbin_examples/basic_policy.csv',
       );
 
       testLogPolicy('test 1', logger, enf.model, 'Policy:');
@@ -80,8 +80,8 @@ void main() {
 
     group('test logRole', () {
       final enf = Enforcer.fromModelPathAndPolicyFile(
-        'examples/rbac_with_domains_model.conf',
-        'examples/rbac_with_domains_policy.csv',
+        'casbin_examples/rbac_with_domains_model.conf',
+        'casbin_examples/rbac_with_domains_policy.csv',
       );
       final rm = enf.rm as DefaultRoleManager;
 

diff --git a/test/management_test.dart b/test/management_test.dart
@@ -19,7 +19,8 @@ import 'package:test/test.dart';
 import 'package:casbin/src/utils/utils.dart' as utils;
 
 void main() {
-  var e = Enforcer('examples/rbac_model.conf', 'examples/rbac_policy.csv');
+  var e = Enforcer(
+      'casbin_examples/rbac_model.conf', 'casbin_examples/rbac_policy.csv');
 
   test('test getAllSubjects', () {
     var allSubjects = e.getAllSubjects();

diff --git a/test/model/model_test.dart b/test/model/model_test.dart
@@ -19,19 +19,20 @@ import 'package:casbin/src/enforcer.dart';
 import '../utils/test_utils.dart';
 
 void main() {
-  final basicModelPath = 'examples/basic_model.conf';
-  final basicPolicyFile = 'examples/basic_policy.csv';
-  final rbacModelPath = 'examples/rbac_model.conf';
-  final rbacPolicyFile = 'examples/rbac_policy.csv';
-  final rbacWithResourcesModel = 'examples/rbac_with_resource_roles_model.conf';
+  final basicModelPath = 'casbin_examples/basic_model.conf';
+  final basicPolicyFile = 'casbin_examples/basic_policy.csv';
+  final rbacModelPath = 'casbin_examples/rbac_model.conf';
+  final rbacPolicyFile = 'casbin_examples/rbac_policy.csv';
+  final rbacWithResourcesModel =
+      'casbin_examples/rbac_with_resource_roles_model.conf';
   final rbacWithResourcesPolicy =
-      'examples/rbac_with_resource_roles_policy.csv';
-  final rbacWithDomainsModel = 'examples/rbac_with_domains_model.conf';
-  final rbacWithDomainsPolicy = 'examples/rbac_with_domains_policy.csv';
-  final rbacWithDenyModel = 'examples/rbac_with_deny_model.conf';
-  final rbacWithDenyPolicy = 'examples/rbac_with_deny_policy.csv';
+      'casbin_examples/rbac_with_resource_roles_policy.csv';
+  final rbacWithDomainsModel = 'casbin_examples/rbac_with_domains_model.conf';
+  final rbacWithDomainsPolicy = 'casbin_examples/rbac_with_domains_policy.csv';
+  final rbacWithDenyModel = 'casbin_examples/rbac_with_deny_model.conf';
+  final rbacWithDenyPolicy = 'casbin_examples/rbac_with_deny_policy.csv';
 
-  final rbacWithNotDenyModel = 'examples/rbac_with_not_deny_model.conf';
+  final rbacWithNotDenyModel = 'casbin_examples/rbac_with_not_deny_model.conf';
 
   group('Test enforcing with basic model', () {
     final e =
@@ -101,8 +102,8 @@ void main() {
 
   group('Test enforcing with abac model with Domains', () {
     var e = Enforcer(
-      'examples/abac_rule_with_domains_model.conf',
-      'examples/abac_rule_with_domains_policy.csv',
+      'casbin_examples/abac_rule_with_domains_model.conf',
+      'casbin_examples/abac_rule_with_domains_policy.csv',
     );
     testDomainEnforce('test 1', e, 'alice', 'domain1', 'data1', 'read', true);
     testDomainEnforce('test 2', e, 'alice', 'domain1', 'data1', 'write', true);