Split xmlreader into nodes and reader modules

4 files changed, 69 insertions, 61 deletions

diff --git a/lib/docx/office-xml-reader.js b/lib/docx/office-xml-reader.js
index 71f5b57..b5231eb 100644
--- a/lib/docx/office-xml-reader.js
+++ b/lib/docx/office-xml-reader.js
@@ -1,5 +1,5 @@
 var promises = require("../promises");
-var xmlreader = require("../xmlreader");
+var xml = require("../xml");
 
 
 exports.readXmlFromZipFile = readXmlFromZipFile;
@@ -17,7 +17,7 @@ var xmlNamespaceMap = {
 
 
 function read(xmlString) {
-    return xmlreader.read(xmlString, xmlNamespaceMap);
+    return xml.readString(xmlString, xmlNamespaceMap);
 }
 
 
diff --git a/lib/xml/index.js b/lib/xml/index.js
new file mode 100644
index 0000000..6c35998
--- /dev/null
+++ b/lib/xml/index.js
@@ -0,0 +1,2 @@
+exports.Element = require("./nodes").Element;
+exports.readString = require("./reader").readString;
diff --git a/lib/xml/nodes.js b/lib/xml/nodes.js
new file mode 100644
index 0000000..ed273cf
--- /dev/null
+++ b/lib/xml/nodes.js
@@ -0,0 +1,60 @@
+var _ = require("underscore");
+
+
+exports.Element = Element;
+
+
+var emptyElement = {
+    first: function() {
+        return null;
+    },
+    firstOrEmpty: function() {
+        return emptyElement;
+    },
+    attributes: {}
+};
+
+function Element(name, attributes, children) {
+    this.type = "element";
+    this.name = name;
+    this.attributes = attributes || {};
+    this.children = children || [];
+}
+
+Element.prototype.first = function(name) {
+    return _.find(this.children, function(child) {
+        return child.name == name;
+    });
+};
+
+Element.prototype.firstOrEmpty = function(name) {
+    return this.first(name) || emptyElement;
+};
+
+Element.prototype.getElementsByTagName = function(name) {
+    var elements = _.filter(this.children, function(child) {
+        return child.name == name;
+    });
+    return toElementList(elements);
+};
+
+Element.prototype.text = function() {
+    if (this.children.length === 0) {
+        return "";
+    } else if (this.children.length !== 1 || this.children[0].type !== "text") {
+        throw new Error("Not implemented");
+    }
+    return this.children[0].value;
+};
+
+var elementListPrototype = {
+    getElementsByTagName: function(name) {
+        return toElementList(_.flatten(this.map(function(element) {
+            return element.getElementsByTagName(name);
+        }, true)));
+    }
+};
+
+function toElementList(array) {
+    return _.extend(array, elementListPrototype);
+}
diff --git a/lib/xmlreader.js b/lib/xml/reader.js
index 551366f..ab175f2 100644
--- a/lib/xmlreader.js
+++ b/lib/xml/reader.js
@@ -1,11 +1,12 @@
-var promises = require("./promises");
+var promises = require("../promises");
 var sax = require("sax");
 var _ = require("underscore");
 
-exports.read = read;
-exports.Element = Element;
+var Element = require("./nodes").Element;
 
-function read(xmlString, namespaceMap) {
+exports.readString = readString;
+
+function readString(xmlString, namespaceMap) {
     namespaceMap = namespaceMap || {};
     
     var finished = false;
@@ -84,58 +85,3 @@ function mapObject(input, valueFunc, keyFunc) {
         return result;
     }, {});
 }
-
-var emptyElement = {
-    first: function() {
-        return null;
-    },
-    firstOrEmpty: function() {
-        return emptyElement;
-    },
-    attributes: {}
-};
-
-function Element(name, attributes, children) {
-    this.type = "element";
-    this.name = name;
-    this.attributes = attributes || {};
-    this.children = children || [];
-}
-
-Element.prototype.first = function(name) {
-    return _.find(this.children, function(child) {
-        return child.name == name;
-    });
-};
-
-Element.prototype.firstOrEmpty = function(name) {
-    return this.first(name) || emptyElement;
-};
-
-Element.prototype.getElementsByTagName = function(name) {
-    var elements = _.filter(this.children, function(child) {
-        return child.name == name;
-    });
-    return toElementList(elements);
-};
-
-Element.prototype.text = function() {
-    if (this.children.length === 0) {
-        return "";
-    } else if (this.children.length !== 1 || this.children[0].type !== "text") {
-        throw new Error("Not implemented");
-    }
-    return this.children[0].value;
-};
-
-var elementListPrototype = {
-    getElementsByTagName: function(name) {
-        return toElementList(_.flatten(this.map(function(element) {
-            return element.getElementsByTagName(name);
-        }, true)));
-    }
-};
-
-function toElementList(array) {
-    return _.extend(array, elementListPrototype);
-}