chewy 0.10.1 → 7.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.circleci/config.yml +240 -0
- data/.github/ISSUE_TEMPLATE/bug_report.md +39 -0
- data/.github/ISSUE_TEMPLATE/feature_request.md +20 -0
- data/.github/PULL_REQUEST_TEMPLATE.md +16 -0
- data/.rubocop.yml +25 -25
- data/Appraisals +12 -10
- data/CHANGELOG.md +312 -331
- data/CODE_OF_CONDUCT.md +14 -0
- data/CONTRIBUTING.md +63 -0
- data/Gemfile +5 -1
- data/LICENSE.txt +1 -1
- data/README.md +143 -77
- data/chewy.gemspec +10 -12
- data/gemfiles/{rails.4.2.mongoid.5.1.gemfile → rails.5.2.activerecord.gemfile} +6 -4
- data/gemfiles/{rails.4.2.activerecord.gemfile → rails.5.2.mongoid.6.4.gemfile} +6 -4
- data/gemfiles/{rails.4.0.activerecord.gemfile → rails.6.0.activerecord.gemfile} +6 -3
- data/gemfiles/rails.6.1.activerecord.gemfile +19 -0
- data/gemfiles/sequel.4.45.gemfile +2 -2
- data/lib/chewy.rb +2 -1
- data/lib/chewy/backports/duplicable.rb +1 -1
- data/lib/chewy/config.rb +10 -39
- data/lib/chewy/fields/base.rb +9 -3
- data/lib/chewy/fields/root.rb +13 -9
- data/lib/chewy/index.rb +3 -1
- data/lib/chewy/index/actions.rb +28 -16
- data/lib/chewy/index/aliases.rb +16 -5
- data/lib/chewy/index/settings.rb +2 -0
- data/lib/chewy/index/specification.rb +12 -10
- data/lib/chewy/minitest/helpers.rb +6 -6
- data/lib/chewy/minitest/search_index_receiver.rb +17 -17
- data/lib/chewy/multi_search.rb +62 -0
- data/lib/chewy/railtie.rb +3 -5
- data/lib/chewy/rake_helper.rb +5 -5
- data/lib/chewy/rspec/update_index.rb +3 -5
- data/lib/chewy/search.rb +4 -11
- data/lib/chewy/search/loader.rb +1 -1
- data/lib/chewy/search/pagination/will_paginate.rb +1 -1
- data/lib/chewy/search/parameters.rb +24 -6
- data/lib/chewy/search/parameters/allow_partial_search_results.rb +27 -0
- data/lib/chewy/search/parameters/concerns/query_storage.rb +4 -3
- data/lib/chewy/search/parameters/indices.rb +123 -0
- data/lib/chewy/search/parameters/none.rb +1 -3
- data/lib/chewy/search/request.rb +101 -74
- data/lib/chewy/search/scrolling.rb +7 -6
- data/lib/chewy/stash.rb +31 -22
- data/lib/chewy/strategy/active_job.rb +1 -1
- data/lib/chewy/strategy/atomic.rb +1 -1
- data/lib/chewy/strategy/sidekiq.rb +1 -1
- data/lib/chewy/type.rb +5 -2
- data/lib/chewy/type/adapter/active_record.rb +1 -1
- data/lib/chewy/type/adapter/base.rb +9 -9
- data/lib/chewy/type/adapter/mongoid.rb +2 -4
- data/lib/chewy/type/adapter/orm.rb +7 -4
- data/lib/chewy/type/adapter/sequel.rb +5 -7
- data/lib/chewy/type/crutch.rb +1 -1
- data/lib/chewy/type/import.rb +16 -5
- data/lib/chewy/type/import/bulk_builder.rb +1 -1
- data/lib/chewy/type/import/bulk_request.rb +4 -2
- data/lib/chewy/type/import/journal_builder.rb +3 -3
- data/lib/chewy/type/import/routine.rb +3 -3
- data/lib/chewy/type/mapping.rb +42 -36
- data/lib/chewy/type/observe.rb +16 -12
- data/lib/chewy/type/syncer.rb +6 -7
- data/lib/chewy/type/witchcraft.rb +5 -3
- data/lib/chewy/type/wrapper.rb +14 -4
- data/lib/chewy/version.rb +1 -1
- data/lib/sequel/plugins/chewy_observe.rb +4 -19
- data/migration_guide.md +34 -0
- data/spec/chewy/config_spec.rb +16 -21
- data/spec/chewy/fields/base_spec.rb +68 -70
- data/spec/chewy/fields/root_spec.rb +13 -13
- data/spec/chewy/index/actions_spec.rb +157 -38
- data/spec/chewy/index/aliases_spec.rb +3 -3
- data/spec/chewy/index/specification_spec.rb +25 -16
- data/spec/chewy/index_spec.rb +75 -45
- data/spec/chewy/journal_spec.rb +33 -29
- data/spec/chewy/minitest/search_index_receiver_spec.rb +11 -9
- data/spec/chewy/multi_search_spec.rb +85 -0
- data/spec/chewy/rake_helper_spec.rb +123 -95
- data/spec/chewy/rspec/update_index_spec.rb +47 -46
- data/spec/chewy/runtime_spec.rb +2 -2
- data/spec/chewy/search/parameters/indices_spec.rb +190 -0
- data/spec/chewy/search/parameters/none_spec.rb +1 -1
- data/spec/chewy/search/parameters_spec.rb +21 -4
- data/spec/chewy/search/request_spec.rb +103 -70
- data/spec/chewy/search/response_spec.rb +27 -17
- data/spec/chewy/search/scrolling_spec.rb +27 -17
- data/spec/chewy/search_spec.rb +49 -35
- data/spec/chewy/stash_spec.rb +15 -13
- data/spec/chewy/strategy/active_job_spec.rb +15 -2
- data/spec/chewy/strategy/shoryuken_spec.rb +8 -2
- data/spec/chewy/strategy/sidekiq_spec.rb +6 -2
- data/spec/chewy/type/adapter/active_record_spec.rb +16 -4
- data/spec/chewy/type/import/bulk_builder_spec.rb +9 -94
- data/spec/chewy/type/import/journal_builder_spec.rb +17 -15
- data/spec/chewy/type/import_spec.rb +15 -0
- data/spec/chewy/type/mapping_spec.rb +51 -18
- data/spec/chewy/type/observe_spec.rb +4 -4
- data/spec/chewy/type/witchcraft_spec.rb +15 -0
- data/spec/chewy/type/wrapper_spec.rb +3 -1
- data/spec/chewy_spec.rb +0 -7
- data/spec/spec_helper.rb +5 -1
- data/spec/support/active_record.rb +21 -0
- metadata +51 -116
- data/.travis.yml +0 -53
- data/LEGACY_DSL.md +0 -497
- data/gemfiles/rails.4.1.activerecord.gemfile +0 -14
- data/gemfiles/rails.5.0.activerecord.gemfile +0 -15
- data/gemfiles/rails.5.0.mongoid.6.0.gemfile +0 -15
- data/gemfiles/rails.5.1.activerecord.gemfile +0 -15
- data/gemfiles/rails.5.1.mongoid.6.1.gemfile +0 -15
- data/lib/chewy/query.rb +0 -1098
- data/lib/chewy/query/compose.rb +0 -68
- data/lib/chewy/query/criteria.rb +0 -191
- data/lib/chewy/query/filters.rb +0 -227
- data/lib/chewy/query/loading.rb +0 -111
- data/lib/chewy/query/nodes/and.rb +0 -25
- data/lib/chewy/query/nodes/base.rb +0 -17
- data/lib/chewy/query/nodes/bool.rb +0 -34
- data/lib/chewy/query/nodes/equal.rb +0 -34
- data/lib/chewy/query/nodes/exists.rb +0 -20
- data/lib/chewy/query/nodes/expr.rb +0 -28
- data/lib/chewy/query/nodes/field.rb +0 -110
- data/lib/chewy/query/nodes/has_child.rb +0 -15
- data/lib/chewy/query/nodes/has_parent.rb +0 -15
- data/lib/chewy/query/nodes/has_relation.rb +0 -59
- data/lib/chewy/query/nodes/match_all.rb +0 -11
- data/lib/chewy/query/nodes/missing.rb +0 -20
- data/lib/chewy/query/nodes/not.rb +0 -25
- data/lib/chewy/query/nodes/or.rb +0 -25
- data/lib/chewy/query/nodes/prefix.rb +0 -19
- data/lib/chewy/query/nodes/query.rb +0 -20
- data/lib/chewy/query/nodes/range.rb +0 -63
- data/lib/chewy/query/nodes/raw.rb +0 -15
- data/lib/chewy/query/nodes/regexp.rb +0 -35
- data/lib/chewy/query/nodes/script.rb +0 -20
- data/lib/chewy/query/pagination.rb +0 -25
- data/spec/chewy/query/criteria_spec.rb +0 -700
- data/spec/chewy/query/filters_spec.rb +0 -201
- data/spec/chewy/query/loading_spec.rb +0 -124
- data/spec/chewy/query/nodes/and_spec.rb +0 -12
- data/spec/chewy/query/nodes/bool_spec.rb +0 -14
- data/spec/chewy/query/nodes/equal_spec.rb +0 -32
- data/spec/chewy/query/nodes/exists_spec.rb +0 -18
- data/spec/chewy/query/nodes/has_child_spec.rb +0 -59
- data/spec/chewy/query/nodes/has_parent_spec.rb +0 -59
- data/spec/chewy/query/nodes/match_all_spec.rb +0 -11
- data/spec/chewy/query/nodes/missing_spec.rb +0 -16
- data/spec/chewy/query/nodes/not_spec.rb +0 -13
- data/spec/chewy/query/nodes/or_spec.rb +0 -12
- data/spec/chewy/query/nodes/prefix_spec.rb +0 -16
- data/spec/chewy/query/nodes/query_spec.rb +0 -12
- data/spec/chewy/query/nodes/range_spec.rb +0 -32
- data/spec/chewy/query/nodes/raw_spec.rb +0 -11
- data/spec/chewy/query/nodes/regexp_spec.rb +0 -43
- data/spec/chewy/query/nodes/script_spec.rb +0 -15
- data/spec/chewy/query/pagination/kaminari_spec.rb +0 -5
- data/spec/chewy/query/pagination/will_paginate_spec.rb +0 -5
- data/spec/chewy/query/pagination_spec.rb +0 -39
- data/spec/chewy/query_spec.rb +0 -636
- data/spec/chewy/search/parameters/indices_boost_spec.rb +0 -83
data/lib/chewy/query/loading.rb
DELETED
@@ -1,111 +0,0 @@
|
|
1
|
-
module Chewy
|
2
|
-
class Query
|
3
|
-
module Loading
|
4
|
-
extend ActiveSupport::Concern
|
5
|
-
|
6
|
-
# Lazily loads actual ORM/ODM objects for search result.
|
7
|
-
# Returns scope marked to return loaded objects array instead of
|
8
|
-
# chewy wrappers. In case when object can not be loaded because it
|
9
|
-
# was deleted or don't satisfy given scope or options - the
|
10
|
-
# result collection will contain nil value in the place of this
|
11
|
-
# object. Use `compact` method to avoid this if necessary.
|
12
|
-
#
|
13
|
-
# UsersIndex.query(...).load #=> [#<User id: 42...>, ...]
|
14
|
-
# UsersIndex.query(...).load.filter(...) #=> [#<User id: 42...>, ...]
|
15
|
-
#
|
16
|
-
# Possible options:
|
17
|
-
#
|
18
|
-
# <tt>:scope</tt> - used to give a scope for _every_ loaded type.
|
19
|
-
#
|
20
|
-
# PlacesIndex.query(...).load(scope: ->{ includes(:testimonials) })
|
21
|
-
#
|
22
|
-
# If places here contain cities and countries then preload will be
|
23
|
-
# done like this:
|
24
|
-
#
|
25
|
-
# City.where(id: [...]).includes(:testimonials)
|
26
|
-
# Country.where(id: [...]).includes(:testimonials)
|
27
|
-
#
|
28
|
-
# It is also possible to pass own scope for every loaded type:
|
29
|
-
#
|
30
|
-
# PlacesIndex.query(...).load(
|
31
|
-
# city: { scope: ->{ includes(:testimonials, :country) }}
|
32
|
-
# country: { scope: ->{ includes(:testimonials, :cities) }}
|
33
|
-
# )
|
34
|
-
#
|
35
|
-
# And loading will be performed as:
|
36
|
-
#
|
37
|
-
# City.where(id: [...]).includes(:testimonials, :country)
|
38
|
-
# Country.where(id: [...]).includes(:testimonials, :cities)
|
39
|
-
#
|
40
|
-
# In case of ActiveRecord objects loading the same result
|
41
|
-
# will be reached using ActiveRecord scopes instead of
|
42
|
-
# lambdas. But it works only with per-type scopes,
|
43
|
-
# and doesn't work with the common scope.
|
44
|
-
#
|
45
|
-
# PlacesIndex.query(...).load(
|
46
|
-
# city: { scope: City.includes(:testimonials, :country) }
|
47
|
-
# country: { scope: Country.includes(:testimonials, :cities) }
|
48
|
-
# )
|
49
|
-
#
|
50
|
-
# <tt>:only</tt> - loads objects for the specified types
|
51
|
-
#
|
52
|
-
# PlacesIndex.query(...).load(only: :city)
|
53
|
-
# PlacesIndex.query(...).load(only: [:city])
|
54
|
-
# PlacesIndex.query(...).load(only: [:city, :country])
|
55
|
-
#
|
56
|
-
# <tt>:except</tt> - doesn't load listed types
|
57
|
-
#
|
58
|
-
# PlacesIndex.query(...).load(except: :city)
|
59
|
-
# PlacesIndex.query(...).load(except: [:city])
|
60
|
-
# PlacesIndex.query(...).load(except: [:city, :country])
|
61
|
-
#
|
62
|
-
def load(options = {})
|
63
|
-
chain { criteria.update_options preload: options, loaded_objects: true }
|
64
|
-
end
|
65
|
-
|
66
|
-
# This methods is just convenient way to preload some ORM/ODM
|
67
|
-
# objects and continue to work with Chewy wrappers. Returns
|
68
|
-
# Chewy query scope. Note that `load` method performs ES request
|
69
|
-
# so preload method should also be the last in scope methods chain.
|
70
|
-
# Takes the same options as the `load` method
|
71
|
-
#
|
72
|
-
# PlacesIndex.query(...).preload(only: :city)
|
73
|
-
#
|
74
|
-
# Loaded objects are also attached to corresponding Chewy
|
75
|
-
# type wrapper objects and available with `_object` accessor.
|
76
|
-
#
|
77
|
-
# scope = PlacesIndex.query(...)
|
78
|
-
# preload_scope = scope.preload
|
79
|
-
# preload_scope.first #=> PlacesIndex::City wrapper instance
|
80
|
-
# preload_scope.first._object #=> City model instance
|
81
|
-
# scope.load == preload_scope.map(&:_object) #=> true
|
82
|
-
#
|
83
|
-
def preload(options = {})
|
84
|
-
chain { criteria.update_options preload: options, loaded_objects: false }
|
85
|
-
end
|
86
|
-
|
87
|
-
private
|
88
|
-
|
89
|
-
def _load_objects!
|
90
|
-
options = criteria.options[:preload]
|
91
|
-
only = Array.wrap(options[:only]).map(&:to_s)
|
92
|
-
except = Array.wrap(options[:except]).map(&:to_s)
|
93
|
-
|
94
|
-
loaded_objects = Hash[_results.group_by(&:class).map do |type, objects|
|
95
|
-
next if except.include?(type.type_name)
|
96
|
-
next if only.present? && !only.include?(type.type_name)
|
97
|
-
|
98
|
-
loaded = type.adapter.load(objects.map(&:id), options.merge(_type: type)) || objects
|
99
|
-
[type, loaded.index_by.with_index do |loaded_object, i|
|
100
|
-
objects[i]._object = loaded_object
|
101
|
-
objects[i]
|
102
|
-
end]
|
103
|
-
end.compact]
|
104
|
-
|
105
|
-
_results.map do |result|
|
106
|
-
loaded_objects[result.class][result] if loaded_objects[result.class]
|
107
|
-
end
|
108
|
-
end
|
109
|
-
end
|
110
|
-
end
|
111
|
-
end
|
@@ -1,25 +0,0 @@
|
|
1
|
-
module Chewy
|
2
|
-
class Query
|
3
|
-
module Nodes
|
4
|
-
class And < Expr
|
5
|
-
def initialize(*nodes)
|
6
|
-
@options = nodes.extract_options!
|
7
|
-
@nodes = nodes.flatten.map { |node| node.is_a?(self.class) ? node.__nodes__ : node }.flatten
|
8
|
-
end
|
9
|
-
|
10
|
-
def __nodes__
|
11
|
-
@nodes
|
12
|
-
end
|
13
|
-
|
14
|
-
def __render__
|
15
|
-
nodes = @nodes.map(&:__render__)
|
16
|
-
if @options.key?(:cache)
|
17
|
-
{and: {filters: nodes, _cache: !!@options[:cache]}}
|
18
|
-
else
|
19
|
-
{and: nodes}
|
20
|
-
end
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
24
|
-
end
|
25
|
-
end
|
@@ -1,17 +0,0 @@
|
|
1
|
-
module Chewy
|
2
|
-
class Query
|
3
|
-
module Nodes
|
4
|
-
class Base
|
5
|
-
def render
|
6
|
-
raise NotImplementedError
|
7
|
-
end
|
8
|
-
|
9
|
-
def eql?(other)
|
10
|
-
other.is_a?(self.class) && instance_variables.all? do |ivar|
|
11
|
-
instance_variable_get(ivar).eql? other.instance_variable_get(ivar)
|
12
|
-
end
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
@@ -1,34 +0,0 @@
|
|
1
|
-
module Chewy
|
2
|
-
class Query
|
3
|
-
module Nodes
|
4
|
-
class Bool < Expr
|
5
|
-
METHODS = %w[must must_not should].freeze
|
6
|
-
|
7
|
-
def initialize(options = {})
|
8
|
-
@options = options
|
9
|
-
@must = []
|
10
|
-
@must_not = []
|
11
|
-
@should = []
|
12
|
-
end
|
13
|
-
|
14
|
-
METHODS.each do |method|
|
15
|
-
define_method method do |*exprs|
|
16
|
-
instance_variable_get("@#{method}").concat(exprs)
|
17
|
-
self
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
|
-
def __render__
|
22
|
-
bool = {
|
23
|
-
bool: Hash[METHODS.map do |method|
|
24
|
-
value = instance_variable_get("@#{method}")
|
25
|
-
[method.to_sym, value.map(&:__render__)] if value.present?
|
26
|
-
end.compact]
|
27
|
-
}
|
28
|
-
bool[:bool][:_cache] = !!@options[:cache] if @options.key?(:cache)
|
29
|
-
bool
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
@@ -1,34 +0,0 @@
|
|
1
|
-
module Chewy
|
2
|
-
class Query
|
3
|
-
module Nodes
|
4
|
-
class Equal < Expr
|
5
|
-
EXECUTION = {
|
6
|
-
:| => :or,
|
7
|
-
:or => :or,
|
8
|
-
:& => :and,
|
9
|
-
:and => :and,
|
10
|
-
:b => :bool,
|
11
|
-
:bool => :bool,
|
12
|
-
:f => :fielddata,
|
13
|
-
:fielddata => :fielddata
|
14
|
-
}.freeze
|
15
|
-
|
16
|
-
def initialize(name, value, *args)
|
17
|
-
@name = name.to_s
|
18
|
-
@value = value
|
19
|
-
@options = args.extract_options!
|
20
|
-
execution = EXECUTION[args.first.to_sym] if args.first
|
21
|
-
@options[:execution] = execution if execution
|
22
|
-
end
|
23
|
-
|
24
|
-
def __render__
|
25
|
-
filter = (@value.is_a?(Array) ? :terms : :term)
|
26
|
-
body = {@name => @value}
|
27
|
-
body.merge!(@options.slice(:execution)) if filter == :terms
|
28
|
-
body[:_cache] = !!@options[:cache] if @options.key?(:cache)
|
29
|
-
{filter => body}
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
module Chewy
|
2
|
-
class Query
|
3
|
-
module Nodes
|
4
|
-
class Exists < Expr
|
5
|
-
def initialize(name, options = {})
|
6
|
-
@name = name.to_s
|
7
|
-
@options = options
|
8
|
-
end
|
9
|
-
|
10
|
-
def !
|
11
|
-
Nodes::Missing.new @name, null_value: true
|
12
|
-
end
|
13
|
-
|
14
|
-
def __render__
|
15
|
-
{exists: {field: @name}}
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
@@ -1,28 +0,0 @@
|
|
1
|
-
module Chewy
|
2
|
-
class Query
|
3
|
-
module Nodes
|
4
|
-
class Expr < Base
|
5
|
-
def &(other)
|
6
|
-
Nodes::And.new self, other
|
7
|
-
end
|
8
|
-
|
9
|
-
def |(other)
|
10
|
-
Nodes::Or.new self, other
|
11
|
-
end
|
12
|
-
|
13
|
-
def !
|
14
|
-
Nodes::Not.new self
|
15
|
-
end
|
16
|
-
|
17
|
-
def ~
|
18
|
-
@options[:cache] = true
|
19
|
-
self
|
20
|
-
end
|
21
|
-
|
22
|
-
def __render__
|
23
|
-
raise NotImplementedError
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
@@ -1,110 +0,0 @@
|
|
1
|
-
module Chewy
|
2
|
-
class Query
|
3
|
-
module Nodes
|
4
|
-
class Field < Base
|
5
|
-
def initialize(name, *args)
|
6
|
-
@name = name.to_s
|
7
|
-
@args = args
|
8
|
-
end
|
9
|
-
|
10
|
-
def !
|
11
|
-
Nodes::Missing.new @name
|
12
|
-
end
|
13
|
-
|
14
|
-
def ~
|
15
|
-
__options_merge__!(cache: true)
|
16
|
-
self
|
17
|
-
end
|
18
|
-
|
19
|
-
def >(other)
|
20
|
-
Nodes::Range.new @name, *__options_merge__(gt: other)
|
21
|
-
end
|
22
|
-
|
23
|
-
def <(other)
|
24
|
-
Nodes::Range.new @name, *__options_merge__(lt: other)
|
25
|
-
end
|
26
|
-
|
27
|
-
def >=(other)
|
28
|
-
Nodes::Range.new @name, *__options_merge__(gt: other, left_closed: true)
|
29
|
-
end
|
30
|
-
|
31
|
-
def <=(other)
|
32
|
-
Nodes::Range.new @name, *__options_merge__(lt: other, right_closed: true)
|
33
|
-
end
|
34
|
-
|
35
|
-
def ==(other)
|
36
|
-
case other
|
37
|
-
when nil
|
38
|
-
nil?
|
39
|
-
when ::Regexp
|
40
|
-
Nodes::Regexp.new @name, other, *@args
|
41
|
-
when ::Range
|
42
|
-
Nodes::Range.new @name, *__options_merge__(gt: other.first, lt: other.last)
|
43
|
-
else
|
44
|
-
if other.is_a?(Array) && other.first.is_a?(::Range)
|
45
|
-
Nodes::Range.new @name, *__options_merge__(
|
46
|
-
gt: other.first.first, lt: other.first.last,
|
47
|
-
left_closed: true, right_closed: true
|
48
|
-
)
|
49
|
-
else
|
50
|
-
Nodes::Equal.new @name, other, *@args
|
51
|
-
end
|
52
|
-
end
|
53
|
-
end
|
54
|
-
|
55
|
-
def !=(other)
|
56
|
-
case other
|
57
|
-
when nil
|
58
|
-
Nodes::Exists.new @name
|
59
|
-
else
|
60
|
-
Nodes::Not.new self == other
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
def =~(other)
|
65
|
-
case other
|
66
|
-
when ::Regexp
|
67
|
-
Nodes::Regexp.new @name, other, *@args
|
68
|
-
else
|
69
|
-
Nodes::Prefix.new @name, other, @args.extract_options!
|
70
|
-
end
|
71
|
-
end
|
72
|
-
|
73
|
-
def !~(other)
|
74
|
-
Not.new(self =~ other)
|
75
|
-
end
|
76
|
-
|
77
|
-
def nil?
|
78
|
-
Nodes::Missing.new @name, existence: false, null_value: true
|
79
|
-
end
|
80
|
-
|
81
|
-
def method_missing(method, *args) # rubocop:disable Style/MethodMissing
|
82
|
-
method = method.to_s
|
83
|
-
if method =~ /\?\Z/
|
84
|
-
Nodes::Exists.new [@name, method.gsub(/\?\Z/, '')].join('.')
|
85
|
-
else
|
86
|
-
self.class.new [@name, method].join('.'), *args
|
87
|
-
end
|
88
|
-
end
|
89
|
-
|
90
|
-
def to_ary
|
91
|
-
nil
|
92
|
-
end
|
93
|
-
|
94
|
-
private
|
95
|
-
|
96
|
-
def __options_merge__!(additional = {})
|
97
|
-
options = @args.extract_options!
|
98
|
-
options = options.merge(additional)
|
99
|
-
@args.push(options)
|
100
|
-
end
|
101
|
-
|
102
|
-
def __options_merge__(additional = {})
|
103
|
-
options = @args.extract_options!
|
104
|
-
options = options.merge(additional)
|
105
|
-
@args + [options]
|
106
|
-
end
|
107
|
-
end
|
108
|
-
end
|
109
|
-
end
|
110
|
-
end
|
@@ -1,59 +0,0 @@
|
|
1
|
-
require 'chewy/query/compose'
|
2
|
-
|
3
|
-
module Chewy
|
4
|
-
class Query
|
5
|
-
module Nodes
|
6
|
-
class HasRelation < Expr
|
7
|
-
include Compose
|
8
|
-
|
9
|
-
def initialize(type, outer = nil)
|
10
|
-
@type = type.to_s
|
11
|
-
@outer = outer
|
12
|
-
@query_mode = :must
|
13
|
-
@filter_mode = :and
|
14
|
-
@queries = []
|
15
|
-
@filters = []
|
16
|
-
end
|
17
|
-
|
18
|
-
def query_mode(mode)
|
19
|
-
@query_mode = mode
|
20
|
-
self
|
21
|
-
end
|
22
|
-
|
23
|
-
def filter_mode(mode)
|
24
|
-
@filter_mode = mode
|
25
|
-
self
|
26
|
-
end
|
27
|
-
|
28
|
-
def query(params = nil, &block)
|
29
|
-
raise 'Query DLS is not supported yet' if block
|
30
|
-
@queries.push(params)
|
31
|
-
self
|
32
|
-
end
|
33
|
-
|
34
|
-
def filter(params = nil, &block)
|
35
|
-
if block
|
36
|
-
@filters.push(Chewy::Query::Filters.new(@outer, &block).__render__)
|
37
|
-
else
|
38
|
-
@filters.push(params)
|
39
|
-
end
|
40
|
-
self
|
41
|
-
end
|
42
|
-
|
43
|
-
def __render__
|
44
|
-
queries = _queries_join @queries, @query_mode
|
45
|
-
filters = _filters_join @filters, @filter_mode
|
46
|
-
|
47
|
-
body = if filters && !queries
|
48
|
-
{filter: filters}
|
49
|
-
else
|
50
|
-
_filtered_query(queries, filters)
|
51
|
-
end
|
52
|
-
body ||= {}
|
53
|
-
|
54
|
-
{_relation => body.merge(type: @type)}
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|