[MODEL] Fixes indexing to use right logger in client

Author: picandocodigo

elasticsearch-model/lib/elasticsearch/model.rb

@@ -127,7 +127,7 @@ module ClassMethods
       # @example Get the client
       #
       #     Elasticsearch::Model.client
-      #     => #<Elasticsearch::Transport::Client:0x007f96a7d0d000 @transport=... >
+      #     => #<Elasticsearch::Client:0x007f96a7d0d000... >
       #
       def client
         @client ||= Elasticsearch::Client.new
@@ -138,7 +138,7 @@ def client
       # @example Configure (set) the client for all models
       #
       #     Elasticsearch::Model.client = Elasticsearch::Client.new host: 'http://localhost:9200', tracer: true
-      #     => #<Elasticsearch::Transport::Client:0x007f96a6dd0d80 @transport=... >
+      #     => #<Elasticsearch::Client:0x007f96a6dd0d80... >
       #
       # @note You have to set the client before you call Elasticsearch methods on the model,
       #       or set it directly on the model; see {Elasticsearch::Model::Client::ClassMethods#client}

elasticsearch-model/lib/elasticsearch/model/client.rb

@@ -17,13 +17,10 @@
 
 module Elasticsearch
   module Model
-
     # Contains an `Elasticsearch::Client` instance
     #
     module Client
-
       module ClassMethods
-
         # Get the client for a specific model class
         #
         # @example Get the client for `Article` and perform API request
@@ -48,7 +45,6 @@ def client=(client)
       end
 
       module InstanceMethods
-
         # Get or set the client for a specific model instance
         #
         # @example Get the client for a specific record and perform API request
@@ -72,7 +68,6 @@ def client=(client)
           @client = client
         end
       end
-
     end
   end
 end

elasticsearch-model/lib/elasticsearch/model/indexing.rb

@@ -290,7 +290,7 @@ def delete_index!(options={})
             self.client.indices.delete index: target_index
           rescue Exception => e
             if e.class.to_s =~ /NotFound/ && options[:force]
-              client.transport.logger.debug("[!!!] Index does not exist (#{e.class})") if client.transport.logger
+              client.transport.transport.logger.debug("[!!!] Index does not exist (#{e.class})") if client.transport.transport.logger
               nil
             else
               raise e
@@ -317,7 +317,7 @@ def refresh_index!(options={})
             self.client.indices.refresh index: target_index
           rescue Exception => e
             if e.class.to_s =~ /NotFound/ && options[:force]
-              client.transport.logger.debug("[!!!] Index does not exist (#{e.class})") if client.transport.logger
+              client.transport.transport.logger.debug("[!!!] Index does not exist (#{e.class})") if client.transport.transport.logger
               nil
             else
               raise e

elasticsearch-model/spec/elasticsearch/model/indexing_spec.rb

@@ -676,9 +676,15 @@ class ::DummyIndexingModelForRecreate
     end
 
     context 'when the index is not found' do
-
       let(:client) do
-        double('client', indices: indices, transport: double('transport', { logger: nil }))
+        double(
+          'client',
+          indices: indices,
+          transport: double(
+            'transport',
+            double('transport', { logger: nil })
+          )
+        )
       end
 
       let(:indices) do