added test and updated readme prep next release

lib/asset-assembler-config.js

@@ -14,14 +14,14 @@ var template = {
 	},
 	
 	linkTargetSingleResult: true,
-	linkTarget: null,
-	linkSources: [],
-	linkMapping: [],
+	linkTarget:     null,
+	linkSources:    [],
+	linkMapping:    [],
 	
-	assetType: null,
-	assetHeader: '\n/* '+name+': begin */\n\n',
-	assetFooter: '\n/* '+name+': end */\n\n',
-	assetSeperator: '\n/* '+name+': next */\n',
+	assetType:      null,
+	assetHeader:    '/* '+name+': Auto generated. */\n',
+	assetFooter:    '/* '+name+': end */\n',
+	assetSeperator: '\n/* '+name+': <%= file %> */\n\n',
 };
 
 function checkConfig(config,callback) {

lib/asset-assembler.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var u       = require('underscore');
 var events  = require('events');
 var fetch   = require('fetch');
 var fs      = require('fs-extra');
@@ -8,7 +9,11 @@ var config  = require('./asset-assembler-config');
 
 
 function buildEnd(assembler, targetFile, resultUriList, callback) {
-	fs.appendFile(targetFile, assembler.config.assetFooter, function (err) {
+	var footer = '';
+	if (assembler.config.assetFooter !== null) {
+		footer = assembler.config.assetFooter;
+	}
+	fs.appendFile(targetFile, footer, function (err) {
 		if (err) {
 			callback(err);
 		} else {
@@ -97,10 +102,11 @@ function aggregateFileList(assembler, targetFile, aggregateList, readFile, callb
 		} else {
 			assembler.emit('file-read-post',aggregateFile);
 			assembler.emit('log','debug','readFile: '+aggregateFile+' size: '+data.length);
-			if (aggregateList.length > 0) {
-				data = data + assembler.config.assetSeperator;
+			if (assembler.config.assetSeperator !== null && assembler.config.assetSeperator.length > 0) {
+				var seperatorTemplate = u.template(assembler.config.assetSeperator);
+				data = seperatorTemplate({file: aggregateFile}) + data;
 			}
-			fs.appendFile(targetFile, data, function (err) {
+			fs.appendFile(targetFile, data + '\n', function (err) {
 				if (err) {
 					callback(err);
 				} else {
@@ -205,7 +211,11 @@ function buildStart(assembler, readFile, callback) {
 			callback(err);
 		} else {
 			assembler.emit('file-write-pre',targetFile);
-			fs.writeFile(targetFile, assembler.config.assetHeader, function(err) {
+			var header = '';
+			if (assembler.config.assetHeader !== null) {
+				header = assembler.config.assetHeader;
+			}
+			fs.writeFile(targetFile, header, function(err) {
 				if (err) {
 					callback(err);
 				} else {

lib/assets-builder-config.js

@@ -12,16 +12,16 @@ var template = {
 	
 	assets: {
 		js: {
-			configCreate: null,
-			configFill: null,
+			configCreate:    null,
+			configFill:      null,
 			assemblerCreate: null,
-			assemblerFill: null,
+			assemblerFill:   null,
 		},
 		css: {
-			configCreate: null,
-			configFill: null,
+			configCreate:    null,
+			configFill:      null,
 			assemblerCreate: null,
-			assemblerFill: null,
+			assemblerFill:   null,
 		},
 	},
 };

lib/factory.js

@@ -55,7 +55,7 @@ var assemblerConstructors = {
 					for (var i = 0; i < regexList.length; i++) {
 						var regex = new RegExp(regexList[i],'gm');
 						var regexReplace = regexData[regexList[i]];
-						//console.log('regex: \''+regex+'\' replace: \''+regexReplace+'\'');
+						console.log('regex: \''+regex+'\' replace: \''+regexReplace+'\'');
 						data = data.replace(regex,regexReplace);
 					}
 					callback(null, data);
@@ -149,6 +149,12 @@ var builderAssemblerCreate = {
 			callback(null,new AS(assemblerConfig,assemblerConstructors.readFileMinify(options)));
 		};
 	},
+	readFileRegex: function(options) {
+		return function (assemblerConfig, callback) {
+			var AS = require('./asset-assembler');
+			callback(null,new AS(assemblerConfig,assemblerConstructors.readFileRegex(options)));
+		};
+	},
 };
 
 var builderEmptyCallback = function () {
@@ -159,6 +165,21 @@ var builderEmptyCallback = function () {
 	};
 };
 
+var builderConfigCreate = {
+	nop: builderEmptyCallback,
+	fromJSON: function (configJSON,type) {
+		return function(callback) {
+			callback(null,{
+				// TODO: add merging 
+				linkMapping:  configJSON.linkMapping,
+				linkTarget:   configJSON[type].linkTarget,
+				linkSources:  configJSON[type].linkSources,
+				assetType:    type,
+			});
+		};
+	},
+};
+
 module.exports = {
 	assembler: {
 		constructor :      assemblerConstructors,
@@ -168,7 +189,7 @@ module.exports = {
 		},
 	},
 	builder: {
-		configCreate:      { nop: builderEmptyCallback },
+		configCreate:      builderConfigCreate,
 		configFill:        { nop: builderEmptyCallback },
 		assemblerCreate:   builderAssemblerCreate,
 		assemblerFill:     { nop: builderEmptyCallback },