chewy 7.1.0 → 7.2.0

data/chewy.gemspec

@@ -1,8 +1,8 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'chewy/version'
 
-Gem::Specification.new do |spec| # rubocop:disable BlockLength
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.name          = 'chewy'
   spec.version       = Chewy::VERSION
   spec.authors       = ['Toptal, LLC', 'pyromaniac']
@@ -17,15 +17,13 @@ Gem::Specification.new do |spec| # rubocop:disable BlockLength
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'elasticsearch-extensions'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'resque_spec'
   spec.add_development_dependency 'rspec', '>= 3.7.0'
   spec.add_development_dependency 'rspec-collection_matchers'
   spec.add_development_dependency 'rspec-its'
-  spec.add_development_dependency 'rubocop', '0.52.1'
+  spec.add_development_dependency 'rubocop', '1.11'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'timecop'
 

data/gemfiles/rails.5.2.activerecord.gemfile

@@ -1,17 +1,11 @@
-# This file was generated by Appraisal
+source 'https://rubygems.org'
 
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.2.0"
-gem "activesupport", "~> 5.2.0"
-gem "activejob", "~> 5.2.0"
-gem "resque", require: false
-gem "shoryuken", require: false
-gem "aws-sdk-sqs", require: false
-gem "sidekiq", require: false
-gem "kaminari-core", "~> 1.1.0", require: false
-gem "will_paginate", require: false
-gem "parallel", require: false
+gem 'activejob', '~> 5.2.0'
+gem 'activerecord', '~> 5.2.0'
+gem 'activesupport', '~> 5.2.0'
+gem 'kaminari-core', '~> 1.1.0', require: false
+gem 'parallel', require: false
 gem 'rspec_junit_formatter', '~> 0.4.1'
+gem 'sidekiq', require: false
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails.6.0.activerecord.gemfile

@@ -1,17 +1,11 @@
-# This file was generated by Appraisal
+source 'https://rubygems.org'
 
-source "https://rubygems.org"
-
-gem "activerecord", "~> 6.0.0"
-gem "activesupport", "~> 6.0.0"
-gem "activejob", "~> 6.0.0"
-gem "resque", require: false
-gem "shoryuken", require: false
-gem "aws-sdk-sqs", require: false
-gem "sidekiq", require: false
-gem "kaminari-core", "~> 1.1.0", require: false
-gem "will_paginate", require: false
-gem "parallel", require: false
+gem 'activejob', '~> 6.0.0'
+gem 'activerecord', '~> 6.0.0'
+gem 'activesupport', '~> 6.0.0'
+gem 'kaminari-core', '~> 1.1.0', require: false
+gem 'parallel', require: false
 gem 'rspec_junit_formatter', '~> 0.4.1'
+gem 'sidekiq', require: false
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails.6.1.activerecord.gemfile

@@ -1,19 +1,13 @@
-# This file was generated by Appraisal
+source 'https://rubygems.org'
 
-source "https://rubygems.org"
-
-gem "activerecord", "~> 6.1.0"
-gem "activesupport", "~> 6.1.0"
-gem "activejob", "~> 6.1.0"
-gem "resque", require: false
-gem "shoryuken", require: false
-gem "aws-sdk-sqs", require: false
-gem "sidekiq", require: false
-gem "kaminari-core", "~> 1.1.0", require: false
-gem "will_paginate", require: false
-gem "parallel", require: false
+gem 'activejob', '~> 6.1.0'
+gem 'activerecord', '~> 6.1.0'
+gem 'activesupport', '~> 6.1.0'
+gem 'kaminari-core', '~> 1.1.0', require: false
+gem 'parallel', require: false
 gem 'rspec_junit_formatter', '~> 0.4.1'
+gem 'sidekiq', require: false
 
 gem 'rexml' if RUBY_VERSION >= '3.0.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/lib/chewy.rb

@@ -29,20 +29,12 @@ end
 
 try_require 'kaminari'
 try_require 'kaminari/core'
-try_require 'will_paginate'
-try_require 'will_paginate/collection'
 try_require 'parallel'
 
 ActiveSupport.on_load(:active_record) do
