mastercontroller 1.1.16 → 1.1.18

package/MasterAction.js

@@ -1,5 +1,5 @@
 
-// version 1.0.16
+// version 1.0.17
 
 var master = require('./MasterControl');
 var fileserver = require('fs');
@@ -24,7 +24,7 @@ class MasterAction{
 
 	// location starts from the view folder. Ex: partialViews/fileName.html
 	returnPartialView(location, data){
-		var actionUrl = master.router.currentRoute.root + "app/views/" + location;
+		var actionUrl = master.router.currentRoute.root + "/app/views/" + location;
 		var getAction = fileserver.readFileSync(actionUrl, 'utf8');
 		if(typeof(templateFunc) === "function"){
 			return templateFunc(getAction, data);
@@ -96,7 +96,7 @@ class MasterAction{
 		this.params = tools.combineObjects(data, this.params);
 		var func = master.viewList;
         this.params = tools.combineObjects(this.params, func);
-		var actionUrl = (location === undefined) ? master.router.currentRoute.root + "app/views/" +  master.router.currentRoute.toController + "/" +  master.router.currentRoute.toAction + ".html" : master.router.currentRoute.root + location;
+		var actionUrl = (location === undefined) ? master.router.currentRoute.root + "/app/views/" +  master.router.currentRoute.toController + "/" +  master.router.currentRoute.toAction + ".html" : master.router.currentRoute.root + location;
 		var actionView = fileserver.readFileSync(actionUrl, 'utf8');
 		if(typeof(templateFunc) === "function"){
 			masterView = templateFunc(actionView, data);
@@ -127,7 +127,7 @@ class MasterAction{
         this.params = tools.combineObjects(data, this.params);
         var func = master.viewList;
         this.params = tools.combineObjects(this.params, func);
-		var viewUrl = (location === undefined || location === "" || location === null) ? master.router.currentRoute.root + "app/views/" + master.router.currentRoute.toController + "/" +  master.router.currentRoute.toAction + ".html": master.router.currentRoute.root + "app/" + location;
+		var viewUrl = (location === undefined || location === "" || location === null) ? master.router.currentRoute.root + "/app/views/" + master.router.currentRoute.toController + "/" +  master.router.currentRoute.toAction + ".html": master.router.currentRoute.root + "/app/" + location;
 		var viewFile = fileserver.readFileSync(viewUrl,'utf8');
 		if(typeof(templateFunc) === "function"){
 			childView = templateFunc(viewFile, this.params);
@@ -137,7 +137,7 @@ class MasterAction{
 		}
 
 		this.params.yield = childView;
-		var masterFile = fileserver.readFileSync(master.router.currentRoute.root + "app/views/layouts/master.html", 'utf8');
+		var masterFile = fileserver.readFileSync(master.router.currentRoute.root + "/app/views/layouts/master.html", 'utf8');
 		if(typeof(templateFunc) === "function"){
 			masterView = templateFunc(masterFile, this.params);
 		}

package/MasterControl.js

@@ -8,6 +8,7 @@ var https = require('https');
 var fs = require('fs');
 var url = require('url');
 var path = require('path');
+var globSearch = require("glob");
 
 
 class MasterControl {
@@ -146,6 +147,22 @@ class MasterControl {
         }
     }
 
+    component(folderLocation, innerFolder){
+
+        var rootFolderLocation = `${this.root}/${folderLocation}/${innerFolder}`;
+        var search = `${rootFolderLocation}/**/*config.js`;
+        var files = globSearch.sync(search, rootFolderLocation);
+        require(files[0]);
+        var searchRoutes = `${rootFolderLocation}/**/*routes.js`;
+        var routeFiles = globSearch.sync(searchRoutes, rootFolderLocation);
+        var route = routeFiles[0];
+        var routeObject = {
+            isComponent : true, 
+            root : rootFolderLocation
+        }
+        this.router.setup(routeObject);
+        require(route);
+    }
 
 
     // adds all the server settings needed
@@ -240,6 +257,18 @@ class MasterControl {
     start(server){
         this.server = server;
     }
+
+    startMVC(foldername){
+        var rootFolderLocation = `${this.root}/${foldername}`;
+        var search = `${rootFolderLocation}/**/*routes.js`;
+        var files = globSearch.sync(search, rootFolderLocation);
+        var route = {
+            isComponent : false, 
+            root : `${this.root}`
+        }
+        this.router.setup(route);
+        require(files[0]);
+    }
     
     
     // builds and calls all the required tools to have master running completely

package/MasterHtml.js

@@ -1,5 +1,5 @@
 
-// version 1.0.16
+// version 1.0.17
 
 var master = require('./MasterControl');
 var  temp =  require('./MasterTemplate');
@@ -37,24 +37,24 @@ class html {
 	   // render all your link tags styles given the folder location
 	renderStyles(folderName, typeArray){
 		var styles = [];
-		var styleFolder = `${master.router.currentRoute.root}app/assets/stylesheets/`;
-		var styleLocation = `${tools.getBackSlashBySection(master.router.currentRoute.root, 3, "/") }app/assets/stylesheets/`;
-
-		if(master.router.currentRoute.isComponent === false){
-			styleLocation = `${tools.getBackSlashBySection(master.router.currentRoute.root, 1, "/") }app/assets/stylesheets/`;
+		var styleFolder = `/app/assets/stylesheets/`;
+		var rootLocation = master.router.currentRoute.root;
+		if(master.router.currentRoute.isComponent === true){
+			rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
+			styleFolder =  `${rootLocation}${styleFolder}`;
 		}
 		var type = typeArray === undefined ? ["css"] : typeArray;
 
 		if(folderName){
-			styleFolder = styleFolder + folderName + "/";
-			styleLocation = styleLocation + folderName+ "/";
+			styleFolder = `${styleFolder}${folderName}/`;
 		 }
 		 if (fs.existsSync(styleFolder)) {
-				fs.readdirSync(styleFolder).forEach(function(file){
+			fs.readdirSync(styleFolder).forEach(function(file){
 
 					var fileExtension = file.replace(/^.*\./, '');
 					if(type.indexOf(fileExtension) >= 0){
-						styles.push(`<link rel="stylesheet" type="text/${type}" href="/${styleLocation}${file}">`);
+						var fileLocatoon = `${styleFolder}${file}`
+						styles.push(`<link rel="stylesheet" type="text/${type}" href="/${fileLocatoon}">`);
 					}
 			});
 		}
@@ -74,24 +74,25 @@ class html {
 	renderScripts(folderName, typeArray){
 
 		var scripts = [];
-		var jsFolder =`${master.router.currentRoute.root}app/assets/javascripts/`;
-		var jsLocation = `${tools.getBackSlashBySection(master.router.currentRoute.root, 3, "/")}app/assets/javascripts/`;
-		if(master.router.currentRoute.isComponent === false){
-			jsLocation = `${tools.getBackSlashBySection(master.router.currentRoute.root, 1, "/")}app/assets/javascripts/`;
+		var jsFolder =`/app/assets/javascripts/`;
+		var rootLocation = master.router.currentRoute.root;
+		if(master.router.currentRoute.isComponent === true){
+			rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
+			jsFolder = `${rootLocation}${jsFolder}`;
 		}
 
 		var type = typeArray === undefined ? ["js"] : typeArray;
 
-		   if(folderName){
-			   jsFolder = jsFolder + folderName + "/";
-			   jsLocation = jsLocation + folderName + "/";
+		if(folderName){
+			jsFolder = `${jsFolder}${folderName}/`;
 		}
 
 		if (fs.existsSync(jsFolder)) {
 			fs.readdirSync(jsFolder).forEach(function(file){
 				var fileExtension = file.replace(/^.*\./, '');
 				if(type.indexOf(fileExtension) >= 0){
-					scripts.push(`<script src="/${jsLocation}${file}"></script>`);
+					var fileLocatoon = `${jsFolder}${file}`
+					scripts.push(`<script src="/${fileLocatoon}"></script>`);
 				}
 		   });
 		}
@@ -109,35 +110,41 @@ class html {
 	}
 
 	// renders js using location
-	renderJS(name, folder){
-		if(name === ""){
-			return '';
+	renderJS(folderName, name){
+		if(folderName === undefined && name === undefined){
+			return "";
 		}
 		else{
-			var jsLocation = `${tools.getBackSlashBySection(master.router.currentRoute.root, 3, "/")}app/assets/javascripts/`;
-			if(folder){
-				jsLocation = jsLocation + folder + "/" + name;
-			}else{
-				jsLocation = jsLocation  + name;
+			var rootLocation = master.router.currentRoute.root;
+			var jsFolder = `/app/assets/javascripts/`;
+			if(master.router.currentRoute.isComponent === true){
+				rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
+				jsFolder = `${rootLocation}${jsFolder}`;
 			}
-			return `<script type="text/javascript" src="/${jsLocation}"></script>`;
+			if(folderName){
+				jsFolder = `${jsFolder}${folderName}/${name}`;
+			}
+			return `<script type="text/javascript" src="/${jsFolder}"></script>`;
 		}
 	}
 
 	// render css directly on the page suing location name
-	renderCss(name, folder){
-		if(name === ""){
+	renderCss(folderName, name){
+		if(folderName === undefined && name === undefined){
 			return "";
 		}
 		else{
-			var styleLocation = `${tools.getBackSlashBySection(master.router.currentRoute.root, 3, "/")}app/assets/stylesheets/`;
+			var styleFolder = `/app/assets/stylesheets/`;
+			var rootLocation = master.router.currentRoute.root;
+			if(master.router.currentRoute.isComponent === true){
+				rootLocation = tools.getBackSlashBySection(master.router.currentRoute.root, 2, "/");
+				styleFolder =  `${rootLocation}${styleFolder}`;
+			}
 			
-			if(folder){
-				styleLocation = styleLocation + folder + "/" + name;
-			}else{
-				styleLocation = styleLocation + name;
+			if(folderName){
+				styleFolder = `${styleFolder}${folderName}/${name}`;
 			}
-			return `<link rel="stylesheet" type="text/css" href="/${styleLocation}">`;
+			return `<link rel="stylesheet" type="text/css" href="/${styleFolder}">`;
 		}
 	}
 

package/MasterRouter.js

@@ -1,10 +1,11 @@
-// version 1.0.18
+// version 1.0.20
 
 var master = require('./MasterControl');
 var tools =  require('./MasterTools');
 const EventEmitter = require("events");
 var currentRoute = {};
-const path = require('path')
+const path = require('path');
+const { root } = require('./MasterControl');
 
  var normalizePaths = function(requestPath, routePath, requestParams){
     var obj = {
@@ -95,38 +96,9 @@ var loadScopedListClasses = function(){
 class MasterRouter {
     currentRouteName = null
     _routes = {}
-    __rootLocation = "";
-
-    loadRoutes(mimeList){
-        this.init(mimeList);
-    }
-
-    addMimeList(mimeList){
-        this._addMimeList(mimeList);
-    }
-
-    init(root){
-        var rootPath = path.join(root, '../');
-        this.__rootLocation = rootPath;
-        require( rootPath + "/routes");
-    }
-
+    
     start(){
         var $that = this;
-        var rootLocation = path.join(this.__rootLocation, '../');
-        var componentExist = false;
-        if(rootLocation.includes("components")){
-            componentExist = true;
-        }
-        this.currentRouteName = tools.makeWordId(4);
-        
-        if(this._routes[this.currentRouteName] === undefined){
-            this._routes[this.currentRouteName] = {
-                root : rootLocation,
-                isComponent : componentExist,
-                routes : []
-            };
-        }
         return {
             route : function(path, toPath, type, constraint){ // function to add to list of routes
                 
@@ -207,6 +179,26 @@ class MasterRouter {
         }
     }
 
+    loadRoutes(mimeList){
+        this.init(mimeList);
+    }
+
+    addMimeList(mimeList){
+        this._addMimeList(mimeList);
+    }
+
+    setup(route){
+        this.currentRouteName = tools.makeWordId(4);
+        
+        if(this._routes[this.currentRouteName] === undefined){
+            this._routes[this.currentRouteName] = {
+                root : route.root,
+                isComponent : route.isComponent,
+                routes : []
+            };
+        }
+    }
+
     get currentRoute(){
         return currentRoute;
     }

package/package.json

@@ -3,7 +3,8 @@
     "qs" : "^6.11.0",
     "formidable": "^2.0.1",
     "cookie": "^0.5.0",
-    "winston": "^3.8.2"
+    "winston": "^3.8.2",
+    "glob" :"^8.0.3"
   },
   "description": "A class library that makes using the Master Framework a breeze",
   "homepage": "https://github.com/Tailor/MasterController#readme",
@@ -17,5 +18,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.1.16"
+  "version": "1.1.18"
 }