chewy 0.8.4 → 5.1.0

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

@@ -5,6 +5,7 @@ module Chewy
     module Nodes
       class HasChild < HasRelation
       private
+
         def _relation
           :has_child
         end

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

@@ -5,6 +5,7 @@ module Chewy
     module Nodes
       class HasParent < HasRelation
       private
+
         def _relation
           :has_parent
         end

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

@@ -6,7 +6,7 @@ module Chewy
       class HasRelation < Expr
         include Compose
 
-        def initialize type, outer = nil
+        def initialize(type, outer = nil)
           @type = type.to_s
           @outer = outer
           @query_mode = :must
@@ -15,26 +15,23 @@ module Chewy
           @filters = []
         end
 
-        def query_mode mode
+        def query_mode(mode)
           @query_mode = mode
           self
         end
 
-        def filter_mode mode
+        def filter_mode(mode)
           @filter_mode = mode
           self
         end
 
-        def query params = nil, &block
-          if block
-            raise 'Query DLS is not supported yet'
-          else
-            @queries.push(params)
-          end
+        def query(params = nil, &block)
+          raise 'Query DLS is not supported yet' if block
+          @queries.push(params)
           self
         end
 
-        def filter params = nil, &block
+        def filter(params = nil, &block)
           if block
             @filters.push(Chewy::Query::Filters.new(@outer, &block).__render__)
           else
@@ -51,9 +48,10 @@ module Chewy
             {filter: filters}
           else
             _filtered_query(queries, filters)
-          end || {}
+          end
+          body ||= {}
 
-          {_relation => body.merge(type: @type)} if body
+          {_relation => body.merge(type: @type)}
         end
       end
     end

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

@@ -2,7 +2,7 @@ module Chewy
   class Query
     module Nodes
       class Missing < Expr
-        def initialize name, options = {}
+        def initialize(name, options = {})
           @name = name.to_s
           @options = options.reverse_merge(existence: true, null_value: false)
         end

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

@@ -2,7 +2,7 @@ module Chewy
   class Query
     module Nodes
       class Not < Expr
-        def initialize expr, options = {}
+        def initialize(expr, options = {})
           @expr = expr
           @options = options
         end

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

@@ -2,7 +2,7 @@ module Chewy
   class Query
     module Nodes
       class Or < 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

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

@@ -2,9 +2,10 @@ module Chewy
   class Query
     module Nodes
       class Prefix < Expr
-        def initialize name, value, options = {}
+        def initialize(name, value, options = {})
           @name = name.to_s
-          @value, @options = value, options
+          @value = value
+          @options = options
         end
 
         def __render__

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

@@ -2,7 +2,7 @@ module Chewy
   class Query
     module Nodes
       class Query < Expr
-        def initialize query, options = {}
+        def initialize(query, options = {})
           @query = query
           @options = options
         end

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

@@ -3,22 +3,22 @@ module Chewy
     module Nodes
       class Range < Expr
         EXECUTION = {
-          :i => :index,
-          :index => :index,
-          :f => :fielddata,
-          :fielddata => :fielddata,
-        }
+          i: :index,
+          index: :index,
+          f: :fielddata,
+          fielddata: :fielddata
+        }.freeze
 
-        def initialize name, *args
+        def initialize(name, *args)
           @name = name.to_s
           @options = args.extract_options!
-          @range = @options.reject { |k, v| ![:gt, :lt].include?(k) }
-          @bounds = @options.reject { |k, v| ![:left_closed, :right_closed].include?(k) }
+          @range = @options.select { |k, _v| %i[gt lt].include?(k) }
+          @bounds = @options.select { |k, _v| %i[left_closed right_closed].include?(k) }
           execution = EXECUTION[args.first.to_sym] if args.first
           @options[:execution] = execution if execution
         end
 
-        def & other
+        def &(other)
           if other.is_a?(self.class) && other.__name__ == @name
             state = __state__.merge(other.__state__)
 

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

@@ -2,7 +2,7 @@ module Chewy
   class Query
     module Nodes
       class Raw < Expr
-        def initialize raw
+        def initialize(raw)
           @raw = raw
         end
 

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

@@ -2,26 +2,30 @@ module Chewy
   class Query
     module Nodes
       class Regexp < Expr
-        FLAGS = %w(all anystring automaton complement empty intersection interval none)
+        FLAGS = %w[all anystring automaton complement empty intersection interval none].freeze
 
-        def initialize name, regexp, *args
+        def initialize(name, regexp, *args)
           @name = name.to_s
           @regexp = regexp.respond_to?(:source) ? regexp.source : regexp.to_s
           @options = args.extract_options!
-          if args.present? || @options[:flags].present?
-            @options[:flags] = FLAGS & (args.present? ? args.flatten : @options[:flags]).map(&:to_s).map(&:downcase)
-          end
+          return if args.blank? && @options[:flags].blank?
+          @options[:flags] = FLAGS & (args.present? ? args.flatten : @options[:flags]).map(&:to_s).map(&:downcase)
         end
 
         def __render__
-          body = @options[:flags] ?
-            {value: @regexp, flags: @options[:flags].map(&:to_s).map(&:upcase).uniq.join('|')} :
+          body = if @options[:flags]
+            {value: @regexp, flags: @options[:flags].map(&:to_s).map(&:upcase).uniq.join('|')}
+          else
             @regexp
+          end
           filter = {@name => body}
           if @options.key?(:cache)
             filter[:_cache] = !!@options[:cache]
-            filter[:_cache_key] = @options[:cache].is_a?(TrueClass) || @options[:cache].is_a?(FalseClass) ?
-              @regexp.underscore : @options[:cache]
+            filter[:_cache_key] = if @options[:cache].is_a?(TrueClass) || @options[:cache].is_a?(FalseClass)
+              @regexp.underscore
+            else
+              @options[:cache]
+            end
           end
           {regexp: filter}
         end

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

@@ -2,16 +2,16 @@ module Chewy
   class Query
     module Nodes
       class Script < Expr
-        def initialize script, params = {}
+        def initialize(script, params = {})
           @script = script
           @params = params
-          @options = params.reject { |k, v| ![:cache].include?(k) }
+          @options = params.select { |k, _v| [:cache].include?(k) }
         end
 
         def __render__
           script = {script: @script}
-          script.merge!(params: @params) if @params.present?
-          script.merge!(_cache: !!@options[:cache]) if @options.key?(:cache)
+          script[:params] = @params if @params.present?
+          script[:_cache] = !!@options[:cache] if @options.key?(:cache)
           {script: script}
         end
       end

data/lib/chewy/query/pagination.rb

@@ -8,9 +8,18 @@ module Chewy
       def total
         _response['hits'].try(:[], 'total') || 0
       end
-
       alias_method :total_count, :total
       alias_method :total_entries, :total
+
+    private
+
+      def raw_limit_value
+        criteria.request_options[:size]
+      end
+
+      def raw_offset_value
+        criteria.request_options[:from]
+      end
     end
   end
 end