elasticsearch-model 6.1.1 → 7.1.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 7.1.1
 platform: ruby
 authors:
 - Karel Minarik
@@ -11,33 +11,33 @@ cert_chain: []
 date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: elasticsearch
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -53,35 +53,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: elasticsearch-extensions
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,21 +165,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: require-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -277,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -305,7 +305,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: require-prof
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -399,7 +399,6 @@ files:
 - spec/elasticsearch/model/indexing_spec.rb
 - spec/elasticsearch/model/module_spec.rb
 - spec/elasticsearch/model/multimodel_spec.rb
-- spec/elasticsearch/model/naming_inheritance_spec.rb
 - spec/elasticsearch/model/naming_spec.rb
 - spec/elasticsearch/model/proxy_spec.rb
 - spec/elasticsearch/model/response/aggregations_spec.rb
@@ -418,6 +417,7 @@ files:
 - spec/support/app/answer.rb
 - spec/support/app/article.rb
 - spec/support/app/article_for_pagination.rb
+- spec/support/app/article_no_type.rb
 - spec/support/app/article_with_custom_serialization.rb
 - spec/support/app/article_with_dynamic_index_name.rb
 - spec/support/app/author.rb
@@ -449,7 +449,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -484,7 +484,6 @@ test_files:
 - spec/elasticsearch/model/indexing_spec.rb
 - spec/elasticsearch/model/module_spec.rb
 - spec/elasticsearch/model/multimodel_spec.rb
-- spec/elasticsearch/model/naming_inheritance_spec.rb
 - spec/elasticsearch/model/naming_spec.rb
 - spec/elasticsearch/model/proxy_spec.rb
 - spec/elasticsearch/model/response/aggregations_spec.rb
@@ -503,6 +502,7 @@ test_files:
 - spec/support/app/answer.rb
 - spec/support/app/article.rb
 - spec/support/app/article_for_pagination.rb
+- spec/support/app/article_no_type.rb
 - spec/support/app/article_with_custom_serialization.rb
 - spec/support/app/article_with_dynamic_index_name.rb
 - spec/support/app/author.rb

data/spec/elasticsearch/model/naming_inheritance_spec.rb

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