gina 0.1.1-alpha.17 → 0.1.1-alpha.170

package/framework/v0.1.1-alpha.170/core/template/boilerplate/bundle/controllers/setup.js

@@ -0,0 +1,111 @@
+//Imports goes here.
+// var md       = require('marked'); // visit: https://github.com/jmcmanus/pagedown-extra
+// var lib      = require('gina').lib;
+// var merge    = lib.merge;
+
+/**
+ * Setup Class
+ * Allows you to extend setup to all your controllers
+ * Most of the things you can do inside a controller, you can do it here
+ *
+ * E.g.: use it inside the controller `onReady` by calling `self.setup(req, res, next)`
+ *
+ *
+ * @param {object} req
+ * @param {object} res
+ * @callback [next]
+ * */
+function SetupClass(req, res, next){
+    // get `app` config
+    // var conf = this.getConfig('app')
+
+    // defining filters
+    var swig = this.engine;
+
+    /**
+     * Inherited filters from Gina are:
+     * [ getWebroot ]
+     * Will get the current webroot
+     *  e.g.:
+     *      {{ '' | getWebroot() }}
+     *
+     * [ getUrl ]
+     * Will tranlate a route name to an url
+     *  e.g.:
+     *      <a href="{{ '/homepage' | getUrl() }}">Homepage</a>
+     *      <a href="{{ 'users-add' | getUrl({ id: user.id }) }}">Add User</a>
+     *      <a href="{{ 'users-edit' | getUrl({ id: user.id }) }}">Edit user</a>
+     *      <a href="{{ 'users-get-empty' | getUrl({ id: '' }) }}">Get empty</a>
+     *      <a href="{{ 'users-list' | getUrl(null, 'http://domain.com') }}">Display all users</a>
+     *      <a href="{{ '/dashboard' | getUrl(null, 'admin') }}">Go to admin bundle's dashboard page</a>
+     *      <a href="{{ 'home@admin' | getUrl() }}">Go to admin bundle's dashboard page</a>
+     *
+     * [ length ]
+     *  Extends default Swig `length` filter
+     *
+     * [ nl2br ]
+     * Will replace all `\n` by `<br/>`
+     *  e.g.:
+     *      {{ contact.address | nl2br }}
+     */
+
+
+    /**
+     * Sample of a swig filter to render markdown content
+     * To activate this code, you will need :
+     * 1) to install `marked` dependency : npm install marked --save
+     * 2) uncomment imports on the top of this script
+     * 3) uncomment the following filter definition
+     */
+    // // default markdown options
+    // var markdownOpt = { // visit: https://github.com/jmcmanus/pagedown-extra
+    //     //renderer    : mdRenderer,
+    //     gfm         : true, // Enable GitHub flavored markdown.
+    //     tables      : false,
+    //     breaks      : true, // Enable GFM line breaks. This option requires the gfm option to be true.
+    //     pedantic    : false, // Conform to obscure parts of markdown.pl as much as possible. Don't fix any of the original markdown bugs or poor behavior.
+    //     // deprecated since version 0.7.0
+    //     // sanitize    : false, // Sanitize the output. Ignore any HTML that has been input.
+    //     smartLists  : true, // Use smarter list behavior than the original markdown. May eventually be default with the old behavior moved into pedantic.
+    //     smartypants : false // Use "smart" typograhic punctuation for things like quotes and dashes.
+    // };
+
+    // md.setOptions(markdownOpt);
+
+    // var setupSwigFilters = function(swig) {
+
+    //     if ( typeof(swig) == 'undefined' ) return;
+
+    //     /*
+    //     * markdown filter
+    //     * Usage:
+    //     *      <p>{{ 'once **apuon** a time\nthere was a princess' | markdown('strong','em') }}"</p>
+    //     *
+    //     * @param {string} text - markdown text string
+    //     *
+    //     * @returns {string} html
+    //     */
+    //    swig.setFilter('markdownToHtml', function (text, options) {
+
+    //         if ( typeof(text) != 'undefined' ) { // found
+
+    //             if ( typeof(options) != 'undefined' ) {
+    //                 options = merge(options, markdownOpt);
+
+    //                 md.setOptions(options);
+    //             }
+
+    //             return md(text)
+    //         }
+
+    //         return text
+    //     });
+    // }
+
+    if (swig && typeof(setupSwigFilters) != 'undefined') { // not always available: redirect, xhr requests
+        setupSwigFilters(swig)
+    }
+
+};
+
+module.exports = SetupClass

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.170}/core/template/boilerplate/bundle/index.js

@@ -6,10 +6,22 @@
 //var session = require('express-session');
 var {bundle} = require('gina');
 
