gina 0.1.1-alpha.99 → 0.1.2-alpha.2

package/framework/v0.1.2-alpha.2/core/controller/index.js

@@ -0,0 +1,23 @@
+var lib = require('../../lib') || require.cache[require.resolve('../../lib')];
+var inherits = lib.inherits;
+var helpers = lib.helpers;
+var context = lib.context;
+
+var cacheless = ( /^false$/i.test(process.env.NODE_ENV_IS_DEV) ) ? false : true;
+var mainPath = './controller';
+var frameworkPath = './controller.framework';
+
+if (cacheless) {
+    delete require.cache[require.resolve(mainPath)];
+    // delete require.cache[require.resolve(frameworkPath)];
+}
+var Controller = null;
+try {
+    Controller = require(mainPath);
+    // Controller.prototype.framework = require(frameworkPath);
+} catch (controllerError) {
+    throw controllerError
+}
+
+
+module.exports = Controller

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/core/dev/index.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/core/dev/lib/class.js

@@ -4,7 +4,7 @@ var Class = function() {
      *
      * Usage :
      *  var YourSingletonObject = {...};
-     *  var YourClass = Utils.construct(YourSingletonObject);
+     *  var YourClass = Lib.construct(YourSingletonObject);
      *
      * @param {object} Class
      * @param {boolean} [autoInit]

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/core/dev/lib/factory.js

@@ -1,7 +1,7 @@
-/* Gina.Utils.Dev.Factory
+/* Gina.Dev.Lib.Factory
  *
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/core/gna.js

@@ -1,7 +1,7 @@
 //"use strict";
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -41,7 +41,7 @@ var modelUtil   = new lib.Model();
 gna.initialized = process.initialized = false;
 gna.routed      = process.routed = false;
 
-gna.utils       = lib;
+gna.lib         = lib;
 gna.locales     = locales;
 gna.plugins     = plugins;
 
@@ -51,7 +51,7 @@ gna.plugins     = plugins;
 var isLoadedThroughCLI      = false; // with gina
 var isLoadedThroughWorker   = false;
 
-//copy & backup for utils/cmd/app.js.
+//copy & backup for lib/cmd/app.js.
 var tmp         = JSON.clone(process.argv); // by default
 var projectName = null;
 
@@ -59,7 +59,8 @@ var projectName = null;
 if (process.argv.length >= 3 /**&& /gina$/.test(process.argv[1])*/ ) {
 
     var ctxObj = null;
-    if ( /(child)\.js$/.test(tmp[1]) ) { // required under a worker
+    // Workers case
+    if ( /(child)\.js$/.test(tmp[1]) || /(child-)(.*)\.js$/.test(tmp[1]) ) {
 
         isLoadedThroughWorker = true;
         var ctxFilename = null;
@@ -91,6 +92,8 @@ if (process.argv.length >= 3 /**&& /gina$/.test(process.argv[1])*/ ) {
             tmp[4] = importedContext.bundle;
 
             setContext('env', importedContext.env);
+            setContext('scope', importedContext.scope);
+
             setContext('bundles', importedContext.bundles);
             setContext('debugPort', importedContext.debugPort);
 
@@ -101,7 +104,11 @@ if (process.argv.length >= 3 /**&& /gina$/.test(process.argv[1])*/ ) {
         }
     } else {
         isLoadedThroughCLI = true;
-        ctxObj = JSON.parse(tmp[2]);
+        try {
+            ctxObj = JSON.parse(tmp[2]);
+        } catch (contextException) {
+            console.error(new Error('[ FRAMEWORK ] Context Exception raised !\nContent (tmp[2]) should be a JSON String: '+ tmp[2] +'\n'+ contextException.stack));
+        }
     }
 
 
@@ -124,7 +131,7 @@ if (process.argv.length >= 3 /**&& /gina$/.test(process.argv[1])*/ ) {
 
         if ( typeof(obj) != 'undefined') {
 
-            for (var a in obj) {
+            for (let a in obj) {
 
                 if (
                     a.substr(0, 5) === 'GINA_'
@@ -176,8 +183,8 @@ try {
 if ( typeof(getEnvVar) == 'undefined') {
     console.debug('[ FRAMEWORK ][PROCESS ARGV] Process ARGV error ' + process.argv);
 }
-//console.debug('[ FRAMEWORK ] GINA_HOMEDIR ' + getEnvVar('GINA_HOMEDIR') );
 
+// console.debug('[ FRAMEWORK ] GINA_HOMEDIR [' + (GINA_HOMEDIR||null) +'] vs getEnvVar(GINA_HOMEDIR) [' + getEnvVar('GINA_HOMEDIR') +']' );
 var projects    = require( _(GINA_HOMEDIR + '/projects.json') );
 var root        = projects[projectName].path;
 
@@ -186,7 +193,7 @@ setPath('project', root);
 
 
 
-setContext('gina.utils', lib);
+setContext('gina.lib', lib);
 setContext('gina.Config', Config);
 setContext('gina.locales', locales);
 setContext('gina.plugins', plugins);
@@ -194,18 +201,21 @@ setContext('gina.plugins', plugins);
 
 
 //Setting env.
-var env             = process.env.NODE_ENV || projects[projectName]['def_env']
-    , isDev         = (env === projects[projectName]['dev_env']) ? true: false
-    , isLocalScope  = (projects[projectName]['local_scope'] === projects[projectName]['def_scope']) ? true: false
+var env                     = process.env.NODE_ENV || projects[projectName]['def_env']
+    , isDev                 = (env === projects[projectName]['dev_env']) ? true: false
+    , scope                 = process.env.NODE_SCOPE || projects[projectName]['def_scope']
+    , isLocalScope          = (scope === projects[projectName]['local_scope']) ? true : false
+    , isProductionScope     = (scope === projects[projectName]['production_scope']) ? true : false
 ;
 
 gna.env = process.env.NODE_ENV = env;
+gna.scope = process.env.NODE_SCOPE = scope;
 gna.os.isWin32 = process.env.isWin32 = isWin32;
 gna.isAborting = false;
 //Cahceless is also defined in the main config : Config::isCacheless().
 process.env.NODE_ENV_IS_DEV = (/^true$/i.test(isDev)) ? true : false;
-process.env.NODE_SCOPE = projects[projectName]['def_scope'];
 process.env.NODE_SCOPE_IS_LOCAL = (/^true$/i.test(isLocalScope)) ? true : false;
+process.env.NODE_SCOPE_IS_PRODUCTION = (/^true$/i.test(isProductionScope)) ? true : false;
 
 
 var bundlesPath = (isDev) ? projects[projectName]['path'] + '/src' : projects[projectName]['path'] + '/bundles';
@@ -272,12 +282,14 @@ gna.started = false;
 var isBundleMounted = function(projects, bundlesPath, bundle, cb) {
     var isMounted       = false
         , env           = process.env.NODE_ENV
+        , scope         = process.env.NODE_SCOPE
         , manisfestPath = null
         , manifest      = null
         , project       = projects[projectName]
     ;
     // supported envs
     setContext('envs', project.envs);
+    setContext('scopes', project.scopes);
 
     // skip this step for workers
     if (isLoadedThroughWorker) {
@@ -356,7 +368,7 @@ gna.getProjectConfiguration = function (callback){
                 && typeof(project['bundles']) != "undefined"
             ) {
 
-                for (var d in dep) {
+                for (let d in dep) {
 
                     if (d == 'bundles') {
                         for (var p in dep[d]) {
@@ -382,6 +394,7 @@ gna.getProjectConfiguration = function (callback){
             }
 
             setContext('env', env);
+            setContext('scope', scope);
             setContext('bundles', bundles);
             setPath('bundle', _(bundlePath, true));
             setPath('helpers', _(bundlePath+'/helpers', true));
@@ -461,7 +474,7 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
 
     if ( isSourceFound ) {
         //will override existing each time you restart.
-        gna.utils.generator.createPathSync(bundlesPath, function onPathCreated(err){
+        gna.lib.generator.createPathSync(bundlesPath, function onPathCreated(err){
             if (!err) {
                 try {
                     var targetObj = new _(target);
@@ -536,7 +549,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
 
                         joinContext(conf.contexts);
                         gna.getConfig = function(name){
-                            var tmp = '';
+                            // var tmp = '';
                             if ( typeof(name) != 'undefined' ) {
                                 try {
                                     //Protect it.
@@ -774,6 +787,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                 if (!Config.instance) {
                     config = new Config({
                         env             : env,
+                        scope           : scope,
                         executionPath   : core.executionPath,
                         projectName     : core.projectName,
                         startingApp     : core.startingApp,
@@ -797,7 +811,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                             //On user conf complete.
                             e.on('complete', function(instance){
 
-                                server.on('started', function (conf) {
+                                server.on('started', async function (conf) {
 
                                     // setting default global middlewares
                                     if ( typeof(instance.use) == 'function' ) {
@@ -871,13 +885,22 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
 
                                     setTimeout( async function onStarted() {
 
-                                        if ( conf.server.scheme == 'https' && /true/i.test(process.env.NODE_SCOPE_IS_LOCAL) ) {
-                                            await server.verifyCertificate(conf.host, conf.server.port);
+                                        if (
+                                            conf.server.scheme == 'https'
+                                            && !/^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION)
+                                        ) {
+                                            try {
+                                                await server.verifyCertificate(conf.host, conf.server.port);
+                                            } catch (err) {
+                                                // console.emerg(err.stack);
+                                                throw err;
+                                            }
                                         }
 
                                         console.info('is now online V(-.o)V',
                                         '\nbundle: [ ' + conf.bundle +' ]',
                                         '\nenv: [ '+ conf.env +' ]',
+                                        '\nscope: [ '+ conf.scope +' ]',
                                         '\nengine: ' + conf.server.engine,
                                         '\nprotocol: ' + conf.server.protocol,
                                         '\nscheme: ' + conf.server.scheme,
@@ -888,8 +911,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                                         );
                                         // placing end:flag to allow the CLI to retrieve bundl info from here
                                         console.notice('[ FRAMEWORK ] Bundle started !');
-                                    }, 1000);
-
+                                    }, 500); // 1000 - Wait to make sure that the bundle is mounted on the file system
                                 });
 
                                 // placing strat:flag to allow the CLI to retrieve bundl info from here
@@ -929,6 +951,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                         bundles         : obj.bundles,
                         allBundles      : obj.allBundles,
                         env             : obj.env,
+                        scope           : obj.scope,
                         isStandalone    : isStandalone,
                         executionPath   : core.executionPath,
                         conf            : obj.conf
@@ -988,10 +1011,11 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
         }
 
         path = path.replace(root + '/', '');
-        var search = null;
+
         if ((/index.js/).test(path) || p[p.length - 1] == 'index') {
             var self = null;
-            path = (self = path.split('/')).splice(0, self.length - 1).join('/')
+            path = (self = path.split('/')).splice(0, self.length - 1).join('/');
+            self = null;
         }
 
         try {
@@ -1000,10 +1024,10 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
             var bundleProcess   = null;
             //finding app.
             if (!isLoadedThroughWorker) {
-                var target, source, tmp;
+
                 for (let bundle in packs) {
                     //is bundle ?
-                    tmp = '';
+                    let tmp = '';
                     // For all but dev
                     if (
                         typeof (packs[bundle].releases) != 'undefined' && !isDev

package/framework/{v0.1.1-alpha.99 → v0.1.2-alpha.2}/core/locales/README.md

@@ -48,6 +48,11 @@ https://github.com/stefangabos/world_countries/
 ``` tty
 node src/make --target=region --region=en
 ```
+or if you want to select multiple languages
+``` tty
+node src/make --target=region --region=en,fr
+```
+
 A `dist/region/en.json` file will be created.
 
 __NB.: To keep the file updated__