gina 0.1.6-alpha.87 → 0.1.6-alpha.89

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

@@ -4,7 +4,7 @@ const fs            = require('fs');
 const os            = require('os');
 const path          = require('path');
 const EventEmitter  = require('events').EventEmitter;
-// const Busboy        = require('./deps/busboy-0.2.14');
+const swig          = require('./deps/swig-1.4.2');
 const Busboy        = require('./deps/busboy-1.6.0');
 const Stream        = require('stream');
 const zlib          = require('zlib'); // gzip / deflate
@@ -12,7 +12,7 @@ const util          = require('util');
 var https           = require('https');
 const sslChecker    = require('ssl-checker');
 
-const swig          = require( _(GINA_FRAMEWORK_DIR +'/node_modules/swig', true) );
+
 var Config          = require('./config');
 var Router          = require('./router');
 var lib             = require('./../lib');
@@ -2762,6 +2762,11 @@ function Server(options) {
         var isMethodAllowed = null, hostname = null;
         out:
             for (let name in routing) {
+                // ignoring routes out of scope
+                if ( routing[name].scopes.indexOf(process.env.NODE_SCOPE) < 0 ) {
+                    continue;
+                }
+
                 if ( typeof(routing[name]['param']) == 'undefined' ) {
                     break;
                 }

package/framework/{v0.1.6-alpha.87 → v0.1.6-alpha.89}/helpers/data/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "data",
+  "name": "gina-helpers-data",
   "version": "1.0.0",
   "description": "Data helper",
 

package/framework/{v0.1.6-alpha.87/helpers/plugins → v0.1.6-alpha.89/helpers/json}/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "json",
+  "name": "gina-helpers-json",
   "version": "1.0.0",
   "description": "JSON helper",
 

package/framework/{v0.1.6-alpha.87/helpers/json → v0.1.6-alpha.89/helpers/plugins}/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "json",
+  "name": "gina-helpers-plugins",
   "version": "1.0.0",
   "description": "JSON helper",
 

package/framework/{v0.1.6-alpha.87 → v0.1.6-alpha.89}/lib/domain/src/main.js

@@ -44,8 +44,10 @@ function Domain(options, cb) {
     var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
     // Detect if user is on IE browser
     var isIE            = false;
+    var defaultUrl      = "/_gina/assets/public_suffix_list.dat";
     if (isGFFCtx) {
         isIE = !!window.MSInputMethodContext && !!document.documentMode;
+        defaultUrl = gina.config.webroot + defaultUrl.substring(1);
     }
 
     if ( typeof(arguments[0]) == 'function' ) {
@@ -57,7 +59,7 @@ function Domain(options, cb) {
         // if isGFFCtx, should be place in the public folder to be served by your own host
         // e.g.: "./public_suffix_list.dat" located under "/my-www-folder/"
         filename            : "../dist/public_suffix_list.dat",
-        url                 : "/_gina/assets/public_suffix_list.dat",
+        url                 : defaultUrl,
         // url                 : "https://publicsuffix.org/list/public_suffix_list.dat",
         alternativeUrl      : "https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat",
         // only available from backend calls
@@ -65,6 +67,14 @@ function Domain(options, cb) {
         isUpdating          : false
     }
 
+    if (
+        !isGFFCtx
+        && typeof(options) != 'undefined'
+        && typeof(options.webroot) != 'undefined'
+    ) {
+        defaultOptions.url = options.webroot + defaultUrl.substring(1);
+    }
+
     // Get the commit version
     // cat ./framework/v0.1.6-alpha.83/core/asset/data/public_suffix_list.dat|grep 'COMMIT:'|sed 's/^\/\/ COMMIT\: //'
 

package/framework/{v0.1.6-alpha.87 → v0.1.6-alpha.89}/lib/logger/src/containers/mq/listener.js

@@ -163,7 +163,11 @@ function MQListener(opt, cb) {
             var forwardId = null;
             conn.on('end', function() {
                 delete sessions[this.sessionId];
-                if ( this.request != 'report' ) {
+                if (
+                    this.request != 'report'
+                    && forwardList
+                    && typeof(forwardList[this.request]) != 'undefined'
+                ) {
                     forwardId = forwardList[this.request].indexOf(this.sessionId);
                     if ( forwardId > -1 && typeof(forwardList[this.request]) != 'undefined') {
                         forwardList[this.request].splice(forwardId, 1);
@@ -176,7 +180,11 @@ function MQListener(opt, cb) {
             // force exit
             conn.on('exit', function() {
                 delete sessions[this.sessionId];
-                if ( this.request != 'report' ) {
+                if (
+                    this.request != 'report'
+                    && forwardList
+                    && typeof(forwardList[this.request]) != 'undefined'
+                ) {
                     forwardId = forwardList[this.request].indexOf(this.sessionId);
                     if ( forwardId > -1 ) {
                         forwardList[this.request].splice(forwardId, 1);

package/framework/{v0.1.6-alpha.87 → v0.1.6-alpha.89}/package.json

@@ -6,7 +6,6 @@
     "engine.io-client": "^6.6.2",
     "requirejs": "2.3.7",
     "ssl-checker": "^2.0.7",
-    "swig": "^1.4.2",
     "uuid": "^7.0.3"
   }
 }

package/package.json

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

package/framework/v0.1.6-alpha.87/VERSION

@@ -1 +0,0 @@
-0.1.6-alpha.87

package/framework/v0.1.6-alpha.87/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.87/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}

package/framework/v0.1.6-alpha.87/core/deps/busboy-0.2.14/.travis.yml

@@ -1,17 +0,0 @@
-sudo: false
-language: cpp
-notifications:
-  email: false
-env:
-  matrix:
-  - TRAVIS_NODE_VERSION="0.10"
-  - TRAVIS_NODE_VERSION="0.12"
-  - TRAVIS_NODE_VERSION="4"
-  - TRAVIS_NODE_VERSION="6"
-  - TRAVIS_NODE_VERSION="7"
-install:
-  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
-  - node --version
-  - npm --version
-  - npm install
-script: npm test

package/framework/v0.1.6-alpha.87/core/deps/busboy-0.2.14/README.md

@@ -1,225 +0,0 @@
-Description
-===========
-
-A node.js module for parsing incoming HTML form data.
-
-If you've found this module to be useful and wish to support it, you may do so by visiting this pledgie campaign:
-<a href='https://pledgie.com/campaigns/28774'><img alt='Click here to support busboy' src='https://pledgie.com/campaigns/28774.png?skin_name=chrome' border='0'></a>
-
-
-Requirements
-============
-
-* [node.js](http://nodejs.org/) -- v0.8.0 or newer
-
-
-Install
-=======
-
-    npm install busboy
-
-
-Examples
-========
-
-* Parsing (multipart) with default options:
-
-```javascript
-var http = require('http'),
-    inspect = require('util').inspect;
-
-var Busboy = require('busboy');
-
-http.createServer(function(req, res) {
-  if (req.method === 'POST') {
-    var busboy = new Busboy({ headers: req.headers });
-    busboy.on('file', function(fieldname, file, filename, encoding, mimetype) {
-      console.log('File [' + fieldname + ']: filename: ' + filename + ', encoding: ' + encoding + ', mimetype: ' + mimetype);
-      file.on('data', function(data) {
-        console.log('File [' + fieldname + '] got ' + data.length + ' bytes');
-      });
-      file.on('end', function() {
-        console.log('File [' + fieldname + '] Finished');
-      });
-    });
-    busboy.on('field', function(fieldname, val, fieldnameTruncated, valTruncated, encoding, mimetype) {
-      console.log('Field [' + fieldname + ']: value: ' + inspect(val));
-    });
-    busboy.on('finish', function() {
-      console.log('Done parsing form!');
-      res.writeHead(303, { Connection: 'close', Location: '/' });
-      res.end();
-    });
-    req.pipe(busboy);
-  } else if (req.method === 'GET') {
-    res.writeHead(200, { Connection: 'close' });
-    res.end('<html><head></head><body>\
-               <form method="POST" enctype="multipart/form-data">\
-                <input type="text" name="textfield"><br />\
-                <input type="file" name="filefield"><br />\
-                <input type="submit">\
-              </form>\
-            </body></html>');
-  }
-}).listen(8000, function() {
-  console.log('Listening for requests');
-});
-
-// Example output, using http://nodejs.org/images/ryan-speaker.jpg as the file:
-//
-// Listening for requests
-// File [filefield]: filename: ryan-speaker.jpg, encoding: binary
-// File [filefield] got 11971 bytes
-// Field [textfield]: value: 'testing! :-)'
-// File [filefield] Finished
-// Done parsing form!
-```
-
-* Save all incoming files to disk:
-
-```javascript
-var http = require('http'),
-    path = require('path'),
-    os = require('os'),
-    fs = require('fs');
-
-var Busboy = require('busboy');
-
-http.createServer(function(req, res) {
-  if (req.method === 'POST') {
-    var busboy = new Busboy({ headers: req.headers });
-    busboy.on('file', function(fieldname, file, filename, encoding, mimetype) {
-      var saveTo = path.join(os.tmpDir(), path.basename(fieldname));
-      file.pipe(fs.createWriteStream(saveTo));
-    });
-    busboy.on('finish', function() {
-      res.writeHead(200, { 'Connection': 'close' });
-      res.end("That's all folks!");
-    });
-    return req.pipe(busboy);
-  }
-  res.writeHead(404);
-  res.end();
-}).listen(8000, function() {
-  console.log('Listening for requests');
-});
-```
-
-* Parsing (urlencoded) with default options:
-
-```javascript
-var http = require('http'),
-    inspect = require('util').inspect;
-
-var Busboy = require('busboy');
-
-http.createServer(function(req, res) {
-  if (req.method === 'POST') {
-    var busboy = new Busboy({ headers: req.headers });
-    busboy.on('file', function(fieldname, file, filename, encoding, mimetype) {
-      console.log('File [' + fieldname + ']: filename: ' + filename);
-      file.on('data', function(data) {
-        console.log('File [' + fieldname + '] got ' + data.length + ' bytes');
-      });
-      file.on('end', function() {
-        console.log('File [' + fieldname + '] Finished');
-      });
-    });
-    busboy.on('field', function(fieldname, val, fieldnameTruncated, valTruncated) {
-      console.log('Field [' + fieldname + ']: value: ' + inspect(val));
-    });
-    busboy.on('finish', function() {
-      console.log('Done parsing form!');
-      res.writeHead(303, { Connection: 'close', Location: '/' });
-      res.end();
-    });
-    req.pipe(busboy);
-  } else if (req.method === 'GET') {
-    res.writeHead(200, { Connection: 'close' });
-    res.end('<html><head></head><body>\
-               <form method="POST">\
-                <input type="text" name="textfield"><br />\
-                <select name="selectfield">\
-                  <option value="1">1</option>\
-                  <option value="10">10</option>\
-                  <option value="100">100</option>\
-                  <option value="9001">9001</option>\
-                </select><br />\
-                <input type="checkbox" name="checkfield">Node.js rules!<br />\
-                <input type="submit">\
-              </form>\
-            </body></html>');
-  }
-}).listen(8000, function() {
-  console.log('Listening for requests');
-});
-
-// Example output:
-//
-// Listening for requests
-// Field [textfield]: value: 'testing! :-)'
-// Field [selectfield]: value: '9001'
-// Field [checkfield]: value: 'on'
-// Done parsing form!
-```
-
-
-API
-===
-
-_Busboy_ is a _Writable_ stream
-
-Busboy (special) events
------------------------
-
-* **file**(< _string_ >fieldname, < _ReadableStream_ >stream, < _string_ >filename, < _string_ >transferEncoding, < _string_ >mimeType) - Emitted for each new file form field found. `transferEncoding` contains the 'Content-Transfer-Encoding' value for the file stream. `mimeType` contains the 'Content-Type' value for the file stream.
-    * Note: if you listen for this event, you should always handle the `stream` no matter if you care about the file contents or not (e.g. you can simply just do `stream.resume();` if you want to discard the contents), otherwise the 'finish' event will never fire on the Busboy instance. However, if you don't care about **any** incoming files, you can simply not listen for the 'file' event at all and any/all files will be automatically and safely discarded (these discarded files do still count towards `files` and `parts` limits).
-    * If a configured file size limit was reached, `stream` will both have a boolean property `truncated` (best checked at the end of the stream) and emit a 'limit' event to notify you when this happens.
-
-* **field**(< _string_ >fieldname, < _string_ >value, < _boolean_ >fieldnameTruncated, < _boolean_ >valueTruncated, < _string_ >transferEncoding, < _string_ >mimeType) - Emitted for each new non-file field found.
-
-* **partsLimit**() - Emitted when specified `parts` limit has been reached. No more 'file' or 'field' events will be emitted.
-
-* **filesLimit**() - Emitted when specified `files` limit has been reached. No more 'file' events will be emitted.
-
-* **fieldsLimit**() - Emitted when specified `fields` limit has been reached. No more 'field' events will be emitted.
-
-
-Busboy methods
---------------
-
-* **(constructor)**(< _object_ >config) - Creates and returns a new Busboy instance.
-
-    * The constructor takes the following valid `config` settings:
-
-        * **headers** - _object_ - These are the HTTP headers of the incoming request, which are used by individual parsers.
-
-        * **highWaterMark** - _integer_ - highWaterMark to use for this Busboy instance (Default: WritableStream default).
-
-        * **fileHwm** - _integer_ - highWaterMark to use for file streams (Default: ReadableStream default).
-
-        * **defCharset** - _string_ - Default character set to use when one isn't defined (Default: 'utf8').
-
-        * **preservePath** - _boolean_ - If paths in the multipart 'filename' field shall be preserved. (Default: false).
-
-        * **limits** - _object_ - Various limits on incoming data. Valid properties are:
-
-            * **fieldNameSize** - _integer_ - Max field name size (in bytes) (Default: 100 bytes).
-
-            * **fieldSize** - _integer_ - Max field value size (in bytes) (Default: 1MB).
-
-            * **fields** - _integer_ - Max number of non-file fields (Default: Infinity).
-
-            * **fileSize** - _integer_ - For multipart forms, the max file size (in bytes) (Default: Infinity).
-
-            * **files** - _integer_ - For multipart forms, the max number of file fields (Default: Infinity).
-
-            * **parts** - _integer_ - For multipart forms, the max number of parts (fields + files) (Default: Infinity).
-
-            * **headerPairs** - _integer_ - For multipart forms, the max number of header key=>value pairs to parse **Default:** 2000 (same as node's http).
-
-    * The constructor can throw errors:
-
-        * **Unsupported content type: $type** - The `Content-Type` isn't one Busboy can parse.
-
-        * **Missing Content-Type** - The provided headers don't include `Content-Type` at all.