Merge branch 'feature/FileExtension' into develop

bin/bemstyla.js

@@ -7,6 +7,7 @@ var pkg = require('../package.json');
 
 program
 	.version(pkg.version)
+	.option('-t, --type [type]', 'file type [styl]', 'styl')
 	.parse(process.argv);
 
 if (program.args.length < 1) {
@@ -16,5 +17,5 @@ if (program.args.length < 1) {
 var index = require('../lib/index');
 
 _.forEach(program.args, function (arg) {
-	index(arg);
+	index(arg, program.type);
 });

lib/format-file.js

@@ -12,17 +12,20 @@ module.exports = {
 	/**
 	* File fish data
 	*
+	* @param {Object} [options]
+	* @param {String} [options.fileType='styl']
 	* @return {Object}
 	*/
-	format: function () {
+	format: function (options) {
+		options = options || {};
 		var result = {};
 
 		_.forEach(TERMS, function (term) {
 			result[term] = {
 				file: {
 					name: '',
 					dir: '',
-					ext: 'styl'
+					ext: options.fileType || 'styl'
 				}
 			};
 		});

lib/index.js

@@ -15,12 +15,17 @@ var formatFileName = require('./format-file-name');
 var creator = require('./creator');
 
 /**
- * @param {String} source
+ * @param {Object} options
+ * @param {String} options.source
+ * @param {String} [options.fileType='styl']
  */
-var maker = function (source) {
+var maker = function (options) {
+	var source = options.source;
 	var parsed = _.cloneDeep(parser.parse(source));
 
-	_.merge(parsed, formatFile.format());
+	_.merge(parsed, formatFile.format({
+		fileType: options.fileType
+	}));
 	_.merge(parsed, formatFileDir.format(source));
 	_.merge(parsed, formatFileName.format(source));
 
@@ -32,9 +37,10 @@ var maker = function (source) {
 
 /**
  * @param {String} source
+ * @param {String} [fileType='styl']
  * @return {Promise}
  */
-module.exports = function (source) {
+module.exports = function (source, fileType) {
 	var promise;
 
 	if (/\.jade$/.test(source)) {
@@ -50,10 +56,16 @@ module.exports = function (source) {
 	return promise.then(function (data) {
 		if (_.isArray(data)) {
 			_.forEach(data, function (item) {
-				maker(item);
+				maker({
+					source: item,
+					fileType: fileType
+				});
 			});
 		} else {
-			maker(data);
+			maker({
+				source: data,
+				fileType: fileType
+			});
 		}
 	});
 };

test/format-file-test.js

@@ -42,19 +42,31 @@ describe('formatFile', function () {
 		};
 
 		it('should return mixed JSON object', function () {
-			var res = _.clone(testResult);
+			var res = _.cloneDeep(testResult);
 
 			assert.deepEqual(formatFile.format(), res);
 		});
 
 		it('should not assign objects', function () {
-			var res = _.clone(testResult);
+			var res = _.cloneDeep(testResult);
 
 			var formatted = formatFile.format();
 			assert.deepEqual(formatted, res);
 			formatted.block.file.dir = 'foo';
 			res.block.file.dir = 'foo';
 			assert.deepEqual(formatted, res);
 		});
+
+		it('should set filetype', function () {
+			var res = _.cloneDeep(testResult);
+			_.forEach(res, function (r) {
+				r.file.ext = 'css';
+			});
+
+			var formatted = formatFile.format({
+				fileType: 'css'
+			});
+			assert.deepEqual(formatted, res);
+		});
 	});
 });

test/index-test.js

@@ -121,4 +121,30 @@ describe('index', function () {
 				done();
 			});
 	});
+
+	it('should fire formatFile.format with options', function (done) {
+		sinon.stub(formatFile, 'format');
+		sinon.stub(creator, 'touch', function () {
+			return {
+				/**
+				*/
+				then: function () {},
+				/**
+				*/
+				catch: function () {}
+			};
+		});
+
+		index('block', 'css')
+			.then(function () {
+				assert.isTrue(formatFile.format.called);
+				assert.deepEqual(formatFile.format.getCall(0).args[0], {
+					fileType: 'css'
+				});
+
+				creator.touch.restore();
+				formatFile.format.restore();
+				done();
+			});
+	});
 });