Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DOMParser utility (XML v1.1) #45

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

DOMParser utility (XML v1.1) #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
50fecf0
DOMParser wrapper (utility function) to handle XML version="1.1" failure
danielweck Feb 4, 2016
3413dc7
extracted preprocessing routine for XML v1.1 utility parser
danielweck Feb 4, 2016
d0441cf
minor debugging code change
danielweck Feb 8, 2016
f277dbc
Merge branch 'develop' into feature/DOMParser
danielweck Mar 8, 2016
d4f320f
Merge branch 'develop' into feature/DOMParser
danielweck Mar 14, 2016
a099156
Merge branch 'develop' into feature/DOMParser
danielweck Apr 26, 2016
74ef405
Merge branch 'develop' into feature/DOMParser
danielweck Aug 16, 2016
efa4e2d
Merge branch 'develop' into feature/DOMParser
danielweck Sep 20, 2016
87c430d
Merge branch 'develop' into feature/DOMParser
danielweck May 25, 2017
0485491
Merge branch 'develop' into feature/DOMParser
danielweck Aug 2, 2018
afbdb85
removed obsolete XmlParser
danielweck Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions spec/models/cfi_generator_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var commonAncestor = $($dom.children()[0]).children()[1];
var $startElement = $($('#startParent', $dom).contents()[0]);
Expand Down Expand Up @@ -63,7 +63,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement1 = $($('#startParent', $dom).contents()[0]);
var $startElement2 = $($('#startParent', $dom).contents()[1]);
Expand All @@ -86,7 +86,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement1 = $($('#startParent', $dom).contents()[1]);
var $startElement2 = $($('#startParent', $dom).contents()[2]);
Expand All @@ -109,7 +109,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement1 = $($('#startElement', $dom).contents()[0]);
var $startElement2 = $($('#startParent', $dom).contents()[2]);
Expand All @@ -132,7 +132,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div id='end'></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement1 = $($('#startParent', $dom).contents()[0]);
var $startElement2 = $($('#end', $dom)[0]);
Expand All @@ -157,7 +157,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement1 = $($('#startParent', $dom).children()[0]);
var $startElement2 = $($('#startParent', $dom).children()[2]);
Expand All @@ -183,7 +183,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement1 = $($('#startParent', $dom).children()[0]);
var $startElement2 = $($('#startParent', $dom).children()[2]);
Expand All @@ -208,7 +208,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement1 = $($('#startParent', $dom).children()[0]);
var $startElement2 = $($('#startParent', $dom).children()[0]);
Expand Down Expand Up @@ -299,7 +299,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).children()[0].firstChild);
var $endElement = $($('#startParent', $dom).children()[2].firstChild);
Expand Down Expand Up @@ -329,7 +329,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).children()[0].firstChild);
var $endElement = $($('#startParent', $dom).children()[0].firstChild);
Expand Down Expand Up @@ -357,7 +357,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).contents()[0]);
var $endElement = $($('#startParent', $dom).children()[0].firstChild);
Expand All @@ -382,7 +382,7 @@ describe("CFI GENERATOR", function () {
" </body>" +
"</html>";

var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));
// per the issue The CFI for "important text" should be : /2/4, /2/1:5, /3:5
var $startElement = $($("strong", $dom).contents()[0]); // "very important"
var $endElement = $($("p", $dom).contents()[2]); // " text"
Expand Down Expand Up @@ -415,7 +415,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).contents()[1]);
var $endElement = $($('#startParent', $dom).contents()[5]);
Expand Down Expand Up @@ -443,7 +443,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).contents()[0]);
var $endElement = $($('#startParent', $dom).contents()[2]);
Expand All @@ -470,7 +470,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).contents()[1]);
var $endElement = $($('#startParent', $dom).contents()[1]);
Expand All @@ -497,7 +497,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).contents()[0]);
var $endElement = $($('#startParent', $dom).contents()[2]);
Expand All @@ -523,7 +523,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).contents()[1]);
var $endElement = $($('#startParent', $dom).contents()[1]);
Expand All @@ -548,7 +548,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).contents()[0]);
var $endElement = $($('#startParent', $dom).contents()[0])
Expand Down Expand Up @@ -606,7 +606,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).contents()[1]);
var $endElement = $($('#startParent', $dom).contents()[3]);
Expand Down Expand Up @@ -636,7 +636,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).contents()[4]);
var $endElement = $($('#startParent', $dom).contents()[4])
Expand Down Expand Up @@ -668,7 +668,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var $startElement = $($('#startParent', $dom).contents()[4]);
var $endElement = $($('#startParent', $dom).contents()[4])
Expand Down Expand Up @@ -696,7 +696,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));
var $startElement = $($('#startParent', $dom).contents()[4]);
var $endElement = $($('#startParent', $dom).contents()[4])
var generatedCFI = EPUBcfi.Generator.generateCharOffsetRangeComponent(
Expand Down Expand Up @@ -733,7 +733,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));

