2.3 Next Major

.circleci/config.yml

@@ -1,103 +1,124 @@
 version: 2.1
+
+commands: 
+  install:
+    steps:
+      - run: pip install . --user
+      - run: pip install -r requirements.txt --user
+
 jobs:
     build:
       docker:
         - image: circleci/python:3.6  # primary container for the build job
       steps:
         - checkout
-        - run: make
-        - run: make ci
-    python34:
+        - install
+        - run: make test
+    lint:
       docker:
-        - image: circleci/python:3.4
+        - image: circleci/python:3.6  # primary container for the build job
       steps:
         - checkout
-        - run: make
-        - run: make ci
+        - install
+        - run: make lint
     python35:
-      docker:
-        - image: circleci/python:3.5
-      steps:
-        - checkout
-        - run: make
-        - run: make ci
-    python37:
       docker:
         - image: circleci/python:3.7
       steps:
         - checkout
-        - run: make
-        - run: make ci
-    MasoniteValidation:
+        - install
+        - run: make test
+    python37:
       docker:
-        - image: circleci/python:3.6
+        - image: circleci/python:3.8.0b2-buster
+          auth:
+            username: jmancuso9  # can specify string literal values
+            password: $DOCKERHUB_PASSWORD
       steps:
         - checkout
-        - run: python trigger_build.py --repo masoniteframework/validation --branch circle-ci --build MASONITE_DEPENDENT_BRANCH=$CIRCLE_BRANCH
-    MasoniteAPI:
+        - install
+        - run: make test
+    python38:
       docker:
-        - image: circleci/python:3.6
+        - image: circleci/python:3.8
       steps:
         - checkout
-        - run: python trigger_build.py --repo masoniteframework/api --branch 2.2 --build BUILD_BRANCH=$CIRCLE_BRANCH
+        - run: make
+        - run: make test
     CodeCoverage:
       docker:
         - image: circleci/python:3.6
       steps:
         - checkout
+        - install
         - run: pip install -r requirements.txt --user
         - run: make coverage
         - run: make deepsource
 
 orbs:
-    masonite: masonite/trigger@dev:latest
+    masonite: masonite/trigger@1.0.0
 
 workflows: 
   version: 2
   build_and_test:
     jobs: 
-      - build:
+      - build: # Python 3.6
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
-              only: /^v*/
-      - python34:
+              only: /^.*/
+      - lint: # Python 3.6
+          requires:
+              - build
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
-              only: /^v*/
+              only: /^.*/
       - python35:
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
-              only: /^v*/
+              only: /^.*/
       - python37:
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
-              only: /^v*/
-      - MasoniteValidation:
+              only: /^.*/
+      - python38:
+          filters:  # required since `deploy` has tag filters AND requires `build`
+            tags:
+              only: /^.*/
+      - CodeCoverage:
           requires:
               - build
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
-              only: /^v*/
-      - MasoniteAPI:
+              only: /^.*/
+      - masonite/trigger:
+          name: MasoniteValidation
+          repo: masoniteframework/validation
+          branch: circle-ci
+          environment: MASONITE_DEPENDENT_BRANCH=${CIRCLE_BRANCH:-2.2}
           requires:
               - build
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
-              only: /^v*/
-      - CodeCoverage:
+              only: /^.*/
+      - masonite/trigger:
+          name: MasoniteAPI
+          repo: masoniteframework/api
+          branch: "2.2"
+          environment: BUILD_BRANCH=${CIRCLE_BRANCH:-2.2}
           requires:
               - build
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
-              only: /^v*/
+              only: /^.*/
       - masonite/deploy:
           username: josephmancuso
+          password: $PYPI_PASSWORD
           requires:
-              - MasoniteValidation
-              - MasoniteAPI
-              - CodeCoverage
+            - MasoniteValidation
+            - MasoniteAPI
+            - CodeCoverage
           filters:
-              tags:
-                  only: /^v*/
-              branches:
-                  ignore: /.*/
+            tags:
+              only: /^.*/
+            branches:
+              ignore: /.*/

.deepsource.toml

@@ -3,8 +3,8 @@ version = 1
 
 test_patterns = [
   'tests/**/*.py',
-  'masonite/testing/*.py',
-  'masonite/testsuite/*.py',
+  'src/masonite/testing/*.py',
+  'src/masonite/testsuite/*.py',
   'testpackage/*.py'
 ]
 

MANIFEST.in

