chewy 5.0.0 → 7.1.0

data/chewy.gemspec

@@ -5,8 +5,8 @@ require 'chewy/version'
 Gem::Specification.new do |spec| # rubocop:disable BlockLength
   spec.name          = 'chewy'
   spec.version       = Chewy::VERSION
-  spec.authors       = ['pyromaniac']
-  spec.email         = ['kinwizard@gmail.com']
+  spec.authors       = ['Toptal, LLC', 'pyromaniac']
+  spec.email         = ['open-source@toptal.com', 'kinwizard@gmail.com']
   spec.summary       = 'Elasticsearch ODM client wrapper'
   spec.description   = 'Chewy provides functionality for Elasticsearch index handling, documents import mappings and chainable query DSL'
   spec.homepage      = 'https://github.com/toptal/chewy'
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec| # rubocop:disable BlockLength
   spec.add_development_dependency 'elasticsearch-extensions'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'resque_spec'
-  spec.add_development_dependency 'rspec'
+  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'
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec| # rubocop:disable BlockLength
   spec.add_development_dependency 'method_source'
   spec.add_development_dependency 'unparser'
 
-  spec.add_dependency 'activesupport', '>= 4.0'
-  spec.add_dependency 'elasticsearch', '>= 2.0.0'
+  spec.add_dependency 'activesupport', '>= 5.2'
+  spec.add_dependency 'elasticsearch', '>= 6.3.0'
   spec.add_dependency 'elasticsearch-dsl'
 end

data/gemfiles/rails.5.2.activerecord.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.2.0.rc1"
-gem "activesupport", "~> 5.2.0.rc1"
-gem "activejob", "~> 5.2.0.rc1"
+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
@@ -12,5 +12,6 @@ gem "sidekiq", require: false
 gem "kaminari-core", "~> 1.1.0", require: false
 gem "will_paginate", require: false
 gem "parallel", require: false
+gem 'rspec_junit_formatter', '~> 0.4.1'
 
 gemspec path: "../"

data/gemfiles/{rails.5.0.activerecord.gemfile → rails.5.2.mongoid.6.4.gemfile}

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0"
-gem "activesupport", "~> 5.0.0"
-gem "activejob", "~> 5.0.0"
+gem "mongoid", "~> 6.4.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
@@ -12,5 +12,6 @@ gem "sidekiq", require: false
 gem "kaminari-core", "~> 1.1.0", require: false
 gem "will_paginate", require: false
 gem "parallel", require: false
+gem 'rspec_junit_formatter', '~> 0.4.1'
 
 gemspec path: "../"

data/gemfiles/{rails.5.0.mongoid.6.1.gemfile → rails.6.0.activerecord.gemfile}

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 6.1.0"
-gem "activesupport", "~> 5.0.0"
-gem "activejob", "~> 5.0.0"
+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
@@ -12,5 +12,6 @@ gem "sidekiq", require: false
 gem "kaminari-core", "~> 1.1.0", require: false
 gem "will_paginate", require: false
 gem "parallel", require: false
+gem 'rspec_junit_formatter', '~> 0.4.1'
 
 gemspec path: "../"

data/gemfiles/{rails.5.1.activerecord.gemfile → rails.6.1.activerecord.gemfile}

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.1.0"
-gem "activesupport", "~> 5.1.0"
-gem "activejob", "~> 5.1.0"
+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
@@ -12,5 +12,8 @@ gem "sidekiq", require: false
 gem "kaminari-core", "~> 1.1.0", require: false
 gem "will_paginate", require: false
 gem "parallel", require: false
+gem 'rspec_junit_formatter', '~> 0.4.1'
+
+gem 'rexml' if RUBY_VERSION >= '3.0.0'
 
 gemspec path: "../"

data/lib/chewy.rb

@@ -132,7 +132,7 @@ module Chewy
     def create_type(index, target, options = {}, &block)
       type = Class.new(Chewy::Type)
 
-      adapter = adapters.find { |klass| klass.accepts?(target) }.new(target, options)
+      adapter = adapters.find { |klass| klass.accepts?(target) }.new(target, **options)
 
       index.const_set(adapter.name, type)
       type.send(:define_singleton_method, :index) { index }

data/lib/chewy/backports/duplicable.rb

@@ -79,7 +79,7 @@ end
 require 'bigdecimal'
 class BigDecimal
   begin
-    BigDecimal.new('4.56').dup
+    BigDecimal('4.56').dup
 
     def duplicable?
       true

data/lib/chewy/config.rb

@@ -3,18 +3,6 @@ module Chewy
     include Singleton
 
     attr_accessor :settings, :logger,
-      # Default query compilation mode. `:must` by default.
-      # See Chewy::Query#query_mode for details
-      #
-      :query_mode,
-      # Default filters compilation mode. `:and` by default.
-      # See Chewy::Query#filter_mode for details
-      #
-      :filter_mode,
-      # Default post_filters compilation mode. `nil` by default.
-      # See Chewy::Query#post_filter_mode for details
-      #
-      :post_filter_mode,
       # The first strategy in stack. `:base` by default.
       # If you need to return to the previous chewy behavior -
       # just set it to `:bypass`
