refactor: Working on reducing coupling between easy classes

Julien Sergent · Julien Sergent · commit d17df1a9e84c · 2017-02-19T20:54:16.000+01:00
diff --git a/easy/core/Application.js b/easy/core/Application.js
@@ -57,17 +57,20 @@ class Application extends Configurable {
         this.configureEnvironment()
 
         /*
-         * Build container
+         * Prepare container
          */
         const containerBuilder = new ContainerBuilder( this )
         containerBuilder.configure({ includeComponents: true })
 
         /*
-         * Create and daemonize databases
+         * Start and daemonize databases
          */
         this.databasesManager = new DatabasesManager( this, containerBuilder.container )
         this.databasesManager.load()
 
+        /*
+         * Build container
+         */
         containerBuilder.addToBuild( 'component.databasesmanager', this.databasesManager )
 
         /*
@@ -110,7 +113,6 @@ class Application extends Configurable {
         this.plugAuthentication()
         this.router.load()
         this.initializePassport()
-        this.plugMiddlewareLogger()
         this.app.use( '/', this.router.scope )
     }
 
@@ -159,6 +161,13 @@ class Application extends Configurable {
          */
         this.app.use( bodyParser.json() ) // support json encoded bodies
         this.app.use( bodyParser.urlencoded({ extended: true }) ) // support encoded bodies
+
+        if ( this.config.app.log ) {
+            this.app.use( morgan(
+                ':date - [:method :url] - [:status, :response-time ms, :res[content-length] B] - [HTTP/:http-version, :remote-addr, :user-agent]',
+                { stream: fs.createWriteStream( `${this.kernel.path.root}/logs/traffic.log`, { flags: 'a' }) }
+            ) )
+        }
     }
 
     /**
@@ -176,9 +185,7 @@ class Application extends Configurable {
             }
 
             req.setEncoding( 'utf8' )
-            req.on( 'data', chunk => {
-                data += chunk
-            })
+            req.on( 'data', chunk => data += chunk )
             req.on( 'end', () => {
                 req.rawBody = data
                 next()
@@ -210,15 +217,6 @@ class Application extends Configurable {
         this.app.use( passport.initialize() )
     }
 
-    /**
-     * plugMiddlewareLogger - Trace everything that happens on the server
-     */
-    plugMiddlewareLogger() {
-        if ( this.config.app.log ) {
-            this.app.use( morgan( ':date - [:method :url] - [:status, :response-time ms, :res[content-length] B] - [HTTP/:http-version, :remote-addr, :user-agent]', { stream: fs.createWriteStream( `${this.kernel.path.root}/logs/traffic.log`, { flags: 'a' }) }) )
-        }
-    }
-
     /**
      * getEnv - get node environment
      *
diff --git a/easy/interfaces/Writer.js b/easy/interfaces/Writer.js
@@ -0,0 +1,16 @@
+/**
+ * @class Writer
+ */
+class Writer {
+    /**
+     * Write the message on specific support
+     *
+     * @param {string} message
+     * @param {object} context
+     *
+     * @returns {any}
+     */
+    async write( message, context ) {}
+}
+
+module.exports = Writer
diff --git a/easy/interfaces/index.js b/easy/interfaces/index.js
@@ -11,3 +11,4 @@ module.exports.Analyzer = require( './Analyzer' )
 module.exports.Configurable = require( './Configurable' )
 module.exports.Document = require( './Document' )
 module.exports.SecurityAccess = require( './SecurityAccess' )
+module.exports.Writer = require( './Writer' )
diff --git a/easy/log/LogWriter.js b/easy/log/LogWriter.js
@@ -10,11 +10,14 @@
 const File = require( '../fs/File' )
 const Console = require( '../core/Console' )
 const { strtr } = require( '../lib/string' )
+const Writer = require( '../interfaces/Writer' )
+
 
 /**
  * @class LogWriter
+ * @extends {Writer}
  */
-class LogWriter {
+class LogWriter extends Writer {
     /**
      * Creates an instance of LogWriter.
      *
@@ -25,6 +28,8 @@ class LogWriter {
      * @memberOf LogWriter
      */
     constructor( logDirectoryManager ) {
+        super()
+
         this.logDirectoryManager = logDirectoryManager
     }
 
diff --git a/easy/log/Logger.js b/easy/log/Logger.js
@@ -27,7 +27,7 @@
 class Logger {
     /**
      * @constructor
-     * @param  {LogWriter} writer
+     * @param  {Writer} writer
      */
     constructor( writer ) {
         this._writer = writer
diff --git a/todo.txt b/todo.txt
@@ -2,8 +2,9 @@
 ----------|  NOW  |----------
 -----------------------------
 
-- Réduire le couplage (par exemple dans LogDirectoryManager, enlever application du constructeur et juste envoyer le path du dossier log)
 - refactor Router, Application, Controller classes
+- Voir pour déléguer des tâches entre Application et Kernel ou virer Kernel 
+- Working on reusable components (Logger, Router, etc.)
 - pouvoir rm un dossier non vide
 - faire les tests du vendor
 - exporter role et user dans un repo externe, importable