-  try_require 'will_paginate/active_record'
   try_require 'kaminari/activerecord'
 end
 
-ActiveSupport.on_load(:mongoid) do
-  try_require 'will_paginate/mongoid'
-  try_require 'kaminari/mongoid'
-end
-
 require 'chewy/version'
 require 'chewy/errors'
 require 'chewy/config'
@@ -52,94 +44,43 @@ require 'chewy/runtime'
 require 'chewy/log_subscriber'
 require 'chewy/strategy'
 require 'chewy/index'
-require 'chewy/type'
 require 'chewy/fields/base'
 require 'chewy/fields/root'
 require 'chewy/journal'
 require 'chewy/railtie' if defined?(::Rails::Railtie)
 
 ActiveSupport.on_load(:active_record) do
-  extend Chewy::Type::Observe::ActiveRecordMethods
-end
-
-ActiveSupport.on_load(:mongoid) do
-  module Mongoid
-    module Document
-      module ClassMethods
-        include Chewy::Type::Observe::MongoidMethods
-      end
-    end
-  end
+  extend Chewy::Index::Observe::ActiveRecordMethods
 end
 
 module Chewy
   @adapters = [
-    Chewy::Type::Adapter::ActiveRecord,
-    Chewy::Type::Adapter::Mongoid,
-    Chewy::Type::Adapter::Sequel,
-    Chewy::Type::Adapter::Object
+    Chewy::Index::Adapter::ActiveRecord,
+    Chewy::Index::Adapter::Object
   ]
 
   class << self
     attr_accessor :adapters
 
-    # Derives a single type for the passed string identifier if possible.
-    #
-    # @example
-    #   Chewy.derive_types(UsersIndex::User) # => UsersIndex::User
-    #   Chewy.derive_types('namespace/users') # => Namespace::UsersIndex::User
-    #   Chewy.derive_types('places') # => raises Chewy::UnderivableType
-    #   Chewy.derive_types('places#city') # => PlacesIndex::City
-    #
-    # @param name [String, Chewy::Type] string type identifier
-    # @raise [Chewy::UnderivableType] in cases when it is impossble to find index or type or more than one type found
-    # @return [Chewy::Type] an array of derived types
-    def derive_type(name)
-      return name if name.is_a?(Class) && name < Chewy::Type
-
-      types = derive_types(name)
-      raise Chewy::UnderivableType, "Index `#{types.first.index}` has more than one type, please specify type via `#{types.first.index.derivable_name}#type_name`" unless types.one?
-      types.first
-    end
-
-    # Derives all the types for the passed string identifier if possible.
+    # Derives an index for the passed string identifier if possible.
     #
     # @example
-    #   Chewy.derive_types('namespace/users') # => [Namespace::UsersIndex::User]
-    #   Chewy.derive_types('places') # => [PlacesIndex::City, PlacesIndex::Country]
-    #   Chewy.derive_types('places#city') # => [PlacesIndex::City]
+    #   Chewy.derive_name(UsersIndex) # => UsersIndex
+    #   Chewy.derive_name('namespace/users') # => Namespace::UsersIndex
+    #   Chewy.derive_name('missing') # => raises Chewy::UndefinedIndex
     #
-    # @param from [String] string type identifier
-    # @raise [Chewy::UnderivableType] in cases when it is impossible to find index or type
-    # @return [Array<Chewy::Type>] an array of derived types
-    def derive_types(from)
-      return from.types if from.is_a?(Class) && (from < Chewy::Index || from < Chewy::Type)
+    # @param index_name [String, Chewy::Index] index identifier or class
+    # @raise [Chewy::UndefinedIndex] in cases when it is impossible to find index
+    # @return [Chewy::Index]
+    def derive_name(index_name)
+      return index_name if index_name.is_a?(Class) && index_name < Chewy::Index
 
-      index_name, type_name = from.split('#', 2)
       class_name = "#{index_name.camelize.gsub(/Index\z/, '')}Index"
       index = class_name.safe_constantize
