Test and client module cleanup

Author: Mathias Bigaignon

entitled/client.py

@@ -24,11 +24,11 @@ def allows(self, actor, action, resource, context: dict | None = None) -> bool:
         policy = self._policy_lookup(resource)
         return policy.allows(actor, action, resource, context)
 
-    def actions(self, actor, resource, context: dict | None = None):
+    def grants(self, actor, resource, context: dict | None = None):
         policy = self._policy_lookup(resource)
         return policy.grants(actor, resource, context)
 
-    def register_policy(self, policy: policies.Policy):
+    def register(self, policy: policies.Policy):
         if hasattr(policy, "__orig_class__"):
             resource_type = getattr(policy, "__orig_class__").__args__[0]
             if resource_type not in self._policy_registrar:
@@ -63,7 +63,7 @@ def _register_from_module(self, module: types.ModuleType):
             attr = getattr(module, attribute_name)
             if isinstance(attr, policies.Policy):
                 try:
-                    self.register_policy(attr)
+                    self.register(attr)
                 except (ValueError, AttributeError):
                     pass
 

tests/test_policies.py

@@ -1,5 +1,3 @@
-from typing import Any
-
 from entitled.policies import Policy
 from entitled.rules import Rule
 from tests.fixtures.models import Tenant, User
@@ -19,7 +17,7 @@ def test_register_rule_decorator(self):
 
         @policy.rule("is_member")
         def is_member(
-            actor: User, resource: Tenant, context: dict[str, Any] | None = None
+            actor: User, resource: Tenant, context: dict | None = None
         ) -> bool:
             return actor.tenant == resource
 
@@ -34,7 +32,7 @@ def test_register_rule_function(self):
 
         @policy.rule("is_member")
         def is_member(
-            actor: User, resource: Tenant, context: dict[str, Any] | None = None
+            actor: User, resource: Tenant, context: dict | None = None
         ) -> bool:
             return actor.tenant == resource
 
@@ -54,19 +52,19 @@ def test_list_grants(self):
 
         @policy.rule("is_member")
         def is_member(
-            actor: User, resource: Tenant, context: dict[str, Any] | None = None
+            actor: User, resource: Tenant, context: dict | None = None
         ) -> bool:
             return actor.tenant == resource
 
         @policy.rule("has_admin_role")
         def has_admin_role(
-            actor: User, resource: Tenant, context: dict[str, Any] | None = None
+            actor: User, resource: Tenant, context: dict | None = None
         ) -> bool:
             return "admin" in actor.roles
 
         @policy.rule("is_tenant_admin")
         def is_tenant_admin(
-            actor: User, resource: Tenant, context: dict[str, Any] | None = None
+            actor: User, resource: Tenant, context: dict | None = None
         ) -> bool:
             return is_member(actor, resource, context) and has_admin_role(
                 actor, resource, context