@@ -1,7 +1,7 @@
-include masonite/snippets/exceptions/css/*
-include masonite/snippets/exceptions/*
-include masonite/snippets/*
-include masonite/snippets/migrations/*
-include masonite/snippets/scaffold/*
-include masonite/snippets/auth/controllers/*
-include masonite/snippets/auth/templates/auth/*
+include src/masonite/snippets/exceptions/css/*
+include src/masonite/snippets/exceptions/*
+include src/masonite/snippets/*
+include src/masonite/snippets/migrations/*
+include src/masonite/snippets/scaffold/*
+include src/masonite/snippets/auth/controllers/*
+include src/masonite/snippets/auth/templates/auth/*

Makefile

@@ -8,12 +8,12 @@ ci:
 	make test
 	make lint
 lint:
-	python -m flake8 masonite/ --ignore=E501,F401,E128,E402,E731,F821,E712,W503
+	python -m flake8 src/masonite/ --ignore=E501,F401,E128,E402,E731,F821,E712,W503
 deepsource:
 	curl https://deepsource.io/cli | sh
 	./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml
 coverage:
-	python -m pytest --cov-report term --cov-report xml --cov=masonite tests/
+	python -m pytest --cov-report term --cov-report xml --cov=src/masonite tests/
 	python -m coveralls
 publish:
 	pip install 'twine>=1.5.0'

app/http/controllers/ConfirmController.py

@@ -0,0 +1,70 @@
+"""The ConfirmController Module."""
+import datetime
+
+from src.masonite.auth import Auth, MustVerifyEmail
+from src.masonite.auth.Sign import Sign
+from src.masonite.managers import MailManager
+from src.masonite.request import Request
+from src.masonite.view import View
+from src.masonite.helpers import config
+
+
+class ConfirmController:
+    """The ConfirmController class."""
+
+    def __init__(self):
+        """The ConfirmController Constructor."""
+        pass
+
+    def verify_show(self, view: View, auth: Auth):
+        """Show the Verify Email page for unverified users.
+
+        Arguments:
+            request {masonite.request.request} -- The Masonite request class.
+            request {masonite.view.view} -- The Masonite view class.
+            request {masonite.auth.auth} -- The Masonite Auth class.
+
+        Returns:
+            [type] -- [description]
+        """
+        return view.render('auth/verify', {'app': config('application'), 'Auth': auth})
+
+    def confirm_email(self, request: Request, view: View, auth: Auth):
+        """Confirm User email and show the correct response.
+
+        Arguments:
+            request {masonite.request.request} -- The Masonite request class.
+            request {masonite.view.view} -- The Masonite view class.
+            request {masonite.auth.auth} -- The Masonite Auth class.
+
+        Returns:
+            [type] -- [description]
+        """
+        sign = Sign()
+        token = sign.unsign(request.param('id'))
+
+        if token is not None:
+            tokenParts = token.split("::")
+            if len(tokenParts) > 1:
+                user = auth.auth_model.find(tokenParts[0])
+
+                if user.verified_at is None:
+                    timestamp = datetime.datetime.fromtimestamp(float(tokenParts[1]))
+                    now = datetime.datetime.now()
+                    timestamp_plus_10 = timestamp + datetime.timedelta(minutes=10)
+
+                    if now < timestamp_plus_10:
+                        user.verified_at = datetime.datetime.now()
+                        user.save()
+
+                        return view.render('auth/confirm', {'app': config('application'), 'Auth': auth})
+
+        return view.render('auth/error', {'app': config('application'), 'Auth': auth})
+
+    def send_verify_email(self, manager: MailManager, request: Request):
+        user = request.user()
+
+        if isinstance(user, MustVerifyEmail):
+            user.verify_email(manager, request)
+
+        return request.redirect('/home')

app/http/controllers/ControllerTest.py

@@ -1,5 +1,5 @@
-from masonite.request import Request
-from masonite.view import View
+from src.masonite.request import Request
+from src.masonite.view import View
 
 
 class ControllerTest:

app/http/controllers/TestController.py

@@ -1,6 +1,7 @@
 from app.jobs.TestJob import TestJob
-from masonite import Queue
-from masonite.request import Request
+from src.masonite import Queue, Mail
+from src.masonite.request import Request
+from src.masonite.view import View
 
 class TestController:
 
@@ -10,6 +11,9 @@ def __init__(self):
     def show(self):
         return 'show'
 
+    def v(self, view: View):
+        return view.render('test')
+
     def change_header(self, request: Request):
         request.header('Content-Type', 'application/xml')
         return 'test'
@@ -25,8 +29,8 @@ def change_404(self, request: Request):
     def testing(self):
         return 'test'
 
-    def json_response(self, request: Request):
-        return {'id': 1}
+    def json_response(self):
+        return {'id': 2}
 
     def post_test(self):
         return 'post_test'
@@ -37,6 +41,10 @@ def json(self):
     def bad(self):
         return 5 / 0
 
+    def keyerror(self):
+        x = {'hello': 'world'}
+        return x['test']
+
     def session(self, request: Request):
         request.session.set('test', 'value')
         return 'session set'
@@ -45,3 +53,6 @@ def queue(self, queue: Queue):
         # queue.driver('amqp').push(self.bad)
         queue.driver('amqp').push(TestJob, channel='default')
         return 'queued'
+
+    def mail(self, mail: Mail):
+        return mail.to('idmann509@gmail.com').template('test', {'test': 'mail'})

app/http/controllers/UnitTestController.py

@@ -1,7 +1,7 @@
 """A UnitTestController Module."""
 
-from masonite.request import Request
-from masonite.controllers import Controller
+from src.masonite.request import Request
+from src.masonite.controllers import Controller
 
 
 class UnitTestController(Controller):
@@ -36,7 +36,7 @@ def json(self):
     def response(self):
         return {
             'count': 5,
-            'iterable': [1,2,3]
+            'iterable': [1, 2, 3]
         }
 
     def multi(self):
@@ -46,6 +46,9 @@ def multi(self):
             }
         }
 
+    def multi_count(self):
+        return {"count": 5, "iterable": [1, 2, 3]}
+
     def patch(self):
         return self.request.input('test')
 

app/http/controllers/WelcomeController.py

@@ -1,14 +1,13 @@
 """Welcome The User To Masonite."""
 
-from masonite.view import View
-from masonite.request import Request
-from masonite.controllers import Controller
+from src.masonite.view import View
+from src.masonite.controllers import Controller
 
 
 class WelcomeController(Controller):
     """Controller For Welcoming The User."""
 
-    def show(self, view: View, request: Request):
+    def show(self, view: View):
         """Show the welcome page.
 
         Arguments: