elasticsearch-model 5.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f9a1aed30a6f21b7c51f5f73ab01e9f00ea7b3d2d3d6b2203b5ba922e6dd63
-  data.tar.gz: 65bcb7ba51e908ada809d47d9aea04d2c78091182061b2d83488735696c25c93
+  metadata.gz: 75f65b56d90c490e0f107c9f57883a91eedc3c1c25793951df233872892f1a01
+  data.tar.gz: fe2cc84bbeb796de9b88f11f741f4822d6c3a4999bbaff5a54f40a339ff918a5
 SHA512:
-  metadata.gz: 81f261b7d86e68d6b23e811a5053bb300982d4536ac3a7026850b098f08237e46a51c847cc2d12736fee7544a3984cae45a0ebef034a6cb38dd41c3bc96c8b14
-  data.tar.gz: e53472c07599acae594fdcdc19405eb4f03cbfe77ee242429d539dc09cce5b03011d3e74f2b777642e0018895ba0e57551f385d37dbb20c6ce62877e8393819f
+  metadata.gz: a458e5ad312c67db37c7ff678c4bbfc19570202d72534a089a30818825fae380e06a40a419ec2f854838f0e924315a2d67f46ca9f966da91a264339c91f2be9f
+  data.tar.gz: dba1a2b0c88ecaca8a5b408f4f6ae8757812ad522320ecfd1f823e679398c6e1c042bb35deec5a6cbe38b9043e6e50605558f07cd0c2d33fd9e4642e5786478e

data/.gitignore

