Fixed example, specs and field type checking

Author: rikkertkoppes

example/index.js

@@ -1,5 +1,5 @@
 var json2xls = require('../lib/json2xls');
-var data = require('../spec/data.json');
+var data = require('../spec/arrayData.json');
 var fs = require('fs');
 
 var xls = json2xls(data,{});

lib/json2xls.js

@@ -23,11 +23,6 @@ function getType(obj,type) {
     }
 }
 
-transform.beforeCellWrite = function(row, cellData, eOpt){
-    eOpt.cellType = getType(cellData,types[i]);
-    return cellData;
-};
-
 //prepare json to be in the correct format for excel-export
 transform.prepareJson = function(json,config) {
     var res = {};
@@ -46,7 +41,10 @@ transform.prepareJson = function(json,config) {
         return {
             caption: key,
             type: getType(jsonArr[0][key],types[i]),
-            beforeCellWrite: transform.beforeCellWrite
+            beforeCellWrite: function(row, cellData, eOpt){
+                eOpt.cellType = getType(cellData,types[i]);
+                return cellData;
+            }
         };
     });
     //rows

package.json

@@ -1,6 +1,6 @@
 {
   "name": "json2xls",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "canonically transform json to an excel document",
   "main": "lib/json2xls.js",
   "scripts": {

spec/prepareSpec.js

@@ -5,6 +5,26 @@ var objectData = require('./objectData.json');
 
 describe('prepare',function() {
 
+    beforeEach(function() {
+        this.addMatchers({
+            toEqualFields: function() {
+                return {
+                    compare: function(actual,expected) {
+                        var res;
+                        var res = expected && expected.all && expected.all(function(item,i) {
+                            return actual[i] && Object.keys(item).all(function(field) {
+                                return actual[i][field] === item[field];
+                            });
+                        })
+                        return {
+                            pass: res
+                        }
+                    }
+                }
+            }
+        })
+    })
+
     describe('when the data is an array', function() {
 
         describe('cols',function() {
@@ -14,33 +34,28 @@ describe('prepare',function() {
             });
             it('should create the correct cols',function() {
                 var res = prep(arrayData);
-                expect(res.cols).toEqual([{
+                expect(res.cols).toEqualFields([{
                     caption: 'name',
-                    type: 'string',
-                    beforeCellWrite: json2xls.beforeCellWrite
+                    type: 'string'
                 },{
                     caption: 'date',
-                    type: 'string',
-                    beforeCellWrite: json2xls.beforeCellWrite
+                    type: 'string'
                 },{
                     caption: 'number',
-                    type: 'number',
-                    beforeCellWrite: json2xls.beforeCellWrite
+                    type: 'number'
                 }]);
             });
 
             it('should create the correct cols when fields are given as array',function() {
                 var res = prep(arrayData,{
                     fields: ['date','name']
                 });
-                expect(res.cols).toEqual([{
+                expect(res.cols).toEqualFields([{
                     caption: 'date',
-                    type: 'string',
-                    beforeCellWrite: json2xls.beforeCellWrite
+                    type: 'string'
                 },{
                     caption: 'name',
-                    type: 'string',
-                    beforeCellWrite: json2xls.beforeCellWrite
+                    type: 'string'
                 }]);
             });
 
@@ -51,14 +66,12 @@ describe('prepare',function() {
                         name: 'string'
                     }
                 });
-                expect(res.cols).toEqual([{
+                expect(res.cols).toEqualFields([{
                     caption: 'number',
-                    type: 'string',
-                    beforeCellWrite: json2xls.beforeCellWrite
+                    type: 'string'
                 },{
                     caption: 'name',
-                    type: 'string',
-                    beforeCellWrite: json2xls.beforeCellWrite
+                    type: 'string'
                 }]);
             });