@@ -46,7 +34,7 @@ module Chewy
       # 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 'string'.
+      # Default field type for any field in any Chewy type. Defaults to 'text'.
       :default_field_type
 
     attr_reader :transport_logger, :transport_tracer,
@@ -59,8 +47,6 @@ module Chewy
 
     def initialize
       @settings = {}
-      @query_mode = :must
-      @filter_mode = :and
       @root_strategy = :base
       @request_strategy = :atomic
       @use_after_commit_callbacks = true
@@ -70,7 +56,7 @@ module Chewy
       @indices_path = 'app/chewy'
       @default_root_options = {}
       @default_field_type = 'text'.freeze
-      self.search_class = Chewy::Search::Request
+      @search_class = build_search_class(Chewy::Search::Request)
     end
 
     def transport_logger=(logger)
@@ -83,10 +69,6 @@ module Chewy
       @transport_tracer = tracer
     end
 
-    def search_class=(base)
-      @search_class = build_search_class(base)
-    end
-
     # Chewy core configurations. There is two ways to set it up:
     # use `Chewy.settings=` method or, for Rails application,
     # create `config/chewy.yml` file. Btw, `config/chewy.yml` supports

data/lib/chewy/fields/base.rb

@@ -7,7 +7,7 @@ module Chewy
       def initialize(name, value: nil, **options)
         @name = name.to_sym
         @options = {}
-        update_options!(options)
+        update_options!(**options)
         @value = value
         @children = []
       end
@@ -34,12 +34,6 @@ module Chewy
         mapping.reverse_merge!(options)
         mapping.reverse_merge!(type: (children.present? ? 'object' : Chewy.default_field_type))
 
-        # This is done to support ES2 journaling and will be removed soon
-        if mapping[:type] == 'keyword' && Chewy::Runtime.version < '5.0'
-          mapping[:type] = 'string'
-          mapping[:index] = 'not_analyzed'
-        end
-
         {name => mapping}
       end
 

data/lib/chewy/fields/root.rb

@@ -6,8 +6,8 @@ module Chewy
       attr_reader :parent
       attr_reader :parent_id
 
-      def initialize(*)
-        super
+      def initialize(name, **options)
+        super(name, **options)
 
         @value ||= -> { self }
         @dynamic_templates = []
@@ -29,8 +29,7 @@ module Chewy
           mappings[name][:dynamic_templates].concat dynamic_templates
         end
 
-        mappings[name][:_parent] = parent.is_a?(Hash) ? parent : {type: parent} if parent
-        mappings
+        mappings[name]
       end
 
       def dynamic_template(*args)

data/lib/chewy/index.rb

@@ -146,27 +146,18 @@ module Chewy
       # passed.
       #
       def define_type(target, options = {}, &block)
+        raise 'Multiple types are deprecated' if type_hash.present?
+
         type_class = Chewy.create_type(self, target, options, &block)
         self.type_hash = type_hash.merge(type_class.type_name => type_class)
       end
 
-      # Types method has double usage.
-      # If no arguments are passed - it returns array of defined types:
-      #
-      #   UsersIndex.types # => [UsersIndex::Admin, UsersIndex::Manager, UsersIndex::User]
-      #
-      # If arguments are passed it treats like a part of chainable query DSL and
-      # adds types array for index to select.
+      # Returns defined type:
       #
-      #   UsersIndex.filters { name =~ 'ro' }.types(:admin, :manager)
-      #   UsersIndex.types(:admin, :manager).filters { name =~ 'ro' } # the same as the first example
+      #   UsersIndex.types # => [UsersIndex::User]
       #
-      def types(*args)
-        if args.present?
-          all.types(*args)
-        else
-          type_hash.values
-        end
+      def types
+        type_hash.values
       end
 
       # Returns defined types names:

data/lib/chewy/index/actions.rb

@@ -30,8 +30,8 @@ module Chewy
         # Suffixed index names might be used for zero-downtime mapping change, for example.
         # Description: (http://www.elasticsearch.org/blog/changing-mapping-with-zero-downtime/).
         #
-        def create(*args)
-          create!(*args)
+        def create(*args, **kwargs)
+          create!(*args, **kwargs)
         rescue Elasticsearch::Transport::Transport::Errors::BadRequest
           false
         end
@@ -74,7 +74,13 @@ module Chewy
         #   UsersIndex.delete '01-2014' # deletes `users_01-2014` index
         #
         def delete(suffix = nil)
-          result = client.indices.delete index: index_name(suffix: suffix)
+          # Verify that the index_name is really the index_name and not an alias.
+          #
+          #   "The index parameter in the delete index API no longer accepts alias names.
+          #   Instead, it accepts only index names (or wildcards which will expand to matching indices)."
+          #   https://www.elastic.co/guide/en/elasticsearch/reference/6.8/breaking-changes-6.0.html#_delete_index_api_resolves_indices_expressions_only_against_indices
+          index_names = client.indices.get_alias(index: index_name(suffix: suffix)).keys
+          result = client.indices.delete index: index_names.join(',')
           Chewy.wait_for_status if result
           result
           # es-ruby >= 1.0.10 handles Elasticsearch::Transport::Transport::Errors::NotFound