var generatedCFI = EPUBcfi.Generator.createCFIElementSteps($($('#startParent', $dom).contents()[0]), "html");
expect(generatedCFI).toEqual("/4/2[startParent]/2");
Expand Down Expand Up @@ -778,7 +778,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "<div></div>"
+ "</html>";
var $dom = $((new window.DOMParser).parseFromString(dom, "text/xml"));
var $dom = $(XmlParse.fromString(dom));
var $startNode = $($('#startParent', $dom).contents()[5]);
var textTerminus = EPUBcfi.Generator.createCFITextNodeStep($startNode, 3, ["cfi-marker"]);
var generatedCFI = EPUBcfi.Generator.createCFIElementSteps($startNode.parent(), "html", ["cfi-marker"]) + textTerminus;
Expand All @@ -801,7 +801,7 @@ describe("CFI GENERATOR", function () {
+ "</div>"
+ "</package>";

var packageDoc = (new window.DOMParser).parseFromString(packageDocXhtml, "text/xml");
var packageDoc = XmlParse.fromString(packageDocXhtml);
var packageDocCFIComponent = EPUBcfi.Generator.generatePackageDocumentCFIComponentWithSpineIndex(2, packageDoc);
expect(packageDocCFIComponent).toEqual("/6/2/6!"); // [ te,xtn]
});
Expand Down Expand Up @@ -894,8 +894,8 @@ describe("CFI GENERATOR", function () {
+ "<div></div>"
+ "</html>";

var contentDoc = (new window.DOMParser).parseFromString(contentDocXhtml, "text/xml");
var packageDoc = (new window.DOMParser).parseFromString(packageDocXhtml, "text/xml");
var contentDoc = XmlParse.fromString(contentDocXhtml);
var packageDoc = XmlParse.fromString(packageDocXhtml);

var contentDocCFIComponent = EPUBcfi.Generator.generateCharacterOffsetCFIComponent($('#startParent', contentDoc).contents()[1], 3);
var packageDocCFIComponent = EPUBcfi.Generator.generatePackageDocumentCFIComponent("contentDocId", packageDoc);
Expand All @@ -907,9 +907,9 @@ describe("CFI GENERATOR", function () {
it('can generate a CFI for an actual epub', function () {

var contentDocXhtml = jasmine.getFixtures().read("moby_dick_content_doc.xhtml");
var contentDoc = (new window.DOMParser).parseFromString(contentDocXhtml, "text/xml");
var contentDoc = XmlParse.fromString(contentDocXhtml);
var packageDocXhtml = jasmine.getFixtures().read("moby_dick_package.opf");
var packageDoc = (new window.DOMParser).parseFromString(packageDocXhtml, "text/xml");
var packageDoc = XmlParse.fromString(packageDocXhtml);

var contentDocCFIComponent = EPUBcfi.Generator.generateCharacterOffsetCFIComponent($("#c01p0008", contentDoc)[0].firstChild, 103);
var packageDocCFIComponent = EPUBcfi.Generator.generatePackageDocumentCFIComponent("xchapter_001", packageDoc);
Expand All @@ -921,9 +921,9 @@ describe("CFI GENERATOR", function () {
it("can generate a CFI without a terminus", function () {

var contentDocXhtml = jasmine.getFixtures().read("moby_dick_content_doc.xhtml");
var contentDoc = (new window.DOMParser).parseFromString(contentDocXhtml, "text/xml");
var contentDoc = XmlParse.fromString(contentDocXhtml);
var packageDocXhtml = jasmine.getFixtures().read("moby_dick_package.opf");
var packageDoc = (new window.DOMParser).parseFromString(packageDocXhtml, "text/xml");
var packageDoc = XmlParse.fromString(packageDocXhtml);

var contentDocCFIComponent = EPUBcfi.Generator.generateElementCFIComponent($("#c01p0008", contentDoc)[0]);
var packageDocCFIComponent = EPUBcfi.Generator.generatePackageDocumentCFIComponent("xchapter_001", packageDoc);
Expand All @@ -935,9 +935,9 @@ describe("CFI GENERATOR", function () {
it("can generate a CFI without a terminus when the start element is the 'html' element", function () {

var contentDocXhtml = jasmine.getFixtures().read("moby_dick_content_doc.xhtml");
var contentDoc = (new window.DOMParser).parseFromString(contentDocXhtml, "text/xml");
var contentDoc = XmlParse.fromString(contentDocXhtml);
var packageDocXhtml = jasmine.getFixtures().read("moby_dick_package.opf");
var packageDoc = (new window.DOMParser).parseFromString(packageDocXhtml, "text/xml");
var packageDoc = XmlParse.fromString(packageDocXhtml);

var contentDocCFIComponent = EPUBcfi.Generator.generateElementCFIComponent($("html", contentDoc)[0]);
var packageDocCFIComponent = EPUBcfi.Generator.generatePackageDocumentCFIComponent("xchapter_001", packageDoc);
Expand All @@ -958,9 +958,9 @@ describe("CFI GENERATOR", function () {
beforeEach(function () {

contentDocXhtml = jasmine.getFixtures().read("moby_dick_content_doc.xhtml");
contentDoc = (new window.DOMParser).parseFromString(contentDocXhtml, "text/xml");
contentDoc = XmlParse.fromString(contentDocXhtml);
packageDocXhtml = jasmine.getFixtures().read("moby_dick_package.opf");
packageDoc = (new window.DOMParser).parseFromString(packageDocXhtml, "text/xml");
packageDoc = XmlParse.fromString(packageDocXhtml);
startTextNode = $("#c01p0008", contentDoc)[0].firstChild;
});

Expand Down
Loading