Updated Dependencies and Fixed Linter Bugs

Author: yubarajshrestha

.github/workflows/pythonapp.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10"]
     name: Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -13,5 +13,5 @@ coverage.xml
 dist
 .env
 *.db
-src/masonite_masonite_permission.egg-info
-storage/app/*
+src/masonite_permission.egg-info
+storage/app/*

makefile

@@ -3,7 +3,7 @@ help: ## Show this help
 	@egrep -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
 
 init: ## Install package dependencies
-	cp .env-example .env
+	cp .env.example .env
 	pip install --upgrade pip
 	# install test project and package dependencies
 	pip install -r requirements.txt

masonite.sqlite3

@@ -8,7 +8,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version="0.2.1",
+    version="1.0.0",
     packages=[
         "masonite_permission",
         "masonite_permission.config",
@@ -48,7 +48,6 @@
         "Operating System :: OS Independent",
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Topic :: Software Development :: Libraries :: Application Frameworks",
@@ -62,7 +61,7 @@
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=["masonite>=4.0<5.0"],
+    install_requires=["masonite>=4.0,<5.0"],
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,
     # for example:

setup.py

@@ -103,7 +103,7 @@ def give_permission_to(self, *args):
         """Give permission to related model"""
         from ..models.permission import Permission
 
-        if type(args[0]) == list:
+        if type(args[0]) is list:
             args = args[0]
 
         permissions = Permission.where_in("slug", args).get()
@@ -132,7 +132,7 @@ def revoke_permission_to(self, *args):
         """Revoke permission from related model"""
         from ..models.permission import Permission
 
-        if type(args[0]) == list:
+        if type(args[0]) is list:
             args = args[0]
 
         permissions = Permission.where_in("slug", args).get()
@@ -158,7 +158,7 @@ def _get_permission_ids(self, args):
             ).where("permissionable_type", self.get_table_name()).delete()
             return
 
-        if type(args[0]) == list:
+        if type(args[0]) is list:
             args = args[0]
 
         for permission in args:
@@ -208,15 +208,15 @@ def sync_permissions(self, *args):
             query.bulk_create(data)
 
     def has_permission_to(self, permission):
-        if type(permission) != str:
+        if type(permission) is not str:
             raise PermissionException("permission must be a string!")
         return self._permission_query().where("permissions.slug", permission).count() > 0
 
     def has_any_permission(self, *args):
         """Check if user has any of the permissions"""
 
         slugs = []
-        if type(args[0]) == list:
+        if type(args[0]) is list:
             slugs = args[0]
         else:
             slugs = list(args)
@@ -227,7 +227,7 @@ def has_all_permissions(self, *args):
         """Check if user has all of the permissions"""
 
         slugs = []
-        if type(args[0]) == list:
+        if type(args[0]) is list:
             slugs = args[0]
         else:
             slugs = list(args)
@@ -236,7 +236,7 @@ def has_all_permissions(self, *args):
 
     def can_(self, permissions):
         """Check if user has a permission"""
-        if type(permissions) != str:
+        if type(permissions) is not str:
             raise PermissionException("permission must be a string!")
 
         action = "all"  # can be all or any

src/masonite_permission/mixins/has_permissions.py

@@ -16,15 +16,15 @@ def roles(self):
 
     def has_role_of(self, role):
         """Check if user has a role"""
-        if type(role) != str:
+        if type(role) is not str:
             raise PermissionException("role must be a string!")
         return self.roles().where("slug", role).count() > 0
 
     def has_any_role(self, *args):
         """Check if user has any of the roles"""
 
         slugs = []
-        if type(args[0]) == list:
+        if type(args[0]) is list:
             slugs = args[0]
         else:
             slugs = list(args)
@@ -35,7 +35,7 @@ def has_all_roles(self, *args):
         """Check if user has all of the roles"""
 
         slugs = []
-        if type(args[0]) == list:
+        if type(args[0]) is list:
             slugs = args[0]
         else:
             slugs = list(args)
@@ -52,7 +52,7 @@ def _get_role_ids(self, args):
             QueryBuilder().table("role_user").where("user_id", self.id).delete()
             return
 
-        if type(args[0]) == list:
+        if type(args[0]) is list:
             args = args[0]
 
         for role in args:
@@ -139,7 +139,7 @@ def revoke_role(self, role):
 
     def is_(self, roles):
         """Check if user has a role"""
-        if type(roles) != str:
+        if type(roles) is not str:
             raise PermissionException("role must be a string!")
 
         action = "all"  # can be all or any

src/masonite_permission/mixins/has_roles.py

@@ -36,7 +36,7 @@ def sync_roles(self, *args):
             ).where("permission_id", self.id).delete()
             return
 
-        if type(args[0]) == list:
+        if type(args[0]) is list:
             args = args[0]
 
         for role in args:
@@ -77,11 +77,11 @@ def attach_role(self, role):
         """
         from ..models.role import Role
 
-        if type(role) == str:
+        if type(role) is str:
             role = Role.where("slug", role).first()
             if not role:
                 raise PermissionException(f"Role: {role} does not exist!")
-        elif type(role) == int:
+        elif type(role) is int:
             role = Role.find(role)
             if not role:
                 raise PermissionException(f"Role: with id {role} does not exist!")
@@ -112,11 +112,11 @@ def detach_role(self, role):
         """
         from ..models.role import Role
 
-        if type(role) == str:
+        if type(role) is str:
             role = Role.where("slug", role).first()
             if not role:
                 raise PermissionException(f"Role: {role} does not exist!")
-        elif type(role) == int:
+        elif type(role) is int:
             role = Role.find(role)
             if not role:
                 raise PermissionException(f"Role: with id {role} does not exist!")

src/masonite_permission/models/permission.py

@@ -41,7 +41,7 @@ def sync_permissions(self, *args):
             ).where("permissionable_type", self.get_table_name()).delete()
             return
 
-        if type(args[0]) == list:
+        if type(args[0]) is list:
             args = args[0]
 
         for permission in args:

src/masonite_permission/models/role.py

@@ -18,7 +18,6 @@
 
 
 class Kernel:
-
     http_middleware = [MaintenanceModeMiddleware, EncryptCookies]
 
     route_middleware = {

tests/integrations/Kernel.py

@@ -2,5 +2,4 @@
 
 
 class VerifyCsrfToken(Middleware):
-
     exempt = ["/filemanager"]