elasticsearch-model 6.1.1 → 7.0.0.pre

data/spec/elasticsearch/model/module_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 do
@@ -72,30 +89,5 @@ describe Elasticsearch::Model do
         expect(Elasticsearch::Model.settings[:foo]).to eq('bar')
       end
     end
-
-    context 'when \'inheritance_enabled\' is set' do
-
-      around do |example|
-        original_value = Elasticsearch::Model.settings[:inheritance_enabled]
-        example.run
-        Elasticsearch::Model.settings[:inheritance_enabled] = original_value
-      end
-
-      context 'when \'inheritance_enabled\' is true' do
-
-        it 'warns with a deprecation message' do
-          expect(Elasticsearch::Model).to receive(:warn)
-          Elasticsearch::Model.inheritance_enabled = true
-        end
-      end
-
-      context 'when \'inheritance_enabled\' is false' do
-
-        it 'does not warn' do
-          expect(Elasticsearch::Model).not_to receive(:warn)
-          Elasticsearch::Model.inheritance_enabled = false
-        end
-      end
-    end
   end
 end

data/spec/elasticsearch/model/multimodel_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::Multimodel do

data/spec/elasticsearch/model/naming_inheritance_spec.rb

@@ -1,184 +1,123 @@
+# 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 'naming inheritance' do
 
-  context 'without using proxy' do
-    before(:all) do
-      TestBase = Class.new do
-        extend ActiveModel::Naming
-
-        extend  Elasticsearch::Model::Naming::ClassMethods
-        include Elasticsearch::Model::Naming::InstanceMethods
-      end
-
-      Animal = Class.new TestBase do
-        extend ActiveModel::Naming
-
-        extend  Elasticsearch::Model::Naming::ClassMethods
-        include Elasticsearch::Model::Naming::InstanceMethods
-
-        index_name "mammals"
-        document_type "mammal"
-      end
-
-      Dog = Class.new Animal
-
-      module ::MyNamespace
-        Dog = Class.new Animal
-      end
-
-      Cat = Class.new Animal do
-        extend ActiveModel::Naming
+  before(:all) do
+    class ::TestBase
+      extend ActiveModel::Naming
 
-        extend  Elasticsearch::Model::Naming::ClassMethods
-        include Elasticsearch::Model::Naming::InstanceMethods
+      extend  Elasticsearch::Model::Naming::ClassMethods
+      include Elasticsearch::Model::Naming::InstanceMethods
+    end
 
-        index_name "cats"
-        document_type "cat"
-      end
+    class ::Animal < ::TestBase
+      extend ActiveModel::Naming
 
-    end
+      extend  Elasticsearch::Model::Naming::ClassMethods
+      include Elasticsearch::Model::Naming::InstanceMethods
 
-    after(:all) do
-      remove_classes(TestBase, Animal, MyNamespace, Cat)
+      index_name "mammals"
+      document_type "mammal"
     end
 
-    around(:all) do |example|
-      original_value = Elasticsearch::Model.inheritance_enabled
-      Elasticsearch::Model.inheritance_enabled = true
-      example.run
-      Elasticsearch::Model.inheritance_enabled = original_value
+    class ::Dog < ::Animal
     end
 
-    describe '#index_name' do
-
-      it 'returns the default index name' do
-        expect(TestBase.index_name).to eq('test_bases')
-        expect(TestBase.new.index_name).to eq('test_bases')
-      end
-
-      it 'returns the explicit index name' do
-        expect(Animal.index_name).to eq('mammals')
-        expect(Animal.new.index_name).to eq('mammals')
-
-        expect(Cat.index_name).to eq('cats')
-        expect(Cat.new.index_name).to eq('cats')
-      end
-
-      it 'returns the ancestor index name' do
-        expect(Dog.index_name).to eq('mammals')
-        expect(Dog.new.index_name).to eq('mammals')
-      end
-
-      it 'returns the ancestor index name for namespaced models' do
-        expect(::MyNamespace::Dog.index_name).to eq('mammals')
-        expect(::MyNamespace::Dog.new.index_name).to eq('mammals')
+    module ::MyNamespace
+      class Dog < ::Animal
       end
     end
 
-    describe '#document_type' do
-
-      it 'returns nil' do
-        expect(TestBase.document_type).to eq('_doc')
-        expect(TestBase.new.document_type).to eq('_doc')
-      end
+    class ::Cat < ::Animal
+      extend ActiveModel::Naming
 
-      it 'returns the explicit document type' do
-        expect(Animal.document_type).to eq('mammal')
-        expect(Animal.new.document_type).to eq('mammal')
+      extend  Elasticsearch::Model::Naming::ClassMethods
+      include Elasticsearch::Model::Naming::InstanceMethods
 
-        expect(Cat.document_type).to eq('cat')
-        expect(Cat.new.document_type).to eq('cat')
-      end
+      index_name "cats"
+      document_type "cat"
+    end
 
-      it 'returns the ancestor document type' do
-        expect(Dog.document_type).to eq('mammal')
-        expect(Dog.new.document_type).to eq('mammal')
-      end
+  end
 
-      it 'returns the ancestor document type for namespaced models' do
-        expect(::MyNamespace::Dog.document_type).to eq('mammal')
-        expect(::MyNamespace::Dog.new.document_type).to eq('mammal')
-      end
-    end
+  after(:all) do
+    remove_classes(TestBase, Animal, MyNamespace, Cat)
   end
 
