nodefony 7.0.0-beta.2 → 7.0.0-beta.21

package/kernel/templating/twig.es6

@@ -10,7 +10,7 @@ try {
 } catch (e) {}
 
 const twigOptions = {
-  'twig options': {
+  "twig options": {
     async: true,
     allowAsync: true,
     cache: true
@@ -19,35 +19,34 @@ const twigOptions = {
 };
 
 class Twig extends nodefony.Template {
-
-  constructor(container, options) {
+  constructor (container, options) {
     super(container, twig, options);
     this.kernelSettings = this.container.getParameters("kernel");
-    this.cache = (this.kernelSettings.environment === "dev") ? false : true;
+    this.cache = this.kernelSettings.environment !== "dev";
     twig.cache(this.cache);
     this.rootDir = this.kernel.rootDir;
     this.name = "Twig";
     container.set("Twig", this);
     this.version = version || twig.VERSION;
     this.nodefonyExtend();
-    this.on("onBoot", ()=>{
-      this.router = this.get("router") ;
-      this.translation = this.get("translation") ;
+    this.on("onBoot", () => {
+      this.router = this.get("router");
+      this.translation = this.get("translation");
     });
   }
 
-  nodefonyExtend(){
+  nodefonyExtend () {
     // router
-    this.extendFunction("url" , this.url.bind(this));
-    this.extendFunction("path" , this.url.bind(this));
+    this.extendFunction("url", this.url.bind(this));
+    this.extendFunction("path", this.url.bind(this));
     // control
-    this.extendFunction("controller" ,Twig.controller);
-    this.extendFunction("render" , Twig.render);
+    this.extendFunction("controller", Twig.controller);
+    this.extendFunction("render", Twig.render);
     // translation
-    this.extendFunction("trans" , Twig.translate);
-    this.extendFunction("translate" , Twig.translate);
-    this.extendFilter("trans" , Twig.translate);
-    this.extendFilter("translate" , Twig.translate);
+    this.extendFunction("trans", Twig.translate);
+    this.extendFunction("translate", Twig.translate);
+    this.extendFilter("trans", Twig.translate);
+    this.extendFilter("translate", Twig.translate);
     this.extendFunction("getLangs", this.getLangs.bind(this));
     this.extendFunction("getLocale", Twig.getLocale);
     this.extendFunction("trans_default_domain", Twig.trans_default_domain);
@@ -60,46 +59,54 @@ class Twig extends nodefony.Template {
     this.extendFunction("CDN", Twig.CDN);
   }
 
-  static getFlashBag (...args){
+  static getFlashBag (...args) {
     return this.context.nodefony.getContext().getFlashBag(...args);
   }
-  static getUser (...args){
+
+  static getUser (...args) {
     return this.context.nodefony.getContext().getUser(...args);
   }
-  static CDN (...args){
-    let context = this.context.nodefony.getContext();
-    let cdn = context.kernelHttp.getCDN(...args);
-    let res = `${context.request.url.protocol}//`;
+
+  static CDN (...args) {
+    const context = this.context.nodefony.getContext();
+    const cdn = context.kernelHttp.getCDN(...args);
+    const res = `${context.request.url.protocol}//`;
     if (cdn) {
       return `${res}${cdn}`;
-    } else {
-      return `${res}${context.request.url.host}`;
     }
+    return "";
+    // return `${res}${context.request.url.host}`;
   }
 
-  static absolute_url (...args){
+  static absolute_url (...args) {
     return this.context.nodefony.getContext().generateAbsoluteUrl(...args);
   }
-  static is_granted (...args){
+
+  static is_granted (...args) {
     return this.context.nodefony.getContext().is_granted(...args);
   }
 
-  static getLocale (){
+  static getLocale () {
     return this.context.nodefony.getContext().translation.getLocale();
   }
-  static trans_default_domain (domain){
+
+  static trans_default_domain (domain) {
     return this.context.nodefony.getContext().translation.trans_default_domain(domain);
   }
-  static getTransDefaultDomain (){
+
+  static getTransDefaultDomain () {
     return this.context.nodefony.getContext().translation.getTransDefaultDomain();
   }
-  static translate(value, domain, local){
+
+  static translate (value, domain, local) {
     return this.context.nodefony.getContext().translation.trans(value, domain, local);
   }
-  getLangs(){
-    return this.translation.getLangs() ;
+
+  getLangs () {
+    return this.translation.getLangs();
   }
-  url(name, variables, host){
+
+  url (name, variables, host) {
     try {
       return this.router.generatePath(name, variables, host);
     } catch (e) {
@@ -107,19 +114,21 @@ class Twig extends nodefony.Template {
       return null;
     }
   }
-  static controller(){
-    let pattern = Array.prototype.shift.call(arguments);
-    let data = Array.prototype.slice.call(arguments);
+
+  static controller () {
+    const pattern = Array.prototype.shift.call(arguments);
+    const data = Array.prototype.slice.call(arguments);
     return new nodefony.subRequest(this.context.nodefony.getContext(), pattern, data);
   }
-  static render(subRequest){
+
+  static render (subRequest) {
     return subRequest.handle();
   }
 
-  renderFile(file, option = {}, callback = null) {
+  renderFile (file, option = {}, callback = null) {
     option.settings = nodefony.extend(true, {}, twigOptions, {
       views: this.rootDir,
-      'twig options': {
+      "twig options": {
         cache: this.cache
       }
     });
@@ -132,7 +141,7 @@ class Twig extends nodefony.Template {
           return this.engine.renderFile(file.path, option, (error, result) => {
             if (error || result === undefined) {
               if (!error) {
-                error = new Error("ERROR PARSING TEMPLATE :" + file.path);
+                error = new Error(`ERROR PARSING TEMPLATE :${file.path}`);
                 return reject(error);
               }
               return reject(error);
@@ -154,10 +163,10 @@ class Twig extends nodefony.Template {
     }
   }
 
-  async render(view, param) {
+  async render (view, param) {
     try {
-      let template = await this.compile(view)
-        .catch(e => {
+      const template = await this.compile(view)
+        .catch((e) => {
           this.log(e, "ERROR");
           throw e;
         });
@@ -170,14 +179,14 @@ class Twig extends nodefony.Template {
     }
   }
 
-  compile(file, callback) {
+  compile (file, callback) {
     return new Promise((resolve, reject) => {
       this.engine.twig({
         path: file.path,
         async: true,
         allowAsync: true,
         base: this.rootDir,
-        //precompiled:false,
+        // precompiled:false,
         name: file.name,
         load: (template) => {
           if (callback) {
@@ -195,11 +204,11 @@ class Twig extends nodefony.Template {
     });
   }
 
-  extendFunction() {
+  extendFunction () {
     return twig.extendFunction.apply(twig, arguments);
   }
 
-  extendFilter() {
+  extendFilter () {
     return twig.extendFilter.apply(twig, arguments);
   }
 }

package/kernel/tests/cliTest.js

@@ -9,13 +9,12 @@
  *	kernel :   instance of kernel who launch the test
  *
  */
-const assert = require('assert');
+const assert = require("assert");
 
 describe("NODEFONY CLI", () => {
-
   beforeEach(() => {});
 
-  describe('SIMPLE', () => {
+  describe("SIMPLE", () => {
     it("CREATE", (done) => {
       const project = new nodefony.cli("project", {
         version: nodefony.version,
@@ -24,12 +23,12 @@ describe("NODEFONY CLI", () => {
       });
       assert.strictEqual(project.name, "project");
       assert.strictEqual(project.commander.version(), nodefony.version);
-      let options = {
-        processName: 'nodefony',
+      const options = {
+        processName: "nodefony",
         autostart: true,
         asciify: true,
         clear: true,
-        prompt: 'default',
+        prompt: "default",
         commander: true,
         color: clc.red.bold,
         signals: true,
@@ -42,7 +41,7 @@ describe("NODEFONY CLI", () => {
       };
       assert.deepStrictEqual(options, project.options);
 
-      let banner = `          Version : ${clc.blueBright.bold(nodefony.version)}   Platform : ${clc.green(process.platform)}   Process : ${clc.green("project")}   Pid : ${project.pid}`;
+      const banner = `          Version : ${clc.blueBright.bold(nodefony.version)}   Platform : ${clc.green(process.platform)}   Process : ${clc.green("project")}   Pid : ${project.pid}`;
       let res = null;
       project.start()
         .then((cli) => {
@@ -52,12 +51,9 @@ describe("NODEFONY CLI", () => {
           assert.strictEqual(res, 0);
           done();
         })
-        .catch(e => {
+        .catch((e) => {
           throw e;
         });
     });
-
   });
-
-
 });

package/kernel/tests/containerTest.js

@@ -11,20 +11,20 @@
  */
 
 
-const assert = require('assert');
+const assert = require("assert");
 
-var myObject = {
+const myObject = {
 
   foo: "bar",
   bar: "foo"
 };
 
-var myObject2 = {
+const myObject2 = {
   foo: "bar2",
   bar: "foo2"
 };
 
-var myClass = function() {
+const myClass = function () {
   this.settings = {
     foo: "bar"
   };
@@ -55,30 +55,26 @@ var myClass = function() {
   };
 };
 
-myClass.prototype.getConfig = function() {
+myClass.prototype.getConfig = function () {
   return this.settings;
 };
 
-myClass.prototype.getConfig2 = function() {
+myClass.prototype.getConfig2 = function () {
   return this.setting2;
 };
 
 
+describe("NODEFONY KERNEL ", () => {
+  describe("CONTAINER", () => {
+    beforeEach(() => {});
 
-
-describe("NODEFONY KERNEL ", function() {
-
-  describe('CONTAINER', function() {
-
-    beforeEach(function() {});
-
-    before(function() {
+    before(() => {
       if (!global.globalContainer) {
         global.globalContainer = new nodefony.Container();
       }
     });
 
-    it("LIB LOADED", function(done) {
+    it("LIB LOADED", (done) => {
       // check nodefony namespace
       assert.equal(typeof nodefony, "object");
 
@@ -89,8 +85,7 @@ describe("NODEFONY KERNEL ", function() {
       done();
     });
 
-    it("INSTANCE CONTAINER", function(done) {
-
+    it("INSTANCE CONTAINER", (done) => {
       // YOU CAN REGISTER INSTANCE HERSELF HAS SERVICES
       global.globalContainer.set("global", global.globalContainer);
       let res = global.globalContainer.get("global");
@@ -101,7 +96,7 @@ describe("NODEFONY KERNEL ", function() {
       res = global.globalContainer.get("obj");
       assert.deepStrictEqual(res, myObject);
 
-      var service = global.globalContainer.set("myService", new myClass());
+      const service = global.globalContainer.set("myService", new myClass());
       assert.deepEqual(service.getConfig(), {
         foo: "bar"
       });
@@ -113,19 +108,17 @@ describe("NODEFONY KERNEL ", function() {
       assert.equal(global.globalContainer.getParameters("config.foo"), "bar");
 
 
-
       done();
     });
 
-    it("SCOPE CONTAINER", function(done) {
-
+    it("SCOPE CONTAINER", (done) => {
       // CREATE SCOPE WITH NAME
       global.globalContainer.addScope("request");
       assert.deepEqual(global.globalContainer.scope.request, {});
 
       // CLONE  ;
       global.scope = global.globalContainer.enterScope("request");
-      var id = global.scope.id;
+      const {id} = global.scope;
       assert(global.globalContainer.scope.request[id], "SCOPE  ID  ERROR");
       assert.deepStrictEqual(global.globalContainer, global.scope.parent);
       assert.deepStrictEqual(global.globalContainer.scope.request[id], global.scope);
@@ -136,7 +129,7 @@ describe("NODEFONY KERNEL ", function() {
       assert.deepStrictEqual(global.scope.get("obj2"), myObject2);
 
 
-      var service = global.scope.get("myService");
+      const service = global.scope.get("myService");
       assert.deepEqual(service.getConfig(), {
         foo: "bar"
       });
@@ -157,13 +150,12 @@ describe("NODEFONY KERNEL ", function() {
       done();
     });
 
-    it("EXTENDED SCOPE ALREADY SCOPED", function(done) {
-
+    it("EXTENDED SCOPE ALREADY SCOPED", (done) => {
       global.scope.addScope("response");
       assert.deepEqual(global.scope.scope.response, {});
       // CLONE  ;
-      var scope = global.scope.enterScopeExtended("response");
-      var id = scope.id;
+      const scope = global.scope.enterScopeExtended("response");
+      const {id} = scope;
       assert(global.scope.scope.response[id], "SCOPE  ID  ERROR");
       assert.deepStrictEqual(global.scope, scope.parent);
       assert.deepStrictEqual(global.scope.scope.response[id], scope);
@@ -172,7 +164,7 @@ describe("NODEFONY KERNEL ", function() {
 
       assert.deepStrictEqual(scope.get("obj2"), myObject2);
 
-      var myObj = {
+      const myObj = {
         bar: "foo"
       };
       scope.set("myObj", myObj);
@@ -182,8 +174,8 @@ describe("NODEFONY KERNEL ", function() {
 
       // CHECK extended recursif
       scope.addScope("websocket");
-      //clone
-      var scope2 = scope.enterScope("websocket");
+      // clone
+      const scope2 = scope.enterScope("websocket");
       assert.deepStrictEqual(scope2.get("obj2"), myObject2);
 
 
@@ -204,8 +196,7 @@ describe("NODEFONY KERNEL ", function() {
       done();
     });
 
-    it("Leave and remove Scope ", function(done) {
-
+    it("Leave and remove Scope ", (done) => {
       global.scope.removeScope("response");
       assert.deepEqual(global.scope.scope.response, undefined);
 
@@ -216,11 +207,10 @@ describe("NODEFONY KERNEL ", function() {
       global.globalContainer.removeScope("request");
       assert.deepEqual(global.globalContainer.scope.request, undefined);
       done();
-
     });
 
-    it("After remove scope ", function(done) {
-      var service = global.globalContainer.get("myService");
+    it("After remove scope ", (done) => {
+      const service = global.globalContainer.get("myService");
       assert.deepEqual(service.getConfig(), {
         foo: "bar"
       });
@@ -238,7 +228,5 @@ describe("NODEFONY KERNEL ", function() {
 
       done();
     });
-
   });
-
 });

package/kernel/tests/kernelTest.js

@@ -13,34 +13,27 @@
  */
 
 
+const assert = require("assert");
 
-
-const assert = require('assert');
-
-describe("NODEFONY KERNEL", function(){
-
-  describe('LIBRARY', function(){
-
-
-    beforeEach(function(){
+describe("NODEFONY KERNEL", () => {
+  describe("LIBRARY", () => {
+    beforeEach(() => {
     });
 
-    before(function(){
+    before(() => {
 
     });
 
-    it("NAMESPACE LOADED", function(done){
+    it("NAMESPACE LOADED", (done) => {
       // check nodefony namespace
-      assert.equal( typeof nodefony, "object" );
+      assert.equal(typeof nodefony, "object");
       done();
     });
 
-    it("INSTANCE KERNEL LOADED", function(done){
+    it("INSTANCE KERNEL LOADED", (done) => {
       // check instance kernel
-      assert.equal( kernel instanceof nodefony.kernel, true);
+      assert.equal(kernel instanceof nodefony.kernel, true);
       done();
     });
-
-
   });
 });