Return object from request with multiple values

Author: jamiebuilds

src/backbone.radio.js

@@ -44,13 +44,13 @@ Radio._eventsApi = function(obj, action, name, rest) {
     return false;
   }
 
-  var results = [];
+  var results = {};
 
   // Handle event maps.
   if (typeof name === 'object') {
     for (var key in name) {
       var result = obj[action].apply(obj, [key, name[key]].concat(rest));
-      eventSplitter.test(key) ? (results = results.concat(result)) : results.push(result);
+      eventSplitter.test(key) ? _.extend(results, result) : results[key] = result;
     }
     return results;
   }
@@ -59,7 +59,7 @@ Radio._eventsApi = function(obj, action, name, rest) {
   if (eventSplitter.test(name)) {
     var names = name.split(eventSplitter);
     for (var i = 0, l = names.length; i < l; i++) {
-      results.push(obj[action].apply(obj, [names[i]].concat(rest)));
+      results[names[i]] = obj[action].apply(obj, [names[i]].concat(rest));
     }
     return results;
   }

test/spec/requests.js

@@ -378,9 +378,12 @@ describe('Requests:', function() {
         .and.calledWith('requestTwo', 'argTwo');
     });
 
-    it('should return an array of replies', function() {
+    it('should return an object of replies', function() {
       expect(this.Requests.request)
-        .to.have.returned(['replyOne', 'replyTwo']);
+        .to.have.returned({
+          requestOne: 'replyOne',
+          requestTwo: 'replyTwo'
+        });
     });
   });
 
@@ -468,9 +471,12 @@ describe('Requests:', function() {
         .and.calledWith('requestTwo', 'argOne', 'argTwo');
     });
 
-    it('should return an array of replies', function() {
+    it('should return an object of replies', function() {
       expect(this.Requests.request)
-        .to.have.returned(['replyOne', 'replyTwo']);
+        .to.have.returned({
+          requestOne: 'replyOne',
+          requestTwo: 'replyTwo'
+        });
     });
   });
 
@@ -532,9 +538,39 @@ describe('Requests:', function() {
         .and.calledWith('requestThree', 'argTwo');
     });
 
-    it('should return an array of replies', function() {
+    it('should return an object of replies', function() {
       expect(this.Requests.request)
-        .to.have.returned(['replyOne', 'replyTwo', 'replyThree']);
+        .to.have.returned({
+          requestOne: 'replyOne',
+          requestTwo: 'replyTwo',
+          requestThree: 'replyThree'
+        });
+    });
+  });
+
+  describe('when calling `request` with object with space-separated keys of requests with matching with matching keys', function() {
+    beforeEach(function() {
+      this.Requests.reply('requestOne requestTwo', _.identity);
+      this.Requests.request({
+        'requestOne requestTwo' : 'argOne',
+        'requestTwo' : 'argTwo'
+      });
+    });
+
+    it('should call the set of requests', function() {
+      expect(this.Requests.request)
+        .to.have.callCount(5)
+        .and.calledWith('requestOne', 'argOne')
+        .and.calledWith('requestTwo', 'argOne')
+        .and.calledWith('requestTwo', 'argTwo');
+    });
+
+    it('should return an object of replies override duplicate keys', function() {
+      expect(this.Requests.request)
+        .to.have.returned({
+          requestOne: 'argOne',
+          requestTwo: 'argTwo'
+        });
     });
   });
 });