+// gina lib samples
+// var lib             = {bundle}.lib;
+// var routing         = lib.routing;
+// var console         = lib.logger;
+// var operate         = lib.math.operate;
+// var Collection      = lib.Collection;
+// var SessionStore    = lib.SessionStore(session);
+// var Domain          = lib.Domain;
+
+
 // do whatever things you need to do before server starts
 //{bundle}.onInitialize( function(event, app, express){//
 //    var self = {bundle};
-//    var conf = self.getConfig(); // getting config/app.json would be: self.getConfig('app')
+//    // getting config/app.json would be: self.getConfig('app')
+//    // or self.getConfig().app
+//    var conf = self.getConfig();
 //    // you can use express middleware components
 //    // eg.: app.use( session({secret: '1234567890QWERTY'}) );
 //

package/framework/v0.1.1-alpha.170/core/template/boilerplate/bundle_templates/html/content/homepage.html

@@ -0,0 +1,8 @@
+{% extends 'html/layouts/main.html' %}
+
+{% set data = page.data %}
+{% block content %}
+    <div class="content">
+        <h1>{{ data.msg }}</h1>
+    </div>
+{% endblock %}

package/framework/v0.1.1-alpha.170/core/template/boilerplate/bundle_templates/html/includes/error-msg-noscript.html

@@ -0,0 +1,11 @@
+<noscript>
+  <div class="wrap error-msg">
+    <a href="http://www.enable-javascript.com/fr/">
+      <p>Pour fonctionner correctement, ce site nécessite que JavaScript soit activé.</p>
+      <p>Tous les navigateurs récents supportent le Javascript, vous n’avez probablement besoin de changer qu’un réglage pour l’activer.</p>
+      <h2>
+        Comment activer Javascript dans votre navigateur&nbsp;?
+      </h2>
+    </a>
+  </div>
+</noscript>

package/framework/v0.1.1-alpha.170/core/template/boilerplate/bundle_templates/html/includes/error-msg-outdated-browser.html

@@ -0,0 +1,8 @@
+<!--[if lt IE 8]>
+  <div class="wrap error-msg">
+    <div>
+      <h2>Vous utilisez un navigateur <strong>non supporté</strong>.</h2>
+      <p>Pour pouvoir utiliser ce site <a href="http://browsehappy.com/">mettez votre navigateur à jour</a> ou <a href="http://www.google.com/chromeframe/?redirect=true">activez Google Chrome Frame</a>.</p>
+    </div>
+  </div>
+<![endif]-->

package/framework/{v0.1.1-alpha.17/core/template/boilerplate/bundle_templates/html/layout → v0.1.1-alpha.170/core/template/boilerplate/bundle_templates/html/layouts}/main.html

@@ -9,10 +9,17 @@
         <meta name="robots" content="index, follow, noarchive">
         <meta name="distribution" content="global">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        {{ page.view.stylesheets }}
-        {{ page.view.scripts }}
     </head>
     <body>
-        {{ page.content }}
+        <div class="outer-wrap">
+            <div class="content wrap">
+                {% include "./html/includes/error-msg-outdated-browser.html" %}
+                {% include "./html/includes/error-msg-noscript.html" %}
+
+                {% block content %}
+                    <p>If you view this message you didn’t define a <strong>content</strong> block in your template.</p>
+                {% endblock %}
+            </div>
+        </div>
     </body>
 </html>

package/framework/v0.1.1-alpha.170/core/template/command/gina.bat.tpl

