Add methods addFactoriesFromDir and addRoutesFromDir to server

lib/index.ts

@@ -1,4 +1,4 @@
-import {Factory, Lair} from 'lair-db/dist';
+import {Factory, Lair} from 'lair-db';
 import Cron from './cron';
 import Job from './job';
 import Route from './route';

lib/route.ts

@@ -1,5 +1,5 @@
 import * as express from 'express';
-import {Lair} from 'lair-db/dist';
+import {Lair} from 'lair-db';
 import {CRUDOptions} from 'lair-db/dist/lair';
 import methods = require('methods');
 import {assert} from './utils';

lib/server.ts

@@ -1,8 +1,9 @@
 import bodyParser = require('body-parser');
 import colors = require('colors/safe');
 import * as express from 'express';
+import read = require('fs-readdir-recursive');
 import * as http from 'http';
-import {Factory, Lair} from 'lair-db/dist';
+import {Factory, Lair} from 'lair-db';
 import winston = require('winston');
 import {printRoutesMap} from './express';
 import Route from './route';
@@ -84,14 +85,22 @@ export default class Server {
     routes.map(route => this.addRoute(route));
   }
 
-  public addFactory(factory: Factory, name: string) {
+  public addRoutesFromDir(path: string) {
+    read(path).forEach(routePath => this.add('route', path, routePath));
+  }
+
+  public addFactory(factory: Factory, name?: string) {
     this.lair.registerFactory(factory, name);
   }
 
   public addFactories(factories: Array<[Factory, string]>) {
     factories.map(args => this.addFactory.apply(this, args));
   }
 
+  public addFactoriesFromDir(path: string) {
+    read(path).forEach(factoryPath => this.add('factory', path, factoryPath));
+  }
+
   public createRecords(factoryName: string, count: number) {
     this.createRecordsQueue.push([factoryName, count]);
   }
@@ -166,4 +175,18 @@ export default class Server {
       this.expressApp._router.stack.forEach(printRoutesMap.bind(null, []));
     }
   }
+
+  private add(type: string, parent: string, path: string) {
+    if (path.match(/\.ts$/) !== null || path.match(/\.js$/) !== null) {
+      const instance = require(`${parent}/${path}`).default;
+      if (instance) {
+        if (type === 'route' && instance instanceof Route) {
+          this.addRoute(instance);
+        }
+        if (type === 'factory' && instance instanceof Factory) {
+          this.addFactory(instance);
+        }
+      }
+    }
+  }
 }

package.json

@@ -32,7 +32,8 @@
     "body-parser": "^1.18.2",
     "colors": "^1.2.1",
     "express": "^4.16.3",
-    "lair-db": "^1.5.4",
+    "fs-readdir-recursive": "^1.1.0",
+    "lair-db": "^1.6.0",
     "methods": "^1.1.2",
     "node-cron": "^1.2.1",
     "winston": "^2.4.1"

tests/server.ts

@@ -91,6 +91,17 @@ describe('#Server', () => {
       expect(this.lair.getDevInfo()).to.have.property('b').that.is.an('object');
     });
   });
+
+  describe('#addFactoriesFromDir', () => {
+    it('should register factories in the Lair', () => {
+      expect(this.lair.getDevInfo()).to.be.eql({});
+      Server.getServer().addFactoriesFromDir(`${__dirname}/test-factories`);
+      const devInfo = this.lair.getDevInfo();
+      expect(devInfo).to.have.property('unit').that.is.an('object');
+      expect(devInfo).to.have.property('squad').that.is.an('object');
+      expect(devInfo).to.have.property('dir').that.is.an('object');
+    });
+  });
 });
 
 describe('#Server integration', () => {
@@ -151,6 +162,31 @@ describe('#Server integration', () => {
     });
   });
 
+  describe('#addRoutesFromDir', () => {
+
+    beforeEach(() => {
+      this.server.addRoutesFromDir(`${__dirname}/test-routes`);
+    });
+
+    it('should add a first route', done => {
+      this.server.startServer(() => chai.request(this.server.server)
+        .get('/api/v2/path')
+        .end((err, res) => {
+          expect(res).to.have.property('status', 200);
+          done();
+        }));
+    });
+
+    it('should add a second route', done => {
+      this.server.startServer(() => chai.request(this.server.server)
+        .get('/api/v2/path/subpath')
+        .end((err, res) => {
+          expect(res).to.have.property('status', 200);
+          done();
+        }));
+    });
+  });
+
   describe('#createRecords', () => {
     beforeEach(() => {
       this.server.addFactory(modelA, 'a');

tests/test-factories/squad.ts

@@ -0,0 +1,5 @@
+import {Factory} from 'lair-db';
+
+export default Factory.create({
+  name: 'squad',
+});

tests/test-factories/subdir/dir.ts

@@ -0,0 +1,5 @@
+import {Factory} from 'lair-db';
+
+export default Factory.create({
+  name: 'dir',
+});

tests/test-factories/unit.ts

@@ -0,0 +1,5 @@
+import {Factory} from 'lair-db';
+
+export default Factory.create({
+  name: 'unit',
+});

tests/test-routes/path.ts

@@ -0,0 +1,3 @@
+import Route from '../../lib/route';
+
+export default Route.createRoute('get', '/path');

tests/test-routes/sub/subpath.ts

@@ -0,0 +1,3 @@
+import Route from '../../../lib/route';
+
+export default Route.createRoute('get', '/path/subpath');