[MODEL] [STORE] Changed the default mapping type to text

The default type for properties defined with the `indexes` method
has been changed to the `text` field type.

Also, fixed the integration test to have the correct mapping
and to use the `bool` query instead of the old `filtered` query.

See:

* https://www.elastic.co/guide/en/elasticsearch/reference/current/string.html
* https://www.elastic.co/guide/en/elasticsearch/reference/current/text.html

Related: #649

Author: karmi

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

@@ -65,8 +65,8 @@ def indexes(name, options={}, &block)
             end
           end
 
-          # Set the type to `string` by default
-          @mapping[name][:type] ||= 'string'
+          # Set the type to `text` by default
+          @mapping[name][:type] ||= 'text'
 
           self
         end

elasticsearch-model/test/integration/active_record_associations_test.rb

@@ -29,13 +29,12 @@ module Searchable
               indexes :authors do
                 indexes :first_name
                 indexes :last_name
-                indexes :full_name, type: 'multi_field' do
-                  indexes :full_name
-                  indexes :raw, analyzer: 'keyword'
+                indexes :full_name, type: 'text' do
+                  indexes :raw, type: 'keyword'
                 end
               end
 
-              indexes :categories, analyzer: 'keyword'
+              indexes :categories, type: 'keyword'
 
               indexes :comments, type: 'nested' do
                 indexes :text
@@ -188,8 +187,8 @@ class Post < ActiveRecord::Base
           Post.__elasticsearch__.refresh_index!
 
           query = { query: {
-                      filtered: {
-                        query: {
+                      bool: {
+                        must: {
                           multi_match: {
                             fields: ['title'],
                             query: 'first'

elasticsearch-model/test/unit/indexing_test.rb

@@ -83,33 +83,23 @@ class NotFound < Exception; end
         assert_equal 'boolean', mappings.to_hash[:mytype][:properties][:foo][:type]
       end
 
-      should "define type as string by default" do
+      should "define type as 'text' by default" do
         mappings = Elasticsearch::Model::Indexing::Mappings.new :mytype
 
-        mappings.indexes :bar, {}
-        assert_equal 'string', mappings.to_hash[:mytype][:properties][:bar][:type]
+        mappings.indexes :bar
+        assert_equal 'text', mappings.to_hash[:mytype][:properties][:bar][:type]
       end
 
       should "define multiple fields" do
         mappings = Elasticsearch::Model::Indexing::Mappings.new :mytype
 
-        mappings.indexes :foo_1, type: 'string' do
-          indexes :raw, analyzer: 'keyword'
+        mappings.indexes :my_field, type: 'text' do
+          indexes :raw, type: 'keyword'
         end
 
-        mappings.indexes :foo_2, type: 'multi_field' do
-          indexes :raw, analyzer: 'keyword'
-        end
-
-        assert_equal 'string',  mappings.to_hash[:mytype][:properties][:foo_1][:type]
-        assert_equal 'string',  mappings.to_hash[:mytype][:properties][:foo_1][:fields][:raw][:type]
-        assert_equal 'keyword', mappings.to_hash[:mytype][:properties][:foo_1][:fields][:raw][:analyzer]
-        assert_nil              mappings.to_hash[:mytype][:properties][:foo_1][:properties]
-
-        assert_equal 'multi_field',  mappings.to_hash[:mytype][:properties][:foo_2][:type]
-        assert_equal 'string',  mappings.to_hash[:mytype][:properties][:foo_2][:fields][:raw][:type]
-        assert_equal 'keyword', mappings.to_hash[:mytype][:properties][:foo_2][:fields][:raw][:analyzer]
-        assert_nil              mappings.to_hash[:mytype][:properties][:foo_2][:properties]
+        assert_equal 'text',    mappings.to_hash[:mytype][:properties][:my_field][:type]
+        assert_equal 'keyword', mappings.to_hash[:mytype][:properties][:my_field][:fields][:raw][:type]
+        assert_nil              mappings.to_hash[:mytype][:properties][:my_field][:properties]
       end
 
       should "define embedded properties" do
@@ -134,15 +124,15 @@ class NotFound < Exception; end
         # Object is the default when `type` is missing and there's a block passed
         #
         assert_equal 'object', mappings.to_hash[:mytype][:properties][:foo][:type]
-        assert_equal 'string', mappings.to_hash[:mytype][:properties][:foo][:properties][:bar][:type]
+        assert_equal 'text',   mappings.to_hash[:mytype][:properties][:foo][:properties][:bar][:type]
         assert_nil             mappings.to_hash[:mytype][:properties][:foo][:fields]
 
         assert_equal 'object', mappings.to_hash[:mytype][:properties][:foo_object][:type]
-        assert_equal 'string', mappings.to_hash[:mytype][:properties][:foo_object][:properties][:bar][:type]
+        assert_equal 'text',   mappings.to_hash[:mytype][:properties][:foo_object][:properties][:bar][:type]
         assert_nil             mappings.to_hash[:mytype][:properties][:foo_object][:fields]
 
         assert_equal 'nested', mappings.to_hash[:mytype][:properties][:foo_nested][:type]
-        assert_equal 'string', mappings.to_hash[:mytype][:properties][:foo_nested][:properties][:bar][:type]
+        assert_equal 'text',   mappings.to_hash[:mytype][:properties][:foo_nested][:properties][:bar][:type]
         assert_nil             mappings.to_hash[:mytype][:properties][:foo_nested][:fields]
 
         assert_equal :nested, mappings.to_hash[:mytype][:properties][:foo_nested_as_symbol][:type]

elasticsearch-persistence/test/unit/repository_indexing_test.rb

@@ -22,7 +22,7 @@ class MyDocument; end
           indexes :title
         end
 
-        assert_equal( {:"my_document"=>{:properties=>{:title=>{:type=>"string"}}}}, subject.mappings.to_hash )
+        assert_equal( {:"my_document"=>{:properties=>{:title=>{:type=>"text"}}}}, subject.mappings.to_hash )
       end
     end