@@ -136,6 +142,8 @@ module Chewy
         %i[import import!].each do |method|
           class_eval <<-METHOD, __FILE__, __LINE__ + 1
             def #{method}(*args)
+              return true if args.first.blank? && !args.first.nil?
+
               options = args.extract_options!
               if args.one? && type_names.one?
                 objects = {type_names.first.to_sym => args.first}
@@ -172,7 +180,7 @@ module Chewy
         def reset!(suffix = nil, apply_journal: true, journal: false, **import_options)
           result = if suffix.present?
             start_time = Time.now
-            indexes = self.indexes
+            indexes = self.indexes - [index_name]
             create! suffix, alias: false
 
             general_name = index_name

data/lib/chewy/index/aliases.rb

@@ -5,14 +5,23 @@ module Chewy
 
       module ClassMethods
         def indexes
-          client.indices.get_alias(name: index_name).keys
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
-          []
+          indexes = empty_if_not_found { client.indices.get(index: index_name).keys }
+          indexes += empty_if_not_found { client.indices.get_alias(name: index_name).keys }
+          indexes.compact.uniq
         end
 
         def aliases
-          name = index_name
-          client.indices.get_alias(index: name, name: '*')[name].try(:[], 'aliases').try(:keys) || []
+          empty_if_not_found do
+            client.indices.get_alias(index: index_name, name: '*').values.flat_map do |aliases|
+              aliases['aliases'].keys
+            end
+          end.compact.uniq
+        end
+
+      private
+
+        def empty_if_not_found
+          yield
         rescue Elasticsearch::Transport::Transport::Errors::NotFound
           []
         end

data/lib/chewy/multi_search.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Chewy
+  # `Chewy::MultiSearch` provides an interface for executing multiple
+  # queries via the Elasticsearch Multi Search API. When a MultiSearch
+  # is performed it wraps the responses from Elasticsearch and assigns
+  # them to the appropriate queries.
+  class MultiSearch
+    attr_reader :queries
+
+    # Instantiate a new MultiSearch instance.
+    #
+    # @param queries [Array<Chewy::Search::Request>]
+    # @option [Elasticsearch::Transport::Client] :client (Chewy.client)
+    #   The Elasticsearch client that should be used for issuing requests.
+    def initialize(queries, client: Chewy.client)
+      @client = client
+      @queries = Array(queries)
+    end
+
+    # Adds a query to be performed by the MultiSearch
+    #
+    # @param query [Chewy::Search::Request]
+    def add_query(query)
+      @queries << query
+    end
+
+    # Performs any unperformed queries and returns the responses for all queries.
+    #
+    # @return [Array<Chewy::Search::Response>]
+    def responses
+      perform
+      queries.map(&:response)
+    end
+
+    # Performs any unperformed queries.
+    def perform
+      unperformed_queries = queries.reject(&:performed?)
+      return if unperformed_queries.empty?
+
+      responses = msearch(unperformed_queries)['responses']
+      unperformed_queries.zip(responses).map { |query, response| query.response = response }
+    end
+
+  private
+
+    attr_reader :client
+
+    def msearch(queries_to_search)
+      body = queries_to_search.flat_map do |query|
+        rendered = query.render
+        [rendered.except(:body), rendered[:body]]
+      end
+
+      client.msearch(body: body)
+    end
+  end
+
+  def self.msearch(queries)
+    Chewy::MultiSearch.new(queries)
+  end
+end

data/lib/chewy/railtie.rb

@@ -22,17 +22,6 @@ module Chewy
     end
 
     module MigrationStrategy
-      extend ActiveSupport::Concern
-      included do
-        alias_method_chain :migrate, :chewy
-      end
-
-      def migrate_with_chewy(*args)
-        Chewy.strategy(:bypass) { migrate_without_chewy(*args) }
-      end
-    end
-
-    module Rails5MigrationStrategy
       def migrate(*args)
         Chewy.strategy(:bypass) { super }
       end
@@ -57,18 +46,13 @@ module Chewy
 
     initializer 'chewy.migration_strategy' do
       ActiveSupport.on_load(:active_record) do
-        if Rails::VERSION::MAJOR >= 5
-          ActiveRecord::Migration.prepend(Rails5MigrationStrategy)
-          ActiveRecord::Migrator.prepend(Rails5MigrationStrategy) if defined? ActiveRecord::Migrator
-        else
-          ActiveRecord::Migration.send(:include, MigrationStrategy)
-          ActiveRecord::Migrator.send(:include, MigrationStrategy) if defined? ActiveRecord::Migrator
-        end
+        ActiveRecord::Migration.prepend(MigrationStrategy)
+        ActiveRecord::Migrator.prepend(MigrationStrategy) if defined? ActiveRecord::Migrator
       end
     end
 
     initializer 'chewy.request_strategy' do |app|
-      app.config.middleware.insert_after(Rails::Rack::Logger, RequestStrategy)
+      app.config.middleware.insert_before(ActionDispatch::ShowExceptions, RequestStrategy)
     end
 
     initializer 'chewy.add_indices_path' do |_app|