gina 0.1.6-alpha.156 → 0.1.6-alpha.158

package/framework/{v0.1.6-alpha.156 → v0.1.6-alpha.158}/core/template/conf/env.json

@@ -54,9 +54,11 @@
         "webrootAutoredirect": true,
         "cache": {
           "enable": false,
+          "path": "{cachePath}",
           // in sec
           "ttl": 3600,
-          "path": "{cachePath}"
+          // Only active when set to `true`, default is `false`
+          "sliding": false
         },
         "resolvers": [],
         // "resolvers": [

package/framework/v0.1.6-alpha.158/lib/cache/README.md

@@ -0,0 +1,19 @@
+## Debuging your test with nodeunit
+
+```tty
+ node --inspect-brk=6959 `which nodeunit` ./test/01-find.js
+```
+
+Options can be passed through routing or manually when writing to cache
+
+```json
+{
+    "cache": {
+        // Static cache from `memory` access or from `fs` access (file sytem)
+        "type": "memory",
+        "ttl": 3600,
+        // Only active when set to `true`, default is `false`
+        "sliding": true
+    }
+}
+```

package/framework/{v0.1.6-alpha.156 → v0.1.6-alpha.158}/lib/cache/src/main.js

@@ -1,15 +1,22 @@
 'use strict';
 if ( typeof(module) !== 'undefined' && module.exports ) {
-    var lib = require('../../index');
+    const lib = require('../../index');
 }
 
 var cache = new Map();
 
+
 function Cache() {
     var isGFFCtx        = ( ( typeof(module) !== 'undefined' ) && module.exports ) ? false : true;
     var merge           = (isGFFCtx) ? require('lib/merge') : require('../../../lib/merge');
-
-    var instance = {};
+    var uuid            = (isGFFCtx) ? require('vendor/uuid') : require('uuid');
+    var Collection      = (isGFFCtx) ? require('lib/collection') : require('../../../lib/collection');
+    // var EventEmitter    = (isGFFCtx) ? EventTarget : require('events').EventEmitter;
+
+    var instance = {
+        _events              : new Collection() //,
+        // eventHadlerInstance  : new EventEmitter()
+    };
     var importedMapInstance = null;
 
     /**
@@ -35,7 +42,7 @@ function Cache() {
         }
 
         if (
-            /object/i.test(typeof(value))
+            /^object$/i.test(typeof(value))
         ) {
             value.createdAt = new Date();
 
@@ -148,6 +155,78 @@ function Cache() {
         return cache.size;
     }
 
+    function onInvalidateEvent(event, data) {
+        console.debug('[cache::onInvalidateEvent] ', event, data);
+
+        if (!cache._events) {
+            return;
+        }
+
+        var found = cache._events
+            .setSearchOption('cacheKey', 'skipEval', true)
+            .find({ event: event});
+        for (let i=0, len=found.length; i<len; i++) {
+            instance['delete'](found[i].cacheKey);
+            cache._events
+                .setSearchOption('cacheKey', 'skipEval', true)
+                .delete({cacheKey: found[i].cacheKey, event: event });
+        }
+
+        if (importedMapInstance) {
+            importedMapInstance = cache;
+        }
+    }
+
+
+    /**
+     * Invalidate cache by event
+     *
+     * @return stats
+     */
+    instance['setEvents'] = function(cacheKey, cacheEvents, cb) {
+        if ( typeof(cache._events) == 'undefined' ) {
+            // collection
+            cache._events = instance['_events'];
+        }
+        // if ( typeof(cache.eventHadlerInstance) == 'undefined' ) {
+        //     // EventEmitter
+        //     cache.eventHadlerInstance = instance['eventHadlerInstance'];
+        // }
+
+        // Placing listeners
+        for (let i=0, len=cacheEvents.length; i<len; i++ ) {
+            // Only place if not already defiend
+            // let trigger = 'cache#invalidate::'+ cacheEvents[i];
+            // if ( typeof(cache.eventHadlerInstance._events[trigger]) == 'undefined' ) {
+            //     console.debug('[cache][set listener] ',trigger);
+            //     cache.eventHadlerInstance.on(trigger, onInvalidateEvent);
+            // }
+
+            if ( !cache._events.setSearchOption('cacheKey', 'skipEval', true).findOne({cacheKey: cacheKey, event: cacheEvents[i]}) ) {
+                cache._events.insert({
+                    id: uuid.v4(),
+                    cacheKey: cacheKey,
+                    event: cacheEvents[i]
+                });
+            }
+        }
+
+        if (importedMapInstance) {
+            importedMapInstance = cache;
+        }
+    }
+
+    /**
+     * Invalidate cache by event
+     *
+     * @return stats
+     */
+    instance['invalidateByEvent'] = function(event, data) {
+        // console.debug('[cache][invalidateByEvent] ',event, data);
+        // cache.eventHadlerInstance.emit('cache#invalidate::'+event, event, data);
+        onInvalidateEvent(event, data)
+    }
+
     return instance;
 };
 

package/framework/{v0.1.6-alpha.156 → v0.1.6-alpha.158}/lib/collection/src/main.js

@@ -61,7 +61,8 @@ function Collection(content, options) {
             true: {
                 re: '^%s$'
             }
-        }
+        },
+        skipEval: false
     };
     var withOrClause = false;
     var notInSearchModeEnabled = false;
