chewy 0.9.0 → 5.2.0

data/lib/chewy/query/compose.rb

@@ -4,23 +4,23 @@ module Chewy
     protected
 
       def _filtered_query(query, filter, options = {})
-        query = { match_all: {} } if !query.present? && filter.present?
+        query = {match_all: {}} if !query.present? && filter.present?
 
         if filter.present?
           filtered = if query.present?
-            { query: { filtered: {
+            {query: {filtered: {
               query: query,
               filter: filter
-            } } }
+            }}}
           else
-            { query: { filtered: {
+            {query: {filtered: {
               filter: filter
-            } } }
+            }}}
           end
           filtered[:query][:filtered][:strategy] = options[:strategy].to_s if options[:strategy].present?
           filtered
         elsif query.present?
-          { query: query }
+          {query: query}
         else
           {}
         end
@@ -32,14 +32,14 @@ module Chewy
         if queries.many? || (queries.present? && logic == :must_not)
           case logic
           when :dis_max
-            { dis_max: { queries: queries } }
+            {dis_max: {queries: queries}}
           when :must, :should, :must_not
-            { bool: { logic => queries } }
+            {bool: {logic => queries}}
           else
             if logic.is_a?(Float)
-              { dis_max: { queries: queries, tie_breaker: logic } }
+              {dis_max: {queries: queries, tie_breaker: logic}}
             else
-              { bool: { should: queries, minimum_should_match: logic } }
+              {bool: {should: queries, minimum_should_match: logic}}
             end
           end
         else
@@ -53,11 +53,11 @@ module Chewy
         if filters.many? || (filters.present? && logic == :must_not)
           case logic
           when :and, :or
-            { logic => filters }
+            {logic => filters}
           when :must, :should, :must_not
-            { bool: { logic => filters } }
+            {bool: {logic => filters}}
           else
-            { bool: { should: filters, minimum_should_match: logic } }
+            {bool: {should: filters, minimum_should_match: logic}}
           end
         else
           filters.first

data/lib/chewy/query/criteria.rb

@@ -4,8 +4,8 @@ module Chewy
   class Query
     class Criteria
       include Compose
-      ARRAY_STORAGES = [:queries, :filters, :post_filters, :sort, :fields, :types, :scores].freeze
-      HASH_STORAGES = [:options, :search_options, :request_options, :facets, :aggregations, :suggest, :script_fields].freeze
+      ARRAY_STORAGES = %i[queries filters post_filters sort fields types scores].freeze
+      HASH_STORAGES = %i[options search_options request_options facets aggregations suggest script_fields].freeze
       STORAGES = ARRAY_STORAGES + HASH_STORAGES
 
       def initialize(options = {})
@@ -20,7 +20,7 @@ module Chewy
         other.is_a?(self.class) && storages == other.storages
       end
 
-      { ARRAY_STORAGES => '[]', HASH_STORAGES => '{}' }.each do |storages, default|
+      {ARRAY_STORAGES => '[]', HASH_STORAGES => '{}'}.each do |storages, default|
         storages.each do |storage|
           class_eval <<-METHODS, __FILE__, __LINE__ + 1
             def #{storage}
@@ -72,7 +72,7 @@ module Chewy
         script_fields.merge!(modifier)
       end
 
-      [:filters, :queries, :post_filters].each do |storage|
+      %i[filters queries post_filters].each do |storage|
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def update_#{storage}(modifier)
             @#{storage} = #{storage} + Array.wrap(modifier).reject(&:blank?)
@@ -83,12 +83,12 @@ module Chewy
       def update_sort(modifier, options = {})
         @sort = nil if options[:purge]
         modifier = Array.wrap(modifier).flatten.map do |element|
-          element.is_a?(Hash) ? element.map { |k, v| { k => v } } : element
+          element.is_a?(Hash) ? element.map { |k, v| {k => v} } : element
         end.flatten
         @sort = sort + modifier
       end
 
-      %w(fields types).each do |storage|
+      %w[fields types].each do |storage|
         define_method "update_#{storage}" do |modifier, options = {}|
           variable = "@#{storage}"
           instance_variable_set(variable, nil) if options[:purge]