@@ -16,6 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 
-gemfiles/3.0.gemfile.lock
-gemfiles/4.0.gemfile.lock
-gemfiles/5.0.gemfile.lock
+gemfiles/*.gemfile.lock

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in elasticsearch-model.gemspec
 gemspec
+
+group :development, :testing do
+  gem 'rspec'
+  gem 'pry-nav'
+end

data/README.md

@@ -19,6 +19,7 @@ is compatible with the Elasticsearch `master` branch, therefore, with the next m
 | 0.1           | → | 1.x           |
 | 2.x           | → | 2.x           |
 | 5.x           | → | 5.x           |
+| 6.x           | → | 6.x           |
 | master        | → | master        |
 
 ## Installation
@@ -321,7 +322,7 @@ Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model
 
 #### The Elasticsearch DSL
 
-In most situation, you'll want to pass the search definition
+In most situations, you'll want to pass the search definition
 in the Elasticsearch [domain-specific language](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html) to the client:
 
 ```ruby
@@ -425,7 +426,7 @@ Article.__elasticsearch__.refresh_index!
 ```
 
 By default, index name and document type will be inferred from your class name,
-you can set it explicitely, however:
+you can set it explicitly, however:
 
 ```ruby
 class Article
@@ -534,7 +535,7 @@ class Indexer
     case operation.to_s
       when /index/
         record = Article.find(record_id)
-        Client.index  index: 'articles', type: 'article', id: record.id, body: record.as_indexed_json
+        Client.index  index: 'articles', type: 'article', id: record.id, body: record.__elasticsearch__.as_indexed_json
       when /delete/
         Client.delete index: 'articles', type: 'article', id: record_id
       else raise ArgumentError, "Unknown operation '#{operation}'"
@@ -674,7 +675,7 @@ module DataMapperAdapter
   #
   module Records
     def records
-      klass.all(id: @ids)
+      klass.all(id: ids)
     end
 
     # ...
@@ -724,13 +725,8 @@ module and its submodules for technical information.
 
 The module provides a common `settings` method to customize various features.
 
-At the moment, the only supported setting is `:inheritance_enabled`, which makes the class receiving the module
-respect index names and document types of a super-class, eg. in case you're using "single table inheritance" (STI)
-in Rails:
-
-```ruby
-Elasticsearch::Model.settings[:inheritance_enabled] = true
-```
+Before version 7.0.0 of the gem, the only supported setting was `:inheritance_enabled`. This setting has been deprecated
+and removed.
 
 ## Development and Community
 
@@ -748,6 +744,17 @@ curl -# https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticse
 SERVER=start TEST_CLUSTER_COMMAND=$PWD/tmp/elasticsearch-1.0.0.RC1/bin/elasticsearch bundle exec rake test:all
 ```
 
+### Single Table Inheritance deprecation
+
+`Single Table Inheritance` has been supported through the 6.x series of this gem. With this feature,
+elasticsearch settings (index mappings, etc) on a parent model could be inherited by a child model leading to different 
+model documents being indexed into the same Elasticsearch index. This feature depended on the ability to set a `type` 
+for a document in Elasticsearch. The Elasticsearch team has deprecated support for `types`, as is described 
+[here.](https://www.elastic.co/guide/en/elasticsearch/reference/current/removal-of-types.html)
+This gem will also remove support for types and `Single Table Inheritance` in version 7.0 as it enables an anti-pattern. 
+Please save different model documents in separate indices. If you want to use STI, you can include an artificial 
+`type` field manually in each document and use it in other operations.
+
 ## License
 
 This software is licensed under the Apache 2 license, quoted below.

data/Rakefile

@@ -4,12 +4,25 @@ desc "Run unit tests"
 task :default => 'test:unit'
 task :test    => 'test:unit'
 
-namespace :bundler do
-  desc "Install dependencies for all the Gemfiles"
+if RUBY_VERSION < '2.3'
+  GEMFILES = ['3.0.gemfile', '4.0.gemfile', '5.0.gemfile']
+else
+  GEMFILES = ['4.0.gemfile', '5.0.gemfile']
+end
+
+namespace :bundle do
+  desc 'Install dependencies for all the Gemfiles in /gemfiles. Optionally define env variable RAILS_VERSIONS. E.g. RAILS_VERSIONS=3.0,5.0'
   task :install do
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/3.0.gemfile', __FILE__)}' bundle install"
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/4.0.gemfile', __FILE__)}' bundle install"
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/5.0.gemfile', __FILE__)}' bundle install"
+    unless defined?(JRUBY_VERSION)
+      puts '-'*80
+      gemfiles = ENV['RAILS_VERSIONS'] ? ENV['RAILS_VERSIONS'].split(',').map { |v| "#{v}.gemfile"} : GEMFILES
+      gemfiles.each do |gemfile|
+        Bundler.with_clean_env do
+          sh "bundle install --gemfile #{File.expand_path('../gemfiles/'+gemfile, __FILE__)}"
+        end
+        puts '-'*80
+      end
+    end
   end
 end
 
@@ -17,38 +30,16 @@ end
 
 require 'rake/testtask'
 namespace :test do
-  Rake::TestTask.new(:run_unit) do |test|
-    test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/unit/**/*_test.rb"]
-    test.verbose = false
-    test.warning = false
-  end
-
-  Rake::TestTask.new(:run_integration) do |test|
-    test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/integration/**/*_test.rb"]
-    test.verbose = false
-    test.warning = false
-  end
-
-  desc "Run unit tests against ActiveModel 3, 4 and 5"
-  task :unit do
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/3.0.gemfile', __FILE__)}' bundle exec rake test:run_unit"
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/4.0.gemfile', __FILE__)}' bundle exec rake test:run_unit"
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/5.0.gemfile', __FILE__)}' bundle exec rake test:run_unit"
-  end
-
-  desc "Run integration tests against latest stable ActiveModel (5)"
-  task :integration do
-    #sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/3.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
-    #sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/4.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/5.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
-  end
 
-  desc "Run unit and integration tests"
-  task :all do
-    Rake::Task['test:unit'].invoke
-    Rake::Task['test:integration'].invoke
+  desc 'Run all tests. Optionally define env variable RAILS_VERSIONS. E.g. RAILS_VERSIONS=3.0,5.0'
+  task :all, [:rails_versions] do |task, args|
+    gemfiles = ENV['RAILS_VERSIONS'] ? ENV['RAILS_VERSIONS'].split(',').map {|v| "#{v}.gemfile"} : GEMFILES
+    puts '-' * 80
+    gemfiles.each do |gemfile|
+      sh "BUNDLE_GEMFILE='#{File.expand_path("../gemfiles/#{gemfile}", __FILE__)}' " +
+             " bundle exec rspec"
+      puts '-' * 80
+    end
   end
 end
 

