Merge 25ad7a5 into 8749572

Brightspace · Dec 18, 2014 · e4fbbdd · e4fbbdd
2 parents 8749572 + 25ad7a5
commit e4fbbdd
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 23 deletions.
diff --git a/lib/loadByFileSync.js b/lib/loadByFileSync.js
@@ -2,17 +2,18 @@
 
 var fs = require( 'fs' ),
 	path = require( 'path' ),
-	et = require('elementtree');
+	et = require('elementtree'),
+	stripBom = require('strip-bom');
 
 module.exports = function( packagePath ) {
 
 	var dir = path.dirname( packagePath );
 
 	var xml = et.parse(
-					fs.readFileSync(
+					stripBom(fs.readFileSync(
 							packagePath,
-							{ encoding: "UTF-8" }
-						)
+							{ encoding: "utf8" }
+						))
 				);
 
 	var filePaths = { JavaScript: [], Css: [] };

diff --git a/lib/loadDefinitionSync.js b/lib/loadDefinitionSync.js
@@ -2,17 +2,18 @@
 
 var fs = require('fs'),
 	path = require('path'),
-	et = require('elementtree');
+	et = require('elementtree'),
+	stripBom = require('strip-bom');
 
 module.exports = function( definitionPath ) {
 
 	var dir = path.dirname( definitionPath );
 
 	var xml = et.parse(
-					fs.readFileSync(
+					stripBom(fs.readFileSync(
 							definitionPath,
-							{ encoding: "UTF-8" }
-						).toString()
+							{ encoding: "utf8" }
+						))
 				);
 
 	var pathsFiles = xml.findall('.//Paths/*');

diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "elementtree": "^0.1.6",
     "q": "^1.0.1",
     "q-io": "^1.11.5",
+    "strip-bom": "^1.0.0",
     "xml2js": "^0.4.4"
   },
   "devDependencies": {

diff --git a/test/data/invalidxml.package.xml b/test/data/invalidxml.package.xml
@@ -1 +1 @@
-invalid XML!
+invalid XML!
diff --git a/test/data/packages/definition1.definition.xml b/test/data/packages/definition1.definition.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Package Name="TestPackage1" HasCss="false" HasJavaScript="true">
 	<Paths>
 		<File Path="../test1.package.xml" />

diff --git a/test/data/packages/definition2.definition.xml b/test/data/packages/definition2.definition.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package Name="TestPackage2" HasCss="false" HasJavaScript="true">
-	<Paths>
-		<File Path="c:\abc\test1.package.xml" />
-		<File Path="/abc/test1.package.xml" />
-	</Paths>
-</Package>
+<?xml version="1.0" encoding="utf-8"?>
+<Package Name="TestPackage2" HasCss="false" HasJavaScript="true">
+	<Paths>
+		<File Path="c:\abc\test1.package.xml" />
+		<File Path="/abc/test1.package.xml" />
+	</Paths>
+</Package>
diff --git a/test/data/packages/definition3.definition.xml b/test/data/packages/definition3.definition.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Package Name="TestPackage3" HasCss="false" HasJavaScript="true">
 	<Paths>
 		<File/>

diff --git a/test/data/packages/invalidxml.definition.xml b/test/data/packages/invalidxml.definition.xml
@@ -1 +1 @@
-invalid XML!
+invalid XML!
diff --git a/test/data/test1.package.xml b/test/data/test1.package.xml
@@ -1,4 +1,4 @@
-<Package Name="TestPackage1" xmlns="http://schemas.desire2learn.com/xml/schemas/package.xsd">
+<Package Name="TestPackage1" xmlns="http://schemas.desire2learn.com/xml/schemas/package.xsd">
 	<Css>
 		<File Path="file1.css" />
 		<File Path="file2.css" />

diff --git a/test/data/test2.package.xml b/test/data/test2.package.xml
@@ -1,4 +1,4 @@
-<Package Name="TestPackage1" xmlns="http://schemas.desire2learn.com/xml/schemas/package.xsd">
+<Package Name="TestPackage2" xmlns="http://schemas.desire2learn.com/xml/schemas/package.xsd">
 	<Css>
 		<File Path="file3.css" />
 		<File Path="file4.css" />

diff --git a/test/data/test3.package.xml b/test/data/test3.package.xml
@@ -1,4 +1,4 @@
-<Package Name="TestPackage3" xmlns="http://schemas.desire2learn.com/xml/schemas/package.xsd">
+<Package Name="TestPackage3" xmlns="http://schemas.desire2learn.com/xml/schemas/package.xsd">
 	<JavaScript>
 		<File Path="file3.js" />
 		<File Path="file4.js" />

diff --git a/test/data/test4.package.xml b/test/data/test4.package.xml
@@ -1,4 +1,4 @@
-<Package Name="TestPackage4" xmlns="http://schemas.desire2learn.com/xml/schemas/package.xsd">
+<Package Name="TestPackage4" xmlns="http://schemas.desire2learn.com/xml/schemas/package.xsd">
 	<Css>
 		<File Path="file3.css" />
 		<File Path="file4.css" />