From e1f18ccd40a40c8f9001517c9f6aa56a797a9110 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 27 Apr 2013 22:48:31 +0100
Subject: Split out stubbed implementation of content-types-reader

---
 lib/content-types-reader.js | 10 ++++++++++
 lib/docx-reader.js          |  9 +++------
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 lib/content-types-reader.js

(limited to 'lib')

diff --git a/lib/content-types-reader.js b/lib/content-types-reader.js
new file mode 100644
index 0000000..5240d21
--- /dev/null
+++ b/lib/content-types-reader.js
@@ -0,0 +1,10 @@
+exports.readContentTypesFromZipFile = readContentTypesFromZipFile;
+
+
+function readContentTypesFromZipFile(file) {
+    return {
+        findContentType: function(path) {
+            return "image/png";
+        }
+    }
+}
diff --git a/lib/docx-reader.js b/lib/docx-reader.js
index c96245a..0861758 100644
--- a/lib/docx-reader.js
+++ b/lib/docx-reader.js
@@ -9,6 +9,7 @@ var readXmlFromZipFile = require("./office-xml-reader").readXmlFromZipFile;
 var documents = require("./documents");
 var DocumentXmlReader = require("./document-xml-reader").DocumentXmlReader;
 var readRelationshipsFromZipFile = require("./relationships-reader").readRelationshipsFromZipFile;
+var readContentTypesFromZipFile = require("./content-types-reader").readContentTypesFromZipFile;
 var Result = require("./results").Result;
 
 
@@ -26,13 +27,9 @@ function read(options) {
     return q.when(docxFile, function(docxFile) {
         return q.all([
             readRelationshipsFromZipFile(docxFile),
+            readContentTypesFromZipFile(docxFile),
             readXmlFromZipFile(docxFile, "word/document.xml")
-        ]).spread(function(relationships, documentXml) {
-            var contentTypes = {
-                findContentType: function(path) {
-                    return "image/png";
-                }
-            };
+        ]).spread(function(relationships, contentTypes, documentXml) {
             var reader = new DocumentXmlReader(relationships, contentTypes, docxFile);
             return reader.convertXmlToDocument(documentXml);
         });
-- 
cgit v1.2.3