@@ -0,0 +1,8 @@
+@echo off
+SET _params=%*
+:: pass params to a subroutine
+CALL :sub "%_params%"
+GOTO :eof
+:sub
+
+node .gina %~n1

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.170}/core/template/command/gina.tpl

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /*
  * 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.
@@ -17,10 +17,10 @@ var fs = require('fs');
 
 try {
     require('./node_modules/gina/node_modules/colors');
-    var utils = require("./node_modules/gina/core/utils");
-    var console = utils.logger;
+    var lib     = require("./node_modules/gina/core/lib");
+    var console = lib.logger;
     console.log('Gina I/O Command Line Tool \r\n'.rainbow);
-    utils.cmd.load(__dirname, "/node_modules/gina/package.json")
+    lib.cmd.load(__dirname, "/node_modules/gina/package.json")
 } catch (err) {
     process.stdout.write(err.stack + '\r\n')
 }

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.170}/core/template/conf/env.json

@@ -15,7 +15,18 @@
   "logsPath": "{executionPath}/logs",
   "{bundle}": {
     "{env}": {
+      // This this the Root Domain
+      // Not to be confuse with the FQDN (host/hostname)
+      // Will take by default :
+      //  - the root domain extracted from your system hostname
+      //  - the `rootDomain` defined in your project/manifest.json
+      //  - the `rootDomain` defined in your project/env.json
+      //  - the `rootDomain` defined in your bundle/config/settings.server.json
+      // Since overrides are possible, last defined value will be the one taken in consideration by gina
+      "rootDomain": "",
       "projectPath": "{executionPath}",
+      "projectVersion": "",
+      "projectVersionMajor": "",
       "bundlesPath": "{executionPath}/bundles",
       "bundlePath": "{bundlesPath}/{bundle}",
       "sharedPath": "{executionPath}/shared",

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.170}/core/template/conf/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "{project} is a nice project !",
   "dependencies": {
-    "gina" : "{gina_version}"
+    // "gina" : "{gina_version}"
   },
   "engine": [
     "node >={node_version}"

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.170}/core/template/conf/statics.json

@@ -4,7 +4,7 @@
   "html": "{templatesPath}/html",  // used for templating
   "sass": "{templatesPath}/sass",  // used for templating
   "handlers": "{handlersPath}",  // used for templating
-  //"common": "{sharedPath}", 
-  "css/vendor/gina": "{gina}/framework/v{version}/core/asset/js/plugin/dist",
-  "js/vendor/gina": "{gina}/framework/v{version}/core/asset/js/plugin/dist"
+  //"common": "{sharedPath}",
+  "css/vendor/gina": "{gina}/framework/v{version}/core/asset/plugin/dist/vendor/gina/css",
+  "js/vendor/gina": "{gina}/framework/v{version}/core/asset/plugin/dist/vendor/gina/js"
 }

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.170}/core/template/conf/templates.json

@@ -2,7 +2,7 @@
   "_common": {
     // if layout == "" or layout == false => isWithoutLayout will be set to `true`
     "layout": "{templatesPath}/html/layout.html",
-    "noLayout": "{gina}/framework/v{version}/core/asset/html/nolayout.html", 
+    "noLayout": "{gina}/framework/v{version}/core/asset/html/nolayout.html",
     "templates": "{templatesPath}", // only if hasView() - deprecated
     "html": "{templatesPath}/html",  // only if hasView()
     "theme": "default_theme", // only if hasView()
@@ -10,7 +10,7 @@
     "handlers": "{templatesPath}/handlers",
     "routeNameAsFilenameEnabled": true,
     "ginaEnabled": true, // set to false, this will exclude gina assets from being loaded
-    "pluginLoader": "{src:{gina}/framework/v{version}/core/asset/js/plugin/dist/gina.onload.min.js}",
+    "pluginLoader": "{src:{gina}/framework/v{version}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js}",
     "http-metas": {
       "content-type": "text/html"
     },

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.170}/helpers/console.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.
@@ -9,8 +9,8 @@
 /**
  * ConsoleHelper
  *
- * @package     Gina.Utils.Helpers
- * @namespace   Gina.Utils.Helpers.ConsoleHelper
+ * @package     Gina.Lib.Helpers
+ * @namespace   Gina.Lib.Helpers.ConsoleHelper
  * @author      Rhinostone <contact@gina.io>
  * */
 

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.170}/helpers/context.js

@@ -1,19 +1,20 @@
 /*
  * 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.
  */
-var fs      = require('fs');
-var os      = require('os');
+var fs              = require('fs');
+var os              = require('os');
+const {execSync}    = require('child_process');
 //var merge   = require('./../lib/merge');
 //var console = require('./../lib/logger');
 
 /**
  * ContextHelper
  *
- * @package     Gina.Utils.Helpers
+ * @package     Gina.Lib.Helpers
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */
@@ -41,6 +42,24 @@ function ContextHelper(contexts) {
         if ( typeof(ContextHelper.initialized) != 'undefined' && ContextHelper.instance) {
             self = ContextHelper.instance;
         } else {
+            // Get system environment variable
+            self.contexts['sysEnvVars'] = { '~/': getUserHome() +'/' };
+            var sysEnvVars = null;
+            try {
+                sysEnvVars = execSync('printenv').toString();
+                sysEnvVars = sysEnvVars.replace(/\n$/, '').split(/\n/g);
+                var len = sysEnvVars.length, i = 0;
+                while ( Array.isArray(sysEnvVars) && i < len ) {
+                    let arr = sysEnvVars[i].split(/\=/);
+                    self.contexts['sysEnvVars']['$'+arr[0]] = arr[1];
+                    i++
+                }
+                sysEnvVars = null;
+            } catch (err) {
+                return throwError(500, err, true)
+            }
+
+
             ContextHelper.initialized = true;
             ContextHelper.instance = self
         }
@@ -50,6 +69,24 @@ function ContextHelper(contexts) {
         return self
     }
 
+    var getUserHome = function() {
+        var home = os.homedir ? os.homedir : function() {
+            var homeDir = process.env[(isWin32()) ? 'USERPROFILE' : 'HOME'];
+
+            if ( !homeDir || homeDir == '' ) {
+                throw new Error('Home directory not defined or not found !');
+            }
+
+            if ( !isWritableSync(homeDir) ) {
+                throw new Error('Home directory found but not writable: need permissions for `'+ homeDir +'`');
+            }
+
+            return homeDir;
+        };
+
+        return home()
+    };
+
     self.configure = function(contexts) {
         joinContext(contexts)
     }
@@ -141,6 +178,92 @@ function ContextHelper(contexts) {
         }
     }
 
