chewy 0.10.0 → 6.0.0

data/gemfiles/{rails.4.2.mongoid.5.1.gemfile → rails.5.2.activerecord.gemfile}

@@ -2,14 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 5.1.0"
-gem "activesupport", "~> 4.2.0"
-gem "activejob", "~> 4.2.0"
+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", "~> 0.17.0", 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.4.2.activerecord.gemfile → rails.5.2.mongoid.6.4.gemfile}

@@ -2,14 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.0"
-gem "activesupport", "~> 4.2.0"
-gem "activejob", "~> 4.2.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
 gem "sidekiq", require: false
-gem "kaminari", "~> 0.17.0", 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.4.0.activerecord.gemfile → rails.6.0.activerecord.gemfile}

@@ -2,13 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.0.0"
-gem "activesupport", "~> 4.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
 gem "sidekiq", require: false
-gem "kaminari", "~> 0.17.0", 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.6.1.activerecord.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+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 'rspec_junit_formatter', '~> 0.4.1'
+
+gem 'rexml' if RUBY_VERSION >= '3.0.0'
+
+gemspec path: "../"

data/gemfiles/sequel.4.45.gemfile

@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "sequel", "~> 4.45.0"
-gem "activesupport", "~> 5.0.0"
-gem "kaminari-core", "~> 1.0.0", require: false
+gem "activesupport", "~> 5.1.0"
+gem "kaminari-core", "~> 1.1.0", require: false
 gem "will_paginate", require: false
 gem "parallel", require: false
 

data/lib/chewy.rb

@@ -17,6 +17,7 @@ require 'active_support/core_ext/string/inflections'
 require 'i18n/core_ext/hash'
 require 'chewy/backports/deep_dup' unless Object.respond_to?(:deep_dup)
 require 'singleton'
+require 'base64'
 
 require 'elasticsearch'
 
@@ -131,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

@@ -2,65 +2,42 @@ module Chewy
   class Config
     include Singleton
 
-    attr_accessor :settings, :transport_logger, :transport_tracer, :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,
-
+    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
 
-      # Default field type for any field in any Chewy type. Defaults to 'string'.
-      :default_field_type,
-
+    attr_reader :transport_logger, :transport_tracer,
       # Chewy search request DSL base class, used by every index.
       :search_class
 
@@ -70,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
@@ -80,8 +55,8 @@ module Chewy
       @disable_refresh_async = false
       @indices_path = 'app/chewy'
       @default_root_options = {}
-      @default_field_type = 'string'.freeze
-      self.search_class = Chewy::Search::Request
+      @default_field_type = 'text'.freeze
+      @search_class = build_search_class(Chewy::Search::Request)
     end
 
     def transport_logger=(logger)
@@ -94,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
@@ -124,7 +95,7 @@ module Chewy
     #
     #      :wait_for_status - if this option set - chewy actions such
     #      as creating or deleting index, importing data will wait for
-    #      the status specified. Extremely useful for tests under havy
+    #      the status specified. Extremely useful for tests under heavy
     #      indexes manipulations.
     #
     #        test:
@@ -153,7 +124,7 @@ module Chewy
 
     def yaml_settings
       @yaml_settings ||= begin
-        if defined?(Rails)
+        if defined?(Rails::VERSION)
           file = Rails.root.join('config', 'chewy.yml')
 
           if File.exist?(file)
@@ -168,9 +139,9 @@ module Chewy
     def build_search_class(base)
       Class.new(base).tap do |search_class|
         if defined?(::Kaminari)
-          search_class.include Chewy::Search::Pagination::Kaminari
+          search_class.send :include, Chewy::Search::Pagination::Kaminari
         elsif defined?(::WillPaginate)
-          search_class.include Chewy::Search::Pagination::WillPaginate
+          search_class.send :include, Chewy::Search::Pagination::WillPaginate
         end
       end
     end

data/lib/chewy/fields/base.rb

@@ -4,13 +4,18 @@ module Chewy
       attr_reader :name, :options, :value, :children
       attr_accessor :parent
 
-      def initialize(name, options = {})
+      def initialize(name, value: nil, **options)
         @name = name.to_sym
-        @options = options.deep_symbolize_keys
-        @value = @options.delete(:value)
+        @options = {}
+        update_options!(**options)
+        @value = value
         @children = []
       end
 
+      def update_options!(**options)
+        @options = options
+      end
+
       def multi_field?
         children.present? && !object_field?
       end
@@ -28,38 +33,19 @@ module Chewy
           end
         mapping.reverse_merge!(options)
         mapping.reverse_merge!(type: (children.present? ? 'object' : Chewy.default_field_type))
+
         {name => mapping}
       end
 
       def compose(*objects)
-        object = objects.first
+        result = evaluate(objects)
 
-        result =
-          if value && value.is_a?(Proc)
-            if value.arity.zero?
-              object.instance_exec(&value)
-            elsif value.arity < 0
-              value.call(*object)
-            else
-              value.call(*objects.first(value.arity))
-            end
-          elsif object.is_a?(Hash)
-            if object.key?(name)
-              object[name]
-            else
-              object[name.to_s]
-            end
+        if children.present? && !multi_field?
+          result = if result.respond_to?(:to_ary)
+            result.to_ary.map { |item| compose_children(item, *objects) }
           else
-            object.send(name)
+            compose_children(result, *objects)
           end
-
-        if children.present? && !multi_field?
-          result =
-            if result.respond_to?(:to_ary)
-              result.to_ary.map { |item| compose_children(item, *objects) }
-            else
-              compose_children(result, *objects)
-            end
         end
 
         {name => result}
@@ -67,6 +53,32 @@ module Chewy
 
     private
 
