elasticsearch-model 7.0.0.pre → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be320b65dde58892add536b616fa70a1bd3ad1be9f4dd4d49d3250fb62d8bb93
-  data.tar.gz: 27386a4dea06f8ba4cbb6bf926b76315b38b4dff0df55e02a050ffdd54430afc
+  metadata.gz: 1ced6c99b3278104e708dc2db19a73422273f92b9c18d3aa1f0d552e0ba27d97
+  data.tar.gz: 9075efe50a3f7da082933e3e9acc9751901dc4561f92a70c4d3cbea000c581ee
 SHA512:
-  metadata.gz: f47057b8d82eb6f49fe7b495806a3b35caa149ebdb3236ed9133d4faad32159e5b47db970e2d6b2488681be4dba5a6f40dc1eec7cfaaee997c428bfb1bd9bb0b
-  data.tar.gz: b1eb060284f12d714c1a7a32cb3705aeee05eb641fb98fcb269e582eacfa28b7da8449d97fa30d6bf5ec4ad188f5f491250ba81e54bf4fa2b8358af62adac60a
+  metadata.gz: b8f7d0e726d805048544b8ffce8a81b269be4f17c3696241372f6258a7c9add622998718fb23c35b752cc1a51d64a0b8ef42a293b31718f6ba4ed51cfced7586
+  data.tar.gz: 36e3325b72bfa63f8ea133b44086d579bb8727a6e5d8c71115ab25d424b6058e849a32aa68326f5450c1f0fbe5c75fedead8878893309ffbca29901c773367be

data/README.md

