elasticsearch-model 7.2.1 → 8.0.0.pre

data/spec/elasticsearch/model/multimodel_spec.rb

@@ -24,29 +24,23 @@ describe Elasticsearch::Model::Multimodel do
   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
 
   describe 'the model registry' do
-
     before(:all) do
-
       class JustAModel
         include Elasticsearch::Model
       end

data/spec/elasticsearch/model/naming_spec.rb

@@ -51,13 +51,7 @@ describe 'naming' do
     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 @@ describe 'naming' do
       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

data/spec/elasticsearch/model/proxy_spec.rb

@@ -18,7 +18,6 @@
 require 'spec_helper'
 
 describe Elasticsearch::Model::Proxy do
-
   before(:all) do
     class ::DummyProxyModel
       include Elasticsearch::Model::Proxy
@@ -123,10 +122,9 @@ describe Elasticsearch::Model::Proxy do
       expect(model).to eq(model_target)
       expect(duplicate).to eq(duplicate_target)
     end
-  end
 
-  it 'forwards keyword arguments to target methods' do
-    expect(DummyProxyModel.new.__elasticsearch__.keyword_method(foo: 'bar')).to eq('bar')
+    it 'forwards keyword arguments to target methods' do
+      expect(DummyProxyModel.new.__elasticsearch__.keyword_method(foo: 'bar')).to eq('bar')
+    end
   end
-
 end

data/spec/elasticsearch/model/response/aggregations_spec.rb

@@ -22,7 +22,6 @@ describe Elasticsearch::Model::Response::Aggregations do
   before(:all) do
     class OriginClass
       def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
     end
   end
 
@@ -34,9 +33,10 @@ describe Elasticsearch::Model::Response::Aggregations do
     {
         'aggregations' => {
             'foo' => {'bar' => 10 },
-            'price' => { 'doc_count' => 123,
-                         'min' => { 'value' => 1.0},
-                         'max' => { 'value' => 99 }
+            'price' => {
+              'doc_count' => 123,
+              'min' => { 'value' => 1.0},
+              'max' => { 'value' => 99 }
             }
         }
     }

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

@@ -26,7 +26,6 @@ describe Elasticsearch::Model::Response::Base do
 
     class OriginClass
       def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
     end
   end
 

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

@@ -23,7 +23,6 @@ describe 'Elasticsearch::Model::Response::Response Kaminari' do
     class ModelClass
       include ::Kaminari::ConfigurationMethods
       def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
     end
   end
 
@@ -58,7 +57,7 @@ describe 'Elasticsearch::Model::Response::Response Kaminari' do
       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 @@ describe 'Elasticsearch::Model::Response::Response Kaminari' do
       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

data/spec/elasticsearch/model/response/pagination/will_paginate_spec.rb

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

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

@@ -31,7 +31,6 @@ describe Elasticsearch::Model::Response::Records do
 
     class DummyModel
       def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
 
       def self.find(*args)
         DummyCollection.new

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

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

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

@@ -19,7 +19,6 @@ require 'spec_helper'
 require 'active_support/json/encoding'
 
 describe Elasticsearch::Model::Response::Result do
-
   let(:result) do
     described_class.new(foo: 'bar', bar: { bam: 'baz' })
   end
@@ -45,23 +44,7 @@ describe Elasticsearch::Model::Response::Result do
     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

data/spec/elasticsearch/model/response/results_spec.rb

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

data/spec/elasticsearch/model/searching_search_request_spec.rb

@@ -23,7 +23,6 @@ describe Elasticsearch::Model::Serializing do
     class ::DummySearchingModel
       extend Elasticsearch::Model::Searching::ClassMethods
       def self.index_name;    'foo'; end
-      def self.document_type; 'bar'; end
     end
   end
 
@@ -44,7 +43,7 @@ describe Elasticsearch::Model::Serializing do
     context 'when the search definition is a simple query' do
 
       before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', q: 'foo').and_return({})
+        expect(client).to receive(:search).with({ index: 'foo', q: 'foo' }).and_return({})
       end
 
       let(:search) do
@@ -59,7 +58,7 @@ describe Elasticsearch::Model::Serializing do
     context 'when the search definition is a hash' do
 
       before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', body: { foo: 'bar' }).and_return({})
+        expect(client).to receive(:search).with({ index: 'foo', body: { foo: 'bar' } }).and_return({})
       end
 
       let(:search) do
@@ -74,7 +73,7 @@ describe Elasticsearch::Model::Serializing do
     context 'when the search definition is a json string' do
 
       before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', body: '{"foo":"bar"}').and_return({})
+        expect(client).to receive(:search).with({ index: 'foo', body: '{"foo":"bar"}' }).and_return({})
       end
 
       let(:search) do
@@ -99,7 +98,7 @@ describe Elasticsearch::Model::Serializing do
       end
 
       before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', body: {foo: 'bar'}).and_return({})
+        expect(client).to receive(:search).with({ index: 'foo', body: {foo: 'bar'} }).and_return({})
       end
 
       let(:search) do
@@ -114,7 +113,7 @@ describe Elasticsearch::Model::Serializing do
     context 'when extra options are specified' do
 
       before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', q: 'foo', size: 15).and_return({})
+        expect(client).to receive(:search).with({ index: 'foo', q: 'foo', size: 15 }).and_return({})
       end
 
       let(:search) do

data/spec/spec_helper.rb

@@ -31,6 +31,10 @@ end
 require 'yaml'
 require 'active_record'
 
+# Load all of ActiveSupport to be sure of complete compatibility -
+# see https://github.com/elastic/elasticsearch-rails/pull/1075 for details
+require 'active_support/all'
+
 unless defined?(ELASTICSEARCH_URL)
   ELASTICSEARCH_URL = ENV['ELASTICSEARCH_URL'] || "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9200)}"
 end
@@ -43,8 +47,11 @@ RSpec.configure do |config|
     require 'ansi'
     tracer = ::Logger.new(STDERR)
     tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n }.ansi(:faint)}\n" }