-      raise Chewy::UnderivableType, "Can not find index named `#{class_name}`" unless index && index < Chewy::Index
-      if type_name.present?
-        type = index.type_hash[type_name] or raise Chewy::UnderivableType, "Index `#{class_name}` doesn`t have type named `#{type_name}`"
-        [type]
-      else
-        index.types
-      end
-    end
 
-    # Creates Chewy::Type ancestor defining index and adapter methods.
-    #
-    def create_type(index, target, options = {}, &block)
-      type = Class.new(Chewy::Type)
-
-      adapter = adapters.find { |klass| klass.accepts?(target) }.new(target, **options)
-
-      index.const_set(adapter.name, type)
-      type.send(:define_singleton_method, :index) { index }
-      type.send(:define_singleton_method, :adapter) { adapter }
+      return index if index && index < Chewy::Index
 
-      type.class_eval(&block) if block
-      type
+      raise Chewy::UndefinedIndex, "Can not find index named `#{class_name}`"
     end
 
     # Main elasticsearch-ruby client instance
@@ -159,7 +100,9 @@ module Chewy
     # Does nothing in case of config `wait_for_status` is undefined.
     #
     def wait_for_status
-      client.cluster.health wait_for_status: Chewy.configuration[:wait_for_status] if Chewy.configuration[:wait_for_status].present?
+      if Chewy.configuration[:wait_for_status].present?
+        client.cluster.health wait_for_status: Chewy.configuration[:wait_for_status]
+      end
     end
 
     # Deletes all corresponding indexes with current prefix from ElasticSearch.
@@ -227,7 +170,10 @@ module Chewy
 
     def eager_load!
       return unless defined?(Chewy::Railtie)
-      dirs = Chewy::Railtie.all_engines.map { |engine| engine.paths[Chewy.configuration[:indices_path]] }.compact.map(&:existent).flatten.uniq
+
+      dirs = Chewy::Railtie.all_engines.map do |engine|
+        engine.paths[Chewy.configuration[:indices_path]]
+      end.compact.map(&:existent).flatten.uniq
 
       dirs.each do |dir|
         Dir.glob(File.join(dir, '**/*.rb')).each do |file|

data/lib/chewy/config.rb

@@ -3,43 +3,46 @@ module Chewy
     include Singleton
 
     attr_accessor :settings, :logger,
-      # The first strategy in stack. `:base` by default.
-      # If you need to return to the previous chewy behavior -
-      # just set it to `:bypass`
-      #
-      :root_strategy,
-      # Default request strategy middleware, used in e.g
-      # Rails controllers. See Chewy::Railtie::RequestStrategy
-      # for more info.
-      #
-      :request_strategy,
-      # Use after_commit callbacks for RDBMS instead of
-      # after_save and after_destroy. True by default. Useful
-      # in tests with transactional fixtures or transactional
-      # DatabaseCleaner strategy.
-      #
-      :use_after_commit_callbacks,
-      # Where Chewy expects to find index definitions
-      # within a Rails app folder.
-      :indices_path,
-      # Set index refresh_interval setting to -1 before reset and put the original value after.
-      # If setting not present, put back to default 1s
-      # https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
-      :reset_disable_refresh_interval,
-      # Set number_of_replicas to 0 before reset and put the original value after
-      # https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
-      :reset_no_replicas,
-      # Refresh or not when import async (sidekiq, resque, activejob)
-      :disable_refresh_async,
-      # Default options for root of Chewy type. Allows to set default options
-      # for type mappings like `_all`.
-      :default_root_options,
-      # Default field type for any field in any Chewy type. Defaults to 'text'.
-      :default_field_type
+                  # The first strategy in stack. `:base` by default.
+                  # If you need to return to the previous chewy behavior -
+                  # just set it to `:bypass`
+                  #
+                  :root_strategy,
+                  # Default request strategy middleware, used in e.g
+                  # Rails controllers. See Chewy::Railtie::RequestStrategy
+                  # for more info.
+                  #
+                  :request_strategy,
+                  # Rails console strategy, `:urgent` by default.
+                  #
+                  :console_strategy,
+                  # Use after_commit callbacks for RDBMS instead of
+                  # after_save and after_destroy. True by default. Useful
+                  # in tests with transactional fixtures or transactional
+                  # DatabaseCleaner strategy.
+                  #
+                  :use_after_commit_callbacks,
+                  # Where Chewy expects to find index definitions
+                  # within a Rails app folder.
+                  :indices_path,
+                  # Set index refresh_interval setting to -1 before reset and put the original value after.
+                  # If setting not present, put back to default 1s
+                  # https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
+                  :reset_disable_refresh_interval,
+                  # Set number_of_replicas to 0 before reset and put the original value after
+                  # https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html
+                  :reset_no_replicas,
+                  # Refresh or not when import async (sidekiq, activejob)
+                  :disable_refresh_async,
+                  # Default options for root of Chewy type. Allows to set default options
+                  # for type mappings like `_all`.
+                  :default_root_options,
+                  # Default field type for any field in any Chewy type. Defaults to 'text'.
+                  :default_field_type
 
     attr_reader :transport_logger, :transport_tracer,
