lint fixed

d-band · Jul 21, 2017 · 586c8d5 · 586c8d5
1 parent 3939dd2
commit 586c8d5
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 64 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "html2xlsx",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Transform html to excel (just support xlsx)",
   "main": "lib/index.js",
   "scripts": {
@@ -41,7 +41,7 @@
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^3.0.1",
     "mocha": "^3.1.2",
-    "nyc": "^11.0.1",
+    "nyc": "^11.0.3",
     "pre-commit": "^1.1.3",
     "rimraf": "^2.5.4",
     "stream-equal": "^1.0.0"

diff --git a/src/index.js b/src/index.js
@@ -12,7 +12,8 @@ module.exports = (html, callback, options = {}) => {
     const $ = cheerio.load(text);
 
     $('table').each((ti, table) => {
-      const sheet = file.addSheet(`Sheet${ti + 1}`);
+      const name = $(table).attr('name') || `Sheet${ti + 1}`;
+      const sheet = file.addSheet(name);
       const maxW = [];
       const offsets = [];
       $('tr', table).each((hi, th) => {

diff --git a/test/index.test.js b/test/index.test.js
@@ -27,7 +27,7 @@ describe('Test: index.js', () => {
           border: 1px solid #eee;
         }
       </style>
-      <table>
+      <table name="Sheet1">
         <tr>
           <td>foo</td>
           <td>bar</td>
@@ -48,23 +48,23 @@ describe('Test: index.js', () => {
         </tr>
       </table>
     `, (err, file) => {
-      if (err) return done(err);
+        if (err) return done(err);
 
-      const tmpfile = join(tmpdir(), 'simple.xlsx');
-      const expfile = join(__dirname, 'expect/simple.xlsx');
-      file
-        .saveAs()
-        .pipe(fs.createWriteStream(tmpfile))
-        .on('finish', () => {
-          const expectFile = fs.createReadStream(expfile);
-          const actualFile = fs.createReadStream(tmpfile);
-          streamEqual(expectFile, actualFile, function (err, ok) {
-            expect(err).to.be.null;
-            expect(ok).to.be.true;
-            done();
+        const tmpfile = join(tmpdir(), 'simple.xlsx');
+        const expfile = join(__dirname, 'expect/simple.xlsx');
+        file
+          .saveAs()
+          .pipe(fs.createWriteStream(tmpfile))
+          .on('finish', () => {
+            const expectFile = fs.createReadStream(expfile);
+            const actualFile = fs.createReadStream(tmpfile);
+            streamEqual(expectFile, actualFile, function (err, ok) {
+              expect(err).to.be.null;
+              expect(ok).to.be.true;
+              done();
+            });
           });
-        });
-    });
+      });
   });
 
   it('should htmlToXlsx complex ok', (done) => {
@@ -233,23 +233,23 @@ describe('Test: index.js', () => {
         </tbody>
       </table>
     `, (err, file) => {
-      if (err) return done(err);
+        if (err) return done(err);
 
-      const tmpfile = join(tmpdir(), 'complex.xlsx');
-      const expfile = join(__dirname, 'expect/complex.xlsx');
-      file
-        .saveAs()
-        .pipe(fs.createWriteStream(tmpfile))
-        .on('finish', () => {
-          const expectFile = fs.createReadStream(expfile);
-          const actualFile = fs.createReadStream(tmpfile);
-          streamEqual(expectFile, actualFile, function (err, ok) {
-            expect(err).to.be.null;
-            expect(ok).to.be.true;
-            done();
+        const tmpfile = join(tmpdir(), 'complex.xlsx');
+        const expfile = join(__dirname, 'expect/complex.xlsx');
+        file
+          .saveAs()
+          .pipe(fs.createWriteStream(tmpfile))
+          .on('finish', () => {
+            const expectFile = fs.createReadStream(expfile);
+            const actualFile = fs.createReadStream(tmpfile);
+            streamEqual(expectFile, actualFile, function (err, ok) {
+              expect(err).to.be.null;
+              expect(ok).to.be.true;
+              done();
+            });
           });
-        });
-    });
+      });
   });
 
   it('should htmlToXlsx merge ok', (done) => {
@@ -272,23 +272,23 @@ describe('Test: index.js', () => {
         </tr>
       </table>
     `, (err, file) => {
-      if (err) return done(err);
+        if (err) return done(err);
 
-      const tmpfile = join(tmpdir(), 'merge.xlsx');
-      const expfile = join(__dirname, 'expect/merge.xlsx');
-      file
-        .saveAs()
-        .pipe(fs.createWriteStream(tmpfile))
-        .on('finish', () => {
-          const expectFile = fs.createReadStream(expfile);
-          const actualFile = fs.createReadStream(tmpfile);
-          streamEqual(expectFile, actualFile, function (err, ok) {
-            expect(err).to.be.null;
-            expect(ok).to.be.true;
-            done();
+        const tmpfile = join(tmpdir(), 'merge.xlsx');
+        const expfile = join(__dirname, 'expect/merge.xlsx');
+        file
+          .saveAs()
+          .pipe(fs.createWriteStream(tmpfile))
+          .on('finish', () => {
+            const expectFile = fs.createReadStream(expfile);
+            const actualFile = fs.createReadStream(tmpfile);
+            streamEqual(expectFile, actualFile, function (err, ok) {
+              expect(err).to.be.null;
+              expect(ok).to.be.true;
+              done();
+            });
           });
-        });
-    });
+      });
   });
 
   it('should htmlToXlsx data type ok', (done) => {
@@ -328,22 +328,22 @@ describe('Test: index.js', () => {
         </tr>
       </table>
     `, (err, file) => {
-      if (err) return done(err);
+        if (err) return done(err);
 
-      const tmpfile = join(tmpdir(), 'datatype.xlsx');
-      const expfile = join(__dirname, 'expect/datatype.xlsx');
-      file
-        .saveAs()
-        .pipe(fs.createWriteStream(tmpfile))
-        .on('finish', () => {
-          const expectFile = fs.createReadStream(expfile);
-          const actualFile = fs.createReadStream(tmpfile);
-          streamEqual(expectFile, actualFile, function (err, ok) {
-            expect(err).to.be.null;
-            expect(ok).to.be.true;
-            done();
+        const tmpfile = join(tmpdir(), 'datatype.xlsx');
+        const expfile = join(__dirname, 'expect/datatype.xlsx');
+        file
+          .saveAs()
+          .pipe(fs.createWriteStream(tmpfile))
+          .on('finish', () => {
+            const expectFile = fs.createReadStream(expfile);
+            const actualFile = fs.createReadStream(tmpfile);
+            streamEqual(expectFile, actualFile, function (err, ok) {
+              expect(err).to.be.null;
+              expect(ok).to.be.true;
+              done();
+            });
           });
-        });
-    });
+      });
   });
 });