Map namespaces of attributes

2 files changed, 20 insertions, 9 deletions

diff --git a/lib/xmlreader.js b/lib/xmlreader.js
index f5a43ae..ef16f7b 100644
--- a/lib/xmlreader.js
+++ b/lib/xmlreader.js
@@ -23,17 +23,17 @@ function read(xmlString, namespaceMap) {
     var deferred = q.defer();
     
     parser.onopentag = function(node) {
-        var attributes = mapValues(node.attributes, function(attribute) {
+        var attributes = mapObject(node.attributes, function(attribute) {
             return attribute.value;
-        });
+        }, mapName);
         
-        var element = new Element(generateTagName(node), attributes);
+        var element = new Element(mapName(node), attributes);
         currentElement.children.push(element);
         stack.push(currentElement);
         currentElement = element
     };
     
-    function generateTagName(node) {
+    function mapName(node) {
         if (node.uri) {
             var mappedPrefix = namespaceMap[node.uri];
             var prefix;
@@ -72,11 +72,12 @@ function read(xmlString, namespaceMap) {
     return deferred.promise;
 }
 
-function mapValues(input, mapper, context) {
-    return _.reduce(input, function (obj, v, k) {
-        obj[k] = mapper.call(context, v, k, input);
-        return obj;
-    }, {}, context);
+function mapObject(input, valueFunc, keyFunc) {
+    return _.reduce(input, function(result, value, key) {
+        var mappedKey = keyFunc.call(null, value, key, input);
+        result[mappedKey] = valueFunc.call(null, value, key, input);
+        return result;
+    }, {});
 }
 
 function Element(name, attributes, children) {
diff --git a/tests/xmlreader.tests.js b/tests/xmlreader.tests.js
index 7f4ca9d..2eb95c8 100644
--- a/tests/xmlreader.tests.js
+++ b/tests/xmlreader.tests.js
@@ -53,6 +53,16 @@ describe('xmlreader.read', function() {
             assert.deepEqual(result.root.name, "x:body");
         });
     })
+
+    test('namespace of attributes is mapped to prefix', function() {
+        var namespaceMap = {
+            "word": "x"
+        };
+        var xmlString = '<w:body xmlns:w="word" w:val="Hello!"/>';
+        return xmlreader.read(xmlString, namespaceMap).then(function(result) {
+            assert.deepEqual(result.root.attributes["x:val"], "Hello!");
+        });
+    })
     
     test('can find first element with name', function() {
         return xmlreader.read('<body><a/><b index="1"/><b index="2"/></body>').then(function(result) {