chewy 0.8.4 → 0.9.0

data/lib/chewy/query/compose.rb

@@ -1,10 +1,9 @@
 module Chewy
   class Query
     module Compose
-
     protected
 
-      def _filtered_query query, filter, options = {}
+      def _filtered_query(query, filter, options = {})
         query = { match_all: {} } if !query.present? && filter.present?
 
         if filter.present?
@@ -18,16 +17,16 @@ module Chewy
               filter: filter
             } } }
           end
-          filtered[:query][:filtered].merge!(strategy: options[:strategy].to_s) if options[:strategy].present?
+          filtered[:query][:filtered][:strategy] = options[:strategy].to_s if options[:strategy].present?
           filtered
         elsif query.present?
           { query: query }
         else
-          { }
+          {}
         end
       end
 
-      def _queries_join queries, logic
+      def _queries_join(queries, logic)
         queries = queries.compact
 
         if queries.many? || (queries.present? && logic == :must_not)
@@ -48,7 +47,7 @@ module Chewy
         end
       end
 
-      def _filters_join filters, logic
+      def _filters_join(filters, logic)
         filters = filters.compact
 
         if filters.many? || (filters.present? && logic == :must_not)

data/lib/chewy/query/criteria.rb

@@ -4,11 +4,11 @@ module Chewy
   class Query
     class Criteria
       include Compose
-      ARRAY_STORAGES = [:queries, :filters, :post_filters, :sort, :fields, :types, :scores]
-      HASH_STORAGES = [:options, :request_options, :facets, :aggregations, :suggest, :script_fields]
+      ARRAY_STORAGES = [:queries, :filters, :post_filters, :sort, :fields, :types, :scores].freeze
+      HASH_STORAGES = [:options, :search_options, :request_options, :facets, :aggregations, :suggest, :script_fields].freeze
       STORAGES = ARRAY_STORAGES + HASH_STORAGES
 
-      def initialize options = {}
+      def initialize(options = {})
         @options = options.merge(
           query_mode: Chewy.query_mode,
           filter_mode: Chewy.filter_mode,
@@ -16,7 +16,7 @@ module Chewy
         )
       end
 
-      def == other
+      def ==(other)
         other.is_a?(self.class) && storages == other.storages
       end
 
@@ -32,7 +32,7 @@ module Chewy
 
       STORAGES.each do |storage|
         define_method "#{storage}?" do
-          send(storage).present?
+          send(storage).any?
         end
       end
 
@@ -48,6 +48,10 @@ module Chewy
         request_options.merge!(modifier)
       end
 
+      def update_search_options(modifier)
+        search_options.merge!(modifier)
+      end
+
       def update_facets(modifier)
         facets.merge!(modifier)
       end
@@ -79,7 +83,7 @@ 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
@@ -93,14 +97,14 @@ module Chewy
         end
       end
 
-      def merge! other
+      def merge!(other)
         STORAGES.each do |storage|
           send("update_#{storage}", other.send(storage))
         end
         self
       end
 
-      def merge other
+      def merge(other)
         clone.merge!(other)
       end
 
@@ -110,17 +114,17 @@ module Chewy
         if options[:simple]
           { body: body.presence || { query: { match_all: {} } } }
         else
-          body.merge!(post_filter: _request_post_filter) if post_filters?
-          body.merge!(facets: facets) if facets?
-          body.merge!(aggregations: aggregations) if aggregations?
-          body.merge!(suggest: suggest) if suggest?
-          body.merge!(sort: sort) if sort?
-          body.merge!(_source: fields) if fields?
-          body.merge!(script_fields: script_fields) if script_fields?
+          body[:post_filter] = _request_post_filter if post_filters?
+          body[:facets] = facets if facets?
+          body[:aggregations] = aggregations if aggregations?
+          body[:suggest] = suggest if suggest?
+          body[:sort] = sort if sort?
+          body[:_source] = fields if fields?
+          body[:script_fields] = script_fields if script_fields?
 
           body = _boost_query(body)
 
-          { body: body.merge!(request_options) }
+          { body: body.merge!(_request_options) }.merge!(search_options)
         end
       end
 
@@ -154,6 +158,12 @@ module Chewy
         body.tap { |b| b[:query] = { function_score: score } }
       end
 
+      def _request_options
+        Hash[request_options.map do |key, value|
+          [key, value.is_a?(Proc) ? value.call : value]
+        end]
+      end
+
       def _request_query
         _queries_join(queries, options[:query_mode])
       end

data/lib/chewy/query/filters.rb

@@ -28,7 +28,7 @@ module Chewy
     #
     #
     class Filters
-      def initialize outer = nil, &block
+      def initialize(outer = nil, &block)
         @block = block
         @outer = outer || eval('self', block.binding)
       end