+      def evaluate(objects)
+        object = objects.first
+
+        if value.is_a?(Proc)
+          if value.arity.zero?
+            object.instance_exec(&value)
+          elsif value.arity < 0
+            value.call(*object)
+          else
+            value.call(*objects.first(value.arity))
+          end
+        else
+          message = value.is_a?(Symbol) || value.is_a?(String) ? value.to_sym : name
+
+          if object.is_a?(Hash)
+            if object.key?(message)
+              object[message]
+            else
+              object[message.to_s]
+            end
+          else
+            object.send(message)
+          end
+        end
+      end
+
       def compose_children(value, *parent_objects)
         return unless value
 

data/lib/chewy/fields/root.rb

@@ -6,14 +6,18 @@ module Chewy
       attr_reader :parent
       attr_reader :parent_id
 
-      def initialize(*args)
-        super(*args)
+      def initialize(name, **options)
+        super(name, **options)
 
-        @id = @options.delete(:id) || options.delete(:_id)
-        @parent = @options.delete(:parent) || options.delete(:_parent)
-        @parent_id = @options.delete(:parent_id)
+        @value ||= -> { self }
         @dynamic_templates = []
-        @options.delete(:type)
+      end
+
+      def update_options!(**options)
+        @id = options.fetch(:id, options.fetch(:_id, @id))
+        @parent = options.fetch(:parent, options.fetch(:_parent, @parent))
+        @parent_id = options.fetch(:parent_id, @parent_id)
+        @options.merge!(options.except(:id, :_id, :parent, :_parent, :parent_id, :type))
       end
 
       def mappings_hash
@@ -65,8 +69,11 @@ module Chewy
       # @param object [Object] a base object for composition
       # @param crutches [Object] any object that will be passed to every field value proc as a last argument
       # @param fields [Array<Symbol>] a list of fields to compose, every field will be composed if empty
-      # @return [Hash] JSON-ready heash with stringifyed keys
+      # @return [Hash] JSON-ready hash with stringified keys
+      #
       def compose(object, crutches = nil, fields: [])
+        result = evaluate([object, crutches])
+
         if children.present?
           child_fields = if fields.present?
             child_hash.slice(*fields).values
@@ -74,13 +81,13 @@ module Chewy
             children
           end
 
-          child_fields.each_with_object({}) do |field, result|
-            result.merge!(field.compose(object, crutches) || {})
+          child_fields.each_with_object({}) do |field, memo|
+            memo.merge!(field.compose(result, crutches) || {})
           end.as_json
         elsif fields.present?
-          object.as_json(only: fields)
+          result.as_json(only: fields, root: false)
         else
-          object.as_json
+          result.as_json(root: false)
         end
       end
 

data/lib/chewy/index.rb

@@ -52,7 +52,7 @@ module Chewy
       #   @return [String] result index name
       def index_name(suggest = nil, prefix: nil, suffix: nil)
         if suggest
-          @base_name = suggest.to_s.underscore.presence
+          @base_name = suggest.to_s.presence
         else
           [
             prefix || prefix_with_deprecation,
@@ -146,6 +146,8 @@ 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

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
@@ -57,14 +57,11 @@ module Chewy
           general_name = index_name
           suffixed_name = index_name(suffix: suffix)
 
-          if Chewy::Runtime.version >= 1.1
-            body = specification_hash
-            body[:aliases] = {general_name => {}} if options[:alias] && suffixed_name != general_name
-            result = client.indices.create(index: suffixed_name, body: body)
-          else
-            result = client.indices.create(index: suffixed_name, body: specification_hash)
-            result &&= client.indices.put_alias(index: suffixed_name, name: general_name) if options[:alias] && name != index_name
-          end
+          body = specification_hash
+          body[:aliases] = {general_name => {}} if options[:alias] && suffixed_name != general_name
+          args = {index: suffixed_name, body: body}
+          args[:include_type_name] = true if Runtime.version >= '6.7.0'
+          result = client.indices.create(**args)
 
           Chewy.wait_for_status if result
           result
@@ -79,7 +76,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
@@ -140,8 +143,17 @@ module Chewy
         #
         %i[import import!].each do |method|
           class_eval <<-METHOD, __FILE__, __LINE__ + 1
-            def #{method} options = {}
-              objects = options.reject { |k, v| !type_names.map(&:to_sym).include?(k) }
+            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}
+              elsif args.one?
+                fail ArgumentError, "Please pass objects for `#{method}` as a hash with type names"
+              else
+                objects = options.reject { |k, v| !type_names.map(&:to_sym).include?(k) }
+              end
               types.map do |type|
                 args = [objects[type.type_name.to_sym], options.dup].reject(&:blank?)
                 type.#{method} *args
@@ -164,7 +176,7 @@ module Chewy
         # @see http://www.elasticsearch.org/blog/changing-mapping-with-zero-downtime
         # @param suffix [String] a suffix for the newly created index
         # @param apply_journal [true, false] if true, journal is applied after the import is completed
-        # @param journal [true, false] journalig is switched off for import during reset by default
+        # @param journal [true, false] journaling is switched off for import during reset by default
         # @param import_options [Hash] options, passed to the import call
         # @return [true, false] false in case of errors
         def reset!(suffix = nil, apply_journal: true, journal: false, **import_options)
@@ -231,7 +243,7 @@ module Chewy
         end
 
         def index_settings(setting_name)
-          return {} unless settings_hash.key?(:settings) || settings_hash[:settings].key?(:index)
+          return {} unless settings_hash.key?(:settings) && settings_hash[:settings].key?(:index)
           settings_hash[:settings][:index].slice(setting_name)
         end
       end