@@ -101,7 +102,12 @@ function Collection(content, options) {
         if (!content[entry]) {
             content[entry] = {};
         }
-        content[entry]._uuid = uuid.v4();
+        if ( typeof(content[entry]._uuid) != 'undefined' ) {
+            content[entry]._hasItsOwnUuid = true;
+        } else {
+            content[entry]._uuid = uuid.v4();
+        }
+
         // To avoid duplicate entries
         searchIndex[idx] = content[entry]._uuid;
         ++idx;
@@ -114,13 +120,13 @@ function Collection(content, options) {
      * eg.:
      *  var recCollection = new Collection(arrayCollection);
      *  var rec =  recCollection
-     *                  .setSearchOption('name', 'isCaseSensitive', false)
+     *                  .setSearchOption('city', 'isCaseSensitive', false)
      *                  .find({ city: 'cap Town' });
      *
      * eg.:
      *  var recCollection = new Collection(arrayCollection);
      *  var searchOptions = {
-     *      name: {
+     *      city: {
      *          isCaseSensitive: false
      *      }
      *  };
@@ -146,7 +152,7 @@ function Collection(content, options) {
             , len   = arguments.length
         ;
 
-        if (arguments.length == 1) {
+        if (len == 1) {
             if ( typeof(arguments[0]) != 'object' )
                 throw new Error('searchOption must be an object');
 
@@ -246,6 +252,13 @@ function Collection(content, options) {
              * @param {number} matched
              */
             var search = function(filter, field, _content, matched, searchOptionRules) {
+                if (
+                    localSearchOptions
+                    && typeof(localSearchOptions[field]) != 'undefined'
+                ) {
+                    searchOptionRules = merge(localSearchOptions[field], searchOptionRules);
+                }
+
                 var reValidCount = null, searchOptCount = null;
                  // null case
                 if (filter === null && _content === null) {
@@ -269,6 +282,7 @@ function Collection(content, options) {
                     && typeof(_content) !== 'object'
                     && /(<|>|=)/.test(filter)
                     && !/undefined|function/.test(typeof(_content))
+                    && !searchOptionRules.skipEval
                 ) { // with operations
                     let originalFilter = filter;
                     let condition = _content + filter;
@@ -306,6 +320,12 @@ function Collection(content, options) {
                     && typeof(_content) !== 'object'
                     && _content === filter
                     && typeof(searchOptions[field]) == 'undefined'
+                    ||
+                    typeof(_content) != 'undefined'
+                    && typeof(_content) !== 'object'
+                    && _content === filter
+                    && typeof(searchOptions[field]) != 'undefined'
+                    && searchOptionRules.skipEval
                 ) {
 
                     ++matched;
@@ -317,7 +337,11 @@ function Collection(content, options) {
                 ) {
                     reValidCount    = 0;
                     searchOptCount  = searchOptions[field].count();
-                    for ( var rule in searchOptions[field]) {
+                    for ( let rule in searchOptions[field]) {
+                        if ( typeof(searchOptionRules[rule][searchOptions[field][rule]]) == 'undefined' ) {
+                            continue
+                        }
+
                         searchOptionRules[rule][searchOptions[field][rule]].re = searchOptionRules[rule][searchOptions[field][rule]].re.replace(/\%s/, filter);
 
                         if (searchOptionRules[rule][searchOptions[field][rule]].modifiers) {
@@ -564,6 +588,7 @@ function Collection(content, options) {
      *
      * Available options :
      *  isCaseSensitive: [true|false] - set to true by default
+     *  skipEval: [true|false] - set to false by default
      *
      * @param {object} filter
      *
@@ -1055,7 +1080,7 @@ function Collection(content, options) {
      *
      *  N.B.: will not affect current result - just returning the DIFF
      *  If you
-     * @param {object} filter - samme as `.find(filter)`
+     * @param {object} filter - same as `.find(filter)`
      * @param {string|boolean} [ uuid | disabled ] - by default, Collection is using its internal _uuid
      * If you want to delete without key comparison, disable `uuid` search mode
      * .delete({ name: 'Jordan' }, false)
@@ -1394,9 +1419,16 @@ function Collection(content, options) {
         var result = ( Array.isArray(this) ) ? this.slice() : content.slice();
         // cleanup
         for (var i = 0, len = result.length; i < len; ++i) {
-            if (result[i]._uuid)
+            if (result[i]._hasItsOwnUuid) {
+                let hasItsOwnUuid = (/^true$/i.test(result[i]._hasItsOwnUuid) ) ? true : false;
+                delete result[i]._hasItsOwnUuid;
+                if (hasItsOwnUuid) {
+                    continue;
+                }
+            }
+            if (result[i]._uuid) {
                 delete result[i]._uuid;
-
+            }
         }
 
         // return JSON.clone(result);

package/framework/{v0.1.6-alpha.156 → v0.1.6-alpha.158}/lib/routing/src/main.js

@@ -1024,7 +1024,7 @@ function Routing() {
                 route.proxy_hostname  = window.location.protocol +'//'+ document.location.hostname;
             } else {
                 route.proxy_hostname  = process.gina.PROXY_HOSTNAME || config.envConf._proxyHostname;
-                console.debug("[getRoute#1]["+isProxyHost+"] process.gina.PROXY_HOSTNAME ("+ process.gina.PROXY_HOSTNAME  +") VS config.envConf._proxyHostname ("+ config.envConf._proxyHostname +")");
+                // console.debug("[getRoute#1]["+isProxyHost+"] process.gina.PROXY_HOSTNAME ("+ process.gina.PROXY_HOSTNAME  +") VS config.envConf._proxyHostname ("+ config.envConf._proxyHostname +")");
             }
             route.proxy_host      = route.proxy_hostname.replace(/^(https|http)\:\/\//, '');
 

package/package.json

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

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

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