@@ -42,7 +42,7 @@ module Chewy
       #
       #   UsersIndex.filter{ name == o{ name } } # => {filter: {term: {name: 'Friend'}}}
       #
-      def o &block
+      def o(&block)
         @outer.instance_exec(&block)
       end
 
@@ -62,7 +62,7 @@ module Chewy
       #
       #   UsersIndex.filter{ f{ field } == 'Name' } == UsersIndex.filter{ name == 'Name' } # => true
       #
-      def f name = nil, *args, &block
+      def f(name = nil, *args, &block)
         name = block ? o(&block) : name
         Nodes::Field.new name, *args
       end
@@ -82,7 +82,7 @@ module Chewy
       #   UsersIndex.filter{ s{ script } } == UsersIndex.filter{ s('doc["num1"].value > 1') } # => true
       #   UsersIndex.filter{ s(param1: 42) { script } } == UsersIndex.filter{ s('doc["num1"].value > 1', param1: 42) } # => true
       #
-      def s *args, &block
+      def s(*args, &block)
         params = args.extract_options!
         script = block ? o(&block) : args.first
         Nodes::Script.new script, params
@@ -100,7 +100,7 @@ module Chewy
       #
       #   UsersIndex.filter{ q{ query } } == UsersIndex.filter{ q(query_string: {query: 'name: hello'}) } # => true
       #
-      def q query = nil, &block
+      def q(query = nil, &block)
         Nodes::Query.new block ? o(&block) : query
       end
 
@@ -119,7 +119,7 @@ module Chewy
       #   UsersIndex.filter{ r{ filter } } == UsersIndex.filter{ r(term: {name: 'Name'}) } # => true
       #   UsersIndex.filter{ r{ filter } } == UsersIndex.filter(term: {name: 'Name'}) # => true
       #
-      def r raw = nil, &block
+      def r(raw = nil, &block)
         Nodes::Raw.new block ? o(&block) : raw
       end
 
@@ -155,7 +155,7 @@ module Chewy
       #       .filter_mode(:or)
       #   end
       #
-      def has_child type
+      def has_child(type) # rubocop:disable Style/PredicateName
         Nodes::HasChild.new(type, @outer)
       end
 
@@ -177,7 +177,7 @@ module Chewy
       #       .filter_mode(:or)
       #   end
       #
-      def has_parent type
+      def has_parent(type) # rubocop:disable Style/PredicateName
         Nodes::HasParent.new(type, @outer)
       end
 
@@ -200,7 +200,7 @@ module Chewy
       #   UsersIndex.filter{ article.title =~ 'Hello' }
       #   UsersIndex.filter{ article.tags? }
       #
-      def method_missing method, *args, &block
+      def method_missing(method, *args) # rubocop:disable Style/MethodMissing
         method = method.to_s
         if method =~ /\?\Z/
           Nodes::Exists.new method.gsub(/\?\Z/, '')

data/lib/chewy/query/loading.rb

@@ -96,8 +96,8 @@ module Chewy
           next if only.present? && !only.include?(type.type_name)
 
           loaded = type.adapter.load(objects, options.merge(_type: type))
-          [type, loaded.index_by.with_index do |loaded, i|
-            objects[i]._object = loaded
+          [type, loaded.index_by.with_index do |loaded_object, i|
+            objects[i]._object = loaded_object
             objects[i]
           end]
         end.compact]

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

@@ -2,7 +2,7 @@ module Chewy
   class Query
     module Nodes
       class And < Expr
-        def initialize *nodes
+        def initialize(*nodes)
           @options = nodes.extract_options!
           @nodes = nodes.flatten.map { |node| node.is_a?(self.class) ? node.__nodes__ : node }.flatten
         end
@@ -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/base.rb

@@ -6,7 +6,7 @@ module Chewy
           raise NotImplementedError
         end
 
-        def eql? other
+        def eql?(other)
           other.is_a?(self.class) && instance_variables.all? do |ivar|
             instance_variable_get(ivar).eql? other.instance_variable_get(ivar)
           end

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

@@ -2,16 +2,18 @@ module Chewy
   class Query
     module Nodes
       class Bool < Expr
-        METHODS = %w(must must_not should)
+        METHODS = %w(must must_not should).freeze
 
-        def initialize options = {}
+        def initialize(options = {})
           @options = options
-          @must, @must_not, @should = [], [], []
+          @must = []
+          @must_not = []
+          @should = []
         end
 
         METHODS.each do |method|
           define_method method do |*exprs|
-            instance_variable_get("@#{method}").push(*exprs)
+            instance_variable_get("@#{method}").concat(exprs)
             self
           end
         end

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

@@ -10,10 +10,10 @@ module Chewy
           :b => :bool,
           :bool => :bool,
           :f => :fielddata,
-          :fielddata => :fielddata,
-        }
+          :fielddata => :fielddata
+        }.freeze
 
