elasticsearch-model 7.2.0 → 8.0.0

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

@@ -18,44 +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|
@@ -67,7 +30,7 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
       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)
@@ -77,7 +40,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe 'indexing a document' do
-
       let(:search_result) do
         Article.search('title:test')
       end
@@ -89,7 +51,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe '#results' do
-
       let(:search_result) do
         Article.search('title:test')
       end
@@ -98,12 +59,11 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
         expect(search_result.results.first).to be_a(Elasticsearch::Model::Response::Result)
       end
 
-      it 'prooperly loads the document' do
+      it 'properly loads the document' do
         expect(search_result.results.first.title).to eq('Test')
       end
 
       context 'when the result contains other data' do
-
         let(:search_result) do
           Article.search(query: { match: { title: 'test' } }, highlight: { fields: { title: {} } })
         end
@@ -120,7 +80,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe '#records' do
-
       let(:search_result) do
         Article.search('title:test')
       end
@@ -135,7 +94,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe 'Enumerable' do
-
       let(:search_result) do
         Article.search('title:test')
       end
@@ -150,7 +108,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe '#id' do
-
       let(:search_result) do
         Article.search('title:test')
       end
@@ -160,19 +117,7 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
       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
@@ -186,7 +131,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe 'search results order' do
-
       let(:search_result) do
         Article.search(query: { match: { title: 'code' }}, sort: { clicks: :desc })
       end
