Removes more type ocurrances

Author: picandocodigo

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

@@ -51,7 +51,6 @@ def as_json(options={})
       class Mappings
         attr_accessor :options
 
-        # @private
         TYPES_WITH_EMBEDDED_PROPERTIES = %w(object nested)
 
         def initialize(options={})
@@ -84,11 +83,7 @@ def indexes(name, options={}, &block)
         end
 
         def to_hash
-          if @type
-            { @type.to_sym => @options.merge( properties: @mapping ) }
-          else
-            @options.merge( properties: @mapping )
-          end
+          @options.merge( properties: @mapping )
         end
 
         def as_json(options={})

elasticsearch-model/lib/elasticsearch/model/multimodel.rb

@@ -80,14 +80,6 @@ def index_name
         models.map { |m| m.index_name }
       end
 
-      # Get an Array of document types used for retrieving documents when doing a search across multiple models
-      #
-      # @return [Array] the list of document types used for retrieving documents
-      #
-      def document_type
-        models.map { |m| m.document_type }.compact.presence
-      end
-
       # Get the client common for all models
       #
       # @return Elastic::Transport::Client

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

@@ -17,15 +17,10 @@
 
 module Elasticsearch
   module Model
-
-    # Provides methods for getting and setting index name and document type for the model
+    # Provides methods for getting and setting index name the model
     #
     module Naming
-
-      DEFAULT_DOC_TYPE = '_doc'.freeze
-
       module ClassMethods
-
         # Get or set the name of the index
         #
         # @example Set the index name for the `Article` model
@@ -64,46 +59,18 @@ def index_name=(name)
           @index_name = name
         end
 
-        # Get or set the document type
-        #
-        # @example Set the document type for the `Article` model
-        #
-        #     class Article
-        #       document_type "my-article"
-        #     end
-        #
-        # @example Directly set the document type for the `Article` model
-        #
-        #     Article.document_type "my-article"
-        #
-        def document_type name=nil
-          @document_type = name || @document_type || implicit(:document_type)
-        end
-
-
-        # Set the document type
-        #
-        # @see document_type
-        #
-        def document_type=(name)
-          @document_type = name
-        end
-
         private
 
