[CLIENT] Apply compression headers manually based on general :compression option

Author: estolfo

elasticsearch-transport/lib/elasticsearch/transport/transport/base.rb

@@ -56,6 +56,7 @@ def initialize(arguments={}, &block)
           @options[:retry_on_status] ||= []
 
           @block       = block
+          @compression = !!@options[:compression]
           @connections = __build_connections
 
           @serializer  = options[:serializer] || ( options[:serializer_class] ? options[:serializer_class].new(self) : DEFAULT_SERIALIZER_CLASS.new(self) )
@@ -369,6 +370,11 @@ def host_unreachable_exceptions
         CONTENT_TYPE_STR = 'Content-Type'.freeze
         CONTENT_TYPE_REGEX = /content\-?\_?type/
         DEFAULT_CONTENT_TYPE = 'application/json'.freeze
+        GZIP = 'gzip'.freeze
+
+        def use_compression?
+          @compression
+        end
 
         def apply_headers(client, options)
           headers = options[:headers] || {}

elasticsearch-transport/lib/elasticsearch/transport/transport/http/faraday.rb

@@ -51,6 +51,7 @@ def perform_request(method, path, params={}, body=nil, headers=nil)
           # @return [Connections::Connection]
           #
           def __build_connection(host, options={}, block=nil)
+            options.merge!(headers: { accept_encoding: 'gzip' }) if use_compression?
             client = ::Faraday.new(__full_url(host), options, &block)
             apply_headers(client, options)
             Connections::Connection.new :host => host, :connection => client
@@ -73,7 +74,7 @@ def host_unreachable_exceptions
 
           def decompress_response(response)
             body = response.body
-            return body unless response.headers && response.headers['content-encoding'] == GZIP
+            return body unless use_compression?
             return body unless gzipped?(body)
 
             io = StringIO.new(body)

elasticsearch-transport/spec/elasticsearch/transport/client_spec.rb

@@ -1244,7 +1244,8 @@
         context 'when using the Net::HTTP adapter' do
 
           let!(:client) do
-            described_class.new(transport_options: { headers: { accept_encoding: 'gzip' } }, adapter: :net_http)
+            #described_class.new(transport_options: { headers: { accept_encoding: 'gzip' } }, adapter: :net_http)
+            described_class.new(hosts: ELASTICSEARCH_HOSTS, compression: true, adapter: :net_http)
           end
 
           it 'sets the options on the transport' do
@@ -1255,7 +1256,7 @@
         context 'when using the HTTPClient adapter' do
 
           let!(:client) do
-            described_class.new(transport_options: { headers: { accept_encoding: 'gzip' } }, adapter: :httpclient)
+            described_class.new(hosts: ELASTICSEARCH_HOSTS, compression: true, adapter: :httpclient)
           end
 
           it 'sets the options on the transport' do
@@ -1266,7 +1267,7 @@
         context 'when using the Patron adapter' do
 
           let!(:client) do
-            described_class.new(transport_options: { headers: { accept_encoding: 'gzip' } }, adapter: :patron)
+            described_class.new(hosts: ELASTICSEARCH_HOSTS, compression: true, adapter: :patron)
           end
 
           it 'sets the options on the transport' do
@@ -1277,7 +1278,7 @@
         context 'when using the Net::HTTP::Persistent adapter' do
 
           let!(:client) do
-            described_class.new(transport_options: { headers: { accept_encoding: 'gzip' } }, adapter: :net_http_persistent)
+            described_class.new(hosts: ELASTICSEARCH_HOSTS, compression: true, adapter: :net_http_persistent)
           end
 
           it 'sets the options on the transport' do
@@ -1288,7 +1289,7 @@
         context 'when using the Typhoeus adapter' do
 
           let!(:client) do
-            described_class.new(transport_options: { headers: { accept_encoding: 'gzip' } }, adapter: :typhoeus)
+            described_class.new(hosts: ELASTICSEARCH_HOSTS, compression: true, adapter: :typhoeus)
           end
 
           it 'sets the options on the transport' do
@@ -1307,7 +1308,7 @@
           client.perform_request('DELETE', 'myindex') rescue
           client.perform_request('PUT', 'myindex', {}, { settings: { number_of_shards: 2, number_of_replicas: 0 } })
           client.perform_request('PUT', 'myindex/mydoc/1', { routing: 'XYZ', timeout: '1s' }, { foo: 'bar' })
-          client.perform_request('GET', '_cluster/health?wait_for_status=green', {})
+          client.perform_request('GET', '_cluster/health?wait_for_status=green&timeout=2s', {})
         end
 
         let(:response) do