Merge remote-tracking branch 'origin' into 1.5

package.json

@@ -61,15 +61,15 @@
     "aliasify": "~1.2.4",
     "express": "~3.4.7",
     "grunt-saucelabs": "git://github.com/spenceralger/grunt-saucelabs.git",
-    "find-root": "~0.1.1"
+    "find-root": "~0.1.1",
+    "event-stream": "~3.1.0"
   },
   "license": "Apache 2.0",
   "dependencies": {
-    "when": "~2.6.0",
-    "lodash": "~2.3.0",
     "chalk": "~0.3.0",
-    "event-stream": "~3.1.0",
-    "forever-agent": "~0.5.2"
+    "forever-agent": "~0.5.2",
+    "lodash-node": "~2.3.0",
+    "when": "~2.6.0"
   },
   "repository": {
     "type": "git",

scripts/release/bower.js

@@ -1,7 +1,7 @@
 var fs = require('fs');
 var spawn = require('../_spawn');
 var async = require('async');
-var _ = require('lodash');
+var _ = require('lodash-node');
 
 var root = require('path').join(__dirname, '../..');
 var bowerDir = root + '/src/bower_es_js';

src/lib/client.js

@@ -32,7 +32,7 @@ var _ = require('./utils');
 function Client(config) {
   config = config || {};
 
-  function EsApiClient(config) {
+  function EsApiClient() {
     // our client will log minimally by default
     if (!config.hasOwnProperty('log')) {
       config.log = 'warning';
@@ -57,7 +57,11 @@ function Client(config) {
   }
 
   EsApiClient.prototype = _.funcEnum(config, 'apiVersion', Client.apis, '0.90');
-  return new EsApiClient(config);
+  if (!config.sniffEndpoint && EsApiClient.prototype === Client.apis['0.90']) {
+    config.sniffEndpoint = '/_cluster/nodes';
+  }
+
+  return new EsApiClient();
 }
 
 Client.apis = require('./apis');

src/lib/transport.js

@@ -30,6 +30,9 @@ function Transport(config) {
   // setup max retries
   this.maxRetries = config.hasOwnProperty('maxRetries') ? config.maxRetries : 3;
 
+  // setup endpoint to use for sniffing
+  this.sniffEndpoint = config.hasOwnProperty('sniffEndpoint') ? config.sniffEndpoint : '/_nodes/_all/clear';
+
   // setup requestTimeout default
   this.requestTimeout = config.hasOwnProperty('requestTimeout') ? config.requestTimeout : 30000;
 
@@ -332,7 +335,7 @@ Transport.prototype.sniff = function (cb) {
   cb = typeof cb === 'function' ? cb : _.noop;
 
   this.request({
-    path: '/_cluster/nodes',
+    path: this.sniffEndpoint,
     method: 'GET'
   }, function (err, resp, status) {
     if (!err && resp && resp.nodes) {

src/lib/utils.js

@@ -1,5 +1,5 @@
 var path = require('path');
-var _ = require('lodash');
+var _ = require('lodash-node/modern');
 var nodeUtils = require('util');
 
 /**

test/fixtures/keepalive.js

@@ -1,5 +1,5 @@
 var elasticsearch = require('../../src/elasticsearch');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var clock = require('sinon').useFakeTimers();
 
 var es = elasticsearch.Client({

test/mocks/browser_http.js

@@ -29,7 +29,7 @@
 
 module.exports = MockHttpRequest;
 
-var _ = require('lodash');
+var _ = require('lodash-node');
 
 function MockHttpRequest() {
   // These are internal flags and data structures

test/mocks/browser_server.js

@@ -3,7 +3,7 @@ var complete = [];
 var MockHttpRequest = require('./browser_http');
 var XhrServer = MockHttpRequest.MockHttpServer;
 var parseUrl = MockHttpRequest.prototype.parseUri;
-var _ = require('lodash');
+var _ = require('lodash-node');
 
 var server = new XhrServer(function (request) {
   var reqDetails = {

test/unit/buffer_flush_tests.js

@@ -3,7 +3,7 @@ module.exports = function (makeLogger) {
   var stub = require('../utils/auto_release_stub').make();
   var fs = require('fs');
   var once = require('events').EventEmitter.prototype.once;
-  var _ = require('lodash');
+  var _ = require('lodash-node');
 
   describe('buffer flush', function () {
     if (require('stream').Writable) {

test/unit/specs/client_action.js

@@ -1,6 +1,6 @@
 var ca = require('../../../src/lib/client_action');
 var expect = require('expect.js');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var when = require('when');
 
 /**

test/unit/specs/connection_abstract.js

@@ -2,7 +2,7 @@ var ConnectionAbstract = require('../../../src/lib/connection');
 var Host = require('../../../src/lib/host');
 var sinon = require('sinon');
 var expect = require('expect.js');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var errors = require('../../../src/lib/errors');
 
 var stub = require('../../utils/auto_release_stub').make();

test/unit/specs/connection_pool.js

@@ -2,7 +2,7 @@ var ConnectionPool = require('../../../src/lib/connection_pool');
 var Host = require('../../../src/lib/host');
 var errors = require('../../../src/lib/errors');
 var ConnectionAbstract = require('../../../src/lib/connection');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var EventEmitter = require('events').EventEmitter;
 var expect = require('expect.js');
 var sinon = require('sinon');

test/unit/specs/errors.js

@@ -1,6 +1,6 @@
 var errors = require('../../../src/lib/errors');
 var expect = require('expect.js');
-var _ = require('lodash');
+var _ = require('lodash-node');
 
 _.each(errors, function (CustomError, name) {
   if (name.charAt(0) !== '_') {

test/unit/specs/file_logger.js

@@ -2,7 +2,7 @@ describe('File Logger', function () {
   var Log = require('../../../src/lib/log');
   var FileLogger = require('../../../src/lib/loggers/file');
   var once = require('events').EventEmitter.prototype.once;
-  var _ = require('lodash');
+  var _ = require('lodash-node');
   var parentLog;
   var logger;
   var expect = require('expect.js');

test/unit/specs/host.js

@@ -1,5 +1,5 @@
 var Host = require('../../../src/lib/host');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var expect = require('expect.js');
 var url = require('url');
 

test/unit/specs/log.js

@@ -1,5 +1,5 @@
 var Log = require('../../../src/lib/log');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var expect = require('expect.js');
 
 describe('Log class', function () {

test/unit/specs/random_selector.js

@@ -1,6 +1,6 @@
 describe('Random Selector', function () {
   var randomSelector = require('../../../src/lib/selectors/random');
-  var _ = require('lodash');
+  var _ = require('lodash-node');
   var expect = require('expect.js');
 
   it('chooses a selection by random', function () {

test/unit/specs/round_robin_selector.js

@@ -1,6 +1,6 @@
 describe('Round Robin Selector', function () {
   var selector = require('../../../src/lib/selectors/round_robin');
-  var _ = require('lodash');
+  var _ = require('lodash-node');
   var expect = require('expect.js');
 
   it('chooses options in order', function () {

test/unit/specs/stream_logger.js

@@ -4,7 +4,7 @@ describe('Stream Logger', function () {
   var MockWritableStream = require('../../mocks/writable_stream');
   var once = require('events').EventEmitter.prototype.once;
   var stream = new MockWritableStream();
-  var _ = require('lodash');
+  var _ = require('lodash-node');
   var expect = require('expect.js');
   var parentLog;
 

test/unit/specs/transport.js

@@ -5,7 +5,7 @@ var when = require('when');
 
 var sinon = require('sinon');
 var expect = require('expect.js');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var nodeList = require('../../fixtures/short_node_list.json');
 var stub = require('../../utils/auto_release_stub').make();
 

test/unit/specs/transport_with_server.js

@@ -6,7 +6,7 @@ var expect = require('expect.js');
 
 var sinon = require('sinon');
 var nock = require('../../mocks/server.js');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var nodeList = require('../../fixtures/short_node_list.json');
 var stub = require('../../utils/auto_release_stub').make();
 

test/utils/jenkins-reporter.js

@@ -7,7 +7,7 @@
 module.exports = JenkinsReporter;
 
 var Base = require('mocha/lib/reporters/base');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var chalk = require('chalk');
 var makeJUnitXml = require('./make_j_unit_xml');
 var fs = require('fs');

test/utils/make_j_unit_xml.js

@@ -28,7 +28,7 @@ var testXml = require('xmlbuilder');
 var suites = testXml.create('testsuites');
 var suiteCount = 0;
 var moment = require('moment');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var chalk = require('chalk');
 
 function makeJUnitXml(runnerName, testDetails) {

test/utils/server.js

@@ -1,7 +1,7 @@
 var express = require('express');
 var http = require('http');
 var fs = require('fs');
-var _ = require('lodash');
+var _ = require('lodash-node');
 var async = require('async');
 var root = require('path').join(__dirname, '../..');
 var browserify = require('browserify');