-  context 'when using proxy' do
-    before(:all) do
-      TestBase = Class.new do
-        extend ActiveModel::Naming
+  around(:all) do |example|
+    original_value = Elasticsearch::Model.settings[:inheritance_enabled]
+    Elasticsearch::Model.settings[:inheritance_enabled] = true
+    example.run
+    Elasticsearch::Model.settings[:inheritance_enabled] = original_value
+  end
 
-        include Elasticsearch::Model
-      end
 
-      Animal = Class.new TestBase do
-        index_name "mammals"
-        document_type "mammal"
-      end
+  describe '#index_name' do
 
-      Dog = Class.new Animal
+    it 'returns the default index name' do
+      expect(TestBase.index_name).to eq('test_bases')
+      expect(TestBase.new.index_name).to eq('test_bases')
+    end
 
-      module MyNamespace
-        Dog = Class.new Animal
-      end
+    it 'returns the explicit index name' do
+      expect(Animal.index_name).to eq('mammals')
+      expect(Animal.new.index_name).to eq('mammals')
 
-      Cat = Class.new Animal do
-        index_name "cats"
-        document_type "cat"
-      end
+      expect(Cat.index_name).to eq('cats')
+      expect(Cat.new.index_name).to eq('cats')
     end
 
-    after(:all) do
-      remove_classes(TestBase, Animal, MyNamespace, Cat)
+    it 'returns the ancestor index name' do
+      expect(Dog.index_name).to eq('mammals')
+      expect(Dog.new.index_name).to eq('mammals')
     end
 
-    around(:all) do |example|
-      original_value = Elasticsearch::Model.settings[:inheritance_enabled]
-      Elasticsearch::Model.settings[:inheritance_enabled] = true
-      example.run
-      Elasticsearch::Model.settings[:inheritance_enabled] = original_value
+    it 'returns the ancestor index name for namespaced models' do
+      expect(::MyNamespace::Dog.index_name).to eq('mammals')
+      expect(::MyNamespace::Dog.new.index_name).to eq('mammals')
     end
+  end
 
-    describe '#index_name' do
-
-      it 'returns the default index name' do
-        expect(TestBase.index_name).to eq('test_bases')
-      end
-
-      it 'returns the explicit index name' do
-        expect(Animal.index_name).to eq('mammals')
-
-        expect(Cat.index_name).to eq('cats')
-      end
-
-      it 'returns the ancestor index name' do
-        expect(Dog.index_name).to eq('mammals')
-      end
+  describe '#document_type' do
 
-      it 'returns the ancestor index name for namespaced models' do
-        expect(::MyNamespace::Dog.index_name).to eq('mammals')
-      end
+    it 'returns nil' do
+      expect(TestBase.document_type).to be_nil
+      expect(TestBase.new.document_type).to be_nil
     end
 
-    describe '#document_type' do
-
-      it 'returns nil' do
-        expect(TestBase.document_type).to eq('_doc')
-      end
+    it 'returns the explicit document type' do
+      expect(Animal.document_type).to eq('mammal')
+      expect(Animal.new.document_type).to eq('mammal')
 
-      it 'returns the explicit document type' do
-        expect(Animal.document_type).to eq('mammal')
-
-        expect(Cat.document_type).to eq('cat')
-      end
+      expect(Cat.document_type).to eq('cat')
+      expect(Cat.new.document_type).to eq('cat')
+    end
 
-      it 'returns the ancestor document type' do
-        expect(Dog.document_type).to eq('mammal')
-      end
+    it 'returns the ancestor document type' do
+      expect(Dog.document_type).to eq('mammal')
+      expect(Dog.new.document_type).to eq('mammal')
+    end
 
-      it 'returns the ancestor document type for namespaced models' do
-        expect(::MyNamespace::Dog.document_type).to eq('mammal')
-      end
+    it 'returns the ancestor document type for namespaced models' do
+      expect(::MyNamespace::Dog.document_type).to eq('mammal')
+      expect(::MyNamespace::Dog.new.document_type).to eq('mammal')
     end
   end
 end

data/spec/elasticsearch/model/naming_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 'naming' do
@@ -34,9 +51,9 @@ describe 'naming' do
     expect(::MyNamespace::DummyNamingModelInNamespace.new.index_name).to eq('my_namespace-dummy_naming_model_in_namespaces')
   end
 
-  it 'returns the document type' do
-    expect(DummyNamingModel.document_type).to eq('_doc')
-    expect(DummyNamingModel.new.document_type).to eq('_doc')
+  it 'returns nil' do
+    expect(DummyNamingModel.document_type).to be_nil
+    expect(DummyNamingModel.new.document_type).to be_nil
   end
 
   describe '#index_name' do
@@ -124,8 +141,8 @@ describe 'naming' do
 
   describe '#document_type' do
 
-    it 'returns the document type' do
-      expect(DummyNamingModel.document_type).to eq('_doc')
+    it 'returns nil' do
+      expect(DummyNamingModel.document_type).to be_nil
     end
 
     context 'when the method is called with an argument' do

data/spec/elasticsearch/model/proxy_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::Proxy do

data/spec/elasticsearch/model/response/aggregations_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::Aggregations do

data/spec/elasticsearch/model/response/base_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::Base do

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