From 0363f064b05698eed9826570aad6985ef47a6322 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 16 Aug 2015 15:52:29 +0100 Subject: Support default namespace --- lib/xml/writer.js | 10 ++++++---- tests/xml/writer.tests.js | 20 +++++++++++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/xml/writer.js b/lib/xml/writer.js index 66cc8de..9bf8c35 100644 --- a/lib/xml/writer.js +++ b/lib/xml/writer.js @@ -25,9 +25,10 @@ function writeString(root, namespaces) { } function mapElementName(name) { - var longFormMatch = /^\{(.*)\}(.*)$/.exec(name); + var longFormMatch = /^\{(.*)\}:(.*)$/.exec(name); if (longFormMatch) { - return uriToPrefix[longFormMatch[1]] + ":" + longFormMatch[2]; + var prefix = uriToPrefix[longFormMatch[1]]; + return prefix + (prefix === "" ? "" : ":") + longFormMatch[2]; } else { return name; } @@ -35,14 +36,15 @@ function writeString(root, namespaces) { function writeDocument(root) { var builder = xmlbuilder - .create(root.name, { + .create(mapElementName(root.name), { version: '1.0', encoding: 'UTF-8', standalone: true }); _.forEach(namespaces, function(uri, prefix) { - builder.attribute("xmlns:" + prefix, uri); + var key = "xmlns" + (prefix === "" ? "" : ":" + prefix); + builder.attribute(key, uri); }); root.children.forEach(function(child) { diff --git a/tests/xml/writer.tests.js b/tests/xml/writer.tests.js index 6c414c0..7f9440f 100644 --- a/tests/xml/writer.tests.js +++ b/tests/xml/writer.tests.js @@ -44,21 +44,35 @@ describe('xml.writer', function() { 'Everything in Transit'); }); + test('can write root element with long-form prefix when URI is namespace', function() { + var element = xml.element("{music}:root"); + assertXmlString(element, {"m": "music"}, + ''); + }); + test('can write child elements with long-form prefix when URI is namespace', function() { - var element = xml.element("root", {"m": "music"}, [ - xml.element("{music}album") + var element = xml.element("root", {}, [ + xml.element("{music}:album") ]); assertXmlString(element, {"m": "music"}, ''); }); test('can write child elements with short-form prefix when URI is namespace', function() { - var element = xml.element("root", {"m": "music"}, [ + var element = xml.element("root", {}, [ xml.element("m:album") ]); assertXmlString(element, {"m": "music"}, ''); }); + + test('default namespace has key of empty string', function() { + var element = xml.element("root", {}, [ + xml.element("{music}:album") + ]); + assertXmlString(element, {"": "music"}, + ''); + }); }); -- cgit v1.2.3