Add imported provider support

.travis.yml

@@ -6,7 +6,7 @@ python:
 - '3.6'
 
 install:
-- pip install .
+- pip install -e .
 - pip install -r requirements.txt
 
 script: travis_retry coverage run -m pytest

config/application.py

@@ -6,24 +6,6 @@
 
 URL = 'http://localhost'
 
-PROVIDERS = [
-    # Framework Providers
-    'masonite.providers.AppProvider',
-    'masonite.providers.SessionProvider',
-    'masonite.providers.CsrfProvider',
-    'masonite.providers.RouteProvider',
-    'masonite.providers.StatusCodeProvider',
-    'masonite.providers.StartResponseProvider',
-    'masonite.providers.SassProvider',
-    'masonite.providers.WhitenoiseProvider',
-    'masonite.providers.MailProvider',
-    'masonite.providers.ViewProvider',
-    'masonite.providers.HelpersProvider',
-    'masonite.providers.UploadProvider',
-    'masonite.providers.BroadcastProvider',
-    'masonite.providers.CacheProvider',
-]
-
 STATIC_ROOT = 'storage'
 
 AUTOLOAD = []

config/providers.py

@@ -0,0 +1,34 @@
+from masonite.providers import (
+    AppProvider,
+    SessionProvider,
+    CsrfProvider,
+    RouteProvider,
+    StatusCodeProvider,
+    StartResponseProvider,
+    SassProvider,
+    WhitenoiseProvider,
+    MailProvider,
+    ViewProvider,
+    HelpersProvider,
+    UploadProvider,
+    BroadcastProvider,
+    CacheProvider
+)
+
+PROVIDERS = [
+    # Framework Providers
+    AppProvider,
+    SessionProvider,
+    CsrfProvider,
+    RouteProvider,
+    StatusCodeProvider,
+    StartResponseProvider,
+    SassProvider,
+    WhitenoiseProvider,
+    MailProvider,
+    ViewProvider,
+    HelpersProvider,
+    UploadProvider,
+    BroadcastProvider,
+    CacheProvider,
+]

masonite/exception_handler.py

@@ -2,8 +2,6 @@
 import traceback
 import os
 
-from config import application
-
 package_directory = os.path.dirname(os.path.realpath(__file__))
 
 

masonite/providers/AppProvider.py

@@ -25,12 +25,10 @@
 from masonite.request import Request
 from masonite.routes import Route
 
-from masonite.autoload import Autoload
-
 from config import storage, application
+from masonite.autoload import Autoload
 from routes import api, web
 
-
 class AppProvider(ServiceProvider):
 
     def register(self):

masonite/storage.py

@@ -5,6 +5,7 @@
 class Storage:
 
     def __init__(self):
+
         pass
 
     # this function will compile sass files only if

masonite/testsuite/TestSuite.py

@@ -1,12 +1,10 @@
 from masonite.app import App
 from masonite.testsuite.TestRoute import TestRoute
 from masonite.testsuite.TestRequest import TestRequest
-from config import application
+from config import application, providers
 from pydoc import locate
 
 
-
-
 def generate_wsgi():
     return {
         'wsgi.version': (1, 0),
@@ -43,6 +41,7 @@ def create_container(self):
 
         container.bind('WSGI', object)
         container.bind('Application', application)
+        container.bind('Providers', providers)
 
         """
         |--------------------------------------------------------------------------
@@ -57,14 +56,14 @@ def create_container(self):
         |
         """
 
-        for provider in container.make('Application').PROVIDERS:
-            locate(provider)().load_app(container).register()
+        for provider in container.make('Providers').PROVIDERS:
+            provider().load_app(container).register()
 
-        for provider in container.make('Application').PROVIDERS:
-            located_provider = locate(provider)().load_app(container)
+        for provider in container.make('Providers').PROVIDERS:
+            located_provider = provider().load_app(container)
 
             if located_provider.wsgi is False:
-                container.resolve(locate(provider)().load_app(container).boot)
+                container.resolve(located_provider.boot)
 
             """
         |--------------------------------------------------------------------------
@@ -88,8 +87,8 @@ def create_container(self):
         |
         """
 
-        for provider in container.make('Application').PROVIDERS:
-            located_provider = locate(provider)().load_app(container)
+        for provider in container.make('Providers').PROVIDERS:
+            located_provider = provider().load_app(container)
             container.bind('Response', 'test')
             if located_provider.wsgi is True:
                 container.resolve(located_provider.boot)
@@ -104,4 +103,4 @@ def route(self, route):
         return TestRoute(route)
 
     def get(self, route_url):
-        return TestRequest().get(route_url)
+        return TestRequest().get(route_url)

setup.py

@@ -15,7 +15,7 @@
         'masonite.contracts',
         'masonite.helpers',
     ],