+    /**
+     * resetContext
+     *
+     * Mostly used by logger container definitions orout of context threads (workers ?)
+     *
+     * TODO - Check if it can be called in `gna.js` & remove at the same time useless calls of setPath() & setContext()
+     */
+    resetContext = function() {
+        setPath('gina.root', getEnvVar('GINA_DIR'));
+        var frameworkPath = getEnvVar('GINA_FRAMEWORK_DIR');
+        setPath('framework', frameworkPath);
+        setPath('gina.core', getEnvVar('GINA_CORE'));
+        setPath('gina.lib', _(frameworkPath +'/lib'));
+        setPath('gina.helpers', _(frameworkPath +'/helpers'));
+        setPath( 'node', _(process.argv[0]), true);
+        var projects    = require( _(getEnvVar('GINA_HOMEDIR') + '/projects.json', true) );
+        var projectName = getContext('projectName');
+        var root        = projects[projectName].path;
+        setPath('project', root);
+        var env         = getContext('env');
+        var isDev       = (env === projects[projectName]['dev_env']) ? true: false;
+        var bundlesPath = projects[projectName]['path'] + '/bundles'; // by default
+        var isProductionScope = ('production' === projects[projectName]['def_scope']) ? true: false;
+        if (isDev) {
+            bundlesPath = projects[projectName]['path'] + '/src'
+        } else if (isProductionScope) {
+            bundlesPath = projects[projectName]['path'] + '/releases'
+        }
+        setPath('bundles', _(bundlesPath, true));
+        var bundle = getContext('bundle');
+        var bundlePath = getPath('project') + '/';
+
+        var modulesPackage = _(root + '/manifest.json');
+        var project     = {}
+            , bundles   = []
+        ;
+
+        if ( fs.existsSync(modulesPackage) ) {
+            try {
+                var dep = require(modulesPackage);
+                if ( typeof(dep['bundles']) == "undefined") {
+                    dep['bundles'] = {};
+                }
+
+                if (
+                    typeof(dep['bundles']) != "undefined"
+                    && typeof(project['bundles']) != "undefined"
+                ) {
+
+                    for (let d in dep) {
+                        if (d == 'bundles') {
+                            for (var p in dep[d]) {
+                                project['bundles'][p] = dep['bundles'][p];
+                            }
+                        } else {
+                            project[d] = dep[d];
+                        }
+
+                    }
+                } else {
+                    project = dep;
+                }
+
+                for (let b in project.bundles) {
+                    bundles.push(b)
+                }
+            } catch (err) {
+                throw err
+            }
+        }
+
+        bundlePath += ( isDev ) ? project.bundles[ bundle ].src : project.bundles[ bundle ].link;
+        setPath('bundle', _(bundlePath, true));
+        setPath('helpers', _(bundlePath+'/helpers', true));
+        setPath('lib', _(bundlePath+'/lib', true));
+        setPath('models', _(bundlePath+'/models', true));
+        setPath('controllers', _(bundlePath+'/controllers', true));
+
+        setContext('envs', projects[projectName].envs);
+        setContext('bundles', bundles);
+        // setContext('gina.lib', lib);
+        // setContext('gina.Config', Config);
+        // setContext('gina.locales', locales);
+        // setContext('gina.plugins', plugins);
+    }
+
 
     var throwError = function(code, err, isFatal) {
         var router      = getContext('router');
@@ -255,7 +378,7 @@ function ContextHelper(contexts) {
             }
         }
 
-        var env = ctx.env || GINA_ENV;
+        var env = ctx.env || getEnvVar('GINA_ENV');
         var envIsDev = ( /^true$/i.test(process.env.NODE_ENV_IS_DEV) ) ? true : false;
         var Config = ctx.gina.Config;
         var conf = null;
