mastercontroller 1.1.14 → 1.1.16

package/MasterControl.js

@@ -1,5 +1,5 @@
 // MasterControl - by Alexander rich
-// version 1.0.18
+// version 1.0.19
 
 var url = require('url');
 var fileserver = require('fs');
@@ -9,6 +9,7 @@ var fs = require('fs');
 var url = require('url');
 var path = require('path');
 
+
 class MasterControl {
     controllerList = {}
     viewList = {}
@@ -16,6 +17,15 @@ class MasterControl {
     _root = null
     _environmentType = null
     _serverProtocol = null
+    _scopedList = []
+
+    #loadTransientListClasses(name, params){
+        Object.defineProperty(this.requestList, name, {
+            get: function() { 
+              return  new params();
+            }
+          });
+    }
 
     get env(){
         return require(`${this.root}/config/environments/env.${this.environmentType}.json`);
@@ -96,13 +106,48 @@ class MasterControl {
         };
     }
     
-    // adds your class to the --------- todo
-    register(name, param){
-        if(name && param){
-            this.requestList[name] = param;
+    /*
+    Services are created each time they are requested. 
+    It gets a new instance of the injected object, on each request of this object. 
+    For each time you inject this object is injected in the class, it will create a new instance.
+    */
+    addTransient(name, params){
+        if(name && params){
+            this.#loadTransientListClasses(name, params);
         }
+       
     }
 
+        /*
+        Services are created on each request (once per request). This is most recommended for WEB applications. 
+        So for example, if during a request you use the same dependency injection, 
+        in many places, you will use the same instance of that object, 
+        it will make reference to the same memory allocation
+        */
+    addScoped(name, params){
+        if(name && params){
+         this._scopedList[name] =  params;
+        }
+    }
+
+    /*
+    Services are created once for the lifetime of the application. It uses the same instance for the whole application.
+    */
+    addSingleton(name, params){
+        if(name && params){
+            this.requestList[name] = new params();
+        }
+    }
+
+    // adds your class instance to the request object.
+    register(name, params){
+        if(name && params){
+            this.requestList[name] = params;
+        }
+    }
+
+
+
     // adds all the server settings needed
     serverSettings(settings){
 

package/MasterRouter.js

@@ -1,6 +1,4 @@
-
-
-// version 1.0.16
+// version 1.0.18
 
 var master = require('./MasterControl');
 var tools =  require('./MasterTools');
@@ -86,6 +84,14 @@ const path = require('path')
     }
 };
 
+var loadScopedListClasses = function(){
+    for (var key in master._scopedList) {
+        var className =  master._scopedList[key];
+        master.requestList[key] = new className();
+    };
+};
+
+
 class MasterRouter {
     currentRouteName = null
     _routes = {}
@@ -128,7 +134,7 @@ class MasterRouter {
                 
                 var route = {
                     type: type.toLowerCase(),
-                    path: path.replace(/^\/|\/$/g, ''),
+                    path: path.replace(/^\/|\/$/g, '').toLowerCase(),
                     toController :pathList[0].replace(/^\/|\/$/g, ''),
                     toAction: pathList[1],
                     constraint : constraint
@@ -140,10 +146,10 @@ class MasterRouter {
         
             resources: function(routeName){ // function to add to list of routes using resources bulk
         
-                    
+
                 $that._routes[$that.currentRouteName].routes.push({
                         type: "get",
-                        path: routeName,
+                        path: routeName.toLowerCase(),
                         toController :routeName,
                         toAction: "index",
                         constraint : null
@@ -151,7 +157,7 @@ class MasterRouter {
         
                     $that._routes[$that.currentRouteName].routes.push({
                         type: "get",
-                        path: routeName,
+                        path: routeName.toLowerCase(),
                         toController :routeName,
                         toAction: "new",
                         constraint : null
@@ -159,7 +165,7 @@ class MasterRouter {
         
                     $that._routes[$that.currentRouteName].routes.push({
                         type: "post",
-                        path: routeName,
+                        path: routeName.toLowerCase(),
                         toController :routeName,
                         toAction: "create",
                         constraint : null
@@ -168,7 +174,7 @@ class MasterRouter {
                     $that._routes[$that.currentRouteName].routes.push({
                         // pages/3
                         type: "get",
-                        path: routeName + "/:id",
+                        path: routeName.toLowerCase() + "/:id",
                         toController :routeName,
                         toAction: "show",
                         constraint : null
@@ -176,7 +182,7 @@ class MasterRouter {
         
                     $that._routes[$that.currentRouteName].routes.push({
                         type: "get",
-                        path: routeName + "/:id/" + "edit",
+                        path: routeName.toLowerCase() + "/:id/" + "edit",
                         toController :routeName,
                         toAction: "edit",
                         constraint : null    
@@ -184,7 +190,7 @@ class MasterRouter {
         
                     $that._routes[$that.currentRouteName].routes.push({
                         type: "put",
-                        path: routeName + "/:id",
+                        path: routeName.toLowerCase() + "/:id",
                         toController :routeName,
                         toAction: "update",
                         constraint : null
@@ -192,7 +198,7 @@ class MasterRouter {
         
                     $that._routes[$that.currentRouteName].routes.push({
                         type: "delete",
-                        path: routeName + "/:id",
+                        path: routeName.toLowerCase() + "/:id",
                         toController :routeName,
                         toAction: "destroy",
                         constraint : null
@@ -236,8 +242,12 @@ class MasterRouter {
 
     _call(requestObject){
 
-         tools.combineObjects(requestObject, master.requestList);
+         tools.combineObjects(master.requestList, requestObject);
+         requestObject = master.requestList;
          var Control = require(`${currentRoute.root}/app/controllers/${tools.firstLetterlowercase(requestObject.toController)}Controller`);
+         if(Control === null){
+            Control = require(`${currentRoute.root}/app/controllers/${tools.firstLetterUppercase(requestObject.toController)}Controller`);
+         }
          tools.combineObjectPrototype(Control, master.controllerList);
          Control.prototype.__namespace = Control.name;
          var control = new Control(requestObject);
@@ -260,9 +270,11 @@ class MasterRouter {
     }
     
     load(rr){ // load the the router
+
+            loadScopedListClasses();
             var $that = this;
             var requestObject = Object.create(rr);
-            requestObject.pathName = requestObject.pathName.replace(/^\/|\/$/g, '');
+            requestObject.pathName = requestObject.pathName.replace(/^\/|\/$/g, '').toLowerCase();
         
             var _loadEmit = new EventEmitter();
             

package/package.json

@@ -17,5 +17,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.1.14"
+  "version": "1.1.16"
 }