Removing type related code

elasticsearch-model/lib/elasticsearch/model.rb

@@ -85,7 +85,7 @@ module Elasticsearch
   #     # ...
   #
   module Model
-    METHODS = [:search, :mapping, :mappings, :settings, :index_name, :document_type, :import]
+    METHODS = [:search, :mapping, :mappings, :settings, :index_name, :import]
 
     # Adds the `Elasticsearch::Model` functionality to the including class.
     #

elasticsearch-model/lib/elasticsearch/model/importing.rb

@@ -59,7 +59,6 @@ module ClassMethods
         #         "index" => {
         #           "error" => 'FAILED',
         #           "_index" => "test",
-        #           "_type" => "_doc",
         #           "_id" => '1',
         #           "_version" => 1,
         #           "result" => "foo",
@@ -138,7 +137,6 @@ def import(options={}, &block)
           errors       = []
           refresh      = options.delete(:refresh)   || false
           target_index = options.delete(:index)     || index_name
-          target_type  = options.delete(:type)      || document_type
           transform    = options.delete(:transform) || __transform
           pipeline     = options.delete(:pipeline)
           return_value = options.delete(:return)    || 'count'
@@ -158,7 +156,6 @@ def import(options={}, &block)
           __find_in_batches(options) do |batch|
             params = {
               index: target_index,
-              type:  target_type,
               body:  __batch_to_bulk(batch, transform)
             }
 

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

@@ -51,13 +51,12 @@ def as_json(options={})
       # Wraps the [index mappings](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html)
       #
       class Mappings
-        attr_accessor :options, :type
+        attr_accessor :options
 
         # @private
         TYPES_WITH_EMBEDDED_PROPERTIES = %w(object nested)
 
-        def initialize(type = nil, options={})
-          @type    = type
+        def initialize(options={})
           @options = options
           @mapping = {}
         end
@@ -152,7 +151,7 @@ module ClassMethods
         # when it doesn't already define them. Use the `__elasticsearch__` proxy otherwise.
         #
         def mapping(options={}, &block)
-          @mapping ||= Mappings.new(document_type, options)
+          @mapping ||= Mappings.new(options)
 
           @mapping.options.update(options) unless options.empty?
 
@@ -372,7 +371,6 @@ def index_document(options={})
           request = { index: index_name,
                       id:    id,
                       body:  document }
-          request.merge!(type: document_type) if document_type
 
           client.index(request.merge!(options))
         end
@@ -393,7 +391,6 @@ def index_document(options={})
         def delete_document(options={})
           request = { index: index_name,
                       id:    self.id }
-          request.merge!(type: document_type) if document_type
 
           client.delete(request.merge!(options))
         end
@@ -434,7 +431,6 @@ def update_document(options={})
               request = { index: index_name,
                           id:    self.id,
                           body:  { doc: attributes } }
-              request.merge!(type: document_type) if document_type
 
               client.update(request.merge!(options))
             end
@@ -461,7 +457,6 @@ def update_document_attributes(attributes, options={})
           request = { index: index_name,
                       id:    self.id,
                       body:  { doc: attributes } }
-          request.merge!(type: document_type) if document_type
 
           client.update(request.merge!(options))
         end

elasticsearch-model/lib/elasticsearch/model/response/result.rb

@@ -40,12 +40,6 @@ def id
           @result['_id']
         end
 
-        # Return document `_type` as `_type`
-        #
-        def type
-          @result['_type']
-        end
-
         # Delegate methods to `@result` or `@result._source`
         #
         def method_missing(name, *arguments)

elasticsearch-model/lib/elasticsearch/model/searching.rb

@@ -37,7 +37,6 @@ def initialize(klass, query_or_payload, options={})
           @options = options
 
           __index_name    = options[:index] || klass.index_name
-          __document_type = options[:type]  || klass.document_type
 
           case
             # search query: ...
@@ -54,9 +53,9 @@ def initialize(klass, query_or_payload, options={})
           end
 
           if body
-            @definition = { index: __index_name, type: __document_type, body: body }.update options
+            @definition = { index: __index_name, body: body }.update options
           else