-        def initialize name, value, *args
+        def initialize(name, value, *args)
           @name = name.to_s
           @value = value
           @options = args.extract_options!
@@ -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.merge!(_cache: !!@options[:cache]) if @options.key?(:cache)
-          {filter => body}
+          body[:_cache] = !!@options[:cache] if @options.key?(:cache)
+          { filter => body }
         end
       end
     end

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

@@ -2,7 +2,7 @@ module Chewy
   class Query
     module Nodes
       class Exists < Expr
-        def initialize name, options = {}
+        def initialize(name, options = {})
           @name = name.to_s
           @options = options
         end
@@ -12,7 +12,7 @@ module Chewy
         end
 
         def __render__
-          {exists: {field: @name}}
+          { exists: { field: @name } }
         end
       end
     end

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

@@ -2,11 +2,11 @@ module Chewy
   class Query
     module Nodes
       class Expr < Base
-        def & other
+        def &(other)
           Nodes::And.new self, other
         end
 
-        def | other
+        def |(other)
           Nodes::Or.new self, other
         end
 

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

@@ -2,7 +2,7 @@ module Chewy
   class Query
     module Nodes
       class Field < Base
-        def initialize name, *args
+        def initialize(name, *args)
           @name = name.to_s
           @args = args
         end
@@ -16,70 +16,74 @@ module Chewy
           self
         end
 
-        def > value
-          Nodes::Range.new @name, *__options_merge__(gt: value)
+        def >(other)
+          Nodes::Range.new @name, *__options_merge__(gt: other)
         end
 
-        def < value
-          Nodes::Range.new @name, *__options_merge__(lt: value)
+        def <(other)
+          Nodes::Range.new @name, *__options_merge__(lt: other)
         end
 
-        def >= value
-          Nodes::Range.new @name, *__options_merge__(gt: value, left_closed: true)
+        def >=(other)
+          Nodes::Range.new @name, *__options_merge__(gt: other, left_closed: true)
         end
 
-        def <= value
-          Nodes::Range.new @name, *__options_merge__(lt: value, right_closed: true)
+        def <=(other)
+          Nodes::Range.new @name, *__options_merge__(lt: other, right_closed: true)
         end
 
-        def == value
-          case value
+        def ==(other)
+          case other
           when nil
-            Nodes::Missing.new @name, existence: false, null_value: true
+            nil?
           when ::Regexp
-            Nodes::Regexp.new @name, value, *@args
+            Nodes::Regexp.new @name, other, *@args
           when ::Range
-            Nodes::Range.new @name, *__options_merge__(gt: value.first, lt: value.last)
+            Nodes::Range.new @name, *__options_merge__(gt: other.first, lt: other.last)
           else
-            if value.is_a?(Array) && value.first.is_a?(::Range)
+            if other.is_a?(Array) && other.first.is_a?(::Range)
               Nodes::Range.new @name, *__options_merge__(
-                gt: value.first.first, lt: value.first.last,
+                gt: other.first.first, lt: other.first.last,
                 left_closed: true, right_closed: true
               )
             else
-              Nodes::Equal.new @name, value, *@args
+              Nodes::Equal.new @name, other, *@args
             end
           end
         end
 
-        def != value
-          case value
+        def !=(other)
+          case other
           when nil
             Nodes::Exists.new @name
           else
-            Nodes::Not.new self == value
+            Nodes::Not.new self == other
           end
         end
 
-        def =~ value
-          case value
+        def =~(other)
+          case other
           when ::Regexp
-            Nodes::Regexp.new @name, value, *@args
+            Nodes::Regexp.new @name, other, *@args
           else
-            Nodes::Prefix.new @name, value, @args.extract_options!
+            Nodes::Prefix.new @name, other, @args.extract_options!
           end
         end
 
-        def !~ value
-          Not.new(self =~ value)
+        def !~(other)
+          Not.new(self =~ other)
         end
 
-        def method_missing method, *args, &block
+        def nil?
+          Nodes::Missing.new @name, existence: false, null_value: true
+        end
+
+        def method_missing(method, *args) # rubocop:disable Style/MethodMissing
           method = method.to_s
           if method =~ /\?\Z/
-            Nodes::Exists.new [@name, method.gsub(/\?\Z/, '')].join(?.)
+            Nodes::Exists.new [@name, method.gsub(/\?\Z/, '')].join('.')
           else
-            self.class.new [@name, method].join(?.), *args
+            self.class.new [@name, method].join('.'), *args
           end
         end
 
@@ -89,13 +93,13 @@ module Chewy
 
       private
 
-        def __options_merge__! additional = {}
+        def __options_merge__!(additional = {})
           options = @args.extract_options!
           options = options.merge(additional)
           @args.push(options)
         end
 
-        def __options_merge__ additional = {}
+        def __options_merge__(additional = {})
           options = @args.extract_options!
           options = options.merge(additional)
           @args + [options]