Merge pull request #10 from moluwole/new_config

New config
moluwole · Aug 21, 2018 · b2f7161 · b2f7161
2 parents 9b34727 + 2d2c7c5
commit b2f7161
Show file tree

Hide file tree

Showing 20 changed files with 359 additions and 171 deletions.
diff --git a/bast/__init__.py b/bast/__init__.py
@@ -12,8 +12,9 @@
 from .migration import Migration
 from .model import Models
 from .route import Route
-
-from .validator import *
+from .session import FileSession
+from .session import MemorySession
+from .environment import load_env
 
 __version__ = "1.0"
 
diff --git a/bast/bast.py b/bast/bast.py
@@ -5,18 +5,14 @@
     For full copyright and license information, view the LICENSE distributed with the Source Code
 """
 
-import logging
+import sys
 import os
-
-try:
-    from configparser import ConfigParser
-except ImportError:
-    import ConfigParser
-
 from tornado.httpserver import HTTPServer
 from tornado.ioloop import IOLoop
 from tornado.options import define, options, parse_command_line
 from tornado.web import Application, StaticFileHandler
+from .environment import load_env
+from colorama import init, Fore
 
 __author__ = "Majiyagbe Oluwole"
 __copyright__ = ""
@@ -26,6 +22,14 @@
 
 
 class Bast(Application):
+    image_folder    = ""
+    script_folder   = ""
+    css_folder      = ""
+    template_folder = ""
+
+    providers = {}
+    session = {}
+
     def __init__(self, route, **settings):
         """
          Bast Server Class. Runs on Tornado HTTP Server (http://www.tornadoweb.org/en/stable/)
@@ -39,17 +43,19 @@ def __init__(self, route, **settings):
         """
         # self.settings = settings
         super().__init__(**settings)
+        init()
         self.host = '127.0.0.1'
         self.port = 2000
         self.debug = True
 
-        self.load_config()
+        # self.load_config()
+        load_env()
+        self.config()
 
         self.handler = route.all().url
-        self.handler.append((r'/css/(.*)', StaticFileHandler, {"path": os.path.abspath(".") + "/public/static/css"}))
-        self.handler.append((r'/script/(.*)', StaticFileHandler, {"path": os.path.abspath(".") + "/public/static/js"}))
-        self.handler.append(
-            (r'/images/(.*)', StaticFileHandler, {"path": os.path.abspath('.') + "/public/static/images"}))
+        self.handler.append((r'/css/(.*)', StaticFileHandler, {"path": self.css_folder}))
+        self.handler.append((r'/script/(.*)', StaticFileHandler, {"path": self.script_folder}))
+        self.handler.append((r'/images/(.*)', StaticFileHandler, {"path": self.image_folder}))
 
         # append the URL for static files to exception
         self.handler.append((r'/exp/(.*)', StaticFileHandler, {'path': os.path.join(os.path.dirname(os.path.realpath(__file__)), "exception")}))
@@ -67,39 +73,34 @@ def run(self):
 
         parse_command_line()
 
-        logging.info("Starting Bast Server....")
-        logging.info("Bast Server Running on %s:%s" % (options.host, options.port))
+        print(Fore.GREEN + "Starting Bast Server....")
+        print(Fore.GREEN + "Bast Server Running on %s:%s" % (options.host, options.port))
 
         application = Application(self.handler, debug=options.debug)
         server = HTTPServer(application)
         server.listen(options.port, options.host)
         IOLoop.current().start()
 
-    def load_config(self):
-        """
-        Function to load configuration details from the config.ini file into environment variables.
-        """
-        config_path = os.path.abspath('.') + "/config/config.ini"
-        if not os.path.exists(config_path):
-            return
-
-        config = ConfigParser()
-        config.read(config_path)
-
-        #   config section
-        os.environ['APP_NAME'] = config['CONFIG']['APP_NAME']
-        os.environ['APP_KEY'] = config['CONFIG']['APP_KEY']
-
-        os.environ['DB_TYPE'] = config['DATABASE']['DB_TYPE']
-        os.environ['DB_NAME'] = config['DATABASE']['DB_NAME']
-        os.environ['DB_HOST'] = config['DATABASE']['DB_HOST']
-        os.environ['DB_USER'] = config['DATABASE']['DB_USER']
-        os.environ['DB_PASSWORD'] = config['DATABASE']['DB_PASSWORD']
-        os.environ['DB_PREFIX'] = config['DATABASE']['DB_PREFIX']
-        os.environ['ABS_PATH'] = os.path.abspath('.')
-
-        self.host = config['CONFIG']['HOST']
-        self.port = config['CONFIG']['PORT']
-        self.debug = config['CONFIG']['DEBUG']
-
-        os.environ['TEMPLATE_FOLDER'] = os.path.abspath('.') + "/public/templates"
+    def config(self):
+        sys.path.extend([os.path.abspath('.')])
+        from config import config
+
+        static_files    = config.STATIC_FILES
+        if config.SESSION_DRIVER is 'memory':
+            from bast import MemorySession
+            self.session.update({"session": MemorySession()})
+        else:
+            from bast import FileSession
+            self.session.update({'session': FileSession()})
+
+        # providers       = provider.providers
+
+        # print(providers['session'])
+
+        os.environ['TEMPLATE_FOLDER'] = os.path.join(os.path.abspath('.'), static_files['template'])
+
+        self.image_folder   = os.path.join(os.path.abspath('.'), static_files['images'])
+        self.css_folder     = os.path.join(os.path.abspath('.'), static_files['css'])
+        self.script_folder  = os.path.join(os.path.abspath('.'), static_files['script'])
+        # self.providers.update(providers)
+