A few bug fixes

dfreedm · dfreedm · commit e86d8458355c · 2014-03-31T17:44:32.000-07:00
Ugh, already up to 0.2.3 :'(

Fix config parsing
Fixes #26
diff --git a/lib/optparser.js b/lib/optparser.js
@@ -12,7 +12,7 @@ var DEFAULT = 'vulcanized.html';
 
 // validate options with boolean return
 function processOptions(options, callback) {
-  excludes = {
+  var excludes = {
     imports: [ABS_URL],
     scripts: [ABS_URL],
     styles: [ABS_URL]
@@ -37,7 +37,7 @@ function processOptions(options, callback) {
       return callback('Malformed config JSON!');
     }
     if (config.excludes) {
-      var e = options.excludes;
+      var e = config.excludes;
       try {
         if (e.imports) {
           e.imports.forEach(function(r) {
@@ -59,6 +59,7 @@ function processOptions(options, callback) {
       }
     }
   }
+  options.excludes = excludes;
 
   if (!options.output) {
     options.output = path.resolve(path.dirname(options.input), DEFAULT);
diff --git a/lib/pathresolver.js b/lib/pathresolver.js
@@ -6,12 +6,7 @@
 
 var path = require('path');
 var constants = require('./constants.js');
-
-// directly update the textnode child of <style>
-// equivalent to <style>.textContent
-function setTextContent(node, text) {
-  node[0].children[0].data = text;
-}
+var setTextContent = require('./utils.js').setTextContent;
 
 function resolvePaths($, input, output) {
   var assetPath = path.relative(output, input);
diff --git a/lib/utils.js b/lib/utils.js
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2013 The Polymer Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+module.exports = {
+  // directly update the textnode child of <style>
+  // equivalent to <style>.textContent
+  setTextContent: function(node, text) {
+    var child = node[0].children[0];
+    if (child) {
+      child.data = text;
+    } else {
+      node[0].children[0] = {
+        data: text,
+        type: 'text',
+        next: null,
+        prev: null,
+        parent: node[0]
+      };
+    }
+  }
+};
diff --git a/lib/vulcan.js b/lib/vulcan.js
@@ -15,6 +15,7 @@ var url = require('url');
 var constants = require('./constants.js');
 var optparser = require('./optparser.js');
 var pathresolver = require('./pathresolver');
+var utils = require('./utils');
 
 var read = {};
 var options = {};
@@ -37,21 +38,19 @@ function exclude(regexes, href) {
 }
 
 function excludeImport(href) {
-  return exclude(excludes.imports, href);
+  return exclude(options.excludes.imports, href);
 }
 
 function excludeScript(href) {
-  return exclude(excludes.scripts, href);
+  return exclude(options.excludes.scripts, href);
 }
 
 function excludeStyle(href) {
-  return exclude(excludes.styles, href);
+  return exclude(options.excludes.styles, href);
 }
 
-// directly update the textnode child of <style>
-// equivalent to <style>.textContent
 function setTextContent(node, text) {
-  node[0].children[0].data = text;
+  utils.setTextContent(node, text);
 }
 
 function readFile(file) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vulcanize",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Process Web Components into one output file",
   "main": "lib/vulcan.js",
   "bin": {
diff --git a/test/empty.css b/test/empty.css
diff --git a/test/index.html b/test/index.html
@@ -6,6 +6,7 @@
   <script src="bower_components/platform/platform.js"></script>
   <link rel="import" href="absolutes.html">
   <link rel="import" href="import-test.html" />
+  <link rel="stylesheet" href="empty.css">
 </head>
 <body>
   <x-import>Hello Import!</x-import>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ var DEFAULT = 'vulcanized.html';`
`12`	`12`
`13`	`13`	`// validate options with boolean return`
`14`	`14`	`function processOptions(options, callback) {`
`15`		`- excludes = {`
	`15`	`+ var excludes = {`
`16`	`16`	`imports: [ABS_URL],`
`17`	`17`	`scripts: [ABS_URL],`
`18`	`18`	`styles: [ABS_URL]`
`@@ -37,7 +37,7 @@ function processOptions(options, callback) {`
`37`	`37`	`return callback('Malformed config JSON!');`
`38`	`38`	`}`
`39`	`39`	`if (config.excludes) {`
`40`		`- var e = options.excludes;`
	`40`	`+ var e = config.excludes;`
`41`	`41`	`try {`
`42`	`42`	`if (e.imports) {`
`43`	`43`	`e.imports.forEach(function(r) {`
`@@ -59,6 +59,7 @@ function processOptions(options, callback) {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
	`62`	`+ options.excludes = excludes;`
`62`	`63`
`63`	`64`	`if (!options.output) {`
`64`	`65`	`options.output = path.resolve(path.dirname(options.input), DEFAULT);`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ var url = require('url');`
`15`	`15`	`var constants = require('./constants.js');`
`16`	`16`	`var optparser = require('./optparser.js');`
`17`	`17`	`var pathresolver = require('./pathresolver');`
	`18`	`+var utils = require('./utils');`
`18`	`19`
`19`	`20`	`var read = {};`
`20`	`21`	`var options = {};`
`@@ -37,21 +38,19 @@ function exclude(regexes, href) {`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`function excludeImport(href) {`
`40`		`- return exclude(excludes.imports, href);`
	`41`	`+ return exclude(options.excludes.imports, href);`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`function excludeScript(href) {`
`44`		`- return exclude(excludes.scripts, href);`
	`45`	`+ return exclude(options.excludes.scripts, href);`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`function excludeStyle(href) {`
`48`		`- return exclude(excludes.styles, href);`
	`49`	`+ return exclude(options.excludes.styles, href);`
`49`	`50`	`}`
`50`	`51`
`51`		`-// directly update the textnode child of <style>`
`52`		`-// equivalent to <style>.textContent`
`53`	`52`	`function setTextContent(node, text) {`
`54`		`- node[0].children[0].data = text;`
	`53`	`+ utils.setTextContent(node, text);`
`55`	`54`	`}`
`56`	`55`
`57`	`56`	`function readFile(file) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vulcanize",`
`3`		`- "version": "0.2.2",`
	`3`	`+ "version": "0.2.3",`
`4`	`4`	`"description": "Process Web Components into one output file",`
`5`	`5`	`"main": "lib/vulcan.js",`
`6`	`6`	`"bin": {`