elasticsearch-model 6.1.1 → 7.1.1

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

@@ -1,3 +1,20 @@
+# 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.
+
 require 'spec_helper'
 
 describe 'Elasticsearch::Model::Response::Response Kaminari' do
@@ -14,11 +31,6 @@ describe 'Elasticsearch::Model::Response::Response Kaminari' do
     remove_classes(ModelClass)
   end
 
-  let(:response_document) do
-    { 'took' => '5', 'timed_out' => false, '_shards' => {'one' => 'OK'},
-      'hits' => { 'total' => 100, 'hits' => (1..100).to_a.map { |i| { _id: i } } } }
-  end
-
   let(:search) do
     Elasticsearch::Model::Searching::SearchRequest.new(model, '*')
   end
@@ -374,37 +386,87 @@ describe 'Elasticsearch::Model::Response::Response Kaminari' do
     end
   end
 
-  context 'when the model is a single one' do
+  context 'when Elasticsearch version is < 7.0' do
 
-    let(:model) do
-      ModelClass
+    let(:response_document) do
+      { 'took' => '5', 'timed_out' => false, '_shards' => {'one' => 'OK'},
+        'hits' => { 'total' => 100, 'hits' => (1..100).to_a.map { |i| { _id: i } } } }
     end
 
-    let(:type_field) do
-      'bar'
-    end
+    context 'when the model is a single one' do
 
-    let(:index_field) do
-      'foo'
+      let(:model) do
+        ModelClass
+      end
+
+      let(:type_field) do
+        'bar'
+      end
+
+      let(:index_field) do
+        'foo'
+      end
+
+      it_behaves_like 'a search request that can be paginated'
     end
 
-    it_behaves_like 'a search request that can be paginated'
-  end
+    context 'when the model is a multimodel' do
+
+      let(:model) do
+        Elasticsearch::Model::Multimodel.new(ModelClass)
+      end
 
-  context 'when the model is a multimodel' do
+      let(:type_field) do
+        ['bar']
+      end
+
+      let(:index_field) do
+        ['foo']
+      end
 
-    let(:model) do
-      Elasticsearch::Model::Multimodel.new(ModelClass)
+      it_behaves_like 'a search request that can be paginated'
     end
+  end
 
-    let(:type_field) do
-      ['bar']
+  context 'when Elasticsearch version is >= 7.0' do
+
+    let(:response_document) do
+      { 'took' => '5', 'timed_out' => false, '_shards' => {'one' => 'OK'},
+        'hits' => { 'total' => { 'value' => 100, 'relation' => 'eq' }, 'hits' => (1..100).to_a.map { |i| { _id: i } } } }
     end
 
-    let(:index_field) do
-      ['foo']
+    context 'when the model is a single one' do
+
+      let(:model) do
+        ModelClass
+      end
+
+      let(:type_field) do
+        'bar'
+      end
+
+      let(:index_field) do
+        'foo'
+      end
+
+      it_behaves_like 'a search request that can be paginated'
     end
 
-    it_behaves_like 'a search request that can be paginated'
+    context 'when the model is a multimodel' do
+
+      let(:model) do
+        Elasticsearch::Model::Multimodel.new(ModelClass)
+      end
+
+      let(:type_field) do
+        ['bar']
+      end
+
+      let(:index_field) do
+        ['foo']
+      end
+
+      it_behaves_like 'a search request that can be paginated'
+    end
   end
 end

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

@@ -1,3 +1,20 @@
+# 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.
+
 require 'spec_helper'
 
 describe 'Elasticsearch::Model::Response::Response WillPaginate' do

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

@@ -1,3 +1,20 @@
+# 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.
+
 require 'spec_helper'
 
 describe Elasticsearch::Model::Response::Records do

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

@@ -1,3 +1,20 @@
+# 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.
+
 require 'spec_helper'
 
 describe Elasticsearch::Model::Response::Response do

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

@@ -1,3 +1,20 @@
+# 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.
+
 require 'spec_helper'
 require 'active_support/json/encoding'
 

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

@@ -1,3 +1,20 @@
+# 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.
+
 require 'spec_helper'
 
 describe Elasticsearch::Model::Response::Results do

data/spec/elasticsearch/model/searching_search_request_spec.rb

@@ -1,3 +1,20 @@
+# 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.
+
 require 'spec_helper'
 
 describe Elasticsearch::Model::Serializing do

data/spec/elasticsearch/model/searching_spec.rb

@@ -1,3 +1,20 @@
+# 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.
+
 require 'spec_helper'
 
 describe Elasticsearch::Model::Searching::ClassMethods do

data/spec/elasticsearch/model/serializing_spec.rb

@@ -1,3 +1,20 @@
+# 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.
+
 require 'spec_helper'
 
 describe Elasticsearch::Model::Serializing do

data/spec/spec_helper.rb

@@ -1,3 +1,20 @@
+# 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.
+
 require 'pry-nav'
 require 'kaminari'
 require 'kaminari/version'
@@ -6,7 +23,11 @@ require 'will_paginate/collection'
 require 'elasticsearch/model'
 require 'hashie/version'
 require 'active_model'
-require 'mongoid'
+begin
+  require 'mongoid'
+rescue LoadError
+  $stderr.puts("'mongoid' gem could not be loaded")
+end
 require 'yaml'
 require 'active_record'
 
@@ -24,6 +45,7 @@ RSpec.configure do |config|
     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)
+    puts "Elasticsearch Version: #{Elasticsearch::Model.client.info['version']}"
 
     unless ActiveRecord::Base.connected?
       ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" )
@@ -59,8 +81,16 @@ end
 # @since 6.0.1
 def clear_indices(*models)
   models.each do |model|
-    begin; Elasticsearch::Model.client.delete_by_query(index: model.index_name, q: '*'); rescue; end
-  end and true
+    begin
+      Elasticsearch::Model.client.delete_by_query(
+        index: model.index_name,
+        q: '*',
+        body: {}
+      )
+    rescue
+    end
+  end
+  true
 end
 
 # Delete all documents from the tables of the provided list of models.
@@ -133,8 +163,10 @@ def test_mongoid?
         client.database.command(ping: 1) && true
       end
     end and true
-  rescue Timeout::Error, LoadError, Mongo::Error => e
-    client.close
+  rescue LoadError
+    $stderr.puts("'mongoid' gem could not be loaded")
+  rescue Timeout::Error, Mongo::Error => e
+    client.close if client
     $stderr.puts("MongoDB not installed or running: #{e}")
   end
 end

data/spec/support/app.rb

@@ -1,3 +1,20 @@
+# 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.
+
 require 'active_record'
 
 require 'support/app/question'
@@ -9,13 +26,21 @@ require 'support/app/namespaced_book'
 require 'support/app/article_for_pagination'
 require 'support/app/article_with_dynamic_index_name'
 require 'support/app/episode'
-require 'support/app/image'
 require 'support/app/series'
-require 'support/app/mongoid_article'
 require 'support/app/article'
+require 'support/app/article_no_type'
 require 'support/app/searchable'
 require 'support/app/category'
 require 'support/app/author'
 require 'support/app/authorship'
 require 'support/app/comment'
 require 'support/app/post'
+
+
+# Mongoid models
+begin
+  require 'support/app/image'
+  require 'support/app/mongoid_article'
+rescue
+  $stderr.puts("'mongoid' gem is not installed, could not load Mongoid models")
+end

data/spec/support/app/answer.rb

@@ -1,3 +1,20 @@
+# 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.
+
 class Answer < ActiveRecord::Base
   include Elasticsearch::Model