Merge pull request #53 from sprynm/update-packages

Update packages

Author: straker

.travis.yml

@@ -2,5 +2,4 @@ language: node_js
 node_js:
   - "8.0"
   - "6.0"
-  - "4.0"
 after_script: "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"

gulpfile.js

@@ -16,10 +16,10 @@ gulp.task('lint', function() {
     .pipe(jshint.reporter( 'jshint-stylish' ))
 });
 
-gulp.task('test', ['lint'], function(done) {
+gulp.task('test', gulp.series('lint', function(done) {
   return gulp.src('test/*.spec.js', {read: false})
     .pipe(mocha());
-});
+}));
 
 // create the polymer script for the handlebars template to use
 gulp.task('vulcanize', function() {
@@ -61,9 +61,12 @@ gulp.task('sass', function() {
 });
 
 gulp.task('watch', function() {
-  gulp.watch(src, ['lint']);
-  gulp.watch('assets/polymer.html', ['vulcanize']);
-  gulp.watch('assets/*.scss', ['sass']);
+    gulp.watch(src, gulp.series('lint'));
+    //gulp.watch('assets/polymer.html', gulp.series('vulcanize'));
+    gulp.watch('assets/*.scss', gulp.series('sass'));
 });
 
-gulp.task('default', ['connect', 'sass', 'lint', 'test', 'watch']);
+gulp.task('default',
+    gulp.series( gulp.parallel('test', 'sass'), gulp.parallel('watch','connect') )
+);
+

lib/tags.js

@@ -2,10 +2,11 @@ var fs = require('fs');
 var path = require('path');
 var marked = require('marked');
 var utils = require('./utils');
+var normalizeNewline = require('normalize-newline');
 
 var validFileRegex = /\.[\w]+$/;
 var firstLineRegex = /^[\n\r]?([^\n\r]+)/;
-var trailingNewline = /[\n\r]+$/;
+var trailingNewline = /\s+$/;
 
 var forwardReferenceSections = {};
 
@@ -35,16 +36,18 @@ var tags = {
   section: function () {
     var name, description;
 
-    if (!this.tag.description && !this.comment.description) {
+    //added trim() to normalize returns on different OSs    
+    if (!this.tag.description && !this.comment.description.trim() ) {
       throw new SyntaxError('unnamed section (' + this.file + ':' +
         (this.tag.line+1) + ')');
     }
 
     // @section did not define the name so use the first line of the comment
     // description as the section name and use the rest as the section description
     if (!this.tag.description) {
-      name = this.comment.description.match(firstLineRegex)[1];
-      description = this.comment.description.substr(name.length + 1);
+      var normDescription = normalizeNewline(this.comment.description);
+      name = normDescription.match(firstLineRegex)[1];
+      description = normDescription.substr(name.length + 1);
     }
 
     // @section defined the name so use the comment description as the section
@@ -300,7 +303,7 @@ var tags = {
     var result, parsedResult, isCode, isHeading, tag;
 
     try {
-      file = fs.readFileSync(resolvedPath, 'utf-8');
+      file = normalizeNewline(fs.readFileSync(resolvedPath, 'utf-8'));
     } catch (e) {
       throw new ReferenceError('File not found \'' + resolvedPath + '\' (' +
         this.file + ':' + (this.tag.line+1) + ')');

package.json

@@ -23,31 +23,31 @@
   },
   "homepage": "https://github.com/straker/livingcss",
   "dependencies": {
-    "comment-parser": "0.4.0",
-    "glob": "^6.0.4",
-    "handlebars": "^4.0.5",
-    "html-minifier": "^1.1.1",
-    "marked": "^0.3.5",
+    "comment-parser": "^0.5.0",
+    "glob": "^7.1.2",
+    "handlebars": "^4.0.11",
+    "html-minifier": "^3.5.8",
+    "marked": "^0.3.12",
+    "normalize-newline": "^3.0.0",
     "mkdirp": "^0.5.1"
   },
   "devDependencies": {
-    "chai": "^3.5.0",
+    "chai": "^4.1.2",
     "coveralls": "^2.11.8",
-    "gulp": "^3.9.0",
-    "gulp-connect": "^2.3.1",
+    "gulp": "^4.0.0",
+    "gulp-connect": "^5.2.0",
     "gulp-insert": "^0.5.0",
-    "gulp-jshint": "^2.0.0",
-    "gulp-mocha": "^2.2.0",
+    "gulp-jshint": "^2.1.0",
+    "gulp-mocha": "^5.0.0",
     "gulp-rename": "^1.2.2",
-    "gulp-replace": "^0.5.4",
-    "gulp-sass": "^2.3.2",
-    "gulp-vulcanize": "^6.1.0",
-    "istanbul": "^0.4.2",
-    "jshint": "^2.9.1",
-    "jshint-stylish": "^2.1.0",
-    "mocha": "^2.4.5",
-    "node-sass": "^3.8.0",
-    "proxyquire": "^1.7.4",
-    "sinon": "^1.17.3"
+    "gulp-replace": "^0.6.1",
+    "gulp-sass": "^3.1.0",
+    "gulp-vulcanize": "^7.0.0",
+    "istanbul": "^0.4.5",
+    "jshint": "^2.9.5",
+    "jshint-stylish": "^2.2.1",
+    "mocha": "^5.0.0",
+    "proxyquire": "^1.8.0",
+    "sinon": "^4.2.2"
   }
 }

test/generate.spec.js

@@ -7,6 +7,7 @@ var utils = require('../lib/utils');
 var path = require('path');
 
 // stubs
+var stub = sinon.stub().throws();
 var minifyCalled = 0;
 var fsStub = {
   writeFile: function(file, data, options, callback) { callback(null); },
@@ -32,7 +33,7 @@ var generate = proxyquire('../lib/generate', {
 describe('generate', function() {
 
   before(function() {
-    sinon.stub(utils, 'readFileGlobs', function() {
+    sinon.stub(utils, 'readFileGlobs').callsFake( function() {
       return Promise.resolve();
     });
   });

test/parseComments.spec.js

@@ -4,6 +4,7 @@ var expect = require('chai').expect;
 var fs = require('fs');
 var path = require('path');
 var parseComments = require('../lib/parseComments');
+var normalizeNewline = require('normalize-newline');
 
 describe('parseComments', function() {
 
@@ -164,7 +165,7 @@ describe('parseComments', function() {
 
       parseComments(data, file, {}, {}, function(block) {
          expect(block.testTag.description).to.equal('<p><em>Will</em> be parsed as <code>markdown</code>.</p>');
-         expect(block.multipleLines.description).to.equal('<h3 id="header">Header</h3>\n<p>paragraph</p>');
+         expect( normalizeNewline(block.multipleLines.description) ).to.equal('<h3 id="header">Header</h3>\n<p>paragraph</p>');
       });
 
       done();

test/tags.spec.js

@@ -5,6 +5,7 @@ var fs = require('fs');
 var path = require('path');
 var parseComments = require('../lib/parseComments');
 var tags = require('../lib/tags');
+var normalizeNewline = require('normalize-newline');
 
 describe('tags', function() {
 
@@ -376,7 +377,7 @@ describe('tags', function() {
 
         parseComments(data, file, tags, {sections: sections, pages: pages}, function(block) {
           expect(block.example).to.exist;
-          expect(block.example.description).to.equal('/**\n * @example example-with-file.css\n */');
+          expect( normalizeNewline(block.example.description) ).to.equal('/**\n * @example example-with-file.css\n */');
         });
 
         done();
@@ -444,7 +445,7 @@ describe('tags', function() {
         }
 
         parseComments(data, file, tags, {sections: sections, pages: pages}, function(block) {
-          expect(block.code.description).to.equal('.example {\n  @extend %placeholder-selector;\n}');
+          expect( normalizeNewline(block.code.description) ).to.equal('.example {\n  @extend %placeholder-selector;\n}');
         });
 
         done();
@@ -521,7 +522,7 @@ describe('tags', function() {
 
         parseComments(data, file, tags, {sections: sections, pages: pages});
 
-        expect(sections[0].name).to.equal('Doc Example');
+        expect( sections[0].name.trim() ).to.equal('Doc Example');
 
         done();
       });
@@ -557,7 +558,7 @@ describe('tags', function() {
 
         parseComments(data, file, tags, {sections: sections, pages: pages});
 
-        expect(sections[0].description).to.equal('<p>Description of the section.</p>\n<h2 id="secondary-heading">Secondary Heading</h2>\n<h1 id="l-heading">L Heading</h1>\n<ul>\n<li>list item 1</li>\n<li>list item 2</li>\n</ul>\n<pre><code>Code in the description\n</code></pre>');
+        expect( normalizeNewline(sections[0].description).trim() ).to.equal('<p>Description of the section.</p>\n<h2 id="secondary-heading">Secondary Heading</h2>\n<h1 id="l-heading">L Heading</h1>\n<ul>\n<li>list item 1</li>\n<li>list item 2</li>\n</ul>\n<pre><code>Code in the description\n</code></pre>');
 
         done();
       });

test/utils.spec.js

@@ -3,6 +3,7 @@
 var expect = require('chai').expect;
 var sinon = require('sinon');
 var proxyquire = require('proxyquire');
+var normalizeNewline = require('normalize-newline');
 
 // stubs
 var fsStub = {
@@ -269,22 +270,22 @@ describe('utils', function() {
       expect(utils.fixSVGIssue(testString)).to.equal('url("data:image\/svg+xml;%27")');
 
       // Case for a closing paren inside url
-      var testString = 'url("data:image/svg+xml;<svg xmlns=\'blah\'><g transform=\'translate(-1, -1)\'>")';
+      testString = 'url("data:image/svg+xml;<svg xmlns=\'blah\'><g transform=\'translate(-1, -1)\'>")';
       expect(utils.fixSVGIssue(testString)).to.equal(
         'url("data:image/svg+xml;<svg xmlns=%27blah%27><g transform=%27translate(-1, -1)%27>")'
       );
     });
 
     it('should only replace single quotes in svg url expressions', function() {
       var testString = 'url("data:image\/svg+xml;\'")\nurl("data:image\/svg+xml;\'")\n\'Arial\'';
-      expect(utils.fixSVGIssue(testString)).to.equal(
+      expect( normalizeNewline( utils.fixSVGIssue(testString) ) ).to.equal(
         'url("data:image\/svg+xml;%27")\nurl("data:image\/svg+xml;%27")\n\'Arial\''
       );
 
       testString = 'url("data:image/svg+xml;\'...\'"), url(\'non-svg-url\')';
       expect(utils.fixSVGIssue(testString)).to.equal(
         'url("data:image/svg+xml;%27...%27"), url(\'non-svg-url\')'
-      )
+      );
     });
 
     it('should leave regular urls alone', function() {