@@ -424,6 +547,7 @@ function ContextHelper(contexts) {
 
     }
 
+
     /**
      * Whisper
      * Convert replace constant names dictionary by its value
@@ -434,7 +558,6 @@ function ContextHelper(contexts) {
      * @returns {object} revealed
      * */
     whisper = function(dictionary, replaceable, rule) {
-
         if ( typeof(rule) != 'undefined') {
             return replaceable
                 // inline rule
@@ -491,6 +614,23 @@ function ContextHelper(contexts) {
                         .replace(/\{(\w+)\}/g, function(s, key) {
                             return dictionary[key] || s;
                         })
+                        // OS Environment Variables
+                        .replace(/\"\~\/\"|\"\$([_A-Z0-9]+)\"/g, function(s, key) {
+                            if ( /^(true|false|null)$/i.test(self.contexts['sysEnvVars'][s]) ) {
+                                return (/^(true|false|null)$/i.test(self.contexts['sysEnvVars'][s])) ? self.contexts['sysEnvVars'][s] : null
+                            }
+                            // When "$SINGLE" and not "$SINGLE/something"
+                            if ( /^\"\$([_A-Z0-9]+)\"$/i.test(s) && !self.contexts['sysEnvVars'][s]) {
+                                return '"'+ (self.contexts['sysEnvVars'][s] || null) +'"';
+                            }
+                            if ( /^\"\~\/\"$/i.test(s) && !self.contexts['sysEnvVars'][s]) {
+                                return '"'+ (self.contexts['sysEnvVars'][s] || null) +'"';
+                            }
+                            return '"'+ (self.contexts['sysEnvVars'][s] || null) +'"';
+                        })
+                        .replace(/\~\/|\$([_A-Z0-9]+)/g, function(s, key) {
+                            return self.contexts['sysEnvVars'][s] || null;
+                        })
                 )
             }
         }

package/framework/{v0.1.1-alpha.17 → v0.1.1-alpha.170}/helpers/dateFormat.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.
@@ -30,7 +30,7 @@
 function DateFormatHelper() {
 
     var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
-    var merge           = (isGFFCtx) ? require('utils/merge') : require('./../lib/merge');
+    var merge           = (isGFFCtx) ? require('lib/merge') : require('./../lib/merge');
 
 
     // if ( typeof(define) === 'function' && define.amd ) {
@@ -65,6 +65,7 @@ function DateFormatHelper() {
         shortIsoTime:        "HH:MM",
         longIsoTime:        "HH:MM:ss TT",
         isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
+        longIsoDateTime:    "yyyy-mm-dd'T'HH:MM:ss.L",
         isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
     };
 
@@ -125,7 +126,7 @@ function DateFormatHelper() {
     var format = function(date, mask, utc) {
 
         // if ( typeof(merge) == 'undefined' || !merge ) {
-        //     merge = (isGFFCtx) ? require('utils/merge') : require('./../lib/merge');
+        //     merge = (isGFFCtx) ? require('lib/merge') : require('./../lib/merge');
 
         // }
 
@@ -140,7 +141,7 @@ function DateFormatHelper() {
         } catch( mergeErr) {
             // called from logger - redefinition needed for none-dev env: cache issue
             isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
-            merge           = (isGFFCtx) ? require('utils/merge') : require('./../lib/merge');
+            merge           = (isGFFCtx) ? require('lib/merge') : require('./../lib/merge');
             masksList = merge(i18n.masks, dF.masks);
         }
 
@@ -209,7 +210,8 @@ function DateFormatHelper() {
                 s:    s,
                 ss:   pad(s),
                 l:    pad(L, 3),
-                L:    pad(L > 99 ? Math.round(L / 10) : L),
+                // L:    pad(L > 99 ? Math.round(L / 10) : L),
+                L:    pad(L),
                 t:    H < 12 ? "a"  : "p",
                 tt:   H < 12 ? "am" : "pm",
                 T:    H < 12 ? "A"  : "P",
@@ -278,8 +280,8 @@ function DateFormatHelper() {
     /**
      *  Will give an array of dates between the current date to a targeted date
      *
-     *  TODO - add a closure to `ignoreWeekend()` based on Utils::Validator
-     *  TODO - add a closure to `ignoreFromList(array)` based on Utils::Validator
+     *  TODO - add a closure to `ignoreWeekend()` based on Lib::Validator
+     *  TODO - add a closure to `ignoreFromList(array)` based on Lib::Validator
      *
      *  @param {object} dateTo
      *  @param {string} [ mask ]