data/elasticsearch-model.gemspec

@@ -21,21 +21,21 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files  = [ "README.md", "LICENSE.txt" ]
   s.rdoc_options      = [ "--charset=UTF-8" ]
 
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = ">= 2.2"
 
-  s.add_dependency "elasticsearch",       '~> 5'
+  s.add_dependency "elasticsearch",       '~> 6'
   s.add_dependency "activesupport",       '> 3'
   s.add_dependency "hashie"
 
-  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "bundler"
   s.add_development_dependency "rake", "~> 11.1"
 
   s.add_development_dependency "elasticsearch-extensions"
 
-  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "sqlite3" unless defined?(JRUBY_VERSION)
   s.add_development_dependency "activemodel",   "> 3"
 
-  s.add_development_dependency "oj"
+  s.add_development_dependency "oj" unless defined?(JRUBY_VERSION)
   s.add_development_dependency "kaminari"
   s.add_development_dependency "will_paginate"
 
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha"
   s.add_development_dependency "turn"
   s.add_development_dependency "yard"
-  s.add_development_dependency "ruby-prof"
+  s.add_development_dependency "ruby-prof" unless defined?(JRUBY_VERSION)
   s.add_development_dependency "pry"
 
   s.add_development_dependency "simplecov"

data/examples/activerecord_custom_analyzer.rb

@@ -0,0 +1,135 @@
+# Custom Analyzer for ActiveRecord integration with Elasticsearch
+# ===============================================================
+
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'ansi'
+require 'logger'
+
+require 'active_record'
+require 'elasticsearch/model'
+
+ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
+ActiveRecord::Base.establish_connection( adapter: 'sqlite3', database: ":memory:" )
+
+ActiveRecord::Schema.define(version: 1) do
+  create_table :articles do |t|
+    t.string :title
+    t.date    :published_at
+    t.timestamps
+  end
+end
+
+Elasticsearch::Model.client.transport.logger = ActiveSupport::Logger.new(STDOUT)
+Elasticsearch::Model.client.transport.logger.formatter = lambda { |s, d, p, m| "#{m.ansi(:faint)}\n" }
+
+class Article < ActiveRecord::Base
+  include Elasticsearch::Model
+
+  settings index: {
+    number_of_shards: 1,
+    number_of_replicas: 0,
+    analysis: {
+      analyzer: {
+        pattern: {
+          type: 'pattern',
+          pattern: "\\s|_|-|\\.",
+          lowercase: true
+        },
+        trigram: {
+          tokenizer: 'trigram'
+        }
+      },
+      tokenizer: {
+        trigram: {
+          type: 'ngram',
+          min_gram: 3,
+          max_gram: 3,
+          token_chars: ['letter', 'digit']
+        }
+      }
+    } } do
+    mapping do
+      indexes :title, type: 'text', analyzer: 'english' do
+        indexes :keyword, analyzer: 'keyword'
+        indexes :pattern, analyzer: 'pattern'
+        indexes :trigram, analyzer: 'trigram'
+      end
+    end
+  end
+end
+
+# Create example records
+#
+Article.delete_all
+Article.create title: 'Foo'
+Article.create title: 'Foo-Bar'
+Article.create title: 'Foo_Bar_Bazooka'
+Article.create title: 'Foo.Bar'
+
+# Index records
+#
+errors = Article.import force: true, refresh: true, return: 'errors'
+puts "[!] Errors importing records: #{errors.map { |d| d['index']['error'] }.join(', ')}".ansi(:red) && exit(1) unless errors.empty?
+
+puts '', '-'*80
+
+puts "English analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
+     "Tokens: " +
+     Article.__elasticsearch__.client.indices
+      .analyze(index: Article.index_name, body: { field: 'title', text: 'Foo_Bar_1_Bazooka' })['tokens']
+      .map { |d| "[#{d['token']}]" }.join(' '),
+    "\n"
+
+puts "Keyword analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
+     "Tokens: " +
+     Article.__elasticsearch__.client.indices
+      .analyze(index: Article.index_name, body: { field: 'title.keyword', text: 'Foo_Bar_1_Bazooka' })['tokens']
+      .map { |d| "[#{d['token']}]" }.join(' '),
+     "\n"
+
+puts "Pattern analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
+     "Tokens: " +
+     Article.__elasticsearch__.client.indices
+      .analyze(index: Article.index_name, body: { field: 'title.pattern', text: 'Foo_Bar_1_Bazooka' })['tokens']
+      .map { |d| "[#{d['token']}]" }.join(' '),
+     "\n"
+
+puts "Trigram analyzer [Foo_Bar_1_Bazooka]".ansi(:bold),
+     "Tokens: " +
+     Article.__elasticsearch__.client.indices
+      .analyze(index: Article.index_name, body: { field: 'title.trigram', text: 'Foo_Bar_1_Bazooka' })['tokens']
+      .map { |d| "[#{d['token']}]" }.join(' '),
+     "\n"
+
+puts '', '-'*80
+
+response = Article.search query: { match: { 'title' => 'foo' } } ;
+
+puts "English search for 'foo'".ansi(:bold),
+     "#{response.response.hits.total} matches: " +
+     response.records.map { |d| d.title }.join(', '),
+     "\n"
+
+puts '', '-'*80
+
+response = Article.search query: { match: { 'title.pattern' => 'foo' } } ;
+
+puts "Pattern search for 'foo'".ansi(:bold),
+     "#{response.response.hits.total} matches: " +
+     response.records.map { |d| d.title }.join(', '),
+     "\n"
+
+puts '', '-'*80
+
+response = Article.search query: { match: { 'title.trigram' => 'zoo' } } ;
+
+puts "Trigram search for 'zoo'".ansi(:bold),
+     "#{response.response.hits.total} matches: " +
+     response.records.map { |d| d.title }.join(', '),
+     "\n"
+
+puts '', '-'*80
+
+
+require 'pry'; binding.pry;