@@ -209,7 +153,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe 'a paged collection' do
-
       let(:search_result) do
         Article.search(query: { match: { title: { query: 'test' } } },
                        size: 2,
@@ -225,7 +168,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe '#destroy' do
-
       before do
         Article.create!(title: 'destroy', body: '', clicks: 1)
         Article.__elasticsearch__.refresh_index!
@@ -246,7 +188,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe 'full document updates' do
-
       before do
         article = Article.create!(title: 'update', body: '', clicks: 1)
         Article.__elasticsearch__.refresh_index!
@@ -267,7 +208,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe 'attribute updates' do
-
       before do
         article = Article.create!(title: 'update', body: '', clicks: 1)
         Article.__elasticsearch__.refresh_index!
@@ -288,7 +228,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe '#save' do
-
       before do
         article = Article.create!(title: 'save', body: '', clicks: 1)
 
@@ -315,7 +254,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe 'a DSL search' do
-
       let(:search_result) do
         Article.search(query: { match: { title: { query: 'test' } } })
       end
@@ -327,7 +265,6 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe 'chaining SQL queries on response.records' do
-
       let(:search_result) do
         Article.search(query: { match: { title: { query: 'test' } } })
       end
@@ -340,31 +277,23 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe 'ordering of SQL queries' do
-
       context 'when order is called on the ActiveRecord query' do
-
         let(:search_result) do
           Article.search query: { match: { title: { query: 'test' } } }
         end
 
-        it 'allows the SQL query to be ordered independent of the Elasticsearch results order', unless: active_record_at_least_4? do
-          expect(search_result.records.order('title DESC').first.title).to eq('Testing Coding')
-          expect(search_result.records.order('title DESC')[0].title).to eq('Testing Coding')
-        end
-
-        it 'allows the SQL query to be ordered independent of the Elasticsearch results order', if: active_record_at_least_4? do
+        it 'allows the SQL query to be ordered independent of the Elasticsearch results order' do
           expect(search_result.records.order(title: :desc).first.title).to eq('Testing Coding')
           expect(search_result.records.order(title: :desc)[0].title).to eq('Testing Coding')
         end
       end
 
       context 'when more methods are chained on the ActiveRecord query' do
-
         let(:search_result) do
           Article.search query: {match: {title: {query: 'test'}}}
         end
 
-        it 'allows the SQL query to be ordered independent of the Elasticsearch results order', if: active_record_at_least_4? do
+        it 'allows the SQL query to be ordered independent of the Elasticsearch results order' do
           expect(search_result.records.distinct.order(title: :desc).first.title).to eq('Testing Coding')
           expect(search_result.records.distinct.order(title: :desc)[0].title).to eq('Testing Coding')
         end
@@ -372,11 +301,10 @@ describe Elasticsearch::Model::Adapter::ActiveRecord do
     end
 
     describe 'access to the response via methods' do
-
       let(:search_result) do
         Article.search(query: { match: { title: { query: 'test' } } },
                        aggregations: {
-                           dates: { date_histogram: { field: 'created_at', interval: 'hour' } },
+                           dates: { date_histogram: { field: 'created_at', calendar_interval: 'hour' } },
                            clicks: { global: {}, aggregations: { min: { min: { field: 'clicks' } } } }
                        },
                        suggest: { text: 'tezt', title: { term: { field: 'title', suggest_mode: 'always' } } })

data/spec/elasticsearch/model/adapters/active_record/import_spec.rb

@@ -19,12 +19,12 @@ require 'spec_helper'
 
 describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
   before(:all) do
-    ActiveRecord::Schema.define(:version => 1) do
+    ActiveRecord::Schema.define(version: 1) do
       create_table :import_articles do |t|
         t.string   :title
         t.integer  :views
         t.string   :numeric # For the sake of invalid data sent to Elasticsearch
-        t.datetime :created_at, :default => 'NOW()'
+        t.datetime :created_at, default: 'NOW()'
       end
     end
 
@@ -52,6 +52,10 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Importing' do
       it 'imports all documents' do
         expect(ImportArticle.search('*').results.total).to eq(10)
       end
+
+      it "does not pollute the model's namespace" do
+        expect(ImportArticle.methods).not_to include(:__transform)
+      end
     end
 
     context 'when batch size is specified' do

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

@@ -27,7 +27,7 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Namespaced Model' do
     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 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Namespaced Model' do
       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')

data/spec/elasticsearch/model/adapters/active_record/pagination_spec.rb

@@ -18,7 +18,6 @@
 require 'spec_helper'
 
 describe 'Elasticsearch::Model::Adapter::ActiveRecord Pagination' do
-
   before(:all) do
     ActiveRecord::Schema.define(:version => 1) do
       create_table ArticleForPagination.table_name do |t|
@@ -41,48 +40,41 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Pagination' do
   end
 
   context 'when no other page is specified' do
-
     let(:records) do
       ArticleForPagination.search('title:test').page(1).records
     end
 
     describe '#size' do
-
       it 'returns the correct size' do
         expect(records.size).to eq(25)
       end
     end
 
     describe '#current_page' do
-
       it 'returns the correct current page' do
         expect(records.current_page).to eq(1)
       end
     end
 
     describe '#prev_page' do
-
       it 'returns the correct previous page' do
         expect(records.prev_page).to be_nil
       end
     end
 
     describe '#next_page' do
-
       it 'returns the correct next page' do
         expect(records.next_page).to eq(2)
       end
     end
 
     describe '#total_pages' do
-
       it 'returns the correct total pages' do
         expect(records.total_pages).to eq(3)
       end
     end
 
     describe '#first_page?' do
-
       it 'returns the correct first page' do
         expect(records.first_page?).to be(true)
       end

data/spec/elasticsearch/model/adapters/active_record/parent_child_spec.rb

@@ -38,7 +38,7 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Parent-Child' do
       add_index(:answers, :question_id) unless index_exists?(:answers, :question_id)
 
       clear_tables(Question)
-      ParentChildSearchable.create_index!(force: true, include_type_name: true)
+      ParentChildSearchable.create_index!(force: true)
 
       q_1 = Question.create!(title: 'First Question',  author: 'John')
       q_2 = Question.create!(title: 'Second Question', author: 'Jody')
@@ -53,7 +53,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Parent-Child' do
   end
 
   describe 'has_child search' do
-
     let(:search_result) do
       Question.search(query: { has_child: { type: 'answer', query: { match: { author: 'john' } } } })
     end
@@ -64,7 +63,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Parent-Child' do
   end
 
   describe 'hash_parent search' do
-
     let(:search_result) do
       Answer.search(query: { has_parent: { parent_type: 'question', query: { match: { author: 'john' } } } })
     end
@@ -75,7 +73,6 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Parent-Child' do
   end
 
   context 'when a parent is deleted' do
-
     before do
       Question.where(title: 'First Question').each(&:destroy)
       Question.__elasticsearch__.refresh_index!

data/spec/elasticsearch/model/adapters/active_record/serialization_spec.rb

@@ -18,7 +18,6 @@
 require 'spec_helper'
 
 describe 'Elasticsearch::Model::Adapter::ActiveRecord Serialization' do
-
   before(:all) do
     ActiveRecord::Schema.define(:version => 1) do
       create_table ArticleWithCustomSerialization.table_name do |t|
@@ -32,18 +31,17 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Serialization' do
   end
 
   context 'when the model has a custom serialization defined' do
-
     before do
       ArticleWithCustomSerialization.create!(title: 'Test', status: 'green')
       ArticleWithCustomSerialization.__elasticsearch__.refresh_index!
     end
 
     context 'when a document is indexed' do
-
       let(:search_result) do
-        ArticleWithCustomSerialization.__elasticsearch__.client.get(index: 'article_with_custom_serializations',
-                                                                    type:  '_doc',
-                                                                    id:    '1')
+        ArticleWithCustomSerialization.__elasticsearch__.client.get(
+          index: 'article_with_custom_serializations',
+          id:    '1'
+        )
       end
 
       it 'applies the serialization when indexing' do
@@ -52,9 +50,8 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Serialization' do
     end
 
     context 'when a document is updated' do
-
       before do
-        article.update_attributes(title: 'UPDATED', status: 'yellow')
+        article.update(title: 'UPDATED', status: 'yellow')
         ArticleWithCustomSerialization.__elasticsearch__.refresh_index!
       end
 
@@ -65,9 +62,10 @@ describe 'Elasticsearch::Model::Adapter::ActiveRecord Serialization' do
       end
 
       let(:search_result) do
-        ArticleWithCustomSerialization.__elasticsearch__.client.get(index: 'article_with_custom_serializations',
-                                                                    type:  '_doc',
-                                                                    id:    article.id)
+        ArticleWithCustomSerialization.__elasticsearch__.client.get(
+          index: 'article_with_custom_serializations',
+          id:    article.id
+        )
       end
 
       it 'applies the serialization when updating' do

data/spec/elasticsearch/model/adapters/mongoid_spec.rb

@@ -174,7 +174,7 @@ describe Elasticsearch::Model::Adapter::Mongoid do
     context 'query criteria specified as a hash' do
 
       before do
-        expect(relation).to receive(:where).with(color: 'red').and_return(relation)
+        expect(relation).to receive(:where).with({ color: 'red' }).and_return(relation)
       end
 
       let(:query) do

data/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) }
@@ -42,7 +40,6 @@ describe Elasticsearch::Model::Adapter::Multiple do
         include Elasticsearch::Model
 
         index_name 'dummy'
