gina 0.1.6-alpha.89 → 0.1.6-alpha.90

package/framework/{v0.1.6-alpha.89 → v0.1.6-alpha.90}/core/server.js

@@ -51,7 +51,7 @@ function Server(options) {
         var swigOptions = {
             autoescape: ( typeof(conf.autoescape) != 'undefined') ? conf.autoescape: false,
             loader: swig.loaders.fs(dir),
-            cache: (conf.cacheless) ? false : 'memory'
+            cache: (conf.isCacheless) ? false : 'memory'
         };
 
         swig.setDefaults(swigOptions);
@@ -352,7 +352,7 @@ function Server(options) {
             , serverCoreConf        = self.conf.core
             , routing               = {}
             , reverseRouting        = {}
-            , cacheless             = config.isCacheless()
+            , isCacheless           = config.isCacheless()
             , env                   = self.env
             , scope                 = self.scope
             , apps                  = conf.allBundles // conf.bundles
@@ -392,7 +392,7 @@ function Server(options) {
                     filename = main
                 }
 
-                if (cacheless) {
+                if (isCacheless) {
                     delete require.cache[require.resolve(_(filename, true))]
                 }
 
@@ -445,15 +445,15 @@ function Server(options) {
                         }
 
                         if (typeof(tmp[rule].url) != 'object') {
-                            if (tmp[rule].url.length > 1 && tmp[rule].url.substr(0,1) != '/') {
+                            if (tmp[rule].url.length > 1 && tmp[rule].url.substring(0,1) != '/') {
                                 tmp[rule].url = '/'+tmp[rule].url
                             }
-                            /** else if (tmp[rule].url.length > 1 && conf.envConf[apps[i]][env].server.webroot.substr(conf.envConf[apps[i]][env].server.webroot.length-1,1) == '/') {
-                                tmp[rule].url = tmp[rule].url.substr(1)
+                            /** else if (tmp[rule].url.length > 1 && conf.envConf[apps[i]][env].server.webroot.substring(conf.envConf[apps[i]][env].server.webroot.length-1,1) == '/') {
+                                tmp[rule].url = tmp[rule].url.substring(1)
                             }*/
                             else {
-                                if (wroot.substr(wroot.length-1,1) == '/') {
-                                    wroot = wroot.substr(wroot.length-1,1).replace('/', '')
+                                if (wroot.substring(wroot.length-1,1) == '/') {
+                                    wroot = wroot.substring(wroot.length-1,1).replace('/', '')
                                 }
                             }
 
@@ -469,8 +469,8 @@ function Server(options) {
                                     localWroot = '/'+ routing[rule].bundle;
                                     conf.envConf[tmp[rule].bundle][env].server.webroot = localWroot
                                 }
-                                if (localWroot.substr(localWroot.length-1,1) == '/') {
-                                    localWroot = localWroot.substr(localWroot.length-1,1).replace('/', '')
+                                if (localWroot.substring(localWroot.length-1,1) == '/') {
+                                    localWroot = localWroot.substring(localWroot.length-1,1).replace('/', '')
                                 }
                                 if ( typeof(tmp[rule].param.ignoreWebRoot) == 'undefined' || !tmp[rule].param.ignoreWebRoot )
                                     tmp[rule].url = localWroot + tmp[rule].url
@@ -484,11 +484,11 @@ function Server(options) {
                         } else {
 
                             for (var u=0; u<tmp[rule].url.length; ++u) {
-                                if (tmp[rule].url[u].length > 1 && tmp[rule].url[u].substr(0,1) != '/') {
+                                if (tmp[rule].url[u].length > 1 && tmp[rule].url[u].substring(0,1) != '/') {
                                     tmp[rule].url[u] = '/'+tmp[rule].url[u]
                                 } else {
-                                    if (wroot.substr(wroot.length-1,1) == '/') {
-                                        wroot = wroot.substr(wroot.length-1,1).replace('/', '')
+                                    if (wroot.substring(wroot.length-1,1) == '/') {
+                                        wroot = wroot.substring(wroot.length-1,1).replace('/', '')
                                     }
                                 }
                                 if ( typeof(tmp[rule].param.ignoreWebRoot) == 'undefined' || !tmp[rule].param.ignoreWebRoot )
@@ -605,7 +605,7 @@ function Server(options) {
         ) {
 
             // by default
-            path = url.replace(url.substr(url.lastIndexOf('/')+1), '');
+            path = url.replace(url.substring(url.lastIndexOf('/')+1), '');
             if ( typeof(altConf) != 'undefined' && altConf ) {
                 bundleConf = self.conf[altConf.split(/\@/)[1]][bundleConf.env];
                 backedupPath = path;
@@ -613,7 +613,7 @@ function Server(options) {
             }
 
 
-            // catch `statics.json` defined paths || bundleConf.staticResources.indexOf(url.replace(url.substr(url.lastIndexOf('/')+1), '')) > -1
+            // catch `statics.json` defined paths || bundleConf.staticResources.indexOf(url.replace(url.substring(url.lastIndexOf('/')+1), '')) > -1
             if (  bundleConf.staticResources.indexOf(path) > -1 || bundleConf.staticResources.indexOf(staticProps.firstLevel) > -1 ) {
                 if ( typeof(altConf) != 'undefined' && altConf && backedupPath ) {
                     filename = (bundleConf.staticResources.indexOf(path) > -1) ? bundleConf.content.statics[path] + url.replace(backedupPath, '/') : bundleConf.content.statics[staticProps.firstLevel] + url.replace(staticProps.firstLevel, '/');
@@ -652,8 +652,8 @@ function Server(options) {
      */
     var getAssets = function (bundleConf, layoutStr, swig, data) {
 
-        // layout search for <link|script|img>
-        var layoutAssets        = layoutStr.match(/<link .*?<\/link>|<link .*?(rel\=\"(stylesheet|icon|manifest|(.*)\-icon))(.*)|<script.*?<\/script>|<img .*?(.*)/g) || [];
+        // layout search for <link|source|script|img>
+        var layoutAssets        = layoutStr.match(/<link .*?<\/link>|<link .*?(rel\=\"(stylesheet|icon|manifest|(.*)\-icon))(.*)|<source .*?(type\=\"(image))(.*)|<script.*?<\/script>|<img .*?(.*)/g) || [];
 
         var assets      = {}
             , cssFiles  = []
@@ -683,39 +683,85 @@ function Server(options) {
         for (; i < len; ++i) {
 
             if (
-                !/(\<img|\<link|\<script)/g.test(layoutAssets[i])
-                || /\<img/.test(layoutAssets[i]) &&  /srcset/.test(layoutAssets[i]) // not able to handle this case for now
+                !/(\<img|\<link|\<source|\<script)/g.test(layoutAssets[i])
+                ||
+                // not able to handle srcset case for now
+                /**
+                /\<img/.test(layoutAssets[i])
+                    && */ /srcset/.test(layoutAssets[i])
             ) {
                 continue;
             }
 
+            // https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/rel/preload
+            let asType = null;
+
             if ( /\<img/.test(layoutAssets[i]) ) {
                 type    = 'image';
                 tag     = 'img';
+                asType  = type;
             }
 
-            if ( /\<script/.test(layoutAssets[i]) ) {
-                type    = 'javascript';
-                tag     = 'script';
-            }
+
 
             if ( /\<link/.test(layoutAssets[i]) ) {
-                if ( /rel\=\"stylesheet/.test(layoutAssets[i]) ) {
-                    type    = 'stylesheet';
-                } else if ( /rel\=\"(icon|(.*)\-icon)/.test(layoutAssets[i]) ) {
-                    type    = 'image';
-                } else {
-                    type = 'file';
+                // if ( /rel\=\"stylesheet/.test(layoutAssets[i]) ) {
+                //     type    = 'stylesheet';
+                // } else if ( /rel\=\"(icon|(.*)\-icon)/.test(layoutAssets[i]) ) {
+                //     type    = 'image';
+                // } else {
+                //     type = 'file';
+                // }
+                type = layoutAssets[i].match(/rel=\"[-a-z 0-9]+\"/)[0] || null;
+                if (type) {
+                    type = type.replace(/^rel\=\"|"$/g, '');
+                }
+
+
+                switch (type) {
+                    case /stylesheet/.test(type):
+                        asType  = 'style';
+                        break;
+
+                    case /javascript/.test(type):
+                        asType  = 'script';
+                        break;
+
+                    default:
+                        asType  = null;
+                        if ( /icon/.test(type) ) {
+                            asType  = 'image';
+                        }
+                        if ( /font/.test(type) ) {
+                            asType  = 'font';
+                        }
+                        // if ( /manifest/.test(type) ) {
+                        //     asType  = 'webmanifest';
+                        // }
+                        break;
                 }
 
                 tag     = 'link';
             }
 
+            if ( /\<source/.test(layoutAssets[i]) ) {
+                if ( /type\=\"image/.test(layoutAssets[i]) ) {
+                    type    = 'image';
+                }
+
+                tag     = 'source';
+            }
+
+            if ( /\<script/.test(layoutAssets[i]) ) {
+                type    = 'javascript';
+                tag     = 'script';
+            }
+
             domain  = null;
             try {
-                url     = layoutAssets[i].match(/(src|href)\=(\".*?\"|\'.*?\')/)[0];
+                url     = layoutAssets[i].match(/(src|href|srcset)\=(\".*?\"|\'.*?\')/)[0];
             } catch (err) {
-                console.warn('Problem with this asset ('+ i +'/'+ len +'): '+ layoutAssets[i].substr(0, 80) +'...');
+                console.warn('Problem with this asset ('+ i +'/'+ len +'): '+ layoutAssets[i].substring(0, 80) +'...');
                 continue;
             }
 
@@ -724,12 +770,13 @@ function Server(options) {
                 continue
             }
             //url = url.replace(/((src|href)\=\"|(src|href)\=\'|\"|\')/g, '');
-            url = url.replace(/((src|href)\=\"|(src|href)\=\')/g, '');
+            url = url.replace(/((src|href|srcset)\=\"|(src|href|srcset)\=\')/g, '');
             if ( !/^\{\{/.test(url) ) {
                 url = url.replace(/(\"|\')/g, '');
             }
-            if (swig && /^\{\{/.test(url) )
+            if (swig && /^\{\{/.test(url) ) {
                 url = swig.compile(url, swig.getOptions())(data);
+            }
 
             if (!/(\:\/\/|^\/\/)/.test(url) ) {
                 filename = getAssetFilenameFromUrl(bundleConf, url);
@@ -749,7 +796,7 @@ function Server(options) {
             isAvailable =  ( /404/.test(filename) ) ? false : true;
             if ( isAvailable ) {
                 try {
-                    ext         = url.substr(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/)[0];
+                    ext         = url.substring(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/)[0];
                 } catch(err) {
 
                     console.warn('No extension found for `'+ filename +'`\n'+ err.stack );
@@ -758,11 +805,13 @@ function Server(options) {
             }
 
 
+
             assets[key] = {
                 type        : type,
+                as          : asType,
                 url         : url,
                 ext         : ext,
-                mime        : (!ext) ? 'NA' : (bundleConf.server.coreConfiguration.mime[ext.substr(1)] || 'NA'),
+                mime        : (!ext) ? 'NA' : (bundleConf.server.coreConfiguration.mime[ext.substring(1)] || 'NA'),
                 filename    : ( /404/.test(filename) ) ? 'not found' : filename,
                 isAvailable : isAvailable
             };
@@ -894,14 +943,14 @@ function Server(options) {
                                 //key =  (( /404/.test(filename) ) ? '[404]' : '[200]') +' '+ url;
                                 key         = url;
                                 isAvailable =  ( /404/.test(filename) ) ? false : true;
-                                ext         = url.substr(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/)[0];
+                                ext         = url.substring(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/)[0];
                                 assets[key] = {
                                     referrer    : cssFiles[i],
                                     definition  : definition,
                                     type        : type,
                                     url         : url,
                                     ext         : ext,
-                                    mime        : bundleConf.server.coreConfiguration.mime[ext.substr(1)] || 'NA',
+                                    mime        : bundleConf.server.coreConfiguration.mime[ext.substring(1)] || 'NA',
                                     filename    : ( /404/.test(filename) ) ? 'not found' : filename
                                 };
 
@@ -1146,13 +1195,13 @@ function Server(options) {
     }
 
     this.onHttp2Stream = function(stream, headers, response) {
-        var header      = null
-            , isWebroot = false
-            , pathname  = null
-            , asset     = null
-            , assets    = this._options.template.assets
-            , conf      = this._options.conf
-            , cacheless = conf.cacheless
+        var header          = null
+            , isWebroot     = false
+            , pathname      = null
+            , asset         = null
+            , assets        = this._options.template.assets
+            , conf          = this._options.conf
+            , isCacheless   = conf.isCacheless
         ;
 
 
@@ -1251,7 +1300,7 @@ function Server(options) {
                 ':status': 301
             };
 
-            if (cacheless) {
+            if (isCacheless) {
                 header['cache-control'] = 'no-cache, no-store, must-revalidate';
                 header['pragma'] = 'no-cache';
                 header['expires'] = '0';
@@ -1324,7 +1373,7 @@ function Server(options) {
                     header['content-length'] = fs.statSync(assets[ url ].filename).size;
                 }
 
-                if (cacheless) {
+                if (isCacheless) {
                     // source maps integration for javascript & css
                     if ( /(.js|.css)$/.test(asset.filename) && fs.existsSync(asset.filename +'.map') ) {
                         //pathname = asset.filename +'.map';
@@ -1413,7 +1462,7 @@ function Server(options) {
             self._options.conf = bundleConf
         }
 
-        var cacheless       = bundleConf.cacheless;
+        var isCacheless       = bundleConf.isCacheless;
         // by default
         var filename        = bundleConf.publicPath + pathname;
         var isFilenameDir   = null
@@ -1478,7 +1527,7 @@ function Server(options) {
                             'content-type': bundleConf.server.coreConfiguration.mime[ext]+'; charset='+ bundleConf.encoding
                         };
 
-                        if (cacheless) {
+                        if (isCacheless) {
                             header['cache-control'] = 'no-cache, no-store, must-revalidate';
                             header['pragma'] = 'no-cache';
                             header['expires'] = '0';
@@ -1495,7 +1544,7 @@ function Server(options) {
                         response.setHeader('location', request.url);
                         request = checkPreflightRequest(request, response);
                         completeHeaders(null, request, response);
-                        if (cacheless) {
+                        if (isCacheless) {
                             response.writeHead(301, {
                                 'cache-control': 'no-cache, no-store, must-revalidate', // preventing browsers from using cache
                                 'pragma': 'no-cache',
@@ -1510,7 +1559,7 @@ function Server(options) {
             }
 
 
-            if (cacheless) {
+            if (isCacheless) {
                 delete require.cache[require.resolve(filename)];
             }
 
@@ -1560,8 +1609,12 @@ function Server(options) {
                             request.url = ( ext != null && typeof(ext[0]) != 'undefined' ) ? request.url : request.url + 'index.html';
 
                             self._responseHeaders         = response.getHeaders();
-                            if (!isBinary && typeof(self._options.template.assets[request.url]) == 'undefined')
+                            if (
+                                !isBinary
+                                && typeof(self._options.template.assets[request.url]) == 'undefined'
+                            ) {
                                 self._options.template.assets = getAssets(bundleConf, file);
+                            }
 
                             if (
                                 typeof(self._options.template.assets[request.url]) == 'undefined'
@@ -1626,7 +1679,7 @@ function Server(options) {
                                                         'location': request.url
                                                     };
 
-                                                    if (cacheless) {
+                                                    if (isCacheless) {
                                                         header['cache-control'] = 'no-cache, no-store, must-revalidate';
                                                         header['pragma'] = 'no-cache';
                                                         header['expires'] = '0';
@@ -1697,11 +1750,11 @@ function Server(options) {
                                 'content-type': contentType + '; charset='+ bundleConf.encoding
                             };
 
-                            if (cacheless) {
+                            if (isCacheless) {
                                 // source maps integration for javascript & css
                                 if ( /(.js|.css)$/.test(filename) && fs.existsSync(filename +'.map') && !/sourceMappingURL/.test(file) ) {
                                     //pathname = pathname +'.map';
-                                    pathname = webroot + pathname.substr(1) +'.map';
+                                    pathname = webroot + pathname.substring(1) +'.map';
                                     // serve without cache
                                     header['X-SourceMap'] = pathname;
                                     header['cache-control'] = 'no-cache, no-store, must-revalidate';
@@ -1731,11 +1784,11 @@ function Server(options) {
                                 response.setHeader('content-length', fs.statSync(filename).size);
                             }
 
-                            if (cacheless) {
+                            if (isCacheless) {
                                 // source maps integration for javascript & css
                                 if ( /(.js|.css)$/.test(filename) && fs.existsSync(filename +'.map') && !/sourceMappingURL/.test(file) ) {
                                     //pathname = pathname +'.map'
-                                    pathname = webroot + pathname.substr(1) +'.map';
+                                    pathname = webroot + pathname.substring(1) +'.map';
                                     response.setHeader("X-SourceMap", pathname)
                                 }
 
@@ -1887,7 +1940,7 @@ function Server(options) {
                 if ( typeof(ext) != 'undefined' &&  ext != null) {
                     ext = ext[0];
                     // if image with `@` found
-                    if ( /^image/i.test(self.conf[self.appName][self.env].server.coreConfiguration.mime[ext.substr(1)]) ) {
+                    if ( /^image/i.test(self.conf[self.appName][self.env].server.coreConfiguration.mime[ext.substring(1)]) ) {
                         isImage = true
                     }
                 }
@@ -1896,7 +1949,7 @@ function Server(options) {
                     // and must not be an email
                     && !/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(request.url)
                     // and must be handled by mime.types
-                    &&  typeof(self.conf[self.appName][self.env].server.coreConfiguration.mime[ext.substr(1)]) != 'undefined'
+                    &&  typeof(self.conf[self.appName][self.env].server.coreConfiguration.mime[ext.substring(1)]) != 'undefined'
                     ||
                     ext != null
                     && isImage
@@ -1922,7 +1975,7 @@ function Server(options) {
 
             if (
                 staticProps.isStaticFilename && staticsArr.indexOf(request.url) > -1
-                || staticProps.isStaticFilename && staticsArr.indexOf( request.url.replace(request.url.substr(request.url.lastIndexOf('/')+1), '') ) > -1
+                || staticProps.isStaticFilename && staticsArr.indexOf( request.url.replace(request.url.substring(request.url.lastIndexOf('/')+1), '') ) > -1
                 || staticProps.isStaticFilename && new RegExp('^'+ staticProps.firstLevel).test(request.url)
                 || /\/$/.test(request.url) && !isWebrootHandledByRouting && !/\/engine\.io\//.test(request.url)
             ) {
@@ -2113,7 +2166,7 @@ function Server(options) {
                                 && opt.groups[group].allowedExtensions != '*'
                             ) {
                                 var ext     = opt.groups[group].allowedExtensions;
-                                var fileExt = filename.substr(filename.lastIndexOf('.')+1)
+                                var fileExt = filename.substring(filename.lastIndexOf('.')+1)
                                 if ( !Array.isArray(ext) ) {
                                     ext = [ext]
                                 }
@@ -2273,8 +2326,8 @@ function Server(options) {
                                 request.body = request.body.replace(/\+/g, ' ');
                             }
 
-                            if ( request.body.substr(0,1) == '?')
-                                request.body = request.body.substr(1);
+                            if ( request.body.substring(0,1) == '?')
+                                request.body = request.body.substring(1);
 
                             try {
                                 bodyStr = decodeURIComponent(request.body); // it is already a string for sure
@@ -2425,8 +2478,8 @@ function Server(options) {
                                 request.body = request.body.replace(/\+/g, ' ');
                             }
 
-                            if ( request.body.substr(0,1) == '?')
-                                request.body = request.body.substr(1);
+                            if ( request.body.substring(0,1) == '?')
+                                request.body = request.body.substring(1);
 
                             // false & true case
                             try {
@@ -2547,8 +2600,10 @@ function Server(options) {
 
         var config = new Config();
         config.setBundles(self.bundles);
-        var conf = config.getInstance(); // for all loaded bundles
-        if ( typeof(conf) != 'undefined') {//for cacheless mode
+        // for all loaded bundles
+        var conf = config.getInstance();
+        //for cacheless mode
+        if ( typeof(conf) != 'undefined') {
             self.conf = conf;
         }
 
@@ -2563,7 +2618,7 @@ function Server(options) {
                 if (self.bundles.indexOf(b) < 0) continue;
                 if ( typeof(conf[b][self.env].content) != 'undefined' && typeof(conf[b][self.env].content.statics) != 'undefined' && conf[b][self.env].content.statics.count() > 0 ) {
                     for (let s in conf[b][self.env].content.statics) {
-                        s = (s.substr(0,1) == '/') ? s.substr(1) : s;
+                        s = (s.substring(0,1) == '/') ? s.substring(1) : s;
                         if ( (new RegExp('^/'+s)).test(pathname) ) {
                             bundle = b;
                             break end
@@ -2598,18 +2653,18 @@ function Server(options) {
     }
 
     var onBundleConfigLoaded = function(bundle, options) {
-        var err         = options.err
-            , cacheless = options.config.isCacheless()
-            , pathname  = options.pathname
-            , req       = options.req
-            , res       = options.res
-            , config    = options.conf
-            , next      = options.next
-            , callback  = options.callback
+        var err             = options.err
+            , isCacheless   = options.config.isCacheless()
+            , pathname      = options.pathname
+            , req           = options.req
+            , res           = options.res
+            , config        = options.conf
+            , next          = options.next
+            , callback      = options.callback
         ;
 
         //Reloading assets & files.
-        // if (!cacheless) { // all but dev & debug
+        // if (!isCacheless) { // all but dev & debug
             callback(err, bundle, pathname, options.config, req, res, next)
         // } else {
         //     config.refresh(bundle, function(err, routing) {
@@ -2732,7 +2787,7 @@ function Server(options) {
             , isRoute           = {}
             , withViews         = hasViews(bundle)
             , router            = local.router
-            , cacheless         = config.isCacheless()
+            , isCacheless       = config.isCacheless()
             , wroot             = null
         ;
 
@@ -2992,11 +3047,11 @@ function Server(options) {
                     , ext                   = null
                     , isHtmlContent         = false
                     , hasCustomErrorFile    = false
-                    , eCode                 = code.toString().substr(0,1) + 'xx'
+                    , eCode                 = code.toString().substring(0,1) + 'xx'
                 ;
-                var extArr = url.substr(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/);
+                var extArr = url.substring(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/);
                 if (extArr) {
-                    ext = extArr[0].substr(1);
+                    ext = extArr[0].substring(1);
                 }
                 if ( !ext || /^(html|htm)$/i.test(ext) ) {
                     isHtmlContent = true;

package/framework/{v0.1.6-alpha.89 → v0.1.6-alpha.90}/core/status.codes

@@ -50,14 +50,9 @@
     "429": "Too Many Requests",
     "431": "Request Header Fields Too Large",
     "451": "Unavailable For Legal Reasons",
-    
+
     // Extended Ngnix 4xx codes
     "444": "No Response",
-    "495": "SSL Certificate Error",
-    "496": "SSL Certificate Required",
-    "497": "HTTP Request Sent to HTTPS Port",
-    "498": "Token expired/invalid",
-    "499": "Client Closed Request", 
 
     "500": "Internal Server Error",
     "501": "Not Implemented",
@@ -72,20 +67,15 @@
     "511": "Network Authentication Required",
 
     "103": "Checkpoint",
-    "420": "Method Failure",
     "420": "Enhance Your Calm",
     "450": "Blocked by Windows Parental Controls",
     "498": "Invalid Token",
-    "499": "Token Required",
-    "499": "Request has been forbidden by antivirus",
     "509": "Bandwidth Limit Exceeded",
     "530": "Site is frozen",
 
     "440": "Login Timeout",
     "449": "Retry With",
-    "451": "Redirect",
 
-    "444": "No Response",
     "495": "SSL Certificate Error",
     "496": "SSL Certificate Required",
     "497": "HTTP Request Sent to HTTPS Port",

package/framework/{v0.1.6-alpha.89 → v0.1.6-alpha.90}/helpers/context.js

@@ -130,7 +130,7 @@ function ContextHelper(contexts) {
 
                     ++_count;
                     if (k == len-1) {
-                        str = str.substr(0, str.length-1);
+                        str = str.substring(0, str.length-1);
                         str += "\"_content_\"";
                         for (var c = 0; c<_count; ++c) {
                             str += "}"

package/framework/{v0.1.6-alpha.89 → v0.1.6-alpha.90}/helpers/json/src/main.js

@@ -67,8 +67,10 @@ module.exports = function(){
             i = 0;
             for(; i< len; ++i) {
                 // ignore urls
-                if ( /(\:|\")/.test( jsonStr.substr(jsonStr.indexOf(commentsWithSlashes[i])-1,1) ) )
+                // if ( /(\:|\")/.test( jsonStr.substring(jsonStr.indexOf(commentsWithSlashes[i])-1,1) ) ) {
+                if ( /(\:|\")/.test( jsonStr.substr(jsonStr.indexOf(commentsWithSlashes[i])-1,1) ) ) {
                     continue;
+                }
 
                 jsonStr = jsonStr.replace(commentsWithSlashes[i], '');
             }
@@ -84,8 +86,8 @@ module.exports = function(){
             var stack   = err.stack.match(/position(\s|\s+)\d+/);
             if ( Array.isArray(stack) && stack.length > 0) {
                 pos     = stack[0].replace(/[^\d+]/g, '');
-                jsonStr = jsonStr.substr(0, pos) + '--(ERROR !)--\n' + jsonStr.substr(pos);
-                msg     = (jsonStr.length > 400) ?  '...'+ jsonStr.substr(pos-200, 300) +'...' : jsonStr;
+                jsonStr = jsonStr.substring(0, pos) + '--(ERROR !)--\n' + jsonStr.substring(pos);
+                msg     = (jsonStr.length > 400) ?  '...'+ jsonStr.substring(pos-200, 300) +'...' : jsonStr;
                 error = new Error('[ requireJSON ] could not parse `'+ filename +'`:' +'\n\rSomething is wrong around this portion:\n\r'+msg+'<strong style="color:red">"</strong>\n\rPlease check your file: `'+ filename +'`'+ '\n\r<strong style="color:red">'+err.stack+'</strong>\n');
             } else {
                 error = new Error('[ requireJSON ] could not parse `'+ filename +'`:' +'\n\rSomething is wrong with the content of your file.\n\rPlease check the syntax of your file : `'+ filename +'`'+ '\n\r<strong style="color:red">'+err.stack+'</strong>\n');

package/framework/{v0.1.6-alpha.89 → v0.1.6-alpha.90}/helpers/path.js

@@ -705,9 +705,9 @@ function PathHelper() {
         var childElementsOnly = [], find;
         // ending char : / or \
         var s = new _(source).toUnixStyle();
-        find = s.substr(s.length-1, 1);
+        find = s.substring(s.length-1, 1);
         if ( find == '\/') {
-            source = s.substr(0, s.length-1);
+            source = s.substring(0, s.length-1);
             childElementsOnly['source'] = true
         } else {
             source = s;
@@ -716,9 +716,9 @@ function PathHelper() {
 
         // ending char : / or \
         var d = new _(destination).toUnixStyle();
-        find = d.substr(d.length-1, 1);
+        find = d.substring(d.length-1, 1);
         if ( find == '\/') {
-            destination = d.substr(0, d.length-1);
+            destination = d.substring(0, d.length-1);
             childElementsOnly['destination'] = true
         } else {
             destination = d;
@@ -1643,7 +1643,7 @@ function PathHelper() {
 
                 ++_count;
                 if (k == len-1) {
-                    str = str.substr(0, str.length-1);
+                    str = str.substring(0, str.length-1);
                     str += "\"_content_\"";
                     for (let c = 0; c<_count; ++c) {
                         str += "}"

package/framework/{v0.1.6-alpha.89 → v0.1.6-alpha.90}/helpers/plugins/src/api-error.js

@@ -114,12 +114,12 @@ function ApiError(errorMessage, fieldName, errorStatus) {
                     var paths = getPaths(), path = null;
                     // model
                     if ( /model/i.test(filename) ) {
-                        path = paths.models.substr(paths.models.lastIndexOf(bundleName)) +'/'+ filename.substr(filename.lastIndexOf(bundleName+'\/models'));
+                        path = paths.models.substring(paths.models.lastIndexOf(bundleName)) +'/'+ filename.substring(filename.lastIndexOf(bundleName+'\/models'));
                         error.tag += 'model:'
                     }
                     // controller
                     else {
-                        path = paths.controllers.substr(paths.controllers.lastIndexOf(bundleName)) +'/'+ filename.substr(filename.lastIndexOf(bundleName+'\/controllers'));
+                        path = paths.controllers.substring(paths.controllers.lastIndexOf(bundleName)) +'/'+ filename.substring(filename.lastIndexOf(bundleName+'\/controllers'));
                         error.tag += 'controller:';
                         var controllerInstanceString = path.match(/controller\.(.*)\.js/)[1] || null;
                         error.tag += (controllerInstanceString) ? controllerInstanceString : 'controller:';