chewy 0.10.1 → 5.0.0

data/gemfiles/rails.4.0.activerecord.gemfile

@@ -6,6 +6,7 @@ gem "activerecord", "~> 4.0.0"
 gem "activesupport", "~> 4.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 "will_paginate", require: false

data/gemfiles/rails.4.1.activerecord.gemfile

@@ -6,6 +6,7 @@ gem "activerecord", "~> 4.1.0"
 gem "activesupport", "~> 4.1.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 "will_paginate", require: false

data/gemfiles/rails.4.2.activerecord.gemfile

@@ -7,6 +7,7 @@ gem "activesupport", "~> 4.2.0"
 gem "activejob", "~> 4.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 "will_paginate", require: false

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

@@ -2,11 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 5.1.0"
+gem "mongoid", "~> 5.2.0"
 gem "activesupport", "~> 4.2.0"
 gem "activejob", "~> 4.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 "will_paginate", require: false

data/gemfiles/rails.5.0.activerecord.gemfile

@@ -7,8 +7,9 @@ gem "activesupport", "~> 5.0.0"
 gem "activejob", "~> 5.0.0"
 gem "resque", require: false
 gem "shoryuken", require: false
+gem "aws-sdk-sqs", require: false
 gem "sidekiq", require: false
-gem "kaminari-core", "~> 1.0.0", require: false
+gem "kaminari-core", "~> 1.1.0", require: false
 gem "will_paginate", require: false
 gem "parallel", require: false
 

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

@@ -2,13 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 6.0.0"
+gem "mongoid", "~> 6.1.0"
 gem "activesupport", "~> 5.0.0"
 gem "activejob", "~> 5.0.0"
 gem "resque", require: false
 gem "shoryuken", require: false
+gem "aws-sdk-sqs", require: false
 gem "sidekiq", require: false
-gem "kaminari-core", "~> 1.0.0", require: false
+gem "kaminari-core", "~> 1.1.0", require: false
 gem "will_paginate", require: false
 gem "parallel", require: false
 

data/gemfiles/rails.5.1.activerecord.gemfile

@@ -7,8 +7,9 @@ gem "activesupport", "~> 5.1.0"
 gem "activejob", "~> 5.1.0"
 gem "resque", require: false
 gem "shoryuken", require: false
+gem "aws-sdk-sqs", require: false
 gem "sidekiq", require: false
-gem "kaminari-core", "~> 1.0.0", require: false
+gem "kaminari-core", "~> 1.1.0", require: false
 gem "will_paginate", require: false
 gem "parallel", require: false
 

data/gemfiles/{rails.5.1.mongoid.6.1.gemfile → rails.5.1.mongoid.6.3.gemfile}

@@ -2,13 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 6.1.0"
+gem "mongoid", "~> 6.3.0"
 gem "activesupport", "~> 5.1.0"
 gem "activejob", "~> 5.1.0"
 gem "resque", require: false
 gem "shoryuken", require: false
+gem "aws-sdk-sqs", require: false
 gem "sidekiq", require: false
-gem "kaminari-core", "~> 1.0.0", require: false
+gem "kaminari-core", "~> 1.1.0", require: false
 gem "will_paginate", require: false
 gem "parallel", require: false
 

data/gemfiles/rails.5.2.activerecord.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.0.rc1"
+gem "activesupport", "~> 5.2.0.rc1"
+gem "activejob", "~> 5.2.0.rc1"
+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
+
+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'
 

data/lib/chewy/config.rb

@@ -2,65 +2,54 @@ module Chewy
   class Config
     include Singleton
 