@@ -112,7 +112,7 @@ module Chewy
         body = _filtered_query(_request_query, _request_filter, options.slice(:strategy))
 
         if options[:simple]
-          { body: body.presence || { query: { match_all: {} } } }
+          {body: body.presence || {query: {match_all: {}}}}
         else
           body[:post_filter] = _request_post_filter if post_filters?
           body[:facets] = facets if facets?
@@ -124,7 +124,7 @@ module Chewy
 
           body = _boost_query(body)
 
-          { body: body.merge!(_request_options) }.merge!(search_options)
+          {body: body.merge!(_request_options)}.merge!(search_options)
         end
       end
 
@@ -134,9 +134,9 @@ module Chewy
         STORAGES.map { |storage| send(storage) }
       end
 
-      def initialize_clone(other)
+      def initialize_clone(origin)
         STORAGES.each do |storage|
-          value = other.send(storage)
+          value = origin.send(storage)
           instance_variable_set("@#{storage}", value.deep_dup)
         end
       end
@@ -146,7 +146,7 @@ module Chewy
         query = body.delete :query
         filter = body.delete :filter
         if query && filter
-          query = { filtered: { query: query, filter: filter } }
+          query = {filtered: {query: query, filter: filter}}
           filter = nil
         end
         score = {}
@@ -155,7 +155,7 @@ module Chewy
         score[:score_mode] = options[:score_mode] if options[:score_mode]
         score[:query] = query if query
         score[:filter] = filter if filter
-        body.tap { |b| b[:query] = { function_score: score } }
+        body.tap { |b| b[:query] = {function_score: score} }
       end
 
       def _request_options
@@ -180,7 +180,7 @@ module Chewy
       end
 
       def _request_types
-        _filters_join(types.map { |type| { type: { value: type } } }, :or)
+        _filters_join(types.map { |type| {type: {value: type}} }, :or)
       end
 
       def _request_post_filter

data/lib/chewy/query/filters.rb

@@ -24,18 +24,20 @@ module Chewy
     # You can use logic operations <tt>&</tt> and <tt>|</tt> to concat
     # expressions.
     #
+    # @example
     #   UsersIndex.filter{ (article.title =~ /Honey/) & (age < 42) & !rate }
     #
     #
     class Filters
       def initialize(outer = nil, &block)
         @block = block
-        @outer = outer || eval('self', block.binding)
+        @outer = outer || eval('self', block.binding, __FILE__, __LINE__)
       end
 
       # Outer scope call
       # Block evaluates in the external context
       #
+      # @example
       #   def name
       #     'Friend'
       #   end
@@ -50,12 +52,14 @@ module Chewy
       # Used if method_missing is not working by some reason.
       # Additional expression options might be passed as second argument hash.
       #
+      # @example
       #   UsersIndex.filter{ f(:name) == 'Name' } == UsersIndex.filter{ name == 'Name' } # => true
       #   UsersIndex.filter{ f(:name, execution: :bool) == ['Name1', 'Name2'] } ==
       #     UsersIndex.filter{ name(execution: :bool) == ['Name1', 'Name2'] } # => true
       #
       # Supports block for getting field name from the outer scope
       #
+      # @example
       #   def field
       #     :name
       #   end
@@ -70,11 +74,13 @@ module Chewy
       # Returns script filter
       # Just script filter. Supports additional params.
       #
+      # @example
       #   UsersIndex.filter{ s('doc["num1"].value > 1') }
       #   UsersIndex.filter{ s('doc["num1"].value > param1', param1: 42) }
       #
       # Supports block for getting script from the outer scope
       #
+      # @example
       #   def script
       #     'doc["num1"].value > param1 || 1'
       #   end
@@ -90,10 +96,12 @@ module Chewy
 
       # Returns query filter
       #
+      # @example
       #   UsersIndex.filter{ q(query_string: {query: 'name: hello'}) }
       #
       # Supports block for getting query from the outer scope
       #
+      # @example
       #   def query
       #     {query_string: {query: 'name: hello'}}
       #   end
@@ -107,11 +115,13 @@ module Chewy
       # Returns raw expression
       # Same as filter with arguments instead of block, but can participate in expressions
       #
