Merge pull request #423 from peakon/fix/numbers

Don't break when attempting to import a zip file that's not an Excel file (eg. .numbers)

lib/xlsx/xform/book/workbook-xform.js

@@ -142,7 +142,7 @@ utils.inherits(WorkbookXform, BaseXform, {
   },
 
   reconcile: function(model) {
-    var rels = model.workbookRels.reduce(function(map, rel) {
+    var rels = (model.workbookRels || []).reduce(function(map, rel) {
       map[rel.Id] = rel;
       return map;
     }, {});
@@ -152,7 +152,7 @@ utils.inherits(WorkbookXform, BaseXform, {
     var worksheet;
     var index = 0;
 
-    model.sheets.forEach(function(sheet) {
+    (model.sheets || []).forEach(function(sheet) {
       var rel = rels[sheet.rId];
       if (!rel) {
         return;

lib/xlsx/xlsx.js

@@ -108,7 +108,7 @@ XLSX.prototype = {
       sharedStrings: model.sharedStrings,
       media: model.media,
       mediaIndex: model.mediaIndex,
-      date1904: model.properties.date1904,
+      date1904: model.properties && model.properties.date1904,
       drawings: model.drawings,
     };
     model.worksheets.forEach(function(worksheet) {

spec/integration/worksheet.spec.js

@@ -3,6 +3,7 @@
 var expect = require('chai').expect;
 var verquire = require('../utils/verquire');
 var testutils = require('./../utils/index');
+var path = require('path');
 
 var Excel = verquire('excel');
 var Range = verquire('doc/range');
@@ -619,4 +620,14 @@ describe('Worksheet', function() {
       expect(ws.getCell('C3').numFmt).to.equal(testutils.styles.numFmts.numFmt1);
     });
   });
+
+  describe('When passed a non-Excel file', function() {
+    it('Should not break when importing a .numbers file', function() {
+      return new Excel.Workbook().xlsx.readFile(path.resolve(__dirname, 'data', 'numbers.numbers'))
+        .then(function(workbook) {
+          expect(workbook).to.have.property('worksheets');
+          expect(workbook.worksheets).to.have.length(0);
+        });
+    });
+  });
 });