@@ -5,7 +5,7 @@ the [`elasticsearch`](https://github.com/elastic/elasticsearch-ruby) library.
 
 It aims to simplify integration of Ruby classes ("models"), commonly found
 e.g. in [Ruby on Rails](http://rubyonrails.org) applications, with the
-[Elasticsearch](http://www.elasticsearch.org) search and analytics engine.
+[Elasticsearch](https://www.elastic.co) search and analytics engine.
 
 ## Compatibility
 
@@ -19,6 +19,7 @@ is compatible with the Elasticsearch `master` branch, therefore, with the next m
 | 0.1           | → | 1.x           |
 | 2.x           | → | 2.x           |
 | 5.x           | → | 5.x           |
+| 6.x           | → | 6.x           |
 | master        | → | master        |
 
 ## Installation
@@ -151,7 +152,7 @@ for information about the Ruby client API.
 
 ### Importing the data
 
-The first thing you'll want to do is importing your data into the index:
+The first thing you'll want to do is import your data into the index:
 
 ```ruby
 Article.import
@@ -322,7 +323,7 @@ Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model
 #### The Elasticsearch DSL
 
 In most situations, you'll want to pass the search definition
-in the Elasticsearch [domain-specific language](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html) to the client:
+in the Elasticsearch [domain-specific language](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html) to the client:
 
 ```ruby
 response = Article.search query:     { match:  { title: "Fox Dogs" } },
@@ -532,7 +533,7 @@ class Indexer
   Logger = Sidekiq.logger.level == Logger::DEBUG ? Sidekiq.logger : nil
   Client = Elasticsearch::Client.new host: 'localhost:9200', logger: Logger
 
-  def perform(operation, record_id)
+  def perform_async(operation, record_id)
     logger.debug [operation, "ID: #{record_id}"]
 
     case operation.to_s
@@ -732,13 +733,8 @@ module and its submodules for technical information.
 
 The module provides a common `settings` method to customize various features.
 
-At the moment, the only supported setting is `:inheritance_enabled`, which makes the class receiving the module
-respect index names and document types of a super-class, eg. in case you're using "single table inheritance" (STI)
-in Rails:
-
-```ruby
-Elasticsearch::Model.settings[:inheritance_enabled] = true
-```
+Before version 7.0.0 of the gem, the only supported setting was `:inheritance_enabled`. This setting has been deprecated
+and removed.
 
 ## Development and Community
 
@@ -756,20 +752,34 @@ curl -# https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticse
 SERVER=start TEST_CLUSTER_COMMAND=$PWD/tmp/elasticsearch-1.0.0.RC1/bin/elasticsearch bundle exec rake test:all
 ```
 
+### Single Table Inheritance support
+
+Versions < 7.0.0 of this gem supported inheritance-- more specifically, `Single Table Inheritance`. With this feature,
+elasticsearch settings (index mappings, etc) on a parent model could be inherited by a child model leading to different
+model documents being indexed into the same Elasticsearch index. This feature depended on the ability to set a `type`
+for a document in Elasticsearch. The Elasticsearch team has deprecated support for `types`, as is described
+[here.](https://www.elastic.co/guide/en/elasticsearch/reference/current/removal-of-types.html)
+This gem will also remove support for types and `Single Table Inheritance` in version 7.0 as it enables an anti-pattern.
+Please save different model documents in separate indices. If you want to use STI, you can include an artificial
+`type` field manually in each document and use it in other operations.
+
 ## License
 
 This software is licensed under the Apache 2 license, quoted below.
 
-    Copyright (c) 2014 Elasticsearch <http://www.elasticsearch.org>
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
+    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.
+    
+    	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.

data/examples/activerecord_associations.rb

@@ -98,6 +98,22 @@ module Searchable
 
   module Indexing
 
+  #Index only the specified fields
+  settings do
+    mappings dynamic: false do
+      indexes :categories, type: :object do
+        indexes :title
+      end
+      indexes :authors, type: :object do
+        indexes :full_name
+        indexes :department
+      end
+      indexes :comments, type: :object do
+        indexes :text 
+      end
+    end
+  end
+    
     # Customize the JSON serialization for Elasticsearch
     def as_indexed_json(options={})
       self.as_json(

data/gemfiles/6.0.gemfile

@@ -25,10 +25,10 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'activemodel',  '6.0.0.rc1'
-gem 'activerecord', '6.0.0.rc1'
+gem 'activemodel',  '6.0.0'
+gem 'activerecord', '6.0.0'
 gem 'sqlite3' unless defined?(JRUBY_VERSION)
-gem 'mongoid', '~> 6'
+#gem 'mongoid', '~> 6'
 
 group :development, :testing do
   gem 'rspec'

data/lib/elasticsearch/model.rb

@@ -89,9 +89,10 @@ module Elasticsearch
 
     # Adds the `Elasticsearch::Model` functionality to the including class.
     #
-    # * Creates the `__elasticsearch__` class and instance methods, pointing to the proxy object
-    # * Includes the necessary modules in the proxy classes
-    # * Sets up delegation for crucial methods such as `search`, etc.
+    # * Creates the `__elasticsearch__` class and instance method. These methods return a proxy object with
+    #   other common methods defined on them.
+    # * The module includes other modules with further functionality.
+    # * Sets up delegation for common methods such as `import` and `search`.
     #
     # @example Include the module in the `Article` model definition
     #
@@ -108,50 +109,16 @@ module Elasticsearch
       base.class_eval do
         include Elasticsearch::Model::Proxy
 
-        Elasticsearch::Model::Proxy::ClassMethodsProxy.class_eval do
-          include Elasticsearch::Model::Client::ClassMethods
-          include Elasticsearch::Model::Naming::ClassMethods
-          include Elasticsearch::Model::Indexing::ClassMethods
-          include Elasticsearch::Model::Searching::ClassMethods
-        end
-
-        Elasticsearch::Model::Proxy::InstanceMethodsProxy.class_eval do
-          include Elasticsearch::Model::Client::InstanceMethods
-          include Elasticsearch::Model::Naming::InstanceMethods
-          include Elasticsearch::Model::Indexing::InstanceMethods
-          include Elasticsearch::Model::Serializing::InstanceMethods
-        end
-
-        Elasticsearch::Model::Proxy::InstanceMethodsProxy.class_eval <<-CODE, __FILE__, __LINE__ + 1
-          def as_indexed_json(options={})
-            target.respond_to?(:as_indexed_json) ? target.__send__(:as_indexed_json, options) : super
-          end
-        CODE
-
-        # Delegate important methods to the `__elasticsearch__` proxy, unless they are defined already
-        #
+        # Delegate common methods to the `__elasticsearch__` ClassMethodsProxy, unless they are defined already
         class << self
           METHODS.each do |method|
-            delegate method, to: :__elasticsearch__ unless self.public_instance_methods.include?(method)
+            delegate method, to: :__elasticsearch__ unless self.respond_to?(method)
           end
         end
-
-        # Mix the importing module into the proxy
-        #
-        self.__elasticsearch__.class_eval do
-          include Elasticsearch::Model::Importing::ClassMethods
-          include Adapter.from_class(base).importing_mixin
-        end
-
-        # Add to the registry if it's a class (and not in intermediate module)
-        Registry.add(base) if base.is_a?(Class)
       end
-    end
 
-    # Access the module settings
-    #
-    def self.settings
-      @settings ||= {}
+      # Add to the model to the registry if it's a class (and not in intermediate module)
+      Registry.add(base) if base.is_a?(Class)
     end
 
     module ClassMethods
@@ -205,22 +172,10 @@ module Elasticsearch
         Response::Response.new(models, request)
       end
 
-      # Check if inheritance is enabled
-      #
-      # @note Inheritance is disabled by default.
-      #
-      def inheritance_enabled
-        @inheritance_enabled ||= false
-      end
-
-      # Enable inheritance of index_name and document_type
-      #
-      # @example Enable inheritance
-      #
-      #     Elasticsearch::Model.inheritance_enabled = true
+      # Access the module settings
       #
-      def inheritance_enabled=(inheritance_enabled)
-        @inheritance_enabled = inheritance_enabled
+      def settings
+        @settings ||= {}
       end
     end
     extend ClassMethods

data/lib/elasticsearch/model/importing.rb

@@ -53,7 +53,29 @@ module Elasticsearch
         #
         # @yield [Hash] Gives the Hash with the Elasticsearch response to the block
         #
-        # @return [Fixnum] Number of errors encountered during importing
+        # @return [Fixnum] default, number of errors encountered during importing
+        # @return [Array<Hash>] if +return+ option is specified to be +"errors"+,
+        #   contains only those failed items in the response +items+ key, e.g.:
+        #
+        #     [
+        #       {
+        #         "index" => {
+        #           "error" => 'FAILED',
+        #           "_index" => "test",
+        #           "_type" => "_doc",
+        #           "_id" => '1',
+        #           "_version" => 1,
+        #           "result" => "foo",
+        #           "_shards" => {
+        #             "total" => 1,
+        #             "successful" => 0,
+        #             "failed" => 1
+        #           },
+        #           "status" => 400
+        #         }
+        #       }
+        #     ]
+        #
         #
         # @example Import all records into the index
         #
@@ -99,20 +121,19 @@ module Elasticsearch
         #
         # @example Update the batch before yielding it
         #
-        #     class Article
-        #       # ...
-        #       def self.enrich(batch)
-        #         batch.each do |item|
-        #           item.metadata = MyAPI.get_metadata(item.id)
-        #         end
-        #         batch
-        #       end
-        #     end
+        #    class Article
+        #      # ...
+        #      def self.enrich(batch)
+        #        batch.each do |item|
+        #          item.metadata = MyAPI.get_metadata(item.id)
+        #        end
+        #        batch
+        #      end
+        #    end
         #
         #    Article.import preprocess: :enrich
         #
-        # @example Return an array of error elements instead of the number of errors, eg.
-        #          to try importing these records again
+        # @example Return an array of error elements instead of the number of errors, e.g. to try importing these records again
         #
         #    Article.import return: 'errors'
         #

data/lib/elasticsearch/model/indexing.rb

@@ -30,7 +30,7 @@ module Elasticsearch
     #
     module Indexing
 
-      # Wraps the [index settings](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/setup-configuration.html#configuration-index-settings)
+      # Wraps the [index settings](https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html)
       #
       class Settings
         attr_accessor :settings
@@ -48,7 +48,7 @@ module Elasticsearch
         end
       end
 
-      # Wraps the [index mappings](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping.html)
+      # Wraps the [index mappings](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html)
       #
       class Mappings
         attr_accessor :options, :type
@@ -308,7 +308,7 @@ module Elasticsearch
         #
         #     Article.__elasticsearch__.refresh_index! index: 'my-index'
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-refresh.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-refresh.html
         #
         def refresh_index!(options={})
           target_index = options.delete(:index) || self.index_name
@@ -338,13 +338,17 @@ module Elasticsearch
           #
           # @see #update_document
           #
-          base.before_save do |i|
-            if i.class.instance_methods.include?(:changes_to_save) # Rails 5.1
-              i.instance_variable_set(:@__changed_model_attributes,
-                                      Hash[ i.changes_to_save.map { |key, value| [key, value.last] } ])
-            elsif i.class.instance_methods.include?(:changes)
-              i.instance_variable_set(:@__changed_model_attributes,
-                                      Hash[ i.changes.map { |key, value| [key, value.last] } ])
+          base.before_save do |obj|
+            if obj.respond_to?(:changes_to_save) # Rails 5.1
+              changes_to_save = obj.changes_to_save
+            elsif obj.respond_to?(:changes)
+              changes_to_save = obj.changes
+            end
+
+            if changes_to_save
+              attrs = obj.instance_variable_get(:@__changed_model_attributes) || {}
+              latest_changes = changes_to_save.inject({}) { |latest_changes, (k,v)| latest_changes.merge!(k => v.last) }
+              obj.instance_variable_set(:@__changed_model_attributes, attrs.merge(latest_changes))
             end
           end if base.respond_to?(:before_save)
         end
@@ -364,14 +368,13 @@ module Elasticsearch
         # @see http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions:index
         #
         def index_document(options={})
-          document = self.as_indexed_json
-
-          client.index(
-            { index: index_name,
-              type:  document_type,
-              id:    self.id,
-              body:  document }.merge(options)
-          )
+          document = as_indexed_json
+          request = { index: index_name,
+                      id:    id,
+                      body:  document }
+          request.merge!(type: document_type) if document_type
+
+          client.index(request.merge!(options))
         end
 
         # Deletes the model instance from the index
@@ -388,11 +391,11 @@ module Elasticsearch
         # @see http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions:delete
         #
         def delete_document(options={})
-          client.delete(
-            { index: index_name,
-              type:  document_type,
-              id:    self.id }.merge(options)
-          )
+          request = { index: index_name,
+                      id:    self.id }
+          request.merge!(type: document_type) if document_type
+
+          client.delete(request.merge!(options))
         end
 
         # Tries to gather the changed attributes of a model instance
@@ -427,12 +430,14 @@ module Elasticsearch
               attributes_in_database
             end
 
-            client.update(
-              { index: index_name,
-                type:  document_type,
-                id:    self.id,
-                body:  { doc: attributes } }.merge(options)
-            ) unless attributes.empty?
+            unless attributes.empty?
+              request = { index: index_name,
+                          id:    self.id,
+                          body:  { doc: attributes } }
+              request.merge!(type: document_type) if document_type
+
+              client.update(request.merge!(options))
+            end
           else
             index_document(options)
           end
@@ -453,12 +458,12 @@ module Elasticsearch
         # @return [Hash] The response from Elasticsearch
         #
         def update_document_attributes(attributes, options={})
-          client.update(
-            { index: index_name,
-              type:  document_type,
-              id:    self.id,
-              body:  { doc: attributes } }.merge(options)
-          )
+          request = { index: index_name,
+                      id:    self.id,
+                      body:  { doc: attributes } }
+          request.merge!(type: document_type) if document_type
+
+          client.update(request.merge!(options))
         end
       end
 

data/lib/elasticsearch/model/naming.rb

@@ -92,16 +92,7 @@ module Elasticsearch
         private
 
           def implicit(prop)
-            value = nil
-
-            if Elasticsearch::Model.settings[:inheritance_enabled]
-              self.ancestors.each do |klass|
-                next if klass == self
-                break if value = klass.respond_to?(prop) && klass.send(prop)
-              end
-            end
-
-            value || self.send("default_#{prop}")
+            self.send("default_#{prop}")
           end
 
           def default_index_name

data/lib/elasticsearch/model/proxy.rb

@@ -19,15 +19,15 @@ module Elasticsearch
   module Model
 
     # This module provides a proxy interfacing between the including class and
-    # {Elasticsearch::Model}, preventing the pollution of the including class namespace.
+    # `Elasticsearch::Model`, preventing the pollution of the including class namespace.
     #
     # The only "gateway" between the model and Elasticsearch::Model is the
-    # `__elasticsearch__` class and instance method.
+    # `#__elasticsearch__` class and instance method.
     #
     # The including class must be compatible with
     # [ActiveModel](https://github.com/rails/rails/tree/master/activemodel).
     #
-    # @example Include the {Elasticsearch::Model} module into an `Article` model
+    # @example Include the `Elasticsearch::Model` module into an `Article` model
     #
     #     class Article < ActiveRecord::Base
     #       include Elasticsearch::Model
@@ -53,21 +53,19 @@ module Elasticsearch
       #       module and the functionality is accessible via the proxy.
       #
       def self.included(base)
+
         base.class_eval do
-          # {ClassMethodsProxy} instance, accessed as `MyModel.__elasticsearch__`
-          #
+
+          # `ClassMethodsProxy` instance, accessed as `MyModel.__elasticsearch__`
           def self.__elasticsearch__ &block
             @__elasticsearch__ ||= ClassMethodsProxy.new(self)
             @__elasticsearch__.instance_eval(&block) if block_given?
             @__elasticsearch__
           end
 
-          # {InstanceMethodsProxy}, accessed as `@mymodel.__elasticsearch__`
-          #
-          def __elasticsearch__ &block
-            @__elasticsearch__ ||= InstanceMethodsProxy.new(self)
-            @__elasticsearch__.instance_eval(&block) if block_given?
-            @__elasticsearch__
+          # Mix the importing module into the `ClassMethodsProxy`
+          self.__elasticsearch__.class_eval do
+            include Adapter.from_class(base).importing_mixin
           end
 
           # Register a callback for storing changed attributes for models which implement
@@ -75,18 +73,28 @@ module Elasticsearch
           #
           # @see http://api.rubyonrails.org/classes/ActiveModel/Dirty.html
           #
-          before_save do |i|
-            if i.class.instance_methods.include?(:changes_to_save) # Rails 5.1
-              a = i.__elasticsearch__.instance_variable_get(:@__changed_model_attributes) || {}
-              i.__elasticsearch__.instance_variable_set(:@__changed_model_attributes,
-                                                        a.merge(Hash[ i.changes_to_save.map { |key, value| [key, value.last] } ]))
-            elsif i.class.instance_methods.include?(:changes)
-              a = i.__elasticsearch__.instance_variable_get(:@__changed_model_attributes) || {}
-              i.__elasticsearch__.instance_variable_set(:@__changed_model_attributes,
-                                                        a.merge(Hash[ i.changes.map { |key, value| [key, value.last] } ]))
+          before_save do |obj|
+            if obj.respond_to?(:changes_to_save) # Rails 5.1
+              changes_to_save = obj.changes_to_save
+            elsif obj.respond_to?(:changes)
+              changes_to_save = obj.changes
+            end
+
+            if changes_to_save
+              attrs = obj.__elasticsearch__.instance_variable_get(:@__changed_model_attributes) || {}
+              latest_changes = changes_to_save.inject({}) { |latest_changes, (k,v)| latest_changes.merge!(k => v.last) }
+              obj.__elasticsearch__.instance_variable_set(:@__changed_model_attributes, attrs.merge(latest_changes))
             end
           end if respond_to?(:before_save)
         end
+
+        # {InstanceMethodsProxy}, accessed as `@mymodel.__elasticsearch__`
+        #
+        def __elasticsearch__ &block
+          @__elasticsearch__ ||= InstanceMethodsProxy.new(self)
+          @__elasticsearch__.instance_eval(&block) if block_given?
+          @__elasticsearch__
+        end
       end
 
       # @overload dup
@@ -130,6 +138,11 @@ module Elasticsearch
       #
       class ClassMethodsProxy
         include Base
+        include Elasticsearch::Model::Client::ClassMethods
+        include Elasticsearch::Model::Naming::ClassMethods
+        include Elasticsearch::Model::Indexing::ClassMethods
+        include Elasticsearch::Model::Searching::ClassMethods
+        include Elasticsearch::Model::Importing::ClassMethods
       end
 
       # A proxy interfacing between Elasticsearch::Model instance methods and model instance methods
@@ -138,6 +151,10 @@ module Elasticsearch
       #
       class InstanceMethodsProxy
         include Base
+        include Elasticsearch::Model::Client::InstanceMethods
+        include Elasticsearch::Model::Naming::InstanceMethods
+        include Elasticsearch::Model::Indexing::InstanceMethods
+        include Elasticsearch::Model::Serializing::InstanceMethods
 
         def klass
           target.class
@@ -153,8 +170,11 @@ module Elasticsearch
         def as_json(options={})
           target.as_json(options)
         end
-      end
 
+        def as_indexed_json(options={})
+          target.respond_to?(:as_indexed_json) ? target.__send__(:as_indexed_json, options) : super
+        end
+      end
     end
   end
 end

data/lib/elasticsearch/model/response/records.rb

@@ -45,7 +45,6 @@ module Elasticsearch
           metaclass.__send__ :include, adapter.records_mixin
 
           self.options = options
-          self
         end
 
         # Returns the hit IDs

data/lib/elasticsearch/model/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Model
-    VERSION = "7.0.0.pre"
+    VERSION = "7.0.0"
   end
 end

data/spec/elasticsearch/model/indexing_spec.rb

@@ -418,7 +418,7 @@ describe Elasticsearch::Model::Indexing do
         expect(instance).to receive(:client).and_return(client)
         expect(instance).to receive(:as_indexed_json).and_return('JSON')
         expect(instance).to receive(:index_name).and_return('foo')
-        expect(instance).to receive(:document_type).and_return('bar')
+        expect(instance).to receive(:document_type).twice.and_return('bar')
         expect(instance).to receive(:id).and_return('1')
       end
 
@@ -458,7 +458,7 @@ describe Elasticsearch::Model::Indexing do
       before do
         expect(instance).to receive(:client).and_return(client)
         expect(instance).to receive(:index_name).and_return('foo')
-        expect(instance).to receive(:document_type).and_return('bar')
+        expect(instance).to receive(:document_type).twice.and_return('bar')
         expect(instance).to receive(:id).and_return('1')
       end
 
@@ -602,7 +602,7 @@ describe Elasticsearch::Model::Indexing do
         before do
           expect(instance).to receive(:client).and_return(client)
           expect(instance).to receive(:index_name).and_return('foo')
-          expect(instance).to receive(:document_type).and_return('bar')
+          expect(instance).to receive(:document_type).twice.and_return('bar')
           expect(instance).to receive(:id).and_return('1')
           instance.instance_variable_set(:@__changed_model_attributes, { author: 'john' })
         end

data/spec/spec_helper.rb

@@ -23,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'
 
@@ -151,8 +155,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

@@ -26,9 +26,7 @@ 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'
@@ -37,3 +35,12 @@ 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: 7.0.0.pre
+  version: 7.0.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -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
@@ -453,11 +452,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ActiveModel/Record integrations for Elasticsearch.
@@ -485,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

data/spec/elasticsearch/model/naming_inheritance_spec.rb

@@ -1,123 +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.
-
-require 'spec_helper'
-
-describe 'naming inheritance' do
-
-  before(:all) do
-    class ::TestBase
-      extend ActiveModel::Naming
-
-      extend  Elasticsearch::Model::Naming::ClassMethods
-      include Elasticsearch::Model::Naming::InstanceMethods
-    end
-
-    class ::Animal < ::TestBase
-      extend ActiveModel::Naming
-
-      extend  Elasticsearch::Model::Naming::ClassMethods
-      include Elasticsearch::Model::Naming::InstanceMethods
-
-      index_name "mammals"
-      document_type "mammal"
-    end
-
-    class ::Dog < ::Animal
-    end
-
-    module ::MyNamespace
-      class Dog < ::Animal
-      end
-    end
-
-    class ::Cat < ::Animal
-      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.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')
-      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 be_nil
-      expect(TestBase.new.document_type).to be_nil
-    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