Merge pull request #30 from jdesgats/custom-parser

Added custom callback to parse input files

Author: handrews

lib/get-files.js

@@ -33,17 +33,19 @@ getFiles.raw = function (filePaths) {
 
 /**
  * Same as the `.raw()` method, except this method will attempt to parse
- * the file contents as JSON.
+ * the file contents to JavaScript object with provided parser. The parser
+ * will be called with file contents and file name (in that order).
  *
  * @param {array} filePaths
+ * @param {function} callback to parse contents, defaults to JSON parser
  * @returns {Promise}
  */
-getFiles.asJSON = function (filePaths) {
+getFiles.asObjects = function (filePaths, parser) {
   return getFiles.raw(filePaths)
     .then(function(map) {
       return _.mapValues(map, function(str, filePath) {
         try {
-          return JSON.parse(str);
+          return (parser || getFiles.defaultParser)(str, filePath);
         } catch (e) {
           e.filePath = filePath;
           throw e;
@@ -55,4 +57,8 @@ getFiles.asJSON = function (filePaths) {
     });
 };
 
+getFiles.defaultParser = function (content, filePath) {
+  return JSON.parse(content);
+};
+
 module.exports = getFiles;

lib/parser.js

@@ -50,7 +50,7 @@ Parser.prototype.filterPaths = function (paths) {
  * @return {Object}
  */
 Parser.prototype.retreive = function(files) {
-  return getFiles.asJSON(files);
+  return getFiles.asObjects(files, this.options.parser);
 };
 
 /**

test/lib/get-files.js

@@ -1,10 +1,14 @@
 'use strict';
 /* globals: describe, it */
 
-var expect = require('chai').expect;
+var chai = require('chai');
+var expect = chai.expect;
+var sinon = require('sinon');
 var getFiles = require('../../lib/get-files');
 var fixturesDir = process.cwd() + '/test/fixtures';
 
+chai.use(require('sinon-chai'));
+
 /** @name describe @function */
 /** @name it @function */
 /** @name before @function */
@@ -23,12 +27,24 @@ describe('Get files', function() {
     });
   });
 
-  describe('#asJSON', function() {
+  describe('#asObjects', function() {
     it('should return a mapped object of JSON contents, keyed by file name', function() {
-      return getFiles.asJSON([fixturesDir + '/schema1.json', fixturesDir + '/schema2.json']).then(function(map) {
+      return getFiles.asObjects([fixturesDir + '/schema1.json', fixturesDir + '/schema2.json']).then(function(map) {
+        expect(map).to.be.an('object');
+        expect(map).to.have.property(fixturesDir + '/schema1.json').that.is.an('object');
+        expect(map).to.have.property(fixturesDir + '/schema2.json').that.is.an('object');
+      });
+    });
+
+    it('should allow to specify a custom parser, keyed by file name', function() {
+      var cb = sinon.spy(JSON.parse);
+      return getFiles.asObjects([fixturesDir + '/schema1.json', fixturesDir + '/schema2.json'], cb).then(function(map) {
         expect(map).to.be.an('object');
         expect(map).to.have.property(fixturesDir + '/schema1.json').that.is.an('object');
         expect(map).to.have.property(fixturesDir + '/schema2.json').that.is.an('object');
+        expect(cb).to.have.been.calledTwice;
+        expect(cb).to.have.been.calledWithMatch(sinon.match.string, fixturesDir + '/schema1.json');
+        expect(cb).to.have.been.calledWithMatch(sinon.match.string, fixturesDir + '/schema2.json');
       });
     });
   });