-    attr_accessor :settings, :transport_logger, :transport_tracer, :logger,
-
+    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`
       #
       :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 'string'.
-      :default_field_type,
+      :default_field_type
 
+    attr_reader :transport_logger, :transport_tracer,
       # Chewy search request DSL base class, used by every index.
       :search_class
 
@@ -80,7 +69,7 @@ module Chewy
       @disable_refresh_async = false
       @indices_path = 'app/chewy'
       @default_root_options = {}
-      @default_field_type = 'string'.freeze
+      @default_field_type = 'text'.freeze
       self.search_class = Chewy::Search::Request
     end
 
@@ -124,7 +113,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 +142,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 +157,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,6 +33,13 @@ module Chewy
           end
         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,15 +6,18 @@ module Chewy
       attr_reader :parent
       attr_reader :parent_id
 
-      def initialize(*args)
-        super(*args)
+      def initialize(*)
+        super
 
-        @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
@@ -66,7 +69,8 @@ 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])
 
@@ -81,9 +85,9 @@ module Chewy
             memo.merge!(field.compose(result, crutches) || {})
           end.as_json
         elsif fields.present?
-          result.as_json(only: fields)
+          result.as_json(only: fields, root: false)
         else
-          result.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,

data/lib/chewy/index/actions.rb

@@ -57,14 +57,9 @@ 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
+          result = client.indices.create(index: suffixed_name, body: body)
 
           Chewy.wait_for_status if result
           result
@@ -140,8 +135,15 @@ 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)
+              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 +166,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 +233,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

data/lib/chewy/index/settings.rb

@@ -4,12 +4,14 @@ module Chewy
     # hash. At first, you need to store some analyzers or other
     # analysis options to the corresponding repository:
     #
+    # @example
     #   Chewy.analyzer :title_analyzer, type: 'custom', filter: %w(lowercase icu_folding title_nysiis)
     #   Chewy.filter :title_nysiis, type: 'phonetic', encoder: 'nysiis', replace: false
     #
     # `title_nysiis` filter here will be expanded automatically when
     # `title_analyzer` analyser will be used in index settings:
     #
+    # @example
     #   class ProductsIndex < Chewy::Index
     #     settings analysis: {
     #       analyzer: [

data/lib/chewy/index/specification.rb

@@ -2,21 +2,21 @@ module Chewy
   class Index
     # Index specification is a combination of index settings and
     # mappings. The idea behind this class is that specification
-    # can be locked in the `Chewy::Stash` between resets, so it is
-    # possible to track changes. In the future it is planned to
-    # be way smarter but right now `rake chewy:deploy` checks
-    # if there were changes and resets the index only if anything
-    # was changed. Otherwise, the index reset is skipped.
+    # can be locked in the `Chewy::Stash::Specification` between
+    # resets, so it is possible to track changes. In the future
+    # it is planned to be way smarter but right now `rake chewy:deploy`
+    # checks if there were changes and resets the index only if
+    # anything was changed. Otherwise, the index reset is skipped.
     #
-    # @see Chewy::Stash
+    # @see Chewy::Stash::Specification
     class Specification
-      # @see Chewy::Index.specification
+      # @see Chewy::Index::Specification
       # @param index [Chewy::Index] Just a chewy index
       def initialize(index)
         @index = index
       end
 
-      # Stores the current index specification to the `Chewy::Stash`
+      # Stores the current index specification to the `Chewy::Stash::Specification`
       # as json.
       #
       # @raise [Chewy::ImportFailed] if something went wrong
@@ -24,7 +24,7 @@ module Chewy
       def lock!
         Chewy::Stash::Specification.import!([
           id: @index.derivable_name,
-          value: current.to_json
+          specification: Base64.encode64(current.to_json)
         ], journal: false)
       end
 
@@ -34,7 +34,9 @@ module Chewy
       # @return [Hash] hash produced with JSON parser
       def locked
         filter = {ids: {values: [@index.derivable_name]}}
-        JSON.parse(Chewy::Stash::Specification.filter(filter).first.try!(:value) || '{}')
+        document = Chewy::Stash::Specification.filter(filter).first
+        return {} unless document
+        JSON.load(Base64.decode64(document.specification)) # rubocop:disable Security/JSONLoad
       end
 
       # Simply returns `Chewy::Index.specification_hash`, but