Supporting order in TermsAggreagation like array to allow multi-ordering

dist/elastic.js

@@ -1,6 +1,6 @@
-/*! elastic.js - v1.2.0 - 2014-10-13
+/*! elastic.js - v1.2.0 - 2015-11-01
  * https://github.com/fullscale/elastic.js
- * Copyright (c) 2014 FullScale Labs, LLC; Licensed MIT */
+ * Copyright (c) 2015 FullScale Labs, LLC; Licensed MIT */
 
 /**
  @namespace
@@ -5540,6 +5540,8 @@
       @returns {Object} returns <code>this</code> so that calls can be chained.
       */
       order: function (order, direction) {
+        var orderAsObj = {};
+
         if (order == null) {
           return agg[name].terms.order;
         }
@@ -5553,8 +5555,9 @@
           direction = 'desc';
         }
 
-        agg[name].terms.order = {};
-        agg[name].terms.order[order] = direction;
+        orderAsObj[order] = direction;
+        agg[name].terms.order = agg[name].terms.order || [];
+        agg[name].terms.order.push(orderAsObj);
         return this;
       }
 

src/aggregations/TermsAggregation.js

@@ -287,6 +287,8 @@
       @returns {Object} returns <code>this</code> so that calls can be chained.
       */
       order: function (order, direction) {
+        var orderAsObj = {};
+
         if (order == null) {
           return agg[name].terms.order;
         }
@@ -300,8 +302,9 @@
           direction = 'desc';
         }
 
-        agg[name].terms.order = {};
-        agg[name].terms.order[order] = direction;
+        orderAsObj[order] = direction;
+        agg[name].terms.order = agg[name].terms.order || [];
+        agg[name].terms.order.push(orderAsObj);
         return this;
       }
 

tests/aggregation_test.js

@@ -1304,11 +1304,11 @@ exports.aggregations = {
     doTest();
 
     agg.order('_count', 'asc');
-    expected.myagg.terms.order = {'_count': 'asc'};
+    expected.myagg.terms.order = [{'_count': 'asc'}];
     doTest();
 
     agg.order('_term', 'invalid');
-    expected.myagg.terms.order = {'_term': 'desc'};
+    expected.myagg.terms.order = [{'_count': 'asc'},{'_term': 'desc'}];
     doTest();
 
     agg.agg(ta1);