-          def implicit(prop)
-            self.send("default_#{prop}")
-          end
-
-          def default_index_name
-            self.model_name.collection.gsub(/\//, '-')
-          end
+        def implicit(prop)
+          self.send("default_#{prop}")
+        end
 
-          def default_document_type; end
+        def default_index_name
+          self.model_name.collection.gsub(/\//, '-')
+        end
       end
 
       module InstanceMethods
-
         # Get or set the index name for the model instance
         #
         # @example Set the index name for an instance of the `Article` model
@@ -129,25 +96,7 @@ def index_name name=nil, &block
         def index_name=(name)
           @index_name = name
         end
-
-        # @example Set the document type for an instance of the `Article` model
-        #
-        #     @article.document_type "my-article"
-        #     @article.__elasticsearch__.update_document
-        #
-        def document_type name=nil
-          @document_type = name || @document_type || self.class.document_type
-        end
-
-        # Set the document type
-        #
-        # @see document_type
-        #
-        def document_type=(name)
-          @document_type = name
-        end
       end
-
     end
   end
 end

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

@@ -18,43 +18,7 @@
 require 'spec_helper'
 
 describe Elasticsearch::Model::Adapter::ActiveRecord do
-
-  context 'when a document_type is not defined for the Model' do
-    before do
-      ActiveRecord::Schema.define(:version => 1) do
-        create_table :article_no_types do |t|
-          t.string   :title
-          t.string   :body
-          t.integer  :clicks, :default => 0
-          t.datetime :created_at, :default => 'NOW()'
-        end
-      end
-
-      ArticleNoType.delete_all
-      ArticleNoType.__elasticsearch__.create_index!(force: true)
-
-      ArticleNoType.create!(title: 'Test', body: '', clicks: 1)
-      ArticleNoType.create!(title: 'Testing Coding', body: '', clicks: 2)
-      ArticleNoType.create!(title: 'Coding', body: '', clicks: 3)
-
-      ArticleNoType.__elasticsearch__.refresh_index!
-    end
-
-    describe 'indexing a document' do
-
-      let(:search_result) do
-        ArticleNoType.search('title:test')
-      end
-
-      it 'allows searching for documents' do
-        expect(search_result.results.size).to be(2)
-        expect(search_result.records.size).to be(2)
-      end
-    end
-  end
-
-  context 'when a document_type is defined for the Model' do
-
+  context 'for the Model' do
     before(:all) do
       ActiveRecord::Schema.define(:version => 1) do
         create_table :articles do |t|

elasticsearch-model/spec/elasticsearch/model/adapters/multiple_spec.rb

@@ -18,13 +18,11 @@
 require 'spec_helper'
 
 describe Elasticsearch::Model::Adapter::Multiple do
-
   before(:all) do
     class DummyOne
       include Elasticsearch::Model
 
       index_name 'dummy'
-      document_type 'dummy_one'
 
       def self.find(ids)
         ids.map { |id| new(id) }

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

@@ -94,10 +94,6 @@ class NotFound < Exception; end
       expect(DummyIndexingModel.mappings).to be_a(Elasticsearch::Model::Indexing::Mappings)
     end
 
-    it 'does not raise an exception when there is no type passed to the #initialize method' do
-      expect(Elasticsearch::Model::Indexing::Mappings.new)
-    end
-
     it 'should be convertible to a hash' do
       expect(Elasticsearch::Model::Indexing::Mappings.new({ foo: 'bar' }).to_hash).to eq(expected_mapping_hash)
     end
@@ -106,44 +102,7 @@ class NotFound < Exception; end
       expect(Elasticsearch::Model::Indexing::Mappings.new({ foo: 'bar' }).as_json).to eq(expected_mapping_hash)
     end
 
-    context 'when a type is specified' do
-      let(:mappings) do
-        Elasticsearch::Model::Indexing::Mappings.new
-      end
-
-      before do
-        mappings.indexes :foo, { type: 'boolean', include_in_all: false }
-        mappings.indexes :bar
-      end
-
-      it 'creates the correct mapping definition' do
-        expect(mappings.to_hash[:properties][:foo][:type]).to eq('boolean')
-      end
-
-      it 'uses text as the default field type' do
-        expect(mappings.to_hash[:properties][:bar][:type]).to eq('text')
-      end
-
-      context 'when the \'include_type_name\' option is specified' do
-        let(:mappings) do
-          Elasticsearch::Model::Indexing::Mappings.new(include_type_name: true)
-        end
-
-        before do
-          mappings.indexes :foo, { type: 'boolean', include_in_all: false }
-        end
-
-        it 'creates the correct mapping definition' do
-          expect(mappings.to_hash[:properties][:foo][:type]).to eq('boolean')
-        end
-
-        it 'sets the \'include_type_name\' option' do
-          expect(mappings.to_hash[:include_type_name]).to eq(true)
-        end
-      end
-    end
-
-    context 'when a type is not specified' do
+    context 'basic mappings' do
       let(:mappings) do
         Elasticsearch::Model::Indexing::Mappings.new
       end

elasticsearch-model/spec/elasticsearch/model/multimodel_spec.rb

@@ -24,21 +24,17 @@
   end
 
   let(:model_1) do
-    double('Foo', index_name: 'foo_index', document_type: 'foo', to_ary: nil)
+    double('Foo', index_name: 'foo_index', to_ary: nil)
   end
 
   let(:model_2) do
-    double('Bar', index_name: 'bar_index', document_type: 'bar', to_ary: nil)
+    double('Bar', index_name: 'bar_index', to_ary: nil)
   end
 
   it 'has an index name' do
     expect(multimodel.index_name).to eq(['foo_index', 'bar_index'])
   end
 
-  it 'has an document type' do
-    expect(multimodel.document_type).to eq(['foo', 'bar'])
-  end
-
   it 'has a client' do
     expect(multimodel.client).to eq(Elasticsearch::Model.client)
   end

elasticsearch-model/spec/elasticsearch/model/response/aggregations_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/pagination/will_paginate_spec.rb

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

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

@@ -31,7 +31,6 @@ def foo;          'BAR';                end
 
     class DummyModel
       def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
 
       def self.find(*args)
         DummyCollection.new

elasticsearch-model/spec/elasticsearch/model/response/results_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