Move modules for docx reading into separate directory

12 files changed, 26 insertions, 27 deletions

diff --git a/lib/content-types-reader.js b/lib/docx/content-types-reader.js
index 0a74eb9..0a74eb9 100644
--- a/lib/content-types-reader.js
+++ b/lib/docx/content-types-reader.js
diff --git a/lib/document-xml-reader.js b/lib/docx/document-xml-reader.js
index 8937374..1825006 100644
--- a/lib/document-xml-reader.js
+++ b/lib/docx/document-xml-reader.js
@@ -1,11 +1,11 @@
 exports.DocumentXmlReader = DocumentXmlReader;
 
-var promises = require("./promises");
 var _ = require("underscore");
 
-var documents = require("./documents");
-var Result = require("./results").Result;
-var warning = require("./results").warning;
+var promises = require("../promises");
+var documents = require("../documents");
+var Result = require("../results").Result;
+var warning = require("../results").warning;
 
 
 function DocumentXmlReader(relationships, contentTypes, docxFile, numbering) {
diff --git a/lib/docx-reader.js b/lib/docx/docx-reader.js
index e36ab10..787c0e0 100644
--- a/lib/docx-reader.js
+++ b/lib/docx/docx-reader.js
@@ -1,10 +1,10 @@
 exports.read = read;
 
-var promises = require("./promises");
-var unzip = require("./unzip");
+var promises = require("../promises");
+var unzip = require("../unzip");
 
 var readXmlFromZipFile = require("./office-xml-reader").readXmlFromZipFile;
-var documents = require("./documents");
+var documents = require("../documents");
 var DocumentXmlReader = require("./document-xml-reader").DocumentXmlReader;
 var readRelationshipsFromZipFile = require("./relationships-reader").readRelationshipsFromZipFile;
 var readContentTypesFromZipFile = require("./content-types-reader").readContentTypesFromZipFile;
diff --git a/lib/numbering-xml.js b/lib/docx/numbering-xml.js
index 7e64dc2..7e64dc2 100644
--- a/lib/numbering-xml.js
+++ b/lib/docx/numbering-xml.js
diff --git a/lib/office-xml-reader.js b/lib/docx/office-xml-reader.js
index fa67c41..39b700e 100644
--- a/lib/office-xml-reader.js
+++ b/lib/docx/office-xml-reader.js
@@ -1,6 +1,5 @@
-var promises = require("./promises");
-
-var xmlreader = require("./xmlreader");
+var promises = require("../promises");
+var xmlreader = require("../xmlreader");
 
 
 exports.readXmlFromZipFile = readXmlFromZipFile;
diff --git a/lib/relationships-reader.js b/lib/docx/relationships-reader.js
index fe6c7f1..fe6c7f1 100644
--- a/lib/relationships-reader.js
+++ b/lib/docx/relationships-reader.js
diff --git a/lib/index.js b/lib/index.js
index d42acd6..6ccfd85 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,4 +1,4 @@
-var docxReader = require("./docx-reader");
+var docxReader = require("./docx/docx-reader");
 var DocumentConverter = require("./document-to-html").DocumentConverter;
 var styleMapping = require("./style-reader").readStyle;
 var readOptions = require("./options-reader").readOptions;
diff --git a/package.json b/package.json
index 109c85f..a05c17c 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "./lib/unzip.js": "./browser/unzip.js"
   },
   "scripts": {
-    "test": "mocha tests"
+    "test": "mocha tests --recursive"
   },
   "licenses": [
     {
diff --git a/tests/content-types-reader.tests.js b/tests/docx/content-types-reader.tests.js
index df7ed47..b0f135e 100644
--- a/tests/content-types-reader.tests.js
+++ b/tests/docx/content-types-reader.tests.js
@@ -1,8 +1,8 @@
 var assert = require("assert");
 
-var readContentTypesFromXml = require("../lib/content-types-reader").readContentTypesFromXml;
-var XmlElement = require("../lib/xmlreader").Element;
-var test = require("./testing").test;
+var readContentTypesFromXml = require("../../lib/docx/content-types-reader").readContentTypesFromXml;
+var XmlElement = require("../../lib/xmlreader").Element;
+var test = require("../testing").test;
 
 
 describe('readContentTypesFromXml', function() {
diff --git a/tests/document-xml-reader.tests.js b/tests/docx/document-xml-reader.tests.js
index 14a9cbe..7cdbefc 100644
--- a/tests/document-xml-reader.tests.js
+++ b/tests/docx/document-xml-reader.tests.js
@@ -1,11 +1,11 @@
 var assert = require("assert");
 
-var DocumentXmlReader = require("../lib/document-xml-reader").DocumentXmlReader;
-var documents = require("../lib/documents");
-var XmlElement = require("../lib/xmlreader").Element;
-var Numbering = require("../lib/numbering-xml").Numbering;
+var DocumentXmlReader = require("../../lib/docx/document-xml-reader").DocumentXmlReader;
+var documents = require("../../lib/documents");
+var XmlElement = require("../../lib/xmlreader").Element;
+var Numbering = require("../../lib/docx/numbering-xml").Numbering;
 
-var testing = require("./testing");
+var testing = require("../testing");
 var test = testing.test;
 var createFakeDocxFile = testing.createFakeDocxFile;
 
diff --git a/tests/docx-reader.tests.js b/tests/docx/docx-reader.tests.js
index 4fc487f..9dc1921 100644
--- a/tests/docx-reader.tests.js
+++ b/tests/docx/docx-reader.tests.js
@@ -1,10 +1,10 @@
 var assert = require("assert");
 
-var docxReader = require("../lib/docx-reader");
-var documents = require("../lib/documents");
-var XmlElement = require("../lib/xmlreader").Element;
+var docxReader = require("../../lib/docx/docx-reader");
+var documents = require("../../lib/documents");
+var XmlElement = require("../../lib/xmlreader").Element;
 
-var testing = require("./testing");
+var testing = require("../testing");
 var test = testing.test;
 var testData = testing.testData;
 var createFakeDocxFile = testing.createFakeDocxFile;
diff --git a/tests/numbering-xml.tests.js b/tests/docx/numbering-xml.tests.js
index 3312dfe..a101806 100644
--- a/tests/numbering-xml.tests.js
+++ b/tests/docx/numbering-xml.tests.js
@@ -2,9 +2,9 @@ var assert = require("assert");
 
 var duck = require("duck");
 
-var readNumberingXml = require("../lib/numbering-xml").readNumberingXml;
-var XmlElement = require("../lib/xmlreader").Element;
-var test = require("./testing").test;
+var readNumberingXml = require("../../lib/docx/numbering-xml").readNumberingXml;
+var XmlElement = require("../../lib/xmlreader").Element;
+var test = require("../testing").test;
 
 
 describe('readNumberingXml', function() {