-        document_type 'dummy_two'
 
         def self.find(ids)
           ids.map { |id| new(id) }
@@ -60,7 +57,6 @@ describe Elasticsearch::Model::Adapter::Multiple do
       include Elasticsearch::Model
 
       index_name 'other_index'
-      document_type 'dummy_two'
 
       def self.find(ids)
         ids.map { |id| new(id) }
@@ -86,27 +82,22 @@ describe Elasticsearch::Model::Adapter::Multiple do
     [
       {
         _index: 'dummy',
-        _type: 'dummy_two',
         _id: '2'
       },
       {
         _index: 'dummy',
-        _type: 'dummy_one',
         _id: '2'
       },
       {
         _index: 'other_index',
-        _type: 'dummy_two',
         _id: '1'
       },
       {
         _index: 'dummy',
-        _type: 'dummy_two',
         _id: '1'
       },
       {
         _index: 'dummy',
-        _type: 'dummy_one',
         _id: '3'
       }
     ]
@@ -121,13 +112,12 @@ describe Elasticsearch::Model::Adapter::Multiple do
   end
 
   describe '#records' do
-
     before do
       multimodel.class.send :include, Elasticsearch::Model::Adapter::Multiple::Records
       expect(multimodel).to receive(:response).at_least(:once).and_return(response)
     end
 
-    it 'instantiates the correct types of instances' do
+    xit 'instantiates the correct types of instances' do
       expect(multimodel.records[0]).to be_a(Namespace::DummyTwo)
       expect(multimodel.records[1]).to be_a(DummyOne)
       expect(multimodel.records[2]).to be_a(DummyTwo)

data/spec/elasticsearch/model/importing_spec.rb