+      # @example
       #   UsersIndex.filter{ r(term: {name: 'Name'}) }
       #   UsersIndex.filter{ r(term: {name: 'Name'}) & (age < 42) }
       #
       # Supports block for getting raw filter from the outer scope
       #
+      # @example
       #   def filter
       #     {term: {name: 'Name'}}
       #   end
@@ -126,12 +136,13 @@ module Chewy
       # Bool filter chainable methods
       # Used to create bool query. Nodes are passed as arguments.
       #
+      # @example
       #   UsersIndex.filter{ must(age < 42, name == 'Name') }
       #   UsersIndex.filter{ should(age < 42, name == 'Name') }
       #   UsersIndex.filter{ must(age < 42).should(name == 'Name1', name == 'Name2') }
       #   UsersIndex.filter{ should_not(age >= 42).must(name == 'Name1') }
       #
-      %w(must must_not should).each do |method|
+      %w[must must_not should].each do |method|
         define_method method do |*exprs|
           Nodes::Bool.new.send(method, *exprs)
         end
@@ -141,12 +152,14 @@ module Chewy
       # Chainable interface acts the same as main query interface. You can pass plain
       # filters or plain queries or filter with DSL block.
       #
+      # @example
       #   UsersIndex.filter{ has_child('user').filter(term: {role: 'Admin'}) }
       #   UsersIndex.filter{ has_child('user').filter{ role == 'Admin' } }
       #   UsersIndex.filter{ has_child('user').query(match: {name: 'borogoves'}) }
       #
       # Filters and queries might be combined and filter_mode and query_mode are configurable:
       #
+      # @example
       #   UsersIndex.filter do
       #     has_child('user')
       #       .filter{ name: 'Peter' }
@@ -155,7 +168,7 @@ module Chewy
       #       .filter_mode(:or)
       #   end
       #
-      def has_child(type) # rubocop:disable Style/PredicateName
+      def has_child(type) # rubocop:disable Naming/PredicateName
         Nodes::HasChild.new(type, @outer)
       end
 
@@ -163,12 +176,14 @@ module Chewy
       # Chainable interface acts the same as main query interface. You can pass plain
       # filters or plain queries or filter with DSL block.
       #
+      # @example
       #   UsersIndex.filter{ has_parent('user').filter(term: {role: 'Admin'}) }
       #   UsersIndex.filter{ has_parent('user').filter{ role == 'Admin' } }
       #   UsersIndex.filter{ has_parent('user').query(match: {name: 'borogoves'}) }
       #
       # Filters and queries might be combined and filter_mode and query_mode are configurable:
       #
+      # @example
       #   UsersIndex.filter do
       #     has_parent('user')
       #       .filter{ name: 'Peter' }
@@ -177,7 +192,7 @@ module Chewy
       #       .filter_mode(:or)
       #   end
       #
-      def has_parent(type) # rubocop:disable Style/PredicateName
+      def has_parent(type) # rubocop:disable Naming/PredicateName
         Nodes::HasParent.new(type, @outer)
       end
 
@@ -190,6 +205,7 @@ module Chewy
       # Creates field or exists node
       # Additional options for further expression might be passed as hash
       #
+      # @example
       #   UsersIndex.filter{ name == 'Name' } == UsersIndex.filter(term: {name: 'Name'}) # => true
       #   UsersIndex.filter{ name? } == UsersIndex.filter(exists: {term: 'name'}) # => true
       #   UsersIndex.filter{ name(execution: :bool) == ['Name1', 'Name2'] } ==
@@ -197,6 +213,7 @@ module Chewy
       #
       # Also field names might be chained to use dot-notation for ES field names
       #
+      # @example
       #   UsersIndex.filter{ article.title =~ 'Hello' }
       #   UsersIndex.filter{ article.tags? }
       #

data/lib/chewy/query/loading.rb

