gina 0.1.1-alpha.170 → 0.1.1-alpha.172

package/framework/{v0.1.1-alpha.170 → v0.1.1-alpha.172}/lib/routing/src/main.js

@@ -1003,7 +1003,7 @@ function Routing() {
                 if ( self.reservedParams.indexOf(r) > -1 || new RegExp(route.param[r]).test(maskedUrl) )
                     continue;
                 if (typeof(params[r]) != 'undefined' )
-                    queryParams += r +'='+ encodeURIComponent(params[r])+ '&';
+                    queryParams += r +'='+ encodeRFC5987ValueChars(params[r])+ '&';
             }
 
             if (queryParams.length > 1) {
@@ -1292,7 +1292,7 @@ function Routing() {
 
         pathname    = url.replace( new RegExp('^('+ hostname +'|'+hostname.replace(/\:\d+/, '') +')' ), '');
         if ( typeof(request.routing.path) == 'undefined' )
-            request.routing.path = unescape(pathname);
+            request.routing.path = decodeURI(pathname);
         method      = ( typeof(method) != 'undefined' ) ? method.toLowerCase() : 'get';
 
         if (isMethodProvidedByDefault) {
@@ -1300,7 +1300,7 @@ function Routing() {
             request.originalMethod = request.method;
 
             request.method = method;
-            request.routing.path = unescape(pathname)
+            request.routing.path = decodeURI(pathname)
         }
         // last method check
         if ( !request.method)
@@ -1335,7 +1335,7 @@ function Routing() {
                     method              : localMethod,
                     requirements        : routing[name].requirements,
                     namespace           : routing[name].namespace || undefined,
-                    url                 : unescape(pathname), /// avoid %20
+                    url                 : decodeURI(pathname), /// avoid %20
                     rule                : routing[name].originalRule || name,
                     param               : routing[name].param,
                     //middleware: routing[name].middleware,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.170",
+  "version": "0.1.1-alpha.172",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.170/core/gna",
+  "main": "./framework/v0.1.1-alpha.172/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
     "postpublish": "node ./script/post_publish.js",

package/resources/home/main.json

@@ -71,15 +71,21 @@
         "{release}": "http"
     },
     "cultures": {
-        "_comment": "e.g.:  en-US, fr-FR ... available for the framework then used to translate the admin dashboard",
-        "{release}": [  "en-US", "fr-FR" ]
+        "_comment": "e.g.:  en_US, fr_FR ... available for the framework then used to translate the admin dashboard",
+        "{release}": [  "en_CM", "fr_CM" ]
     },
     "def_culture": {
-        "{release}": "en-US"
+        "{release}": "en_CM"
+    },
+    "def_iso_short": {
+        "{release}": "cm"
     },
     "def_timezone": {
         "{release}": "Africa/Douala"
     },
+    "def_date": {
+        "{release}": "yyyy/mm/dd"
+    },
     "log_levels": {
         "_comment": "hierarchy",
         "{release}": [  "trace", "debug", "info", "warn", "error", "fatal" ]

package/resources/home/settings.json

@@ -24,6 +24,8 @@
     "tmpdir": "{tmp_dir}",
     "logdir": "{log_dir}",
     "culture": "{culture}",
+    "iso_short": "{iso_short}",
     "timezone": "{timezone}",
+    "date": "{date}",
     "log_level": "{log_level}"
 }

package/services/env.json

@@ -6,5 +6,13 @@
         "prod": {
             "host": "localhost"
         }
+    },
+    "toolbar": {
+        "dev": {
+            "host": "localhost"
+        },
+        "prod": {
+            "host": "localhost"
+        }
     }
 }

package/services/manifest.json

@@ -13,6 +13,18 @@
                     "target": "releases/proxy/prod/0.0.1"
                 }
             }
+        },
+        "toolbar": {
+            "_comment": "Your comment goes here.",
+            "version": "0.0.1",
+            "tag": "001",
+            "src": "src/toolbar",
+            "link": "bundles/toolbar",
+            "releases": {
+                "prod": {
+                    "target": "releases/toolbar/prod/0.0.1"
+                }
+            }
         }
     }
 }

package/services/src/proxy/config/settings.json