data/examples/activerecord_mapping_completion.rb

@@ -25,9 +25,7 @@ class Article < ActiveRecord::Base
   end
 
   def as_indexed_json(options={})
-    as_json.merge \
-    title_suggest: { input:  title },
-    url: "/articles/#{id}"
+    as_json.merge 'url' => "/articles/#{id}"
   end
 end
 
@@ -52,20 +50,7 @@ response_1 = Article.search 'foo';
 puts "Article search:".ansi(:bold),
      response_1.to_a.map { |d| "Title: #{d.title}" }.inspect.ansi(:bold, :yellow)
 
-response_2 = Article.__elasticsearch__.client.suggest \
-  index: Article.index_name,
-  body: {
-    articles: {
-      text: 'foo',
-      completion: { field: 'title.suggest' }
-    }
-  };
-
-puts "Article suggest:".ansi(:bold),
-     response_2['articles'].first['options'].map { |d| "#{d['text']} -> #{d['_source']['url']}" }.
-     inspect.ansi(:bold, :green)
-
-response_3 = Article.search \
+response_2 = Article.search \
   query: {
     match: { title: 'foo' }
   },
@@ -78,7 +63,7 @@ response_3 = Article.search \
   _source: ['title', 'url']
 
 puts "Article search with suggest:".ansi(:bold),
-     response_3.response['suggest']['articles'].first['options'].map { |d| "#{d['text']} -> #{d['_source']['url']}" }.
+     response_2.response['suggest']['articles'].first['options'].map { |d| "#{d['text']} -> #{d['_source']['url']}" }.
      inspect.ansi(:bold, :blue)
 
 require 'pry'; binding.pry;

data/examples/datamapper_article.rb

@@ -50,11 +50,21 @@ module DataMapperAdapter
   #
   module Records
     def records
-      klass.all(id: @ids)
+      klass.all(id: ids)
     end
 
     # ...
   end
+
+  module Callbacks
+    def self.included(model)
+      model.class_eval do
+        after(:create) { __elasticsearch__.index_document  }
+        after(:save) { __elasticsearch__.update_document }
+        after(:destroy) { __elasticsearch__.delete_document }
+      end
+    end
+  end
 end
 
 # Register the adapter