@@ -94,8 +94,7 @@ module Chewy
         loaded_objects = Hash[_results.group_by(&:class).map do |type, objects|
           next if except.include?(type.type_name)
           next if only.present? && !only.include?(type.type_name)
-
-          loaded = type.adapter.load(objects, options.merge(_type: type))
+          loaded = type.adapter.load(objects.map(&:id), **options.merge(_type: type)) || objects
           [type, loaded.index_by.with_index do |loaded_object, i|
             objects[i]._object = loaded_object
             objects[i]

data/lib/chewy/query/nodes/and.rb

@@ -14,9 +14,9 @@ module Chewy
         def __render__
           nodes = @nodes.map(&:__render__)
           if @options.key?(:cache)
-            { and: { filters: nodes, _cache: !!@options[:cache] } }
+            {and: {filters: nodes, _cache: !!@options[:cache]}}
           else
-            { and: nodes }
+            {and: nodes}
           end
         end
       end

data/lib/chewy/query/nodes/bool.rb

@@ -2,7 +2,7 @@ module Chewy
   class Query
     module Nodes
       class Bool < Expr
-        METHODS = %w(must must_not should).freeze
+        METHODS = %w[must must_not should].freeze
 
         def initialize(options = {})
           @options = options

data/lib/chewy/query/nodes/equal.rb

@@ -23,10 +23,10 @@ module Chewy
 
         def __render__
           filter = (@value.is_a?(Array) ? :terms : :term)
-          body = { @name => @value }
+          body = {@name => @value}
           body.merge!(@options.slice(:execution)) if filter == :terms
           body[:_cache] = !!@options[:cache] if @options.key?(:cache)
-          { filter => body }
+          {filter => body}
         end
       end
     end

data/lib/chewy/query/nodes/exists.rb

@@ -12,7 +12,7 @@ module Chewy
         end
 
         def __render__
-          { exists: { field: @name } }
+          {exists: {field: @name}}
         end
       end
     end

data/lib/chewy/query/nodes/field.rb

@@ -39,7 +39,7 @@ module Chewy
           when ::Regexp
             Nodes::Regexp.new @name, other, *@args
           when ::Range
-            Nodes::Range.new @name, *__options_merge__(gt: other.first, lt: other.last)
+            Nodes::Range.new @name, *__options_merge__(gt: other.begin, lt: other.end)
           else
             if other.is_a?(Array) && other.first.is_a?(::Range)
               Nodes::Range.new @name, *__options_merge__(

data/lib/chewy/query/nodes/has_relation.rb

@@ -45,13 +45,13 @@ module Chewy
           filters = _filters_join @filters, @filter_mode
 
           body = if filters && !queries
-            { filter: filters }
+            {filter: filters}
           else
             _filtered_query(queries, filters)
           end
           body ||= {}
 
-          { _relation => body.merge(type: @type) }
+          {_relation => body.merge(type: @type)}
         end
       end
     end

data/lib/chewy/query/nodes/match_all.rb

@@ -3,7 +3,7 @@ module Chewy
     module Nodes
       class MatchAll < Expr
         def __render__
-          { match_all: {} }
+          {match_all: {}}
         end
       end
     end

data/lib/chewy/query/nodes/missing.rb

@@ -12,7 +12,7 @@ module Chewy
         end
 
         def __render__
-          { missing: { field: @name }.merge(@options.slice(:existence, :null_value)) }
+          {missing: {field: @name}.merge(@options.slice(:existence, :null_value))}
         end
       end
     end

data/lib/chewy/query/nodes/not.rb

@@ -14,9 +14,9 @@ module Chewy
         def __render__
           expr = @expr.__render__
           if @options.key?(:cache)
-            { not: { filter: expr, _cache: !!@options[:cache] } }
+            {not: {filter: expr, _cache: !!@options[:cache]}}
           else
-            { not: expr }
+            {not: expr}
           end
         end
       end

data/lib/chewy/query/nodes/or.rb

@@ -14,9 +14,9 @@ module Chewy
         def __render__
           nodes = @nodes.map(&:__render__)
           if @options.key?(:cache)
-            { or: { filters: nodes, _cache: !!@options[:cache] } }
+            {or: {filters: nodes, _cache: !!@options[:cache]}}
           else
-            { or: nodes }
+            {or: nodes}
           end
         end
       end

data/lib/chewy/query/nodes/prefix.rb

@@ -9,7 +9,7 @@ module Chewy
         end
 
         def __render__
-          filter = { prefix: { @name => @value } }
+          filter = {prefix: {@name => @value}}
           filter[:prefix][:_cache] = !!@options[:cache] if @options.key?(:cache)
           filter
         end