@@ -1,8 +1,8 @@
 // bundle needs to be restarted on changes !!
 {
     "region": {
-        "code": "en_CM",
-        "shortCode": "en",
+        "culture": "en_CM",
+        "isoShort": "en",
         "date": "yyyy/mm/dd",
         "timeZone": "Africa/Douala"
     }

package/services/src/toolbar/config/app.json

@@ -0,0 +1,6 @@
+// bundle needs to be restarted on changes !!
+{
+  "name": "toolbar",
+  "version": "0.0.1",
+  "greeting": "Hello World !"
+}

package/services/src/toolbar/config/routing.json

@@ -0,0 +1,11 @@
+// bundle needs to be restarted on changes !!
+{
+  "homepage": {
+    "namespace": "content",
+    "url": "/",
+    "method": "GET",
+    "param": {
+      "control": "home"
+    }
+  }
+}

package/services/src/toolbar/config/settings.server.json

@@ -0,0 +1,30 @@
+// bundle needs to be restarted on changes !!
+{
+    "webroot": "/toolbar" // do not forget to add a coma here if you add other options ;)
+    /**
+    * `webrootAutoredirect` settings
+    * Default is `true`: set to false if you have describe a redirection rule from your `routing.json`
+    */
+    // "webrootAutoredirect": false,
+
+    /**
+    * `template` settings
+    * Default is `false`: will automatically be set to `true` when you add a view/template (`false` is right for APIs only)
+    */
+    // "template": false,
+
+    /**
+    * `response` settings
+    * This section is mostly used to setup CORS
+    */
+    // "response": {
+    //        // CORS settings sample
+    //     "header": {
+    //         "access-control-allow-origin": "toolbar@{project}, https://checkout.stripe.com",
+    //         "access-control-allow-headers": "X-Requested-With", // To allow AJAX request
+    //         "access-control-allow-methods": "POST, GET, OPTIONS",
+    //         "access-control-allow-credentials": true,
+    //         "vary": "Origin"
+    //     }
+    // }
+}

package/services/src/toolbar/controllers/controller.content.js

@@ -0,0 +1,39 @@
+//Imports goes here.
+
+/**
+ * ToolbarContentController
+ * Here are handled all contents
+ * */
+function ToolbarContentController() {
+    var self = this;
+    // get config/app.json content
+    var appConf = this.getConfig('app');
+
+    /**
+     * Home action
+     *
+     * @param {object} req
+     * @param {object} res
+     * @callback [next]
+     * */
+    this.home = function(req, res) {
+        var data = {
+            msg: appConf.greeting
+        };
+
+        self.renderJSON(data);
+
+        // use this to render errors
+        // self.throwError( new Error('Error sample') );
+    }
+
+    // The onReady Event is called when the controller is loaded
+    // You can use this to define, overwrite and customise default controller methods & even swig filters
+    //this.onReady = function(req, res, next){
+    //    // e.g: Define a setup function that you call when the controller is ready
+    //    //setup(req, res, next)
+    //    // Or better, you can just complete and reuse the `setup.js` and call self.setup(req, res, next)
+    //}
+};
+
+module.exports = ToolbarContentController

package/services/src/toolbar/controllers/controller.js

@@ -0,0 +1,30 @@
+//Imports goes here.
+
+/**
+ * ToolbarController
+ * This controller is inherited by all the namespace controllers.
+ * This means that all public methods written here are reusable by the other controllers
+ * without calling `require` in case you decide to add a namespace.
+ * It is strongly advised to use namespaces to organize you code :
+ * E.g.:
+ *      gina namespace:add toolbar/blogpost @{project}
+ *      gina namespace:add toolbar/account @{project}
+ *      ...
+ * */
+function ToolbarController() {
+    var self = this;
+    // get config/app.json content
+    // var appConf = this.getConfig('app');
+
+    
+
+    // The onReady Event is called when the controller is loaded
+    // You can use this to define, overwrite and customise default controller methods & swig filters
+    this.onReady = function(req, res, next){
+       // e.g: Define a `setup` function (inside this coontroller) that you can call when the controller is ready
+       // Or better, you can just complete and reuse the `setup.js` and call self.setup(req, res, next)
+       self.setup(req, res, next)
+    }
+};
+
+module.exports = ToolbarController

package/services/src/toolbar/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/services/src/toolbar/index.js

@@ -0,0 +1,43 @@
+/**
+ * Toolbar bundle
+ *
+ * */
+//import sample
+//var session = require('express-session');
+var toolbar = require('gina');
+
+// gina lib samples
+// var lib             = toolbar.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
+//toolbar.onInitialize( function(event, app, express){//
+//    var self = toolbar;
+//    // 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'}) );
+//
+//    //then notify the server that startup sequence can be resumed
+//    event.emit('complete', app);// this is important !
+//});
+
+// If you need to do something once the server has started
+// toolbar.onStarted(function(){
+//     console.info('toolbar has started ! ');
+// });
+
+// Catch unhandled errors
+// toolbar.onError(function(err, req, res, next){
+//     console.error('<toolbar> fatal error: ' + err.message + '\nstack:\n'+ err.stack);
+//     next(err);
+// });
+
+toolbar.start();