-      # Chewy search request DSL base class, used by every index.
-      :search_class
+                # Chewy search request DSL base class, used by every index.
+                :search_class
 
     def self.delegated
       public_instance_methods - superclass.public_instance_methods - Singleton.public_instance_methods
@@ -49,6 +52,7 @@ module Chewy
       @settings = {}
       @root_strategy = :base
       @request_strategy = :atomic
+      @console_strategy = :urgent
       @use_after_commit_callbacks = true
       @reset_disable_refresh_interval = false
       @reset_no_replicas = false
@@ -138,11 +142,7 @@ module Chewy
 
     def build_search_class(base)
       Class.new(base).tap do |search_class|
-        if defined?(::Kaminari)
-          search_class.send :include, Chewy::Search::Pagination::Kaminari
-        elsif defined?(::WillPaginate)
-          search_class.send :include, Chewy::Search::Pagination::WillPaginate
-        end
+        search_class.send :include, Chewy::Search::Pagination::Kaminari if defined?(::Kaminari)
       end
     end
   end

data/lib/chewy/errors.rb

@@ -5,12 +5,6 @@ module Chewy
   class UndefinedIndex < Error
   end
 
-  class UndefinedType < Error
-  end
-
-  class UnderivableType < Error
-  end
-
   class UndefinedUpdateStrategy < Error
     def initialize(_type)
       super <<-MESSAGE
@@ -36,10 +30,4 @@ module Chewy
       super message
     end
   end
-
-  class RemovedFeature < Error
-  end
-
-  class PluginMissing < Error
-  end
 end

data/lib/chewy/fields/base.rb

@@ -40,6 +40,8 @@ module Chewy
       def compose(*objects)
         result = evaluate(objects)
 
+        return {} if result.blank? && ignore_blank?
+
         if children.present? && !multi_field?
           result = if result.respond_to?(:to_ary)
             result.to_ary.map { |item| compose_children(item, *objects) }
@@ -53,13 +55,21 @@ module Chewy
 
     private
 
+      def geo_point?
+        @options[:type].to_s == 'geo_point'
+      end
+
+      def ignore_blank?
+        @options.fetch(:ignore_blank) { geo_point? }
+      end
+
       def evaluate(objects)
         object = objects.first
 
         if value.is_a?(Proc)
           if value.arity.zero?
             object.instance_exec(&value)
-          elsif value.arity < 0
+          elsif value.arity.negative?
             value.call(*object)
           else
             value.call(*objects.first(value.arity))

data/lib/chewy/fields/root.rb

@@ -1,10 +1,7 @@
 module Chewy
   module Fields
     class Root < Chewy::Fields::Base
-      attr_reader :dynamic_templates
-      attr_reader :id
-      attr_reader :parent
-      attr_reader :parent_id
+      attr_reader :dynamic_templates, :id, :parent, :parent_id
 
       def initialize(name, **options)
         super(name, **options)
@@ -55,11 +52,13 @@ module Chewy
 
       def compose_parent(object)
         return unless parent_id
+
         parent_id.arity.zero? ? object.instance_exec(&parent_id) : parent_id.call(object)
       end
 
       def compose_id(object)
         return unless id
+
         id.arity.zero? ? object.instance_exec(&id) : id.call(object)
       end