-    Elasticsearch::Model.client = Elasticsearch::Client.new host: ELASTICSEARCH_URL,
-                                                            tracer: (ENV['QUIET'] ? nil : tracer)
+    Elasticsearch::Model.client = Elasticsearch::Client.new(
+      host: ELASTICSEARCH_URL,
+      tracer: (ENV['QUIET'] ? nil : tracer),
+      transport_options: { :ssl => { verify: false } }
+    )
     puts "Elasticsearch Version: #{Elasticsearch::Model.client.info['version']}"
 
     unless ActiveRecord::Base.connected?
@@ -63,15 +70,6 @@ RSpec.configure do |config|
   end
 end
 
-# Is the ActiveRecord version at least 4.0?
-#
-# @return [ true, false ] Whether the ActiveRecord version is at least 4.0.
-#
-# @since 6.0.1
-def active_record_at_least_4?
-  defined?(::ActiveRecord) && ::ActiveRecord::VERSION::MAJOR >= 4
-end
-
 # Delete all documents from the indices of the provided list of models.
 #
 # @param [ Array<ActiveRecord::Base> ] models The list of models.

data/spec/support/app/answer.rb

@@ -23,7 +23,6 @@ class Answer < ActiveRecord::Base
   JOIN_TYPE = 'answer'.freeze
 
   index_name 'questions_and_answers'.freeze
-  document_type 'doc'.freeze
 
   before_create :randomize_id
 

data/spec/support/app/article.rb

@@ -19,8 +19,6 @@ 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'

data/spec/support/app/article_no_type.rb

@@ -21,7 +21,7 @@ class ::ArticleNoType < ActiveRecord::Base
 
   settings index: {number_of_shards: 1, number_of_replicas: 0} do
     mapping do
-      indexes :title, type: 'text', analyzer: 'snowball'
+      indexes :title, analyzer: 'snowball'
       indexes :body, type: 'text'
       indexes :clicks, type: 'integer'
       indexes :created_at, type: 'date'

data/spec/support/app/namespaced_book.rb

@@ -20,8 +20,6 @@ module MyNamespace
     include Elasticsearch::Model
     include Elasticsearch::Model::Callbacks
 
-    document_type 'book'
-
     mapping { indexes :title }
   end
 end

data/spec/support/app/parent_and_child_searchable.rb

@@ -26,10 +26,12 @@ module ParentChildSearchable
     settings = Question.settings.to_hash.merge Answer.settings.to_hash
     mapping_properties = { join_field: { type: JOIN,
                                          relations: { Question::JOIN_TYPE => Answer::JOIN_TYPE } } }
-
-    merged_properties = mapping_properties.merge(Question.mappings.to_hash[:doc][:properties]).merge(
-        Answer.mappings.to_hash[:doc][:properties])
-    mappings = { doc: { properties: merged_properties }}
+    merged_properties = mapping_properties.merge(
+      Question.mappings.to_hash[:properties]
+    ).merge(
+      Answer.mappings.to_hash[:properties]
+    )
+    mappings = { properties: merged_properties }
 
     client.indices.create({ index: INDEX_NAME,
                             body: {

data/spec/support/app/question.rb

@@ -24,7 +24,6 @@ class Question < ActiveRecord::Base
   JOIN_METADATA = { join_field: JOIN_TYPE}.freeze
 
   index_name 'questions_and_answers'.freeze
-  document_type 'doc'.freeze
 
   mapping do
     indexes :title

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 8.0.0.pre
 platform: ruby
 authors:
-- Karel Minarik
+- Elastic Client Library Maintainers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: ActiveModel/Record integrations for Elasticsearch.
 email:
-- karel.minarik@elasticsearch.org
+- client-libs@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -330,10 +330,9 @@ files:
 - examples/mongoid_article.rb
 - examples/ohm_article.rb
 - examples/riak_article.rb
-- gemfiles/3.0.gemfile
-- gemfiles/4.0.gemfile
-- gemfiles/5.0.gemfile
-- gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
+- gemfiles/7.0.gemfile
+- gemfiles/7.1.gemfile
 - lib/elasticsearch/model.rb
 - lib/elasticsearch/model/adapter.rb
 - lib/elasticsearch/model/adapters/active_record.rb
@@ -435,14 +434,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: ActiveModel/Record integrations for Elasticsearch.

data/gemfiles/4.0.gemfile

@@ -1,36 +0,0 @@
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Usage:
-#
-# $ BUNDLE_GEMFILE=./gemfiles/4.0.gemfile bundle install
-# $ BUNDLE_GEMFILE=./gemfiles/4.0.gemfile bundle exec rake test:integration
-
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'activemodel',  '~> 4'
-gem 'activerecord', '~> 4'
-gem 'mongoid', '~> 5'
-gem 'sqlite3', '> 1.3', '< 1.4' unless defined?(JRUBY_VERSION)
-
-group :development, :testing do
-  gem 'bigdecimal', '~> 1'
-  gem 'pry-nav'
-  gem 'rspec'
-end