-            @definition = { index: __index_name, type: __document_type, q: q }.update options
+            @definition = { index: __index_name, q: q }.update options
           end
         end
 

elasticsearch-model/spec/elasticsearch/model/adapters/active_record/basic_spec.rb

@@ -66,7 +66,7 @@
       end
 
       Article.delete_all
-      Article.__elasticsearch__.create_index!(force: true, include_type_name: true)
+      Article.__elasticsearch__.create_index!(force: true)
 
       Article.create!(title: 'Test', body: '', clicks: 1)
       Article.create!(title: 'Testing Coding', body: '', clicks: 2)
@@ -159,19 +159,7 @@
       end
     end
 
-    describe '#id' do
-
-      let(:search_result) do
-        Article.search('title:test')
-      end
-
-      it 'returns the type' do
-        expect(search_result.results.first.type).to eq('article')
-      end
-    end
-
     describe '#each_with_hit' do
-
       let(:search_result) do
         Article.search('title:test')
       end

elasticsearch-model/spec/elasticsearch/model/adapters/active_record/namespaced_model_spec.rb

@@ -27,7 +27,7 @@
     end
 
     MyNamespace::Book.delete_all
-    MyNamespace::Book.__elasticsearch__.create_index!(force: true, include_type_name: true)
+    MyNamespace::Book.__elasticsearch__.create_index!(force: true)
     MyNamespace::Book.create!(title: 'Test')
     MyNamespace::Book.__elasticsearch__.refresh_index!
   end
@@ -43,10 +43,6 @@
       expect(MyNamespace::Book.index_name).to eq('my_namespace-books')
     end
 
-    it 'has the proper document type' do
-      expect(MyNamespace::Book.document_type).to eq('book')
-    end
-
     it 'saves the document into the index' do
       expect(MyNamespace::Book.search('title:test').results.size).to eq(1)
       expect(MyNamespace::Book.search('title:test').results.first.title).to eq('Test')

elasticsearch-model/spec/elasticsearch/model/importing_spec.rb

@@ -57,7 +57,6 @@ def importing_mixin
   describe '#import' do
     before do
       allow(DummyImportingModel).to receive(:index_name).and_return('foo')
-      allow(DummyImportingModel).to receive(:document_type).and_return('foo')
       allow(DummyImportingModel).to receive(:index_exists?).and_return(true)
       allow(DummyImportingModel).to receive(:__batch_to_bulk)
       allow(client).to receive(:bulk).and_return(response)
@@ -148,25 +147,14 @@ def importing_mixin
     context 'when a different index name is provided' do
       before do
         expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(client).to receive(:bulk).with(body: nil, index: 'my-new-index', type: 'foo').and_return(response)
+        expect(client).to receive(:bulk).with(body: nil, index: 'my-new-index').and_return(response)
       end
 
       it 'uses the alternate index name' do
         expect(DummyImportingModel.import(index: 'my-new-index')).to eq(0)
       end
     end
 
-    context 'when a different document type is provided' do
-      before do
-        expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(client).to receive(:bulk).with(body: nil, index: 'foo', type: 'my-new-type').and_return(response)
-      end
-
-      it 'uses the alternate index name' do
-        expect(DummyImportingModel.import(type: 'my-new-type')).to eq(0)
-      end
-    end
-
     context 'the transform method' do
       before do
         expect(DummyImportingModel).to receive(:client).and_return(client)
@@ -215,7 +203,7 @@ def importing_mixin
     context 'when a pipeline is provided as an options' do
       before do
         expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(client).to receive(:bulk).with(body: nil, index: 'foo', type: 'foo', pipeline: 'my-pipeline').and_return(response)
+        expect(client).to receive(:bulk).with(body: nil, index: 'foo', pipeline: 'my-pipeline').and_return(response)
       end
 
       it 'uses the pipeline option' do

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

@@ -38,7 +38,6 @@ class NotFound < Exception; end
   end
 
   describe 'the Settings class' do
-
     it 'should be convertible to a hash' do
       expect(Elasticsearch::Model::Indexing::Settings.new(foo: 'bar').to_hash).to eq(foo: 'bar')
     end

