chewy 0.10.1 → 7.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.github/CODEOWNERS +1 -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/.github/workflows/ruby.yml +74 -0
- data/.rubocop.yml +28 -23
- data/.rubocop_todo.yml +110 -22
- data/CHANGELOG.md +480 -298
- data/CODE_OF_CONDUCT.md +14 -0
- data/CONTRIBUTING.md +63 -0
- data/Gemfile +3 -5
- data/Guardfile +3 -1
- data/LICENSE.txt +1 -1
- data/README.md +571 -333
- data/chewy.gemspec +12 -15
- data/gemfiles/rails.5.2.activerecord.gemfile +11 -0
- data/gemfiles/rails.6.0.activerecord.gemfile +11 -0
- data/gemfiles/rails.6.1.activerecord.gemfile +13 -0
- data/gemfiles/rails.7.0.activerecord.gemfile +13 -0
- data/lib/chewy/config.rb +48 -77
- data/lib/chewy/errors.rb +4 -10
- data/lib/chewy/fields/base.rb +88 -16
- data/lib/chewy/fields/root.rb +15 -21
- data/lib/chewy/index/actions.rb +67 -38
- data/lib/chewy/{type → index}/adapter/active_record.rb +18 -4
- data/lib/chewy/{type → index}/adapter/base.rb +11 -12
- data/lib/chewy/{type → index}/adapter/object.rb +28 -32
- data/lib/chewy/{type → index}/adapter/orm.rb +26 -24
- data/lib/chewy/index/aliases.rb +14 -5
- data/lib/chewy/index/crutch.rb +40 -0
- data/lib/chewy/index/import/bulk_builder.rb +311 -0
- data/lib/chewy/{type → index}/import/bulk_request.rb +10 -9
- data/lib/chewy/{type → index}/import/journal_builder.rb +11 -12
- data/lib/chewy/{type → index}/import/routine.rb +19 -18
- data/lib/chewy/{type → index}/import.rb +82 -36
- data/lib/chewy/{type → index}/mapping.rb +63 -62
- data/lib/chewy/index/observe/active_record_methods.rb +87 -0
- data/lib/chewy/index/observe/callback.rb +34 -0
- data/lib/chewy/index/observe.rb +17 -0
- data/lib/chewy/index/settings.rb +2 -0
- data/lib/chewy/index/specification.rb +13 -10
- data/lib/chewy/{type → index}/syncer.rb +62 -63
- data/lib/chewy/{type → index}/witchcraft.rb +15 -9
- data/lib/chewy/{type → index}/wrapper.rb +16 -6
- data/lib/chewy/index.rb +68 -93
- data/lib/chewy/journal.rb +25 -14
- data/lib/chewy/minitest/helpers.rb +91 -18
- data/lib/chewy/minitest/search_index_receiver.rb +29 -33
- data/lib/chewy/multi_search.rb +62 -0
- data/lib/chewy/railtie.rb +8 -24
- data/lib/chewy/rake_helper.rb +141 -112
- data/lib/chewy/rspec/build_query.rb +12 -0
- data/lib/chewy/rspec/helpers.rb +55 -0
- data/lib/chewy/rspec/update_index.rb +58 -49
- data/lib/chewy/rspec.rb +2 -0
- data/lib/chewy/runtime.rb +1 -1
- data/lib/chewy/search/loader.rb +19 -41
- data/lib/chewy/search/parameters/allow_partial_search_results.rb +27 -0
- data/lib/chewy/search/parameters/collapse.rb +16 -0
- data/lib/chewy/search/parameters/concerns/query_storage.rb +6 -5
- data/lib/chewy/search/parameters/ignore_unavailable.rb +27 -0
- data/lib/chewy/search/parameters/indices.rb +78 -0
- data/lib/chewy/search/parameters/none.rb +1 -3
- data/lib/chewy/search/parameters/order.rb +6 -19
- data/lib/chewy/search/parameters/source.rb +5 -1
- data/lib/chewy/search/parameters/track_total_hits.rb +16 -0
- data/lib/chewy/search/parameters.rb +28 -8
- data/lib/chewy/search/query_proxy.rb +9 -2
- data/lib/chewy/search/request.rb +207 -157
- data/lib/chewy/search/response.rb +5 -5
- data/lib/chewy/search/scoping.rb +7 -8
- data/lib/chewy/search/scrolling.rb +14 -13
- data/lib/chewy/search.rb +7 -26
- data/lib/chewy/stash.rb +27 -29
- data/lib/chewy/strategy/active_job.rb +2 -2
- data/lib/chewy/strategy/atomic.rb +1 -1
- data/lib/chewy/strategy/atomic_no_refresh.rb +18 -0
- data/lib/chewy/strategy/base.rb +10 -0
- data/lib/chewy/strategy/delayed_sidekiq/scheduler.rb +148 -0
- data/lib/chewy/strategy/delayed_sidekiq/worker.rb +52 -0
- data/lib/chewy/strategy/delayed_sidekiq.rb +17 -0
- data/lib/chewy/strategy/lazy_sidekiq.rb +64 -0
- data/lib/chewy/strategy/sidekiq.rb +3 -2
- data/lib/chewy/strategy.rb +6 -19
- data/lib/chewy/version.rb +1 -1
- data/lib/chewy.rb +37 -80
- data/lib/generators/chewy/install_generator.rb +1 -1
- data/lib/tasks/chewy.rake +26 -32
- data/migration_guide.md +56 -0
- data/spec/chewy/config_spec.rb +27 -57
- data/spec/chewy/fields/base_spec.rb +457 -174
- data/spec/chewy/fields/root_spec.rb +24 -32
- data/spec/chewy/fields/time_fields_spec.rb +5 -5
- data/spec/chewy/index/actions_spec.rb +425 -60
- data/spec/chewy/{type → index}/adapter/active_record_spec.rb +110 -44
- data/spec/chewy/{type → index}/adapter/object_spec.rb +21 -6
- data/spec/chewy/index/aliases_spec.rb +3 -3
- data/spec/chewy/index/import/bulk_builder_spec.rb +494 -0
- data/spec/chewy/{type → index}/import/bulk_request_spec.rb +5 -12
- data/spec/chewy/{type → index}/import/journal_builder_spec.rb +22 -30
- data/spec/chewy/{type → index}/import/routine_spec.rb +19 -19
- data/spec/chewy/{type → index}/import_spec.rb +154 -95
- data/spec/chewy/index/mapping_spec.rb +135 -0
- data/spec/chewy/index/observe/active_record_methods_spec.rb +68 -0
- data/spec/chewy/index/observe/callback_spec.rb +139 -0
- data/spec/chewy/index/observe_spec.rb +143 -0
- data/spec/chewy/index/settings_spec.rb +3 -1
- data/spec/chewy/index/specification_spec.rb +32 -33
- data/spec/chewy/{type → index}/syncer_spec.rb +14 -19
- data/spec/chewy/{type → index}/witchcraft_spec.rb +34 -21
- data/spec/chewy/index/wrapper_spec.rb +100 -0
- data/spec/chewy/index_spec.rb +99 -114
- data/spec/chewy/journal_spec.rb +56 -101
- data/spec/chewy/minitest/helpers_spec.rb +122 -14
- data/spec/chewy/minitest/search_index_receiver_spec.rb +24 -26
- data/spec/chewy/multi_search_spec.rb +84 -0
- data/spec/chewy/rake_helper_spec.rb +325 -101
- data/spec/chewy/rspec/build_query_spec.rb +34 -0
- data/spec/chewy/rspec/helpers_spec.rb +61 -0
- data/spec/chewy/rspec/update_index_spec.rb +106 -102
- data/spec/chewy/runtime_spec.rb +2 -2
- data/spec/chewy/search/loader_spec.rb +19 -53
- data/spec/chewy/search/pagination/kaminari_examples.rb +3 -5
- data/spec/chewy/search/pagination/kaminari_spec.rb +1 -1
- data/spec/chewy/search/parameters/collapse_spec.rb +5 -0
- data/spec/chewy/search/parameters/ignore_unavailable_spec.rb +67 -0
- data/spec/chewy/search/parameters/indices_spec.rb +99 -0
- data/spec/chewy/search/parameters/none_spec.rb +1 -1
- data/spec/chewy/search/parameters/order_spec.rb +18 -11
- data/spec/chewy/search/parameters/query_storage_examples.rb +67 -21
- data/spec/chewy/search/parameters/search_after_spec.rb +4 -1
- data/spec/chewy/search/parameters/source_spec.rb +8 -2
- data/spec/chewy/search/parameters/track_total_hits_spec.rb +5 -0
- data/spec/chewy/search/parameters_spec.rb +39 -8
- data/spec/chewy/search/query_proxy_spec.rb +68 -17
- data/spec/chewy/search/request_spec.rb +360 -149
- data/spec/chewy/search/response_spec.rb +35 -25
- data/spec/chewy/search/scrolling_spec.rb +28 -26
- data/spec/chewy/search_spec.rb +73 -53
- data/spec/chewy/stash_spec.rb +16 -26
- data/spec/chewy/strategy/active_job_spec.rb +23 -10
- data/spec/chewy/strategy/atomic_no_refresh_spec.rb +60 -0
- data/spec/chewy/strategy/atomic_spec.rb +9 -10
- data/spec/chewy/strategy/delayed_sidekiq_spec.rb +190 -0
- data/spec/chewy/strategy/lazy_sidekiq_spec.rb +214 -0
- data/spec/chewy/strategy/sidekiq_spec.rb +14 -10
- data/spec/chewy/strategy_spec.rb +19 -15
- data/spec/chewy_spec.rb +17 -110
- data/spec/spec_helper.rb +7 -22
- data/spec/support/active_record.rb +43 -5
- metadata +123 -198
- data/.travis.yml +0 -53
- data/Appraisals +0 -79
- data/LEGACY_DSL.md +0 -497
- data/gemfiles/rails.4.0.activerecord.gemfile +0 -14
- data/gemfiles/rails.4.1.activerecord.gemfile +0 -14
- data/gemfiles/rails.4.2.activerecord.gemfile +0 -15
- data/gemfiles/rails.4.2.mongoid.5.1.gemfile +0 -15
- 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/gemfiles/sequel.4.45.gemfile +0 -11
- data/lib/chewy/backports/deep_dup.rb +0 -46
- data/lib/chewy/backports/duplicable.rb +0 -91
- 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/lib/chewy/query.rb +0 -1098
- data/lib/chewy/search/pagination/will_paginate.rb +0 -43
- data/lib/chewy/search/parameters/types.rb +0 -20
- data/lib/chewy/strategy/resque.rb +0 -27
- data/lib/chewy/strategy/shoryuken.rb +0 -40
- data/lib/chewy/type/actions.rb +0 -43
- data/lib/chewy/type/adapter/mongoid.rb +0 -69
- data/lib/chewy/type/adapter/sequel.rb +0 -95
- data/lib/chewy/type/crutch.rb +0 -32
- data/lib/chewy/type/import/bulk_builder.rb +0 -122
- data/lib/chewy/type/observe.rb +0 -78
- data/lib/chewy/type.rb +0 -117
- data/lib/sequel/plugins/chewy_observe.rb +0 -78
- 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/pagination/will_paginate_examples.rb +0 -63
- data/spec/chewy/search/pagination/will_paginate_spec.rb +0 -23
- data/spec/chewy/search/parameters/indices_boost_spec.rb +0 -83
- data/spec/chewy/search/parameters/types_spec.rb +0 -5
- data/spec/chewy/strategy/resque_spec.rb +0 -46
- data/spec/chewy/strategy/shoryuken_spec.rb +0 -64
- data/spec/chewy/type/actions_spec.rb +0 -50
- data/spec/chewy/type/adapter/mongoid_spec.rb +0 -372
- data/spec/chewy/type/adapter/sequel_spec.rb +0 -472
- data/spec/chewy/type/import/bulk_builder_spec.rb +0 -279
- data/spec/chewy/type/mapping_spec.rb +0 -142
- data/spec/chewy/type/observe_spec.rb +0 -137
- data/spec/chewy/type/wrapper_spec.rb +0 -98
- data/spec/chewy/type_spec.rb +0 -55
- data/spec/support/mongoid.rb +0 -93
- data/spec/support/sequel.rb +0 -80
@@ -1,15 +0,0 @@
|
|
1
|
-
# This file was generated by Appraisal
|
2
|
-
|
3
|
-
source "https://rubygems.org"
|
4
|
-
|
5
|
-
gem "mongoid", "~> 6.1.0"
|
6
|
-
gem "activesupport", "~> 5.1.0"
|
7
|
-
gem "activejob", "~> 5.1.0"
|
8
|
-
gem "resque", require: false
|
9
|
-
gem "shoryuken", require: false
|
10
|
-
gem "sidekiq", require: false
|
11
|
-
gem "kaminari-core", "~> 1.0.0", require: false
|
12
|
-
gem "will_paginate", require: false
|
13
|
-
gem "parallel", require: false
|
14
|
-
|
15
|
-
gemspec path: "../"
|
@@ -1,11 +0,0 @@
|
|
1
|
-
# This file was generated by Appraisal
|
2
|
-
|
3
|
-
source "https://rubygems.org"
|
4
|
-
|
5
|
-
gem "sequel", "~> 4.45.0"
|
6
|
-
gem "activesupport", "~> 5.0.0"
|
7
|
-
gem "kaminari-core", "~> 1.0.0", require: false
|
8
|
-
gem "will_paginate", require: false
|
9
|
-
gem "parallel", require: false
|
10
|
-
|
11
|
-
gemspec path: "../"
|
@@ -1,46 +0,0 @@
|
|
1
|
-
require 'chewy/backports/duplicable'
|
2
|
-
|
3
|
-
class Object
|
4
|
-
# Returns a deep copy of object if it's duplicable. If it's
|
5
|
-
# not duplicable, returns +self+.
|
6
|
-
#
|
7
|
-
# object = Object.new
|
8
|
-
# dup = object.deep_dup
|
9
|
-
# dup.instance_variable_set(:@a, 1)
|
10
|
-
#
|
11
|
-
# object.instance_variable_defined?(:@a) # => false
|
12
|
-
# dup.instance_variable_defined?(:@a) # => true
|
13
|
-
def deep_dup
|
14
|
-
duplicable? ? dup : self
|
15
|
-
end
|
16
|
-
end
|
17
|
-
|
18
|
-
class Array
|
19
|
-
# Returns a deep copy of array.
|
20
|
-
#
|
21
|
-
# array = [1, [2, 3]]
|
22
|
-
# dup = array.deep_dup
|
23
|
-
# dup[1][2] = 4
|
24
|
-
#
|
25
|
-
# array[1][2] # => nil
|
26
|
-
# dup[1][2] # => 4
|
27
|
-
def deep_dup
|
28
|
-
map(&:deep_dup)
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
|
-
class Hash
|
33
|
-
# Returns a deep copy of hash.
|
34
|
-
#
|
35
|
-
# hash = { a: { b: 'b' } }
|
36
|
-
# dup = hash.deep_dup
|
37
|
-
# dup[:a][:c] = 'c'
|
38
|
-
#
|
39
|
-
# hash[:a][:c] # => nil
|
40
|
-
# dup[:a][:c] # => "c"
|
41
|
-
def deep_dup
|
42
|
-
each_with_object(dup) do |(key, value), hash|
|
43
|
-
hash[key.deep_dup] = value.deep_dup
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
@@ -1,91 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Most objects are cloneable, but not all. For example you can't dup +nil+:
|
3
|
-
#
|
4
|
-
# nil.dup # => TypeError: can't dup NilClass
|
5
|
-
#
|
6
|
-
# Classes may signal their instances are not duplicable removing +dup+/+clone+
|
7
|
-
# or raising exceptions from them. So, to dup an arbitrary object you normally
|
8
|
-
# use an optimistic approach and are ready to catch an exception, say:
|
9
|
-
#
|
10
|
-
# arbitrary_object.dup rescue object
|
11
|
-
#
|
12
|
-
# Rails dups objects in a few critical spots where they are not that arbitrary.
|
13
|
-
# That rescue is very expensive (like 40 times slower than a predicate), and it
|
14
|
-
# is often triggered.
|
15
|
-
#
|
16
|
-
# That's why we hardcode the following cases and check duplicable? instead of
|
17
|
-
# using that rescue idiom.
|
18
|
-
#++
|
19
|
-
class Object
|
20
|
-
# Can you safely dup this object?
|
21
|
-
#
|
22
|
-
# False for +nil+, +false+, +true+, symbol, and number objects;
|
23
|
-
# true otherwise.
|
24
|
-
def duplicable?
|
25
|
-
true
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
class NilClass
|
30
|
-
# +nil+ is not duplicable:
|
31
|
-
#
|
32
|
-
# nil.duplicable? # => false
|
33
|
-
# nil.dup # => TypeError: can't dup NilClass
|
34
|
-
def duplicable?
|
35
|
-
false
|
36
|
-
end
|
37
|
-
end
|
38
|
-
|
39
|
-
class FalseClass
|
40
|
-
# +false+ is not duplicable:
|
41
|
-
#
|
42
|
-
# false.duplicable? # => false
|
43
|
-
# false.dup # => TypeError: can't dup FalseClass
|
44
|
-
def duplicable?
|
45
|
-
false
|
46
|
-
end
|
47
|
-
end
|
48
|
-
|
49
|
-
class TrueClass
|
50
|
-
# +true+ is not duplicable:
|
51
|
-
#
|
52
|
-
# true.duplicable? # => false
|
53
|
-
# true.dup # => TypeError: can't dup TrueClass
|
54
|
-
def duplicable?
|
55
|
-
false
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
|
-
class Symbol
|
60
|
-
# Symbols are not duplicable:
|
61
|
-
#
|
62
|
-
# :my_symbol.duplicable? # => false
|
63
|
-
# :my_symbol.dup # => TypeError: can't dup Symbol
|
64
|
-
def duplicable?
|
65
|
-
false
|
66
|
-
end
|
67
|
-
end
|
68
|
-
|
69
|
-
class Numeric
|
70
|
-
# Numbers are not duplicable:
|
71
|
-
#
|
72
|
-
# 3.duplicable? # => false
|
73
|
-
# 3.dup # => TypeError: can't dup Fixnum
|
74
|
-
def duplicable?
|
75
|
-
false
|
76
|
-
end
|
77
|
-
end
|
78
|
-
|
79
|
-
require 'bigdecimal'
|
80
|
-
class BigDecimal
|
81
|
-
begin
|
82
|
-
BigDecimal.new('4.56').dup
|
83
|
-
|
84
|
-
def duplicable?
|
85
|
-
true
|
86
|
-
end
|
87
|
-
rescue TypeError
|
88
|
-
# can't dup, so use superclass implementation
|
89
|
-
nil
|
90
|
-
end
|
91
|
-
end
|
data/lib/chewy/query/compose.rb
DELETED
@@ -1,68 +0,0 @@
|
|
1
|
-
module Chewy
|
2
|
-
class Query
|
3
|
-
module Compose
|
4
|
-
protected
|
5
|
-
|
6
|
-
def _filtered_query(query, filter, options = {})
|
7
|
-
query = {match_all: {}} if !query.present? && filter.present?
|
8
|
-
|
9
|
-
if filter.present?
|
10
|
-
filtered = if query.present?
|
11
|
-
{query: {filtered: {
|
12
|
-
query: query,
|
13
|
-
filter: filter
|
14
|
-
}}}
|
15
|
-
else
|
16
|
-
{query: {filtered: {
|
17
|
-
filter: filter
|
18
|
-
}}}
|
19
|
-
end
|
20
|
-
filtered[:query][:filtered][:strategy] = options[:strategy].to_s if options[:strategy].present?
|
21
|
-
filtered
|
22
|
-
elsif query.present?
|
23
|
-
{query: query}
|
24
|
-
else
|
25
|
-
{}
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
def _queries_join(queries, logic)
|
30
|
-
queries = queries.compact
|
31
|
-
|
32
|
-
if queries.many? || (queries.present? && logic == :must_not)
|
33
|
-
case logic
|
34
|
-
when :dis_max
|
35
|
-
{dis_max: {queries: queries}}
|
36
|
-
when :must, :should, :must_not
|
37
|
-
{bool: {logic => queries}}
|
38
|
-
else
|
39
|
-
if logic.is_a?(Float)
|
40
|
-
{dis_max: {queries: queries, tie_breaker: logic}}
|
41
|
-
else
|
42
|
-
{bool: {should: queries, minimum_should_match: logic}}
|
43
|
-
end
|
44
|
-
end
|
45
|
-
else
|
46
|
-
queries.first
|
47
|
-
end
|
48
|
-
end
|
49
|
-
|
50
|
-
def _filters_join(filters, logic)
|
51
|
-
filters = filters.compact
|
52
|
-
|
53
|
-
if filters.many? || (filters.present? && logic == :must_not)
|
54
|
-
case logic
|
55
|
-
when :and, :or
|
56
|
-
{logic => filters}
|
57
|
-
when :must, :should, :must_not
|
58
|
-
{bool: {logic => filters}}
|
59
|
-
else
|
60
|
-
{bool: {should: filters, minimum_should_match: logic}}
|
61
|
-
end
|
62
|
-
else
|
63
|
-
filters.first
|
64
|
-
end
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
68
|
-
end
|
data/lib/chewy/query/criteria.rb
DELETED
@@ -1,191 +0,0 @@
|
|
1
|
-
require 'chewy/query/compose'
|
2
|
-
|
3
|
-
module Chewy
|
4
|
-
class Query
|
5
|
-
class Criteria
|
6
|
-
include Compose
|
7
|
-
ARRAY_STORAGES = %i[queries filters post_filters sort fields types scores].freeze
|
8
|
-
HASH_STORAGES = %i[options search_options request_options facets aggregations suggest script_fields].freeze
|
9
|
-
STORAGES = ARRAY_STORAGES + HASH_STORAGES
|
10
|
-
|
11
|
-
def initialize(options = {})
|
12
|
-
@options = options.merge(
|
13
|
-
query_mode: Chewy.query_mode,
|
14
|
-
filter_mode: Chewy.filter_mode,
|
15
|
-
post_filter_mode: Chewy.post_filter_mode || Chewy.filter_mode
|
16
|
-
)
|
17
|
-
end
|
18
|
-
|
19
|
-
def ==(other)
|
20
|
-
other.is_a?(self.class) && storages == other.storages
|
21
|
-
end
|
22
|
-
|
23
|
-
{ARRAY_STORAGES => '[]', HASH_STORAGES => '{}'}.each do |storages, default|
|
24
|
-
storages.each do |storage|
|
25
|
-
class_eval <<-METHODS, __FILE__, __LINE__ + 1
|
26
|
-
def #{storage}
|
27
|
-
@#{storage} ||= #{default}
|
28
|
-
end
|
29
|
-
METHODS
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
STORAGES.each do |storage|
|
34
|
-
define_method "#{storage}?" do
|
35
|
-
send(storage).any?
|
36
|
-
end
|
37
|
-
end
|
38
|
-
|
39
|
-
def none?
|
40
|
-
!!options[:none]
|
41
|
-
end
|
42
|
-
|
43
|
-
def update_options(modifier)
|
44
|
-
options.merge!(modifier)
|
45
|
-
end
|
46
|
-
|
47
|
-
def update_request_options(modifier)
|
48
|
-
request_options.merge!(modifier)
|
49
|
-
end
|
50
|
-
|
51
|
-
def update_search_options(modifier)
|
52
|
-
search_options.merge!(modifier)
|
53
|
-
end
|
54
|
-
|
55
|
-
def update_facets(modifier)
|
56
|
-
facets.merge!(modifier)
|
57
|
-
end
|
58
|
-
|
59
|
-
def update_scores(modifier)
|
60
|
-
@scores = scores + Array.wrap(modifier).reject(&:blank?)
|
61
|
-
end
|
62
|
-
|
63
|
-
def update_aggregations(modifier)
|
64
|
-
aggregations.merge!(modifier)
|
65
|
-
end
|
66
|
-
|
67
|
-
def update_suggest(modifier)
|
68
|
-
suggest.merge!(modifier)
|
69
|
-
end
|
70
|
-
|
71
|
-
def update_script_fields(modifier)
|
72
|
-
script_fields.merge!(modifier)
|
73
|
-
end
|
74
|
-
|
75
|
-
%i[filters queries post_filters].each do |storage|
|
76
|
-
class_eval <<-RUBY, __FILE__, __LINE__ + 1
|
77
|
-
def update_#{storage}(modifier)
|
78
|
-
@#{storage} = #{storage} + Array.wrap(modifier).reject(&:blank?)
|
79
|
-
end
|
80
|
-
RUBY
|
81
|
-
end
|
82
|
-
|
83
|
-
def update_sort(modifier, options = {})
|
84
|
-
@sort = nil if options[:purge]
|
85
|
-
modifier = Array.wrap(modifier).flatten.map do |element|
|
86
|
-
element.is_a?(Hash) ? element.map { |k, v| {k => v} } : element
|
87
|
-
end.flatten
|
88
|
-
@sort = sort + modifier
|
89
|
-
end
|
90
|
-
|
91
|
-
%w[fields types].each do |storage|
|
92
|
-
define_method "update_#{storage}" do |modifier, options = {}|
|
93
|
-
variable = "@#{storage}"
|
94
|
-
instance_variable_set(variable, nil) if options[:purge]
|
95
|
-
modifier = send(storage) | Array.wrap(modifier).flatten.map(&:to_s).reject(&:blank?)
|
96
|
-
instance_variable_set(variable, modifier)
|
97
|
-
end
|
98
|
-
end
|
99
|
-
|
100
|
-
def merge!(other)
|
101
|
-
STORAGES.each do |storage|
|
102
|
-
send("update_#{storage}", other.send(storage))
|
103
|
-
end
|
104
|
-
self
|
105
|
-
end
|
106
|
-
|
107
|
-
def merge(other)
|
108
|
-
clone.merge!(other)
|
109
|
-
end
|
110
|
-
|
111
|
-
def request_body
|
112
|
-
body = _filtered_query(_request_query, _request_filter, options.slice(:strategy))
|
113
|
-
|
114
|
-
if options[:simple]
|
115
|
-
{body: body.presence || {query: {match_all: {}}}}
|
116
|
-
else
|
117
|
-
body[:post_filter] = _request_post_filter if post_filters?
|
118
|
-
body[:facets] = facets if facets?
|
119
|
-
body[:aggregations] = aggregations if aggregations?
|
120
|
-
body[:suggest] = suggest if suggest?
|
121
|
-
body[:sort] = sort if sort?
|
122
|
-
body[:_source] = fields if fields?
|
123
|
-
body[:script_fields] = script_fields if script_fields?
|
124
|
-
|
125
|
-
body = _boost_query(body)
|
126
|
-
|
127
|
-
{body: body.merge!(_request_options)}.merge!(search_options)
|
128
|
-
end
|
129
|
-
end
|
130
|
-
|
131
|
-
protected
|
132
|
-
|
133
|
-
def storages
|
134
|
-
STORAGES.map { |storage| send(storage) }
|
135
|
-
end
|
136
|
-
|
137
|
-
def initialize_clone(origin)
|
138
|
-
STORAGES.each do |storage|
|
139
|
-
value = origin.send(storage)
|
140
|
-
instance_variable_set("@#{storage}", value.deep_dup)
|
141
|
-
end
|
142
|
-
end
|
143
|
-
|
144
|
-
def _boost_query(body)
|
145
|
-
return body unless scores?
|
146
|
-
query = body.delete :query
|
147
|
-
filter = body.delete :filter
|
148
|
-
if query && filter
|
149
|
-
query = {filtered: {query: query, filter: filter}}
|
150
|
-
filter = nil
|
151
|
-
end
|
152
|
-
score = {}
|
153
|
-
score[:functions] = scores
|
154
|
-
score[:boost_mode] = options[:boost_mode] if options[:boost_mode]
|
155
|
-
score[:score_mode] = options[:score_mode] if options[:score_mode]
|
156
|
-
score[:query] = query if query
|
157
|
-
score[:filter] = filter if filter
|
158
|
-
body.tap { |b| b[:query] = {function_score: score} }
|
159
|
-
end
|
160
|
-
|
161
|
-
def _request_options
|
162
|
-
Hash[request_options.map do |key, value|
|
163
|
-
[key, value.is_a?(Proc) ? value.call : value]
|
164
|
-
end]
|
165
|
-
end
|
166
|
-
|
167
|
-
def _request_query
|
168
|
-
_queries_join(queries, options[:query_mode])
|
169
|
-
end
|
170
|
-
|
171
|
-
def _request_filter
|
172
|
-
filter_mode = options[:filter_mode]
|
173
|
-
request_filter = if filter_mode == :and
|
174
|
-
filters
|
175
|
-
else
|
176
|
-
[_filters_join(filters, filter_mode)]
|
177
|
-
end
|
178
|
-
|
179
|
-
_filters_join([_request_types, *request_filter], :and)
|
180
|
-
end
|
181
|
-
|
182
|
-
def _request_types
|
183
|
-
_filters_join(types.map { |type| {type: {value: type}} }, :or)
|
184
|
-
end
|
185
|
-
|
186
|
-
def _request_post_filter
|
187
|
-
_filters_join(post_filters, options[:post_filter_mode])
|
188
|
-
end
|
189
|
-
end
|
190
|
-
end
|
191
|
-
end
|
data/lib/chewy/query/filters.rb
DELETED
@@ -1,227 +0,0 @@
|
|
1
|
-
require 'chewy/query/nodes/base'
|
2
|
-
require 'chewy/query/nodes/expr'
|
3
|
-
require 'chewy/query/nodes/field'
|
4
|
-
require 'chewy/query/nodes/bool'
|
5
|
-
require 'chewy/query/nodes/and'
|
6
|
-
require 'chewy/query/nodes/or'
|
7
|
-
require 'chewy/query/nodes/not'
|
8
|
-
require 'chewy/query/nodes/raw'
|
9
|
-
require 'chewy/query/nodes/exists'
|
10
|
-
require 'chewy/query/nodes/missing'
|
11
|
-
require 'chewy/query/nodes/range'
|
12
|
-
require 'chewy/query/nodes/prefix'
|
13
|
-
require 'chewy/query/nodes/regexp'
|
14
|
-
require 'chewy/query/nodes/equal'
|
15
|
-
require 'chewy/query/nodes/query'
|
16
|
-
require 'chewy/query/nodes/script'
|
17
|
-
require 'chewy/query/nodes/has_child'
|
18
|
-
require 'chewy/query/nodes/has_parent'
|
19
|
-
require 'chewy/query/nodes/match_all'
|
20
|
-
|
21
|
-
module Chewy
|
22
|
-
class Query
|
23
|
-
# Context provides simplified DSL functionality for filters declaring.
|
24
|
-
# You can use logic operations <tt>&</tt> and <tt>|</tt> to concat
|
25
|
-
# expressions.
|
26
|
-
#
|
27
|
-
# UsersIndex.filter{ (article.title =~ /Honey/) & (age < 42) & !rate }
|
28
|
-
#
|
29
|
-
#
|
30
|
-
class Filters
|
31
|
-
def initialize(outer = nil, &block)
|
32
|
-
@block = block
|
33
|
-
@outer = outer || eval('self', block.binding)
|
34
|
-
end
|
35
|
-
|
36
|
-
# Outer scope call
|
37
|
-
# Block evaluates in the external context
|
38
|
-
#
|
39
|
-
# def name
|
40
|
-
# 'Friend'
|
41
|
-
# end
|
42
|
-
#
|
43
|
-
# UsersIndex.filter{ name == o{ name } } # => {filter: {term: {name: 'Friend'}}}
|
44
|
-
#
|
45
|
-
def o(&block)
|
46
|
-
@outer.instance_exec(&block)
|
47
|
-
end
|
48
|
-
|
49
|
-
# Returns field node
|
50
|
-
# Used if method_missing is not working by some reason.
|
51
|
-
# Additional expression options might be passed as second argument hash.
|
52
|
-
#
|
53
|
-
# UsersIndex.filter{ f(:name) == 'Name' } == UsersIndex.filter{ name == 'Name' } # => true
|
54
|
-
# UsersIndex.filter{ f(:name, execution: :bool) == ['Name1', 'Name2'] } ==
|
55
|
-
# UsersIndex.filter{ name(execution: :bool) == ['Name1', 'Name2'] } # => true
|
56
|
-
#
|
57
|
-
# Supports block for getting field name from the outer scope
|
58
|
-
#
|
59
|
-
# def field
|
60
|
-
# :name
|
61
|
-
# end
|
62
|
-
#
|
63
|
-
# UsersIndex.filter{ f{ field } == 'Name' } == UsersIndex.filter{ name == 'Name' } # => true
|
64
|
-
#
|
65
|
-
def f(name = nil, *args, &block)
|
66
|
-
name = block ? o(&block) : name
|
67
|
-
Nodes::Field.new name, *args
|
68
|
-
end
|
69
|
-
|
70
|
-
# Returns script filter
|
71
|
-
# Just script filter. Supports additional params.
|
72
|
-
#
|
73
|
-
# UsersIndex.filter{ s('doc["num1"].value > 1') }
|
74
|
-
# UsersIndex.filter{ s('doc["num1"].value > param1', param1: 42) }
|
75
|
-
#
|
76
|
-
# Supports block for getting script from the outer scope
|
77
|
-
#
|
78
|
-
# def script
|
79
|
-
# 'doc["num1"].value > param1 || 1'
|
80
|
-
# end
|
81
|
-
#
|
82
|
-
# UsersIndex.filter{ s{ script } } == UsersIndex.filter{ s('doc["num1"].value > 1') } # => true
|
83
|
-
# UsersIndex.filter{ s(param1: 42) { script } } == UsersIndex.filter{ s('doc["num1"].value > 1', param1: 42) } # => true
|
84
|
-
#
|
85
|
-
def s(*args, &block)
|
86
|
-
params = args.extract_options!
|
87
|
-
script = block ? o(&block) : args.first
|
88
|
-
Nodes::Script.new script, params
|
89
|
-
end
|
90
|
-
|
91
|
-
# Returns query filter
|
92
|
-
#
|
93
|
-
# UsersIndex.filter{ q(query_string: {query: 'name: hello'}) }
|
94
|
-
#
|
95
|
-
# Supports block for getting query from the outer scope
|
96
|
-
#
|
97
|
-
# def query
|
98
|
-
# {query_string: {query: 'name: hello'}}
|
99
|
-
# end
|
100
|
-
#
|
101
|
-
# UsersIndex.filter{ q{ query } } == UsersIndex.filter{ q(query_string: {query: 'name: hello'}) } # => true
|
102
|
-
#
|
103
|
-
def q(query = nil, &block)
|
104
|
-
Nodes::Query.new block ? o(&block) : query
|
105
|
-
end
|
106
|
-
|
107
|
-
# Returns raw expression
|
108
|
-
# Same as filter with arguments instead of block, but can participate in expressions
|
109
|
-
#
|
110
|
-
# UsersIndex.filter{ r(term: {name: 'Name'}) }
|
111
|
-
# UsersIndex.filter{ r(term: {name: 'Name'}) & (age < 42) }
|
112
|
-
#
|
113
|
-
# Supports block for getting raw filter from the outer scope
|
114
|
-
#
|
115
|
-
# def filter
|
116
|
-
# {term: {name: 'Name'}}
|
117
|
-
# end
|
118
|
-
#
|
119
|
-
# UsersIndex.filter{ r{ filter } } == UsersIndex.filter{ r(term: {name: 'Name'}) } # => true
|
120
|
-
# UsersIndex.filter{ r{ filter } } == UsersIndex.filter(term: {name: 'Name'}) # => true
|
121
|
-
#
|
122
|
-
def r(raw = nil, &block)
|
123
|
-
Nodes::Raw.new block ? o(&block) : raw
|
124
|
-
end
|
125
|
-
|
126
|
-
# Bool filter chainable methods
|
127
|
-
# Used to create bool query. Nodes are passed as arguments.
|
128
|
-
#
|
129
|
-
# UsersIndex.filter{ must(age < 42, name == 'Name') }
|
130
|
-
# UsersIndex.filter{ should(age < 42, name == 'Name') }
|
131
|
-
# UsersIndex.filter{ must(age < 42).should(name == 'Name1', name == 'Name2') }
|
132
|
-
# UsersIndex.filter{ should_not(age >= 42).must(name == 'Name1') }
|
133
|
-
#
|
134
|
-
%w[must must_not should].each do |method|
|
135
|
-
define_method method do |*exprs|
|
136
|
-
Nodes::Bool.new.send(method, *exprs)
|
137
|
-
end
|
138
|
-
end
|
139
|
-
|
140
|
-
# Initializes has_child filter.
|
141
|
-
# Chainable interface acts the same as main query interface. You can pass plain
|
142
|
-
# filters or plain queries or filter with DSL block.
|
143
|
-
#
|
144
|
-
# UsersIndex.filter{ has_child('user').filter(term: {role: 'Admin'}) }
|
145
|
-
# UsersIndex.filter{ has_child('user').filter{ role == 'Admin' } }
|
146
|
-
# UsersIndex.filter{ has_child('user').query(match: {name: 'borogoves'}) }
|
147
|
-
#
|
148
|
-
# Filters and queries might be combined and filter_mode and query_mode are configurable:
|
149
|
-
#
|
150
|
-
# UsersIndex.filter do
|
151
|
-
# has_child('user')
|
152
|
-
# .filter{ name: 'Peter' }
|
153
|
-
# .query(match: {name: 'Peter'})
|
154
|
-
# .filter{ age > 42 }
|
155
|
-
# .filter_mode(:or)
|
156
|
-
# end
|
157
|
-
#
|
158
|
-
def has_child(type) # rubocop:disable Style/PredicateName
|
159
|
-
Nodes::HasChild.new(type, @outer)
|
160
|
-
end
|
161
|
-
|
162
|
-
# Initializes has_parent filter.
|
163
|
-
# Chainable interface acts the same as main query interface. You can pass plain
|
164
|
-
# filters or plain queries or filter with DSL block.
|
165
|
-
#
|
166
|
-
# UsersIndex.filter{ has_parent('user').filter(term: {role: 'Admin'}) }
|
167
|
-
# UsersIndex.filter{ has_parent('user').filter{ role == 'Admin' } }
|
168
|
-
# UsersIndex.filter{ has_parent('user').query(match: {name: 'borogoves'}) }
|
169
|
-
#
|
170
|
-
# Filters and queries might be combined and filter_mode and query_mode are configurable:
|
171
|
-
#
|
172
|
-
# UsersIndex.filter do
|
173
|
-
# has_parent('user')
|
174
|
-
# .filter{ name: 'Peter' }
|
175
|
-
# .query(match: {name: 'Peter'})
|
176
|
-
# .filter{ age > 42 }
|
177
|
-
# .filter_mode(:or)
|
178
|
-
# end
|
179
|
-
#
|
180
|
-
def has_parent(type) # rubocop:disable Style/PredicateName
|
181
|
-
Nodes::HasParent.new(type, @outer)
|
182
|
-
end
|
183
|
-
|
184
|
-
# Just simple match_all filter.
|
185
|
-
#
|
186
|
-
def match_all
|
187
|
-
Nodes::MatchAll.new
|
188
|
-
end
|
189
|
-
|
190
|
-
# Creates field or exists node
|
191
|
-
# Additional options for further expression might be passed as hash
|
192
|
-
#
|
193
|
-
# UsersIndex.filter{ name == 'Name' } == UsersIndex.filter(term: {name: 'Name'}) # => true
|
194
|
-
# UsersIndex.filter{ name? } == UsersIndex.filter(exists: {term: 'name'}) # => true
|
195
|
-
# UsersIndex.filter{ name(execution: :bool) == ['Name1', 'Name2'] } ==
|
196
|
-
# UsersIndex.filter(terms: {name: ['Name1', 'Name2'], execution: :bool}) # => true
|
197
|
-
#
|
198
|
-
# Also field names might be chained to use dot-notation for ES field names
|
199
|
-
#
|
200
|
-
# UsersIndex.filter{ article.title =~ 'Hello' }
|
201
|
-
# UsersIndex.filter{ article.tags? }
|
202
|
-
#
|
203
|
-
def method_missing(method, *args) # rubocop:disable Style/MethodMissing
|
204
|
-
method = method.to_s
|
205
|
-
if method =~ /\?\Z/
|
206
|
-
Nodes::Exists.new method.gsub(/\?\Z/, '')
|
207
|
-
else
|
208
|
-
f method, *args
|
209
|
-
end
|
210
|
-
end
|
211
|
-
|
212
|
-
# Evaluates context block, returns top node.
|
213
|
-
# For internal usage.
|
214
|
-
#
|
215
|
-
def __result__
|
216
|
-
instance_exec(&@block)
|
217
|
-
end
|
218
|
-
|
219
|
-
# Renders evaluated filters.
|
220
|
-
# For internal usage.
|
221
|
-
#
|
222
|
-
def __render__
|
223
|
-
__result__.__render__ # haha, wtf?
|
224
|
-
end
|
225
|
-
end
|
226
|
-
end
|
227
|
-
end
|