Prepare for release 2.0.0-beta2

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "diff2html",
-  "version": "2.0.0-beta1",
+  "version": "2.0.0-beta2",
   "homepage": "http://rtfpessoa.github.io/diff2html/",
   "description": "Fast Diff to colorized HTML",
   "keywords": [

dist/diff2html.js

@@ -72,8 +72,9 @@
 	  /*
 	   * Generates json object from string diff input
 	   */
-	  Diff2Html.prototype.getJsonFromDiff = function(diffInput) {
+	  Diff2Html.prototype.getJsonFromDiff = function(diffInput, config) {
-	    return diffParser.generateDiffJson(diffInput);
+	    var configOrEmpty = config || {};
+	    return diffParser.generateDiffJson(diffInput, configOrEmpty);
 	  };
 
 	  /*
@@ -84,7 +85,7 @@
 
 	    var diffJson = diffInput;
 	    if (!configOrEmpty.inputFormat || configOrEmpty.inputFormat === 'diff') {
-	      diffJson = diffParser.generateDiffJson(diffInput);
+	      diffJson = diffParser.generateDiffJson(diffInput, configOrEmpty);
 	    }
 
 	    var fileList = '';
@@ -186,7 +187,7 @@
 
 	  DiffParser.prototype.LINE_TYPE = LINE_TYPE;
 
-	  DiffParser.prototype.generateDiffJson = function(diffInput) {
+	  DiffParser.prototype.generateDiffJson = function(diffInput, config) {
 	    var files = [];
 	    var currentFile = null;
 	    var currentBlock = null;
@@ -296,11 +297,11 @@
 	    var deletedFileMode = /^deleted file mode (\d{6})/;
 	    var newFileMode = /^new file mode (\d{6})/;
 
-	    var copyFrom = /^copy from (.+)/;
+	    var copyFrom = /^copy from "?(.+?)"?/;
-	    var copyTo = /^copy to (.+)/;
+	    var copyTo = /^copy to "?(.+?)"?/;
 
-	    var renameFrom = /^rename from (.+)/;
+	    var renameFrom = /^rename from "?(.+?)"?/;
-	    var renameTo = /^rename to (.+)/;
+	    var renameTo = /^rename to "?(.+?)"?/;
 
 	    var similarityIndex = /^similarity index (\d+)%/;
 	    var dissimilarityIndex = /^dissimilarity index (\d+)%/;
@@ -323,10 +324,10 @@
 	      var values = [];
 	      if (utils.startsWith(line, 'diff')) {
 	        startFile();
-	      } else if (currentFile && !currentFile.oldName && (values = /^--- [aiwco]\/(.+)$/.exec(line))) {
+	      } else if (currentFile && !currentFile.oldName && (values = getSrcFilename(line, config))) {
 	        currentFile.oldName = values[1];
 	        currentFile.language = getExtension(currentFile.oldName, currentFile.language);
-	      } else if (currentFile && !currentFile.newName && (values = /^\+\+\+ [biwco]?\/(.+)$/.exec(line))) {
+	      } else if (currentFile && !currentFile.newName && (values = getDstFilename(line, config))) {
 	        currentFile.newName = values[1];
 	        currentFile.language = getExtension(currentFile.newName, currentFile.language);
 	      } else if (currentFile && utils.startsWith(line, '@@')) {
@@ -389,6 +390,27 @@
 	    return language;
 	  }
 
+	  function getSrcFilename(line, cfg) {
+	    var prefixes = ["a\\/", "i\\/", "w\\/", "c\\/", "o\\/"];
+
+	    if (cfg.srcPrefix) prefixes.push(cfg.srcPrefix);
+
+	    return _getFilename('---', line, prefixes);
+	  }
+
+	  function getDstFilename(line, cfg) {
+	    var prefixes = ["b\\/", "i\\/", "w\\/", "c\\/", "o\\/"];
+
+	    if (cfg.dstPrefix) prefixes.push(cfg.dstPrefix);
+
+	    return _getFilename('\\+\\+\\+', line, prefixes);
+	  }
+
+	  function _getFilename(linePrefix, line, prefixes) {
+	    var prefixesStr = prefixes.join("|");
+	    return new RegExp('^' + linePrefix + ' "?(?:' + prefixesStr + ')(.+?)"?$').exec(line);
+	  }
+
 	  module.exports.DiffParser = new DiffParser();
 
 	})();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "diff2html",
-  "version": "2.0.0-beta1",
+  "version": "2.0.0-beta2",
   "homepage": "http://rtfpessoa.github.io/diff2html/",
   "description": "Fast Diff to colorized HTML",
   "keywords": [