update

Author: dmitry-tuzenkov

container.js

@@ -4,6 +4,7 @@ const getenv = require('getenv');
 const dotenv = require('dotenv');
 const awilix = require('awilix');
 const application = require('./lib/application');
+const grayscaleProcessor = require('./lib/grayscale-processor');
 const logger = require('./loggers/logger');
 const mongo = require('./datasources/mongo');
 const container = awilix.createContainer();
@@ -13,28 +14,37 @@ module.exports = container;
 
 let opts = {
 	formatName: 'camelCase',
-	lifetime: awilix.Lifetime.SCOPED
+	registrationOptions: {
+		lifetime: awilix.Lifetime.SCOPED
+	}
 };
 
 container
 	.loadModules([
 		'controllers/*.js',
-		'datasources/mongo/models/*.js',
 		'datasources/mongo/repositories/*.js',
 		'interface/http/routes/*.js'
 	], opts);
 
 container
 	.registerClass({
 		application: [application, { lifetime: awilix.Lifetime.SINGLETON }],
+		grayscaleProcessor: [grayscaleProcessor, { lifetime: awilix.Lifetime.SINGLETON }]
 	})
 	.registerFunction({
-		logger: [logger, { lifetime: awilix.Lifetime.SINGLETON }]
+		logger: [logger, { lifetime: awilix.Lifetime.SINGLETON }],
+		database: [mongo, { lifetime: awilix.Lifetime.SINGLETON }]
 	})
+	.loadModules(
+		['datasources/mongo/models/*.js'], {
+			formatName: 'camelCase',
+			registrationOptions: {
+				lifetime: awilix.Lifetime.TRANSIENT
+			}
+		})
 	// TODO: need abstract storages, config classes
 	.registerValue({
-		configs: getenv,
-		database: mongo
+		configs: getenv
 	});
 
 // container

controllers/article-controller.js

