fix db parameters

example/index.js

@@ -1,31 +1,16 @@
 'use strict';
 
-var config = require('./lib/config');
+const Api = require('../');
+const api = new Api();
 
-//var Api = require('create-rest-api');
-var Api = require('../');
-var api = new Api(config, {validation: true});
+api.model('comments');
 
-api.registerModel('categories', {
-  name: { type: 'string', required: true },
-});
-
-api.registerModel('directors', {
-  name: { type: 'string', required: true },
-  birthday: { type: 'date' },
-});
+api.verify();
 
-api.registerModel('stars', {
-  name: { type: 'string', required: true },
-  birthday: { type: 'date' },
-});
+api.model('stars');
 
-api.registerModel('movies', {
-  name: { type: 'string', required: true },
-  year: { type: 'integer', required: true },
-  director: { type: 'uuid', link: 'directors' },
-  stars: { type: 'array', link: 'stars' },
-  categories: { type: 'array', link: 'categories' },
+api.model('movies', {
+  stars: { link: 'stars' },
 });
 
 api.start();

example/index2.js

@@ -0,0 +1,44 @@
+'use strict';
+
+var config = require('./lib/config');
+
+//var Api = require('create-rest-api');
+var Api = require('../');
+//var api = new Api(config, {validation: true});
+const api = new Api({
+  listen : {
+    host : '127.0.0.1',
+    port : 8877
+  },
+  db : {
+    mongo : {
+      url : '127.0.0.1',
+      port : 27017,
+      name : 'test'
+    }
+  },
+}, {validation: true});
+
+api.model('categories', {
+  name: { type: 'string', required: true },
+});
+
+api.registerModel('directors', {
+  name: { type: 'string', required: true },
+  birthday: { type: 'date' },
+});
+
+api.registerModel('stars', {
+  name: { type: 'string', required: true },
+  birthday: { type: 'date' },
+});
+
+api.registerModel('movies', {
+  name: { type: 'string', required: true },
+  year: { type: 'integer', required: true },
+  director: { type: 'uuid', link: 'directors' },
+  stars: { type: 'array', link: 'stars' },
+  categories: { type: 'array', link: 'categories' },
+});
+
+api.start();

example/index3.js

@@ -0,0 +1,25 @@
+'use strict';
+
+var config = require('./lib/config');
+
+//var Api = require('create-rest-api');
+var Api = require('../');
+var api = new Api(config);
+
+//api.registerModel('messages');
+
+//api.verify({ login: 'users.login', password: 'users.password', default: {CRUD: 'root', R: /.*+/} });
+
+api.registerModel('users', {CRUD:'root'});
+
+api.registerModel('categories');
+api.registerModel('directors');
+api.registerModel('stars');
+
+api.registerModel('movies', {
+  director: { link: 'directors' },
+  stars: { link: 'stars' },
+  categories: { link: 'categories' }
+});
+
+api.start();

index.js

@@ -17,6 +17,8 @@ exports = module.exports = function (config, options) {
     _config: config,
     _app: app,
     registerModel: app.registerModel,
+    model: app.model,
+    verify: app.verify,
     start: start,
   };
 };
@@ -34,8 +36,8 @@ function start(config) {
     : cfgDb.login ? cfgDb.login + ':' + cfgDb.password + '@'
     : '';
   var dbUrl = process.env.DB_URL || cfgDb.url || 'localhost';
-  if(cfgDb.port) dbUrl += ':' + cfgDb.port;
-  if(cfgDb.name) dbUrl += '/' + cfgDb.name;
+  if(cfgDb.port && !dbUrl.match(/:/)) dbUrl += ':' + cfgDb.port;
+  if(cfgDb.name && !dbUrl.match(/\//)) dbUrl += '/' + cfgDb.name;
   dbUrl = 'mongodb://' + dbAuth + dbUrl;
 
   app._start(HOST, PORT, dbUrl);

lib/logger.js

@@ -7,7 +7,6 @@ var winston = require('winston');
 var moment = require('moment-timezone');
 
 var logLevel = process.env.LOG_LEVEL || 'info';
-
 var Logger = winstonObj;
 
 Logger.getInstance = function () {

lib/server.js

@@ -86,9 +86,9 @@ app._start = function (HOST, PORT, dbUrl) {
   // Connect to DB and start server
   app._db.connect(dbUrl, function (err) {
     if (typeof err !== 'undefined') {
-      app.log.error('server start failed. datbase connection error: %s. Add DB_URL and DB_AUTH globals or update config file.', err);
+      app.log.error('server start failed. datbase connection on %s error: %s. Try to add DB_URL and/or DB_AUTH globals or update config file.', dbUrl, err);
     } else {
-      app.log.info('datbase connected');
+      app.log.info('datbase connected on %s', dbUrl);
       app.listen(PORT, HOST, function () {
         app.log.info('server started on %s:%d', HOST || '*', PORT);
       });
@@ -97,7 +97,7 @@ app._start = function (HOST, PORT, dbUrl) {
 
 };
 
-app.registerModel = function (name, model) {
+app.model = function (name, model) {
   app.models[name] = new DefaultModel(name, model, app._db);
   app.controllers[name] = new DefaultController(name, app.models[name]);
   app.routes[name] = new DefaultRoutes(name, app.controllers[name], app);
@@ -135,4 +135,12 @@ app.registerModel = function (name, model) {
   }
 };
 
+app.registerModel = function (name, model) {
+  console.warn('registerModel is depricated. Use model instead.');
+  return app.model(name, model);
+}
+
+app.verify = function (options) {
+}
+
 module.exports = app;