elasticsearch-model 6.1.0 → 7.0.0

data/spec/support/app/category.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 Category < ActiveRecord::Base
   has_and_belongs_to_many :posts
 end

data/spec/support/app/comment.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 Comment < ActiveRecord::Base
   belongs_to :post, touch: true
 end

data/spec/support/app/episode.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 Episode < ActiveRecord::Base
   include Elasticsearch::Model
   include Elasticsearch::Model::Callbacks

data/spec/support/app/image.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 Image
   include Mongoid::Document
   include Elasticsearch::Model

data/spec/support/app/import_article.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 ImportArticle < ActiveRecord::Base
   include Elasticsearch::Model
 

data/spec/support/app/mongoid_article.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 ::MongoidArticle
   include Mongoid::Document
   include Elasticsearch::Model

data/spec/support/app/namespaced_book.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.
+
 module MyNamespace
   class Book < ActiveRecord::Base
     include Elasticsearch::Model

data/spec/support/app/parent_and_child_searchable.rb

@@ -1,10 +1,27 @@
+# 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.
+
 module ParentChildSearchable
   INDEX_NAME = 'questions_and_answers'.freeze
   JOIN = 'join'.freeze
 
   def create_index!(options={})
     client = Question.__elasticsearch__.client
-    client.indices.delete index: INDEX_NAME rescue nil if options[:force]
+    client.indices.delete index: INDEX_NAME rescue nil if options.delete(:force)
 
     settings = Question.settings.to_hash.merge Answer.settings.to_hash
     mapping_properties = { join_field: { type: JOIN,
@@ -14,10 +31,10 @@ module ParentChildSearchable
         Answer.mappings.to_hash[:doc][:properties])
     mappings = { doc: { properties: merged_properties }}
 
-    client.indices.create index: INDEX_NAME,
-                          body: {
+    client.indices.create({ index: INDEX_NAME,
+                            body: {
                               settings: settings.to_hash,
-                              mappings: mappings }
+                              mappings: mappings } }.merge(options))
   end
 
   extend self

data/spec/support/app/post.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 Post < ActiveRecord::Base
   include Searchable
 

data/spec/support/app/question.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 Question < ActiveRecord::Base
   include Elasticsearch::Model
 

data/spec/support/app/searchable.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.
+
 module Searchable
   extend ActiveSupport::Concern
 

data/spec/support/app/series.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 Series < ActiveRecord::Base
   include Elasticsearch::Model
   include Elasticsearch::Model::Callbacks

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -347,6 +347,7 @@ files:
 - gemfiles/3.0.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/5.0.gemfile
+- gemfiles/6.0.gemfile
 - lib/elasticsearch/model.rb
 - lib/elasticsearch/model/adapter.rb
 - lib/elasticsearch/model/adapters/active_record.rb
@@ -398,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
@@ -417,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
@@ -455,7 +456,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ActiveModel/Record integrations for Elasticsearch.
@@ -483,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
@@ -502,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