@@ -18,18 +18,17 @@
 require 'spec_helper'
 
 describe Elasticsearch::Model::Importing do
-
   before(:all) do
     class DummyImportingModel
     end
 
     module DummyImportingAdapter
       module ImportingMixin
-        def __find_in_batches(options={}, &block)
+        def __find_in_batches(options = {}, &block)
           yield if block_given?
         end
         def __transform
-          lambda {|a|}
+          lambda { |a| }
         end
       end
 
@@ -49,7 +48,6 @@ describe Elasticsearch::Model::Importing do
   end
 
   context 'when a model includes the Importing module' do
-
     it 'provides importing methods' do
       expect(DummyImportingModel.respond_to?(:import)).to be(true)
       expect(DummyImportingModel.respond_to?(:__find_in_batches)).to be(true)
@@ -57,10 +55,8 @@ describe Elasticsearch::Model::Importing do
   end
 
   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)
@@ -75,7 +71,6 @@ describe Elasticsearch::Model::Importing do
     end
 
     context 'when no options are provided' do
-
       before do
         expect(DummyImportingModel).to receive(:client).and_return(client)
         allow(DummyImportingModel).to receive(:index_exists?).and_return(true)
@@ -87,7 +82,6 @@ describe Elasticsearch::Model::Importing do
     end
 
     context 'when there is an error' do
-
       before do
         expect(DummyImportingModel).to receive(:client).and_return(client)
         allow(DummyImportingModel).to receive(:index_exists?).and_return(true)
@@ -102,14 +96,12 @@ describe Elasticsearch::Model::Importing do
       end
 
       context 'when the method is called with the option to return the errors' do
-
         it 'returns the errors' do
           expect(DummyImportingModel.import(return: 'errors')).to eq([{ 'index' => { 'error' => 'FAILED' } }])
         end
       end
 
       context 'when the method is called with a block' do
-
         it 'yields the response to the block' do
           DummyImportingModel.import do |response|
             expect(response['items'].size).to eq(2)
@@ -119,7 +111,6 @@ describe Elasticsearch::Model::Importing do
     end
 
     context 'when the index does not exist' do
-
       before do
         allow(DummyImportingModel).to receive(:index_exists?).and_return(false)
       end
@@ -132,10 +123,9 @@ describe Elasticsearch::Model::Importing do
     end
 
     context 'when the method is called with the force option' do
-
       before do
         expect(DummyImportingModel).to receive(:create_index!).with(force: true, index: 'foo').and_return(true)
-        expect(DummyImportingModel).to receive(:__find_in_batches).with(foo: 'bar').and_return(true)
+        expect(DummyImportingModel).to receive(:__find_in_batches).with({ foo: 'bar' }).and_return(true)
       end
 
       it 'deletes and creates the index' do
@@ -144,10 +134,9 @@ describe Elasticsearch::Model::Importing do
     end
 
     context 'when the method is called with the refresh option' do
-
       before do
         expect(DummyImportingModel).to receive(:refresh_index!).with(index: 'foo').and_return(true)
-        expect(DummyImportingModel).to receive(:__find_in_batches).with(foo: 'bar').and_return(true)
+        expect(DummyImportingModel).to receive(:__find_in_batches).with({ foo: 'bar' }).and_return(true)
       end
 
       it 'refreshes the index' do
@@ -156,10 +145,9 @@ describe Elasticsearch::Model::Importing do
     end
 
     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
@@ -167,20 +155,7 @@ describe Elasticsearch::Model::Importing do
       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)
         expect(DummyImportingModel).to receive(:__transform).and_return(transform)
@@ -197,9 +172,7 @@ describe Elasticsearch::Model::Importing do
     end
 
     context 'when a transform is provided as an option' do
-
       context 'when the transform option is not a lambda' do
-
         let(:transform) do
           'not_callable'
         end
@@ -212,7 +185,6 @@ describe Elasticsearch::Model::Importing do
       end
 
       context 'when the transform option is a lambda' do
-
         before do
           expect(DummyImportingModel).to receive(:client).and_return(client)
           expect(DummyImportingModel).to receive(:__batch_to_bulk).with(anything, transform)
@@ -229,10 +201,9 @@ describe Elasticsearch::Model::Importing do
     end
 
     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