miolo 0.0.25 → 0.0.28

package/lib/config/defaults.js

@@ -50,7 +50,7 @@ module.exports = {
     }
   },
   database: {
-    connection: {
+    db: {
       dialect: 'postgres',
       host: 'localhost',
       port: 5432,
@@ -64,9 +64,7 @@ module.exports = {
       idleTimeoutMillis: 10000 // The maximum time, in milliseconds, that a connection can be idle before being released. Use with combination of evict for proper working, for more details read https://github.com/coopernurse/node-pool/issues/178#issuecomment-327110870,
 
     },
-    options: {
-      log: 'info'
-    }
+    log: 'info'
   },
   routes: {
     body_field: undefined,

package/lib/index.js

@@ -3,28 +3,34 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "getDb", {
+Object.defineProperty(exports, "getConnection", {
   enumerable: true,
   get: function get() {
-    return _calustraRouter.getDb;
+    return _calustra.getConnection;
+  }
+});
+Object.defineProperty(exports, "getConnectionFromCache", {
+  enumerable: true,
+  get: function get() {
+    return _calustraRouter.getConnectionFromCache;
   }
 });
 Object.defineProperty(exports, "getModel", {
   enumerable: true,
   get: function get() {
-    return _calustraRouter.getModel;
+    return _calustraOrm.getModel;
   }
 });
-Object.defineProperty(exports, "init_cacher", {
+Object.defineProperty(exports, "getModelFromCache", {
   enumerable: true,
   get: function get() {
-    return _cacher.init_cacher;
+    return _calustraRouter.getModelFromCache;
   }
 });
-Object.defineProperty(exports, "init_db_connection", {
+Object.defineProperty(exports, "init_cacher", {
   enumerable: true,
   get: function get() {
-    return _conn.init_db_connection;
+    return _cacher.init_cacher;
   }
 });
 Object.defineProperty(exports, "init_emailer", {
@@ -54,6 +60,8 @@ var _cacher = require("./cacher");
 
 var _logger = require("./logger");
 
-var _conn = require("./db/conn");
+var _calustra = require("calustra");
+
+var _calustraOrm = require("calustra-orm");
 
 var _calustraRouter = require("calustra-router");

package/lib/server/index.js

@@ -15,7 +15,7 @@ var _logger = require("../logger");
 
 var _cron = require("./engines/cron");
 
-var _conn = require("../db/conn");
+var _calustra = require("calustra");
 
 var _context = require("./middleware/context");
 
@@ -58,7 +58,7 @@ function _miolo() {
     var conn;
 
     if (config.database) {
-      conn = (0, _conn.init_db_connection)(config.database);
+      conn = (0, _calustra.getConnection)(config.database);
     }
 
     var app = new _koa.default(); // Assign miolo stuff to ctx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "0.0.25",
+  "version": "0.0.28",
   "description": "miolo",
   "main": "lib/index.js",
   "author": "Afialapis <info@afialapis.com>",
@@ -14,8 +14,9 @@
     "assign-deep": "^1.0.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "basic-auth": "^2.0.1",
-    "calustra": "0.0.27",
-    "calustra-router": "0.0.27",
+    "calustra": "0.0.34",
+    "calustra-orm": "0.0.34",
+    "calustra-router": "0.0.34",
     "cron": "^1.8.2",
     "diskspace": "^2.0.0",
     "eslint": "^8.9.0",

package/src/config/defaults.js

@@ -47,7 +47,7 @@ module.exports= {
     }
   },
   database: {
-    connection : {
+    db: {
       dialect:  'postgres',
       host:     'localhost',
       port:     5432,
@@ -58,9 +58,7 @@ module.exports= {
       min:      0,          // Minimum number of connection in pool
       idleTimeoutMillis: 10000,  // The maximum time, in milliseconds, that a connection can be idle before being released. Use with combination of evict for proper working, for more details read https://github.com/coopernurse/node-pool/issues/178#issuecomment-327110870,
     },
-    options: {
-      log: 'info'
-    },
+    log: 'info'
   },
   routes: {
     body_field: undefined,

package/src/index.js

@@ -2,15 +2,17 @@ import {miolo} from './server'
 import { init_emailer } from './emailer'
 import { init_cacher } from './cacher'
 import { init_logger } from './logger'
-import { init_db_connection } from './db/conn'
-import {getDb, getModel} from 'calustra-router'
+import { getConnection } from 'calustra'
+import { getModel } from 'calustra-orm'
+import {getConnectionFromCache, getModelFromCache} from 'calustra-router'
 
 export {
   miolo,
   init_emailer,
   init_cacher,
   init_logger,
-  init_db_connection,
-  getDb, 
-  getModel
+  getConnection,
+  getModel,
+  getConnectionFromCache, 
+  getModelFromCache
 }

package/src/server/index.js

@@ -5,7 +5,7 @@ import { init_logger } from 'src/logger'
 import { init_cron } from './engines/cron'
 // import {init_socket} from './engines/socket'
 
-import { init_db_connection } from 'src/db/conn'
+import { getConnection } from 'calustra'
 
 import { init_context_middleware } from './middleware/context'
 import { init_body_middleware } from './middleware/body'
@@ -29,7 +29,7 @@ async function miolo(sconfig, render, callback) {
   
   let conn
   if (config.database) {
-    conn= init_db_connection(config.database)
+    conn= getConnection(config.database)
   }
 
   const app = new Koa()

package/lib/db/conn.js

@@ -1,15 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.init_db_connection = init_db_connection;
-
-var {
-  getConnection
-} = require('calustra');
-
-function init_db_connection(config) {
-  var conn = getConnection(config);
-  return conn;
-}

package/src/db/conn.js

@@ -1,10 +0,0 @@
-const {getConnection} = require('calustra')
-
-function init_db_connection(config) {
-  
-  const conn= getConnection(config)
-
-  return conn
-}
-
-export {init_db_connection}