Rename styles module to htmlPaths

8 files changed, 42 insertions, 39 deletions

diff --git a/lib/document-to-html.js b/lib/document-to-html.js
index 1fce576..8fe2f0f 100644
--- a/lib/document-to-html.js
+++ b/lib/document-to-html.js
@@ -1,6 +1,6 @@
 var q = require("q");
 
-var styles = require("./styles");
+var htmlPaths = require("./html-paths");
 var HtmlGenerator = require("./html-generator").HtmlGenerator;
 
 exports.DocumentConverter = DocumentConverter;
@@ -8,7 +8,7 @@ exports.DocumentConverter = DocumentConverter;
 
 function DocumentConverter(options) {
     options = options || {};
-    var defaultParagraphStyle = options.defaultParagraphStyle || styles.topLevelElement("p");
+    var defaultParagraphStyle = options.defaultParagraphStyle || htmlPaths.topLevelElement("p");
     
     var paragraphStyleMap = options.paragraphStyleMap || {};
     var runStyleMap = options.runStyleMap || {};
@@ -58,10 +58,10 @@ function DocumentConverter(options) {
             }
         }
         if (run.isBold) {
-            runHtml.push(styles.element("strong"));
+            runHtml.push(htmlPaths.element("strong"));
         }
         if (run.isItalic) {
-            runHtml.push(styles.element("em"));
+            runHtml.push(htmlPaths.element("em"));
         }
         return convertElements(run.children, runHtml)
             .then(function() {
@@ -80,7 +80,7 @@ function DocumentConverter(options) {
             html.text(element.value);
         },
         "hyperlink": function(element, html) {
-            html.push(styles.element("a", {href: element.href}));
+            html.push(htmlPaths.element("a", {href: element.href}));
             return convertElements(element.children, html).then(function() {
                 html.pop();
             });
@@ -93,7 +93,7 @@ function DocumentConverter(options) {
                 if (element.altText) {
                     attributes.alt = element.altText;
                 }
-                html.selfClosing(styles.element("img", attributes));
+                html.selfClosing(htmlPaths.element("img", attributes));
             });
         }
     };
diff --git a/lib/styles.js b/lib/html-paths.js
index 737bdcb..1d3b1f4 100644
--- a/lib/styles.js
+++ b/lib/html-paths.js
@@ -26,3 +26,4 @@ function element(tagName, attributes, options) {
         fresh: options.fresh
     };
 }
+
diff --git a/lib/index.js b/lib/index.js
index 96ba751..778aad6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,14 +1,14 @@
 var docxReader = require("./docx-reader");
 var DocumentConverter = require("./document-to-html").DocumentConverter;
-var styles = require("./styles");
+var htmlPaths = require("./html-paths");
 
 exports.Converter = Converter;
 exports.standardOptions = {
     paragraphStyleMap: {
-        "Heading1": styles.topLevelElement("h1"),
-        "Heading2": styles.topLevelElement("h2"),
-        "Heading3": styles.topLevelElement("h3"),
-        "Heading4": styles.topLevelElement("h4")
+        "Heading1": htmlPaths.topLevelElement("h1"),
+        "Heading2": htmlPaths.topLevelElement("h2"),
+        "Heading3": htmlPaths.topLevelElement("h3"),
+        "Heading4": htmlPaths.topLevelElement("h4")
     }
 };
 
diff --git a/lib/style-reader.js b/lib/style-reader.js
index 9e23abd..01331a6 100644
--- a/lib/style-reader.js
+++ b/lib/style-reader.js
@@ -1,7 +1,7 @@
 var lop = require("lop");
 var RegexTokeniser = lop.RegexTokeniser;
 
-var styles = require("./styles");
+var htmlPaths = require("./html-paths");
 
 exports.read = read;
 
@@ -41,7 +41,7 @@ function read(string) {
         if (fresh) {
             options["fresh"] = true;
         }
-        return styles.element(tagName, attributes, options);
+        return htmlPaths.element(tagName, attributes, options);
     });
     
     var styleRule = lop.rules.then(
@@ -53,7 +53,7 @@ function read(string) {
                 whitespaceRule
             )
         ),