-    version='2.0.0b2',
+    version='2.0.0b3',
     install_requires=[
         'validator.py==1.2.5',
         'cryptography==2.2.2',

tests/test_providers.py

@@ -1,5 +1,5 @@
 from pydoc import locate
-from config import application
+from config import application, providers
 
 from masonite.app import App
 from masonite.routes import Get
@@ -13,11 +13,12 @@ def setup_method(self):
         self.app.bind('WSGI', object)
 
         self.app.bind('Application', application)
+        self.app.bind('Providers', providers)
         self.app.bind('Environ', generate_wsgi())
 
     def test_providers_load_into_container(self):
-        for provider in self.app.make('Application').PROVIDERS:
-            self.app.resolve(locate(provider)().load_app(self.app).register)
+        for provider in self.app.make('Providers').PROVIDERS:
+            self.app.resolve(provider().load_app(self.app).register)
 
         self.app.bind('Response', 'test')
         self.app.bind('WebRoutes', [
@@ -28,10 +29,10 @@ def test_providers_load_into_container(self):
 
         self.app.bind('Response', 'Route not found. Error 404')
 
-        for provider in self.app.make('Application').PROVIDERS:
-            located_provider = locate(provider)().load_app(self.app)
+        for provider in self.app.make('Providers').PROVIDERS:
+            located_provider = provider().load_app(self.app)
 
-            self.app.resolve(locate(provider)().load_app(self.app).boot)
+            self.app.resolve(provider().load_app(self.app).boot)
 
         assert self.app.make('Request')
 

tests/test_requests.py

@@ -1,12 +1,12 @@
-from config import application
+from config import application, providers
 from pydoc import locate
 
 from masonite.request import Request
 from masonite.app import App
 from masonite.routes import Get, Route
 from masonite.helpers.routes import flatten_routes, get, group
 from masonite.helpers.time import cookie_expire_time
-from masonite.testsuite.TestSuite import generate_wsgi
+from masonite.testsuite.TestSuite import generate_wsgi, TestSuite
 
 WEB_ROUTES = flatten_routes([
     get('/test', 'Controller@show').name('test'),
@@ -124,11 +124,12 @@ def test_request_loads_app(self):
     def test_request_gets_input_from_container(self):
         container = App()
         container.bind('Application', application)
+        container.bind('Providers', providers)
         container.bind('WSGI', object)
         container.bind('Environ', wsgi_request)
 
-        for provider in container.make('Application').PROVIDERS:
-            container.resolve(locate(provider)().load_app(container).register)
+        for provider in container.make('Providers').PROVIDERS:
+            container.resolve(provider().load_app(container).register)
 
         container.bind('Response', 'test')
         container.bind('WebRoutes', [
@@ -139,10 +140,10 @@ def test_request_gets_input_from_container(self):
 
         container.bind('Response', 'Route not found. Error 404')
 
-        for provider in container.make('Application').PROVIDERS:
-            located_provider = locate(provider)().load_app(container)
+        for provider in container.make('Providers').PROVIDERS:
+            located_provider = provider().load_app(container)
 
-            container.resolve(locate(provider)().load_app(container).boot)
+            container.resolve(provider().load_app(container).boot)
 
         assert container.make('Request').input('application') == 'Masonite'
         assert container.make('Request').all() == {'application': 'Masonite'}