[MODEL] Use default doc type: _doc (#814)

Author: estolfo

elasticsearch-model/lib/elasticsearch/model/naming.rb

@@ -5,6 +5,8 @@ module Model
     #
     module Naming
 
+      DEFAULT_DOC_TYPE= '_doc'.freeze
+
       module ClassMethods
 
         # Get or set the name of the index
@@ -90,7 +92,7 @@ def default_index_name
           end
 
           def default_document_type
-            self.model_name.element
+            DEFAULT_DOC_TYPE
           end
 
       end

elasticsearch-model/test/integration/active_record_basic_test.rb

@@ -16,6 +16,8 @@ class ::Article < ActiveRecord::Base
         include Elasticsearch::Model
         include Elasticsearch::Model::Callbacks
 
+        document_type 'article'
+
         settings index: { number_of_shards: 1, number_of_replicas: 0 } do
           mapping do
             indexes :title,         type: 'text', analyzer: 'snowball'

elasticsearch-model/test/integration/active_record_custom_serialization_test.rb

@@ -41,7 +41,7 @@ def as_indexed_json(options={})
 
           a = ArticleWithCustomSerialization.__elasticsearch__.client.get \
                 index: 'article_with_custom_serializations',
-                type:  'article_with_custom_serialization',
+                type:  '_doc',
                 id:    '1'
 
           assert_equal( { 'title' => 'Test' }, a['_source'] )
@@ -55,7 +55,7 @@ def as_indexed_json(options={})
 
           a = ArticleWithCustomSerialization.__elasticsearch__.client.get \
                 index: 'article_with_custom_serializations',
-                type:  'article_with_custom_serialization',
+                type:  '_doc',
                 id:    '1'
 
           assert_equal( { 'title' => 'UPDATED' }, a['_source'] )

elasticsearch-model/test/integration/active_record_namespaced_model_test.rb

@@ -22,6 +22,8 @@ class Article < ActiveRecord::Base
               include Elasticsearch::Model
               include Elasticsearch::Model::Callbacks
 
+              document_type 'article'
+
               mapping { indexes :title }
             end
           end

elasticsearch-model/test/unit/indexing_test.rb

@@ -149,7 +149,7 @@ class NotFound < Exception; end
       should "update and return the index mappings" do
         DummyIndexingModel.mappings foo: 'boo'
         DummyIndexingModel.mappings bar: 'bam'
-        assert_equal( { dummy_indexing_model: { foo: "boo", bar: "bam", properties: {} } },
+        assert_equal( { _doc: { foo: "boo", bar: "bam", properties: {} } },
                       DummyIndexingModel.mappings.to_hash )
       end
 
@@ -544,7 +544,7 @@ class ::DummyIndexingModelForRecreate
         indices.expects(:create).with do |payload|
           assert_equal 'dummy_indexing_model_for_recreates', payload[:index]
           assert_equal 1,         payload[:body][:settings][:index][:number_of_shards]
-          assert_equal 'keyword', payload[:body][:mappings][:dummy_indexing_model_for_recreate][:properties][:foo][:analyzer]
+          assert_equal 'keyword', payload[:body][:mappings][:_doc][:properties][:foo][:analyzer]
           true
         end.returns({})
 

elasticsearch-model/test/unit/naming_inheritance_test.rb

@@ -69,8 +69,8 @@ class ::Cat < ::Animal
     end
 
     should "return the default document_type" do
-      assert_equal "test_base", TestBase.document_type
-      assert_equal "test_base", TestBase.new.document_type
+      assert_equal "_doc", TestBase.document_type
+      assert_equal "_doc", TestBase.new.document_type
     end
 
     should "return the explicit document_type" do

elasticsearch-model/test/unit/naming_test.rb

@@ -29,8 +29,8 @@ class DummyNamingModelInNamespace
     end
 
     should "return the default document_type" do
-      assert_equal 'dummy_naming_model', DummyNamingModel.document_type
-      assert_equal 'dummy_naming_model', DummyNamingModel.new.document_type
+      assert_equal '_doc', DummyNamingModel.document_type
+      assert_equal '_doc', DummyNamingModel.new.document_type
     end
 
     should "set and return the index_name" do