-        styles.elements
+        htmlPaths.elements
     );
     
     var tokens = tokenise(string);
diff --git a/tests/document-to-html.tests.js b/tests/document-to-html.tests.js
index e7d65e7..04ac143 100644
--- a/tests/document-to-html.tests.js
+++ b/tests/document-to-html.tests.js
@@ -4,7 +4,7 @@ var q = require("q");
 var documents = require("../lib/documents");
 var DocumentConverter = require("../lib/document-to-html").DocumentConverter;
 var test = require("./testing").test;
-var styles = require("../lib/styles");
+var htmlPaths = require("../lib/html-paths");
 var xmlreader = require("../lib/xmlreader");
 
 
@@ -41,7 +41,9 @@ describe('DocumentConverter', function() {
         var document = new documents.Document([
             paragraphOfText("Hello.")
         ]);
-        var converter = new DocumentConverter({defaultParagraphStyle: styles.topLevelElement("h1")});
+        var converter = new DocumentConverter({
+            defaultParagraphStyle: htmlPaths.topLevelElement("h1")
+        });
         return converter.convertToHtml(document).then(function(result) {
             assert.equal(result.html, "<h1>Hello.</h1>");
         });
@@ -74,7 +76,7 @@ describe('DocumentConverter', function() {
         ]);
         var converter = new DocumentConverter({
             paragraphStyleMap: {
-                "Heading1": styles.topLevelElement("h1")
+                "Heading1": htmlPaths.topLevelElement("h1")
             }
         });
         return converter.convertToHtml(document).then(function(result) {
@@ -88,7 +90,7 @@ describe('DocumentConverter', function() {
         ]);
         var converter = new DocumentConverter({
             paragraphStyleMap: {
-                "Heading1": styles.elements(["h1", "span"])
+                "Heading1": htmlPaths.elements(["h1", "span"])
             }
         });
         return converter.convertToHtml(document).then(function(result) {
@@ -134,7 +136,7 @@ describe('DocumentConverter', function() {
         var run = runOfText("Hello.", {styleName: "Emphasis"});
         var converter = new DocumentConverter({
             runStyleMap: {
-                "Emphasis": styles.elements(["strong"])
+                "Emphasis": htmlPaths.elements(["strong"])
             }
         });
         return converter.convertToHtml(run).then(function(result) {
diff --git a/tests/html-generator.tests.js b/tests/html-generator.tests.js
index 12469ee..d118b27 100644
--- a/tests/html-generator.tests.js
+++ b/tests/html-generator.tests.js
@@ -2,7 +2,7 @@ var assert = require("assert");
 var test = require("./testing").test;
 
 var HtmlGenerator = require("../lib/html-generator").HtmlGenerator;
-var styles = require("../lib/styles");
+var htmlPaths = require("../lib/html-paths");
 
 
 describe('HtmlGenerator', function() {
@@ -19,7 +19,7 @@ describe('HtmlGenerator', function() {
     
     test('asString closes all elements', function() {
         var generator = new HtmlGenerator();
-        generator.style(styles.elements(["p", "span"]));
+        generator.style(htmlPaths.elements(["p", "span"]));
         generator.text("Hello!");
         generator.closeAll();
         return assert.equal(generator.asString(), "<p><span>Hello!</span></p>");
@@ -27,14 +27,14 @@ describe('HtmlGenerator', function() {
     
     test('elements with no text are not generated', function() {
         var generator = new HtmlGenerator();
-        generator.style(styles.elements(["p", "span"]));
+        generator.style(htmlPaths.elements(["p", "span"]));
         generator.closeAll();
         return assert.equal(generator.asString(), "");
     });
     
     test('generates empty string if text is empty string', function() {
         var generator = new HtmlGenerator();
-        generator.style(styles.elements(["p", "span"]));
+        generator.style(htmlPaths.elements(["p", "span"]));
         generator.text("")
         generator.closeAll();
         return assert.equal(generator.asString(), "");
@@ -42,9 +42,9 @@ describe('HtmlGenerator', function() {
     
     test('can leave some HTML elements for next style', function() {
         var generator = new HtmlGenerator();
-        var listStyle = styles.elements([
-            styles.element("ul", {}, {fresh: false}),
-            styles.element("li", {}, {fresh: true})
+        var listStyle = htmlPaths.elements([
+            htmlPaths.element("ul", {}, {fresh: false}),
+            htmlPaths.element("li", {}, {fresh: true})
         ])
         generator.style(listStyle);
         generator.text("Apple");
@@ -56,8 +56,8 @@ describe('HtmlGenerator', function() {
     
     test('renders class attribute of elements', function() {
         var generator = new HtmlGenerator();
-        generator.style(styles.elements([
-            styles.element("p", {"class": "tip"})
+        generator.style(htmlPaths.elements([
+            htmlPaths.element("p", {"class": "tip"})
         ]));
         generator.text("Hello!");
         generator.closeAll();
diff --git a/tests/mammoth.tests.js b/tests/mammoth.tests.js
index f8e799d..e892917 100644
--- a/tests/mammoth.tests.js
+++ b/tests/mammoth.tests.js
@@ -2,7 +2,7 @@ var assert = require("assert");
 var path = require("path");
 
 var mammoth = require("../")
-var styles = require("../lib/styles");
+var htmlPaths = require("../lib/html-paths");
 
 var testing = require("./testing");
 var test = testing.test;
@@ -26,7 +26,7 @@ describe('mammoth', function() {
             "word/document.xml": testData("simple/word/document.xml")
         });
         var converter = new mammoth.Converter({
-            defaultParagraphStyle: styles.topLevelElement("h1")
+            defaultParagraphStyle: htmlPaths.topLevelElement("h1")
         });
         return converter.convertToHtml(docxFile).then(function(result) {
             assert.equal("<h1>Hello.</h1>", result.html);
diff --git a/tests/style-reader.tests.js b/tests/style-reader.tests.js
index 474cb9c..921b544 100644
--- a/tests/style-reader.tests.js
+++ b/tests/style-reader.tests.js
@@ -1,35 +1,35 @@
 var assert = require("assert");
-var styles = require("../lib/styles");
+var htmlPaths = require("../lib/html-paths");
 var styleReader = require("../lib/style-reader");
 var test = require("./testing").test;
 
 
 describe('styleReader.read', function() {
     test('reads single element', function() {
-        assert.deepEqual(styleReader.read("p"), styles.elements(["p"]));
+        assert.deepEqual(styleReader.read("p"), htmlPaths.elements(["p"]));
     });
     
     test('reads nested elements', function() {
-        assert.deepEqual(styleReader.read("ul > li"), styles.elements(["ul", "li"]));
+        assert.deepEqual(styleReader.read("ul > li"), htmlPaths.elements(["ul", "li"]));
     });
     
     test('reads class on element', function() {
-        var expected = styles.elements([
-            styles.element("p", {"class": "tip"})
+        var expected = htmlPaths.elements([
+            htmlPaths.element("p", {"class": "tip"})
         ])
         assert.deepEqual(styleReader.read("p.tip"), expected);
     });
     
     test('reads multiple classes on element', function() {
-        var expected = styles.elements([
-            styles.element("p", {"class": "tip help"})
+        var expected = htmlPaths.elements([
+            htmlPaths.element("p", {"class": "tip help"})
         ])
         assert.deepEqual(styleReader.read("p.tip.help"), expected);
     });
     
     test('reads when element must be fresh', function() {
-        var expected = styles.elements([
-            styles.element("p", {}, {"fresh": true})
+        var expected = htmlPaths.elements([
+            htmlPaths.element("p", {}, {"fresh": true})
         ])
         assert.deepEqual(styleReader.read("p:fresh"), expected);
     });