merge with master

Author: danielb2

README.md

@@ -50,7 +50,7 @@ var options = {
 
 * **object:** Returns a Javascript object instead of a JSON string
 * **reversible:** Makes the JSON reversible to XML (*)
-* **coerce:** Makes type coercion. i.e.: numbers and booleans present in attributes and element values are converted from string to its correspondent data types.
+* **coerce:** Makes type coercion. i.e.: numbers and booleans present in attributes and element values are converted from string to its correspondent data types. Coerce can be optionally defined as an object with specific methods of coercion based on attribute name or tag name, with fallback to default coercion.
 * **trim:** Removes leading and trailing whitespaces as well as line terminators in element values.
 * **arrayNotation:** XML child nodes are always treated as arrays
 * **sanitize:** Sanitizes the following characters present in element values:

lib/xml2json.js

@@ -15,7 +15,7 @@ function startElement(name, attrs) {
     if(options.coerce) {
         // Looping here in stead of making coerce generic as object walk is unnecessary
         for(var key in attrs) {
-            attrs[key] = coerce(attrs[key]);
+            attrs[key] = coerce(attrs[key],key);
         }
     }
 
@@ -64,7 +64,7 @@ function endElement(name) {
             currentObject['$t'] = sanitizer.sanitize(currentObject['$t']);
         }
 
-        currentObject['$t'] = coerce(currentObject['$t']);
+        currentObject['$t'] = coerce(currentObject['$t'],name);
     }
 
     if (currentElementName !== name) {
@@ -86,11 +86,14 @@ function endElement(name) {
     currentObject = ancestor;
 }
 
-function coerce(value) {
+function coerce(value,key) {
     if (!options.coerce || value.trim() === '') {
         return value;
     }
 
+    if (typeof options.coerce[key] === 'function')
+        return options.coerce[key](value);
+
     var num = Number(value);
     if (!isNaN(num)) {
         return num;

package.json

@@ -1,19 +1,19 @@
-{
-  "name": "xml2json",
-  "version": "0.6.1",
-  "author": "Andrew Turley",
-  "email": "[email protected]",
-  "description": "Converts xml to json and vice-versa, using node-expat.",
-  "repository": "git://github.com/buglabs/node-xml2json.git",
-  "license": "MIT",
-  "main": "index",
-  "scripts": {
-    "test": "make test"
-  },
-  "contributors": [
-    {
-      "name": "Camilo Aguilar",
-      "email": "[email protected]"
+{   "name" : "xml2json",
+    "version": "0.7.1",
+    "author": "Andrew Turley",
+    "email": "[email protected]",
+    "description" : "Converts xml to json and vice-versa, using node-expat.",
+    "repository": "git://github.com/buglabs/node-xml2json.git",
+    "license": "MIT",
+    "main": "index",
+    "contributors":[
+        {"name": "Camilo Aguilar", "email": "[email protected]"}
+    ],
+    "dependencies": {
+       "node-expat": "^2.3.7"
+    },
+    "bin": {
+        "xml2json": "bin/xml2json"
     }
   ],
   "dependencies": {

test/fixtures/coerce.json

@@ -1 +1 @@
-{"itemRecord":{"value":[{"longValue":"12345"},{"stringValue":{"number":"false","$t":"this is a string value"}},{"moneyValue":{"number":"true","currencyId":"USD","$t":"104.95"}},{"moneyValue":{"currencyId":"USD","$t":"104.95"}},{"longValue":"0","bool":{"id":"0","$t":"true"}},{"longValue":"0"},{"dateValue":"2012-02-16T17:03:33.000-07:00"},{"stringValue":"SmDZ8RlMIjDvlEW3KUibzj2Q"}]}}
+{"itemRecord":{"value":[{"longValue":"12345"},{"stringValue":{"number":"false","$t":"this is a string value"}},{"moneyValue":{"number":"true","currencyId":"USD","text":"123.45","$t":"104.95"}},{"moneyValue":{"currencyId":"USD","$t":"104.95"}},{"longValue":"0","bool":{"id":"0","$t":"true"}},{"longValue":"0"},{"dateValue":"2012-02-16T17:03:33.000-07:00"},{"stringValue":"SmDZ8RlMIjDvlEW3KUibzj2Q"},{"text":"42.42"}]}}

test/fixtures/coerce.xml

@@ -7,7 +7,7 @@
     </stringValue>
   </value>
   <value>
-    <moneyValue number='true' currencyId="USD">104.95
+    <moneyValue number='true' currencyId="USD" text="123.45">104.95
     </moneyValue>
   </value>
   <value>
@@ -27,4 +27,7 @@
   <value>
     <stringValue>SmDZ8RlMIjDvlEW3KUibzj2Q</stringValue>
   </value>
+  <value>
+    <text>42.42</text>
+  </value>
 </itemRecord>

test/test-coerce.js

@@ -13,10 +13,24 @@ assert.strictEqual(result.itemRecord.value[0].longValue['$t'], 12345);
 assert.strictEqual(result.itemRecord.value[1].stringValue.number, false);
 assert.strictEqual(result.itemRecord.value[2].moneyValue.number, true);
 assert.strictEqual(result.itemRecord.value[2].moneyValue['$t'], 104.95);
+assert.strictEqual(result.itemRecord.value[2].moneyValue.text, 123.45);
+assert.strictEqual(result.itemRecord.value[8].text['$t'], 42.42);
+
 
 // Without coercion
 result = parser.toJson(data, {reversible: true, coerce: false, object: true});
 assert.strictEqual(result.itemRecord.value[0].longValue['$t'], '12345');
 assert.strictEqual(result.itemRecord.value[1].stringValue.number, 'false');
 assert.strictEqual(result.itemRecord.value[2].moneyValue.number, 'true');
-assert.strictEqual(result.itemRecord.value[2].moneyValue['$t'], '104.95');
+assert.strictEqual(result.itemRecord.value[2].moneyValue['$t'], '104.95');
+assert.strictEqual(result.itemRecord.value[2].moneyValue.text, '123.45');
+assert.strictEqual(result.itemRecord.value[8].text['$t'], '42.42');
+
+// With coercion as an optional object
+var result = parser.toJson(data, {reversible: true, coerce: {text:String}, object: true});
+assert.strictEqual(result.itemRecord.value[0].longValue['$t'], 12345);
+assert.strictEqual(result.itemRecord.value[1].stringValue.number, false);
+assert.strictEqual(result.itemRecord.value[2].moneyValue.number, true);
+assert.strictEqual(result.itemRecord.value[2].moneyValue['$t'], 104.95);
+assert.strictEqual(result.itemRecord.value[2].moneyValue.text, '123.45');
+assert.strictEqual(result.itemRecord.value[8].text['$t'], '42.42');

test/test.js

@@ -36,7 +36,7 @@ describe('xml2json', function () {
         var result = parser.toJson(xml, { coerce: false });
         var json = internals.readFixture('coerce.json');
 
-        expect(result).to.deep.equal(json);
+        expect(result + '\n').to.deep.equal(json);
 
         done();
     });
@@ -47,7 +47,7 @@ describe('xml2json', function () {
         var result = parser.toJson(xml, { coerce: false });
         var json = internals.readFixture('domain.json');
 
-        expect(result+'\n').to.deep.equal(json);
+        expect(result + '\n').to.deep.equal(json);
 
         done();
     });
@@ -58,7 +58,7 @@ describe('xml2json', function () {
         var result = parser.toJson(xml, { coerce: false, trim: true, sanitize: false });
         var json = internals.readFixture('large.json');
 
-        expect(result+'\n').to.deep.equal(json);
+        expect(result + '\n').to.deep.equal(json);
 
         done();
     });
@@ -108,6 +108,7 @@ describe('xml2json', function () {
     });
 });
 
+
 describe('json2xml', function () {
 
     it('converts domain to json', function (done) {