data/gemfiles/3.0.gemfile

@@ -10,4 +10,9 @@ gemspec path: '../'
 gem 'activemodel',  '>= 3.0'
 gem 'activerecord', '~> 3.2'
 gem 'mongoid',      '>= 3.0'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6' unless defined?(JRUBY_VERSION)
+
+group :development, :testing do
+  gem 'rspec'
+  gem 'pry-nav'
+end

data/gemfiles/4.0.gemfile

@@ -9,4 +9,11 @@ gemspec path: '../'
 
 gem 'activemodel',  '~> 4'
 gem 'activerecord', '~> 4'
-gem 'sqlite3'
+gem 'mongoid', '~> 5'
+gem 'sqlite3', '~> 1.3.6' unless defined?(JRUBY_VERSION)
+
+group :development, :testing do
+  gem 'bigdecimal', '~> 1'
+  gem 'pry-nav'
+  gem 'rspec'
+end

data/gemfiles/5.0.gemfile

@@ -9,4 +9,10 @@ gemspec path: '../'
 
 gem 'activemodel',  '~> 5'
 gem 'activerecord', '~> 5'
-gem 'sqlite3'
+gem 'sqlite3' unless defined?(JRUBY_VERSION)
+gem 'mongoid', '~> 6.4'
+
+group :development, :testing do
+  gem 'rspec'
+  gem 'pry-nav'
+end

data/gemfiles/6.0.gemfile

@@ -0,0 +1,18 @@
+# Usage:
+#
+# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle install
+# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle exec rake test:integration
+
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activemodel',  '~> 6'
+gem 'activerecord', '~> 6'
+gem 'sqlite3' unless defined?(JRUBY_VERSION)
+gem 'mongoid', '~> 7'
+
+group :development, :testing do
+  gem 'rspec'
+  gem 'pry-nav'
+end

data/lib/elasticsearch/model/adapters/active_record.rb

@@ -35,7 +35,11 @@ module Elasticsearch
                 else
                   self.__send__(:exec_queries)
                 end
-                @records.sort_by { |record| hits.index { |hit| hit['_id'].to_s == record.id.to_s } }
+                if !self.order_values.present?
+                  @records.sort_by { |record| hits.index { |hit| hit['_id'].to_s == record.id.to_s } }
+                else
+                  @records
+                end
               end if self
             end
 
@@ -47,27 +51,6 @@ module Elasticsearch
           def load
             records.__send__(:load)
           end
-
-          # Intercept call to the `order` method, so we can ignore the order from Elasticsearch
-          #
-          def order(*args)
-            sql_records = records.__send__ :order, *args
-
-            # Redefine the `to_a` method to the original one
-            #
-            sql_records.instance_exec do
-              define_singleton_method(:to_a) do
-                if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 4
-                  self.load
-                else
-                  self.__send__(:exec_queries)
-                end
-                @records
-              end
-            end
-
-            sql_records
-          end
         end
 
         module Callbacks
@@ -102,8 +85,9 @@ module Elasticsearch
             scope = scope.__send__(named_scope) if named_scope
             scope = scope.instance_exec(&query) if query
 
-            scope.find_in_batches(options) do |batch|
-              yield (preprocess ? self.__send__(preprocess, batch) : batch)
+            scope.find_in_batches(**options) do |batch|
+              batch = self.__send__(preprocess, batch) if preprocess
+              yield(batch) if batch.present?
             end
           end
 

data/lib/elasticsearch/model/adapters/mongoid.rb

@@ -63,10 +63,17 @@ module Elasticsearch
           # @see https://github.com/karmi/retire/pull/724
           #
           def __find_in_batches(options={}, &block)
-            options[:batch_size] ||= 1_000
+            batch_size = options[:batch_size] || 1_000
+            query = options[:query]
+            named_scope = options[:scope]
+            preprocess = options[:preprocess]
+
+            scope = all
+            scope = scope.send(named_scope) if named_scope
+            scope = query.is_a?(Proc) ? scope.class_exec(&query) : scope.where(query) if query
   
