Merge pull request #103 from dannyrscott/master

allow arrayNotation to accept an array

Author: c4milo

lib/xml2json.js

@@ -20,7 +20,7 @@ function startElement(name, attrs) {
     }
 
     if (! (name in currentObject)) {
-        if(options.arrayNotation) {
+        if(options.arrayNotation || options.forceArrays[name]) {
             currentObject[name] = [attrs];
         } else {
             currentObject[name] = attrs;
@@ -147,12 +147,18 @@ module.exports = function(xml, _options) {
         coerce: joi.alternatives([joi.boolean(), joi.object()]).default(false),
         sanitize: joi.boolean().default(true),
         trim: joi.boolean().default(true),
-        arrayNotation: joi.boolean().default(false)
+        arrayNotation: joi.alternatives([joi.boolean(), joi.array()]).default(false)
     };
     var validation = joi.validate(_options, schema);
     hoek.assert(validation.error === null, validation.error);
     options = validation.value;
-
+    options.forceArrays = {};
+    if (Array.isArray(options.arrayNotation)) {
+        options.arrayNotation.forEach(function(i) {
+            options.forceArrays[i] = true;
+        });
+        options.arrayNotation = false;
+    }
     if (!parser.parse(xml)) {
         throw new Error('There are errors in your xml file: ' + parser.getError());
     }

test/fixtures/forceArray.json

@@ -0,0 +1 @@
+{"json":{"id":"123b","vehicles":[{"year":"1989","annual_mileage":"18000","average_mileage":"30","alarm":"1","ownership":"Financed","make":"TOYOTA","model":"Camry","commute_days_per_week":"5","collision":"$ 500","comprehensive":"$ 500","primary_purpose":"Pleasure"},{"year":"2006","annual_mileage":"37500","average_mileage":"10","alarm":"1","ownership":"Owned","make":"CHRYSLER","model":"CROSSFIRE","commute_days_per_week":"3","collision":"$ 5000","comprehensive":"$ 500","primary_purpose":"CommuteWork"}],"drivers":[{"driver":"Bray Wyatt","birth_date":"1987-05-23","marital_status":"Single","relationship":"Self","gender":"Male","first_licensed":"18","license_status":"ValidLicense","occupation":"Unemployed","education":"HighSchoolDiploma","credit_rating":"Unsure"}]}}

test/fixtures/forceArray.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<json>
+	<id>123b</id>
+	<vehicles>
+		<year>1989</year>
+		<annual_mileage>18000</annual_mileage>
+		<average_mileage>30</average_mileage>
+		<alarm>1</alarm>
+		<ownership>Financed</ownership>
+		<make>TOYOTA</make>
+		<model>Camry</model>
+		<commute_days_per_week>5</commute_days_per_week>
+		<collision>$ 500</collision>
+		<comprehensive>$ 500</comprehensive>
+		<primary_purpose>Pleasure</primary_purpose>
+	</vehicles>
+	<vehicles>
+		<year>2006</year>
+		<annual_mileage>37500</annual_mileage>
+		<average_mileage>10</average_mileage>
+		<alarm>1</alarm>
+		<ownership>Owned</ownership>
+		<make>CHRYSLER</make>
+		<model>CROSSFIRE</model>
+		<commute_days_per_week>3</commute_days_per_week>
+		<collision>$ 5000</collision>
+		<comprehensive>$ 500</comprehensive>
+		<primary_purpose>CommuteWork</primary_purpose>
+	</vehicles>
+	<drivers>
+		<driver>Bray Wyatt</driver>
+		<birth_date>1987-05-23</birth_date>
+		<marital_status>Single</marital_status>
+		<relationship>Self</relationship>
+		<gender>Male</gender>
+		<first_licensed>18</first_licensed>
+		<license_status>ValidLicense</license_status>
+		<occupation>Unemployed</occupation>
+		<education>HighSchoolDiploma</education>
+		<credit_rating>Unsure</credit_rating>
+	</drivers>
+</json>

test/test.js

@@ -107,6 +107,15 @@ describe('xml2json', function () {
         done();
     });
 
+    it('converts with forceArrays', function(done) {
+        var xml = internals.readFixture('forceArray.xml');
+        var result = parser.toJson(xml, {arrayNotation: ['drivers', 'vehicles']});
+        var json = internals.readFixture('forceArray.json');
+
+        expect(result).to.deep.equal(json);
+        done();
+    });
+
     it('throws error on bad options', function (done) {
 
         var throws = function() {