elasticsearch-model/spec/elasticsearch/model/naming_spec.rb

@@ -51,13 +51,7 @@ class DummyNamingModelInNamespace
     expect(::MyNamespace::DummyNamingModelInNamespace.new.index_name).to eq('my_namespace-dummy_naming_model_in_namespaces')
   end
 
-  it 'returns nil' do
-    expect(DummyNamingModel.document_type).to be_nil
-    expect(DummyNamingModel.new.document_type).to be_nil
-  end
-
   describe '#index_name' do
-
     context 'when the index name is set on the class' do
 
       before do
@@ -138,66 +132,4 @@ class DummyNamingModelInNamespace
       end
     end
   end
-
-  describe '#document_type' do
-
-    it 'returns nil' do
-      expect(DummyNamingModel.document_type).to be_nil
-    end
-
-    context 'when the method is called with an argument' do
-
-      before do
-        DummyNamingModel.document_type 'foo'
-      end
-
-      it 'changes the document type' do
-        expect(DummyNamingModel.document_type).to eq('foo')
-      end
-    end
-
-    context 'when the method is called on an instance' do
-
-      let(:instance) do
-        DummyNamingModel.new
-      end
-
-      before do
-        instance.document_type 'foobar_d'
-      end
-
-      it 'changes the document type' do
-        expect(instance.document_type).to eq('foobar_d')
-      end
-    end
-  end
-
-  describe '#document_type=' do
-
-    context 'when the method is called on the class' do
-
-      before do
-        DummyNamingModel.document_type = 'foo_z'
-      end
-
-      it 'changes the document type' do
-        expect(DummyNamingModel.document_type).to eq('foo_z')
-      end
-    end
-
-    context 'when the method is called on an instance' do
-
-      let(:instance) do
-        DummyNamingModel.new
-      end
-
-      before do
-        instance.document_type = 'foobar_b'
-      end
-
-      it 'changes the document type' do
-        expect(instance.document_type).to eq('foobar_b')
-      end
-    end
-  end
 end

elasticsearch-model/spec/elasticsearch/model/response/base_spec.rb

@@ -26,7 +26,6 @@ class DummyBaseClass
 
     class OriginClass
       def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
     end
   end
 

elasticsearch-model/spec/elasticsearch/model/response/pagination/kaminari_spec.rb

@@ -23,7 +23,6 @@
     class ModelClass
       include ::Kaminari::ConfigurationMethods
       def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
     end
   end
 
@@ -58,7 +57,7 @@ def self.document_type; 'bar'; end
       context 'when page is called once' do
 
         let(:search_request) do
-          { index: index_field, from: 25, size: 25, q: '*', type: type_field}
+          { index: index_field, from: 25, size: 25, q: '*' }
         end
 
         before do
@@ -75,11 +74,11 @@ def self.document_type; 'bar'; end
       context 'when page is called more than once' do
 
         let(:search_request_one) do
-          { index: index_field, from: 25, size: 25, q: '*', type: type_field}
+          { index: index_field, from: 25, size: 25, q: '*' }
         end
 
         let(:search_request_two) do
-          { index: index_field, from: 75, size: 25, q: '*', type: type_field}
+          { index: index_field, from: 75, size: 25, q: '*' }
         end
 
         before do

elasticsearch-model/spec/elasticsearch/model/response/response_spec.rb

@@ -22,7 +22,6 @@
   before(:all) do
     class OriginClass
       def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
     end
   end
 

elasticsearch-model/spec/elasticsearch/model/response/result_spec.rb

@@ -44,23 +44,7 @@
     end
   end
 
-  describe '#type' do
-
-    let(:result) do
-      described_class.new(foo: 'bar', _type: 'baz', _source: { type: 'BAM' })
-    end
-
-    it 'returns the _type field' do
-      expect(result.type).to eq('baz')
-    end
-
-    it 'provides access to the source type field' do
-      expect(result._source.type).to eq('BAM')
-    end
-  end
-
   describe 'method delegation' do
-
     let(:result) do
       described_class.new(foo: 'bar', _source: { bar: { bam: 'baz' } })
     end