-            all.no_timeout.each_slice(options[:batch_size]) do |items|
-              yield items
+            scope.no_timeout.each_slice(batch_size) do |items|
+              yield (preprocess ? self.__send__(preprocess, items) : items)
             end
           end
 

data/lib/elasticsearch/model/importing.rb

@@ -130,7 +130,7 @@ module Elasticsearch
             errors +=  response['items'].select { |k, v| k.values.first['error'] }
           end
 
-          self.refresh_index! if refresh
+          self.refresh_index! index: target_index if refresh
 
           case return_value
             when 'errors'

data/lib/elasticsearch/model/indexing.rb

@@ -269,7 +269,8 @@ module Elasticsearch
             self.client.indices.delete index: target_index
           rescue Exception => e
             if e.class.to_s =~ /NotFound/ && options[:force]
-              STDERR.puts "[!!!] Index does not exist (#{e.class})"
+              client.transport.logger.debug("[!!!] Index does not exist (#{e.class})") if client.transport.logger
+              nil
             else
               raise e
             end
@@ -295,7 +296,8 @@ module Elasticsearch
             self.client.indices.refresh index: target_index
           rescue Exception => e
             if e.class.to_s =~ /NotFound/ && options[:force]
-              STDERR.puts "[!!!] Index does not exist (#{e.class})"
+              client.transport.logger.debug("[!!!] Index does not exist (#{e.class})") if client.transport.logger
+              nil
             else
               raise e
             end
@@ -397,7 +399,7 @@ module Elasticsearch
         # @see http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions:update
         #
         def update_document(options={})
-          if attributes_in_database = self.instance_variable_get(:@__changed_model_attributes)
+          if attributes_in_database = self.instance_variable_get(:@__changed_model_attributes).presence
             attributes = if respond_to?(:as_indexed_json)
               self.as_indexed_json.select { |k,v| attributes_in_database.keys.map(&:to_s).include? k.to_s }
             else
@@ -409,7 +411,7 @@ module Elasticsearch
                 type:  document_type,
                 id:    self.id,
                 body:  { doc: attributes } }.merge(options)
-            )
+            ) unless attributes.empty?
           else
             index_document(options)
           end

data/lib/elasticsearch/model/naming.rb

@@ -5,6 +5,8 @@ module Elasticsearch
     #
     module Naming
 
+      DEFAULT_DOC_TYPE = '_doc'.freeze
+
       module ClassMethods
 
         # Get or set the name of the index
@@ -77,7 +79,12 @@ module Elasticsearch
 
             if Elasticsearch::Model.settings[:inheritance_enabled]
               self.ancestors.each do |klass|
-                next if klass == self
+                # When Naming is included in Proxy::ClassMethods the actual model
+                # is among its ancestors. We don't want to call the actual model
+                # since it will result in the same call to the same instance of
+                # Proxy::ClassMethods. To prevent this we also skip the ancestor
+                # that is the target.
+                next if klass == self || self.respond_to?(:target) && klass == self.target
                 break if value = klass.respond_to?(prop) && klass.send(prop)
               end
             end
@@ -90,7 +97,7 @@ module Elasticsearch
           end
 
           def default_document_type
-            self.model_name.element
+            DEFAULT_DOC_TYPE
           end
 
       end

data/lib/elasticsearch/model/response/aggregations.rb

@@ -2,7 +2,7 @@ module Elasticsearch
   module Model
     module Response
 
-      class Aggregations < Hashie::Mash
+      class Aggregations < HashWrapper
         disable_warnings if respond_to?(:disable_warnings)
 
         def initialize(attributes={})

data/lib/elasticsearch/model/response/base.rb

@@ -4,7 +4,7 @@ module Elasticsearch
       # Common funtionality for classes in the {Elasticsearch::Model::Response} module
       #
       module Base
-        attr_reader :klass, :response
+        attr_reader :klass, :response, :raw_response
 
         # @param klass    [Class] The name of the model class
         # @param response [Hash]  The full response returned from Elasticsearch client
@@ -12,7 +12,8 @@ module Elasticsearch
         #
         def initialize(klass, response, options={})
           @klass     = klass
-          @response  = response
+          @raw_response = response
+          @response = response
         end
 
         # @abstract Implement this method in specific class