@@ -3,10 +3,13 @@ const AbstractController = require('./abstract-controller');
 const ARTICLES_COUNT = 25;
 
 class ArticleController extends AbstractController {
-	constructor({ logger, configs, articleModel }) {
+	constructor({ logger, configs, database, articleModel }) {
+		super();
 		this.logger = logger;
 		this.configs = configs;
-		this.articleModel = articleModel;
+		this.database = database;
+		this.articleModel_ = articleModel;
+		this.articleModel = database.model('Article');
 	}
 
 	findAll(query, page) {
@@ -16,13 +19,16 @@ class ArticleController extends AbstractController {
 			.articleModel
 			.find(query)
 			.skip((page - 1) * ARTICLES_COUNT)
-			.limit(ARTICLES_COUNT);
+			.populate('tags')
+			.limit(ARTICLES_COUNT)
+			.exec();
 	}
 
 	findOne(query) {
 		return this
 			.articleModel
-			.findOne(query);
+			.findOne(query)
+			.exec();
 	}
 
 	create(entity) {

controllers/article-controller.test.js

@@ -1 +1,53 @@
 'use strict';
+const sinon = require('sinon');
+const sinonMongoose = require('sinon-mongoose');
+const expect = require('chai')
+	.expect;
+const mongoose = require('mongoose');
+
+const ArticleModel = require('../datasources/mongo/models/article-model');
+const ArticleController = require('./article-controller');
+
+describe('ArticleController', () => {
+	let controller, loggerMock, configsMock, databaseMock, articleModelMock;
+
+	beforeEach(() => {
+		loggerMock = {};
+		configsMock = {};
+
+		articleModelMock = sinon.mock(ArticleModel);
+		databaseMock = {
+			model: () => ArticleModel
+		};
+	});
+
+	it('should find all', (done) => {
+		// let spy = sinon.spy(articleModelMock, 'find');
+
+		articleModelMock
+			.expects('find')
+			// .withArgs()
+			.chain('limit', 25)
+			.chain('skip', 0)
+			.chain('exec')
+			.yields(null, []);
+
+		controller = new ArticleController({
+			logger: loggerMock,
+			configs: configsMock,
+			database: databaseMock,
+			articleModel: articleModelMock
+		});
+
+		return controller
+			.findAll({}, 1)
+			.then(result => {
+				articleModelMock.verify();
+				articleModelMock.restore();
+				expect(result)
+					.to.exist;
+
+				done();
+			});
+	});
+});

controllers/image-controller.js

@@ -0,0 +1,35 @@
+'use strict';
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+const AbstractController = require('./abstract-controller');
+
+class ImageController extends AbstractController {
+	constructor({ logger, configs, grayscaleProcessor }) {
+		super();
+		this.logger = logger;
+		this.configs = configs;
+		this.grayscaleProcessor = grayscaleProcessor;
+		this.stream = null;
+	}
+
+	store(stream) {
+		return new Promise((resolve) => {
+			let filename = crypto.randomBytes(8)
+				.toString('hex') + '.' + path.extname(stream.path);
+			let fullpath = path.resolve(__dirname, '../storage', filename),
+				rstream = fs.createReadStream(path);
+
+			rstream.pipe(fs.createWriteStream(fullpath));
+			rstream.end();
+
+			resolve(stream);
+		});
+	}
+
+	grayscale(stream) {
+		return this.grayscaleProcessor.execute(stream);
+	}
+}
+
+module.exports = ImageController;

datasources/mongo/index.js

@@ -1,6 +1,7 @@
 'use strict';
 const mongoose = require('mongoose');
 
-module.exports = (configs) => {
+module.exports = ({ configs }) => {
+	mongoose.Promise = global.Promise;
 	return mongoose.connect(configs.string('MONGO_URI'));
 };

datasources/mongo/mock/article-model-mock.js

@@ -0,0 +1,7 @@
+'use strict';
+
+class ArticleModelMock {
+
+}
+
+module.exports = ArticleModelMock;

datasources/mongo/models/article-model.js

@@ -25,7 +25,9 @@ const ArticleSchema = new mongoose.Schema({
 		type: String,
 		required: true,
 		trim: true
-	}
+	},
+
+	tags: [{ type: mongoose.Schema.Types.ObjectId, ref: 'ArticleTag' }]
 }, { minimize: false });
 
 ArticleSchema.plugin(createdModifiedPlugin, { index: true });

datasources/mongo/models/article-tag-model.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const mongoose = require('mongoose'),
-	createdModifiedPlugin = require('mongoose-createdmodified')
+	plugin = require('mongoose-createdmodified')
 	.createdModifiedPlugin;
 
 const ArticleTagSchema = new mongoose.Schema({
@@ -11,15 +11,15 @@ const ArticleTagSchema = new mongoose.Schema({
 		trim: true
 	},
 
-	imageUrl: {
+	avatarUrl: {
 		type: String,
 		required: true,
 		trim: true
 	}
 
 }, { minimize: false });
 
-ArticleTagSchema.plugin(createdModifiedPlugin, { index: true });
+ArticleTagSchema.plugin(plugin, { index: true });
 const ArticleTag = mongoose.model('ArticleTag', ArticleTagSchema);
 
 module.exports = ArticleTag;

interface/http/index.js

@@ -1,4 +1,5 @@
 'use strict';
+const path = require('path');
 const restify = require('restify');
 const container = require('../../container');
 const application = container.resolve('application');
@@ -13,9 +14,11 @@ let server = restify.createServer({
 
 server.use(restify.acceptParser(server.acceptable));
 server.use(restify.queryParser());
+server.use(restify.bodyParser({
+	mapFiles: true
+}));
 server.use(restify.CORS());
 server.use(restify.gzipResponse());
-server.use(restify.bodyParser());
 
 server.get('/articles', container.cradle.articleRoute.list);
 server.get('/articles/:id', container.cradle.articleRoute.view);
@@ -29,12 +32,14 @@ server.post('/tags/:id', container.cradle.tagRoute.create);
 server.put('/tags/:id', container.cradle.tagRoute.update);
 server.del('/tags/:id', container.cradle.tagRoute.delete);
 
-application
+module.exports = application
 	.start()
 	.then(() => {
-		return server.listen(port, () => {
+		server.listen(port, () => {
 			logger.info('%s listening at %s', server.name, server.url);
 		});
+
+		return server;
 	})
 	.catch(cause => {
 		logger.error(cause.message, cause.stack);

interface/http/routes/article-route.js

@@ -1,6 +1,7 @@
 'use strict';
+const fs = require('fs');
 
-module.exports = ({ articleController }) => {
+module.exports = ({ articleController, imageController }) => {
 	let route = {};
 
 	route.list = (req, res, next) => {
@@ -24,8 +25,17 @@ module.exports = ({ articleController }) => {
 	};
 
 	route.create = (req, res, next) => {
-		return articleController
-			.create(req.body)
+		return imageController
+			.store(fs.createReadStream(req.files.image.path))
+			.then(stream => {
+				let attrs = req.body;
+				attrs.avatar_url = stream.path;
+
+				return Promise.all([
+					articleController.create(attrs),
+					imageController.grayscale(stream)
+				]);
+			})
 			.then(result => res.json(result))
 			.catch(cause => {
 				return next(cause);

interface/http/tests/test.js

@@ -0,0 +1,23 @@
+'use strict';
+const supertest = require('supertest');
+const server = require('../');
+
+
+describe('Routes testing...', function () {
+	let httpEndpoint = supertest.agent("http://localhost:4000");
+
+	it('should work', function (done) {
+		httpEndpoint
+			.get('/articles')
+			.expect('Content-Type', /json/)
+			.expect('Content-Length', '60')
+			.expect(200)
+			.end((err, res) => {
+
+				console.log(res);
+				done();
+			});
+	});
+
+
+});

lib/grayscale-processor.js

@@ -0,0 +1,15 @@
+'use strict';
+const grayscale = require('image-grayscale');
+
+class GrayscaleProcessor {
+	constructor() {
+
+	}
+
+	execute(stream) {
+		return grayscale(stream, { logProgress: true });
+	}
+
+}
+
+module.exports = GrayscaleProcessor;

lib/local-storage.js

@@ -0,0 +1,7 @@
+'use strict';
+
+class LocalFileStorage {
+  constructor() {
+
+  }
+}

package.json

@@ -4,7 +4,7 @@
   "description": "Samlple node-blog ",
   "scripts": {
     "start": "node interface/http",
-    "test": "exit;"
+    "test": "mocha --reporter spec --check-leaks"
   },
   "repository": {
     "type": "git",
@@ -45,6 +45,8 @@
     "chai": "^3.5.0",
     "mocha": "^3.3.0",
     "sinon": "^2.1.0",
+    "sinon-as-promised": "^4.0.3",
+    "sinon-mongoose": "^2.0.1",
     "supertest": "^3.0.0"
   }
 }