Skip to content

Commit 96722f5

Browse files
josephmancusojosephmancuso
authored
Merge pull request #86 from MasoniteFramework/develop
Next Release (2.0)
2 parents 8604acb + c64fc29 commit 96722f5

15 files changed

+129
-86
lines changed

‎.env-example

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
APP_NAME=Masonite
22
APP_ENV=local
3-
APP_DEBUG=true
4-
APP_LOG_LEVEL=debug
3+
APP_DEBUG=True
54
KEY=your-secret-key
65

76
MAIL_DRIVER=smtp

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
*.pyc
22
.env
33
*__pycache__
4-
venv
4+
venv
5+
.env.*

‎Procfile

-1
This file was deleted.

‎app/http/middleware/CsrfMiddleware.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
''' CSRF Middleware '''
2-
32
from masonite.exceptions import InvalidCSRFToken
43

54

@@ -17,7 +16,7 @@ def before(self):
1716
token = self.__verify_csrf_token()
1817

1918
self.view.share({
20-
'csrf_field': "<input type='hidden' name='csrf_token' value='{0}' />".format(token)
19+
'csrf_field': "<input type='hidden' name='__token' value='{0}' />".format(token)
2120
})
2221

2322
def after(self):
@@ -40,10 +39,10 @@ def __verify_csrf_token(self):
4039
"""
4140

4241
if self.request.is_post() and not self.__in_exempt():
43-
token = self.request.input('csrf_token')
42+
token = self.request.input('__token')
4443
if not self.csrf.verify_csrf_token(token):
4544
raise InvalidCSRFToken("Invalid CSRF token.")
4645
else:
4746
token = self.csrf.generate_csrf_token()
4847

49-
return token
48+
return token

‎bootstrap/start.py

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
''' Start of Application. This function is the gunicorn server '''
22

3-
from pydoc import locate
4-
5-
from dotenv import find_dotenv, load_dotenv
3+
from masonite.environment import LoadEnvironment
64

75
'''
86
|--------------------------------------------------------------------------
@@ -13,11 +11,10 @@
1311
|
1412
'''
1513

16-
load_dotenv(find_dotenv())
14+
LoadEnvironment()
1715

1816
def app(environ, start_response):
1917
''' The WSGI Application Server '''
20-
2118
from wsgi import container
2219

2320
'''
@@ -43,10 +40,8 @@ def app(environ, start_response):
4340
'''
4441

4542
try:
46-
for provider in container.make('Application').PROVIDERS:
47-
located_provider = locate(provider)().load_app(container)
48-
if located_provider.wsgi is True:
49-
container.resolve(located_provider.boot)
43+
for provider in container.make('WSGIProviders'):
44+
container.resolve(provider.boot)
5045
except Exception as e:
5146
container.make('ExceptionHandler').load_exception(e)
5247

‎config/application.py

+16-41
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
|
1414
'''
1515

16-
NAME = 'Masonite 1.6'
16+
NAME = 'Masonite 2.0'
1717

1818
'''
1919
|--------------------------------------------------------------------------
@@ -26,7 +26,7 @@
2626
|
2727
'''
2828

29-
DEBUG = os.getenv('APP_DEBUG', False)
29+
DEBUG = os.getenv('APP_DEBUG', 'False')
3030

3131
'''
3232
|--------------------------------------------------------------------------
@@ -40,7 +40,7 @@
4040
|
4141
'''
4242

43-
KEY = os.environ.get('KEY')
43+
KEY = os.getenv('KEY', None)
4444

4545
'''
4646
|--------------------------------------------------------------------------
@@ -55,62 +55,37 @@
5555

5656
'''
5757
|--------------------------------------------------------------------------
58-
| Providers List
58+
| Base Directory
5959
|--------------------------------------------------------------------------
6060
|
61-
| Providers are a simple way to remove or add functionality for Masonite
62-
| The providers in this list are either ran on server start or when a
63-
| request is made depending on the provider. Take some time to can
64-
| learn more more about Service Providers in our documentation
61+
| Sets the root path of your project
6562
|
6663
'''
6764

68-
PROVIDERS = [
69-
# Framework Providers
70-
'masonite.providers.AppProvider.AppProvider',
71-
'masonite.providers.SessionProvider.SessionProvider',
72-
'masonite.providers.RouteProvider.RouteProvider',
73-
# 'entry.providers.ApiProvider.ApiProvider',
74-
'masonite.providers.RedirectionProvider.RedirectionProvider',
75-
'masonite.providers.StartResponseProvider.StartResponseProvider',
76-
'masonite.providers.SassProvider.SassProvider',
77-
'masonite.providers.WhitenoiseProvider.WhitenoiseProvider',
78-
79-
# Optional Framework Providers
80-
'masonite.providers.MailProvider.MailProvider',
81-
'masonite.providers.UploadProvider.UploadProvider',
82-
'masonite.providers.ViewProvider.ViewProvider',
83-
'masonite.providers.HelpersProvider.HelpersProvider',
84-
'masonite.providers.QueueProvider.QueueProvider',
85-
'masonite.providers.BroadcastProvider.BroadcastProvider',
86-
'masonite.providers.CacheProvider.CacheProvider',
87-
'masonite.providers.CsrfProvider.CsrfProvider',
88-
89-
# Third Party Providers
90-
91-
# Application Providers
92-
'app.providers.UserModelProvider.UserModelProvider',
93-
'app.providers.MiddlewareProvider.MiddlewareProvider',
94-
]
65+
BASE_DIRECTORY = os.getcwd()
9566

9667
'''
9768
|--------------------------------------------------------------------------
98-
| Base Directory
69+
| Static Root
9970
|--------------------------------------------------------------------------
10071
|
101-
| Sets the root path of your project
72+
| Set the static root of your application that you wil use to store assets
10273
|
10374
'''
10475

105-
BASE_DIRECTORY = os.getcwd()
76+
STATIC_ROOT = os.path.join(BASE_DIRECTORY, 'storage')
10677

10778
'''
10879
|--------------------------------------------------------------------------
109-
| Static Root
80+
| Autoload Directories
11081
|--------------------------------------------------------------------------
11182
|
112-
| Set the static root of your application that you wil use to store assets
83+
| List of directories that are used to find classes and autoload them into
84+
| the Service Container. This is initially used to find models and load
85+
| them in but feel free to autoload any directories
11386
|
11487
'''
11588

116-
STATIC_ROOT = os.path.join(BASE_DIRECTORY, 'storage')
89+
AUTOLOAD = [
90+
'app',
91+
]

‎config/auth.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
''' Authentication Settings '''
22

3+
import os
34
from app.User import User
45

56
'''
@@ -20,6 +21,6 @@
2021
'''
2122

2223
AUTH = {
23-
'driver': 'cookie',
24+
'driver': os.getenv('AUTH_DRIVER', 'cookie'),
2425
'model': User,
2526
}

‎config/cache.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
''' Cache Settings '''
22

3+
import os
4+
35
'''
46
|--------------------------------------------------------------------------
57
| Cache Driver
@@ -13,7 +15,7 @@
1315
|
1416
'''
1517

16-
DRIVER = 'disk'
18+
DRIVER = os.getenv('CACHE_DRIVER', 'disk')
1719

1820
'''
1921
|--------------------------------------------------------------------------

‎config/providers.py

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
""" Providers Configuration File """
2+
3+
from masonite.providers import (
4+
AppProvider,
5+
SessionProvider,
6+
RouteProvider,
7+
StatusCodeProvider,
8+
StartResponseProvider,
9+
SassProvider,
10+
WhitenoiseProvider,
11+
MailProvider,
12+
UploadProvider,
13+
ViewProvider,
14+
HelpersProvider,
15+
QueueProvider,
16+
BroadcastProvider,
17+
CacheProvider,
18+
CsrfProvider,
19+
)
20+
21+
from app.providers.MiddlewareProvider import MiddlewareProvider
22+
from app.providers.UserModelProvider import UserModelProvider
23+
24+
'''
25+
|--------------------------------------------------------------------------
26+
| Providers List
27+
|--------------------------------------------------------------------------
28+
|
29+
| Providers are a simple way to remove or add functionality for Masonite
30+
| The providers in this list are either ran on server start or when a
31+
| request is made depending on the provider. Take some time to can
32+
| learn more more about Service Providers in our documentation
33+
|
34+
'''
35+
36+
37+
PROVIDERS = [
38+
# Framework Providers
39+
AppProvider,
40+
SessionProvider,
41+
RouteProvider,
42+
# 'entry.providers.ApiProvider.ApiProvider',
43+
StatusCodeProvider,
44+
StartResponseProvider,
45+
WhitenoiseProvider,
46+
ViewProvider,
47+
48+
# Optional Framework Providers
49+
SassProvider,
50+
MailProvider,
51+
UploadProvider,
52+
QueueProvider,
53+
CacheProvider,
54+
BroadcastProvider,
55+
CacheProvider,
56+
CsrfProvider,
57+
HelpersProvider,
58+
59+
# Third Party Providers
60+
61+
# Application Providers
62+
UserModelProvider,
63+
MiddlewareProvider,
64+
]

‎config/queue.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
''' Queue Settings '''
22

3+
import os
4+
35
'''
46
|--------------------------------------------------------------------------
57
| Queue Driver
@@ -12,7 +14,7 @@
1214
|
1315
'''
1416

15-
DRIVER = 'async'
17+
DRIVER = os.getenv('QUEUE_DRIVER', 'async')
1618

1719
'''
1820
|--------------------------------------------------------------------------

‎config/session.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
''' Session Settings '''
22

3+
import os
4+
35
'''
46
|--------------------------------------------------------------------------
57
| Session Driver
@@ -10,7 +12,7 @@
1012
| inside memory which will delete when the server stops running.
1113
|
1214
| Supported: 'memory', 'cookie'
13-
|
15+
|
1416
'''
1517

16-
DRIVER = 'memory'
18+
DRIVER = os.getenv('SESSION_DRIVER', 'cookie')

‎readme.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
<img src="https://travis-ci.org/MasoniteFramework/masonite.svg?branch=master">
99
<img src="https://img.shields.io/badge/python-3.4+-blue.svg" alt="Python Version"> <img src="http://pepy.tech/badge/masonite?1" alt="License"> <img src="https://img.shields.io/github/license/MasoniteFramework/masonite.svg" alt="License">
10-
<img src="https://coveralls.io/repos/github/MasoniteFramework/core/badge.svg?branch=master" alt="License">
11-
10+
<img src="https://coveralls.io/repos/github/MasoniteFramework/core/badge.svg?branch=master" alt="License">
11+
<a href="https://gitter.im/masonite-framework/Lobby"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="gitter"></a>
1212

1313
</p>
1414

‎requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
waitress==1.1.0
2-
masonite>=1.6,<=1.6.99
2+
masonite>=2.0,<=2.0.99

‎resources/templates/welcome.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</div>
2525

2626
<div class="links">
27-
<a href="https://github.com/MasoniteFramework/masonite">The Rapid Application Python Development Framework</a>
27+
<a href="https://github.com/MasoniteFramework/masonite">The Modern And Developer Centric Python Web Framework</a>
2828
</div>
2929
<br><br>
3030

0 commit comments

Comments
 (0)