Merge pull request #75 from josephmancuso/develop

Service Container Support

app/http/controllers/WelcomeController.py

@@ -8,6 +8,6 @@ class WelcomeController(object):
  def __init__(self):
  pass
 
- def show(self, request):
+ def show(self):
  ''' Show Welcome Template '''
  return view('welcome', {'app': application})

app/providers/UserModelProvider.py

@@ -0,0 +1,11 @@
+from masonite.provider import ServiceProvider
+from app.User import User
+
+class UserModelProvider(ServiceProvider):
+ ''' Binds the User model into the Service Container '''
+
+ def register(self):
+ self.app.bind('User', User)
+
+ def boot(self):
+ pass

bootstrap/start.py

@@ -9,11 +9,11 @@
 from masonite.request import Request
 from masonite.routes import Route
 from masonite.storage import Storage
-from config import middleware
+from masonite.app import App
+from config import middleware, application
 from pydoc import locate
 
 
-
 # Run once and only once the server is ran
 # This will not actually compile if the libsass module in not installed
 Storage().compile_sass()
@@ -23,6 +23,27 @@ def app(environ, start_response):
  os.environ.setdefault('REQUEST_METHOD', environ['REQUEST_METHOD'])
  os.environ.setdefault('URI_PATH', environ['PATH_INFO'])
 
+ # Instantiate the Service Container
+ app = App()
+
+ # Instantiate the Request object.
+ # This is the `request` object passed into controller methods
+ request = Request(environ)
+
+ # Bind the Request object into the container
+ app.bind('Request', request)
+
+ # Execute all the register methods in all containers
+ for provider in application.PROVIDERS:
+ locate(provider)().load_app(app).register()
+
+ # Execute all the boot methods in all containers
+ for provider in application.PROVIDERS:
+ app.resolve(locate(provider)().boot)
+
+ # Load the container into the request
+ app.make('Request').load_app(app)
+
  router = Route(environ)
 
  if router.is_post():
@@ -37,10 +58,6 @@ def app(environ, start_response):
  import routes.web
  routes = routes.web.ROUTES
 
- # Instantiate the Request object.
- # This is the `request` object passed into controller methods
- request = Request(environ)
-
  # Check all http routes
  for route in routes:
  # Compiles the given route to regex
@@ -88,7 +105,7 @@ def app(environ, start_response):
  # Get the data from the route. This data is typically the output
  # of the controller method
  if not request.redirect_url:
- data = router.get(route.route, route.output(request))
+ data = router.get(route.route, app.resolve(route.output))
 
  # Loads the request in so the middleware specified is able to use the
  # request object. This is after middleware and is ran after the request

config/application.py

@@ -37,7 +37,7 @@
 |
 '''
 
-KEY = os.environ.get('key')
+KEY = os.environ.get('KEY')
 
 '''
 |--------------------------------------------------------------------------
@@ -64,7 +64,9 @@
 |
 '''
 
-PROVIDERS = []
+PROVIDERS = [
+ 'app.providers.UserModelProvider.UserModelProvider'
+]
 
 '''
 |--------------------------------------------------------------------------