chewy 0.10.1 → 7.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (243) hide show
  1. checksums.yaml +5 -5
  2. data/.github/CODEOWNERS +1 -0
  3. data/.github/ISSUE_TEMPLATE/bug_report.md +39 -0
  4. data/.github/ISSUE_TEMPLATE/feature_request.md +20 -0
  5. data/.github/PULL_REQUEST_TEMPLATE.md +16 -0
  6. data/.github/workflows/ruby.yml +74 -0
  7. data/.rubocop.yml +28 -23
  8. data/.rubocop_todo.yml +110 -22
  9. data/CHANGELOG.md +480 -298
  10. data/CODE_OF_CONDUCT.md +14 -0
  11. data/CONTRIBUTING.md +63 -0
  12. data/Gemfile +3 -5
  13. data/Guardfile +3 -1
  14. data/LICENSE.txt +1 -1
  15. data/README.md +571 -333
  16. data/chewy.gemspec +12 -15
  17. data/gemfiles/rails.5.2.activerecord.gemfile +11 -0
  18. data/gemfiles/rails.6.0.activerecord.gemfile +11 -0
  19. data/gemfiles/rails.6.1.activerecord.gemfile +13 -0
  20. data/gemfiles/rails.7.0.activerecord.gemfile +13 -0
  21. data/lib/chewy/config.rb +48 -77
  22. data/lib/chewy/errors.rb +4 -10
  23. data/lib/chewy/fields/base.rb +88 -16
  24. data/lib/chewy/fields/root.rb +15 -21
  25. data/lib/chewy/index/actions.rb +67 -38
  26. data/lib/chewy/{type → index}/adapter/active_record.rb +18 -4
  27. data/lib/chewy/{type → index}/adapter/base.rb +11 -12
  28. data/lib/chewy/{type → index}/adapter/object.rb +28 -32
  29. data/lib/chewy/{type → index}/adapter/orm.rb +26 -24
  30. data/lib/chewy/index/aliases.rb +14 -5
  31. data/lib/chewy/index/crutch.rb +40 -0
  32. data/lib/chewy/index/import/bulk_builder.rb +311 -0
  33. data/lib/chewy/{type → index}/import/bulk_request.rb +10 -9
  34. data/lib/chewy/{type → index}/import/journal_builder.rb +11 -12
  35. data/lib/chewy/{type → index}/import/routine.rb +19 -18
  36. data/lib/chewy/{type → index}/import.rb +82 -36
  37. data/lib/chewy/{type → index}/mapping.rb +63 -62
  38. data/lib/chewy/index/observe/active_record_methods.rb +87 -0
  39. data/lib/chewy/index/observe/callback.rb +34 -0
  40. data/lib/chewy/index/observe.rb +17 -0
  41. data/lib/chewy/index/settings.rb +2 -0
  42. data/lib/chewy/index/specification.rb +13 -10
  43. data/lib/chewy/{type → index}/syncer.rb +62 -63
  44. data/lib/chewy/{type → index}/witchcraft.rb +15 -9
  45. data/lib/chewy/{type → index}/wrapper.rb +16 -6
  46. data/lib/chewy/index.rb +68 -93
  47. data/lib/chewy/journal.rb +25 -14
  48. data/lib/chewy/minitest/helpers.rb +91 -18
  49. data/lib/chewy/minitest/search_index_receiver.rb +29 -33
  50. data/lib/chewy/multi_search.rb +62 -0
  51. data/lib/chewy/railtie.rb +8 -24
  52. data/lib/chewy/rake_helper.rb +141 -112
  53. data/lib/chewy/rspec/build_query.rb +12 -0
  54. data/lib/chewy/rspec/helpers.rb +55 -0
  55. data/lib/chewy/rspec/update_index.rb +58 -49
  56. data/lib/chewy/rspec.rb +2 -0
  57. data/lib/chewy/runtime.rb +1 -1
  58. data/lib/chewy/search/loader.rb +19 -41
  59. data/lib/chewy/search/parameters/allow_partial_search_results.rb +27 -0
  60. data/lib/chewy/search/parameters/collapse.rb +16 -0
  61. data/lib/chewy/search/parameters/concerns/query_storage.rb +6 -5
  62. data/lib/chewy/search/parameters/ignore_unavailable.rb +27 -0
  63. data/lib/chewy/search/parameters/indices.rb +78 -0
  64. data/lib/chewy/search/parameters/none.rb +1 -3
  65. data/lib/chewy/search/parameters/order.rb +6 -19
  66. data/lib/chewy/search/parameters/source.rb +5 -1
  67. data/lib/chewy/search/parameters/track_total_hits.rb +16 -0
  68. data/lib/chewy/search/parameters.rb +28 -8
  69. data/lib/chewy/search/query_proxy.rb +9 -2
  70. data/lib/chewy/search/request.rb +207 -157
  71. data/lib/chewy/search/response.rb +5 -5
  72. data/lib/chewy/search/scoping.rb +7 -8
  73. data/lib/chewy/search/scrolling.rb +14 -13
  74. data/lib/chewy/search.rb +7 -26
  75. data/lib/chewy/stash.rb +27 -29
  76. data/lib/chewy/strategy/active_job.rb +2 -2
  77. data/lib/chewy/strategy/atomic.rb +1 -1
  78. data/lib/chewy/strategy/atomic_no_refresh.rb +18 -0
  79. data/lib/chewy/strategy/base.rb +10 -0
  80. data/lib/chewy/strategy/delayed_sidekiq/scheduler.rb +148 -0
  81. data/lib/chewy/strategy/delayed_sidekiq/worker.rb +52 -0
  82. data/lib/chewy/strategy/delayed_sidekiq.rb +17 -0
  83. data/lib/chewy/strategy/lazy_sidekiq.rb +64 -0
  84. data/lib/chewy/strategy/sidekiq.rb +3 -2
  85. data/lib/chewy/strategy.rb +6 -19
  86. data/lib/chewy/version.rb +1 -1
  87. data/lib/chewy.rb +37 -80
  88. data/lib/generators/chewy/install_generator.rb +1 -1
  89. data/lib/tasks/chewy.rake +26 -32
  90. data/migration_guide.md +56 -0
  91. data/spec/chewy/config_spec.rb +27 -57
  92. data/spec/chewy/fields/base_spec.rb +457 -174
  93. data/spec/chewy/fields/root_spec.rb +24 -32
  94. data/spec/chewy/fields/time_fields_spec.rb +5 -5
  95. data/spec/chewy/index/actions_spec.rb +425 -60
  96. data/spec/chewy/{type → index}/adapter/active_record_spec.rb +110 -44
  97. data/spec/chewy/{type → index}/adapter/object_spec.rb +21 -6
  98. data/spec/chewy/index/aliases_spec.rb +3 -3
  99. data/spec/chewy/index/import/bulk_builder_spec.rb +494 -0
  100. data/spec/chewy/{type → index}/import/bulk_request_spec.rb +5 -12
  101. data/spec/chewy/{type → index}/import/journal_builder_spec.rb +22 -30
  102. data/spec/chewy/{type → index}/import/routine_spec.rb +19 -19
  103. data/spec/chewy/{type → index}/import_spec.rb +154 -95
  104. data/spec/chewy/index/mapping_spec.rb +135 -0
  105. data/spec/chewy/index/observe/active_record_methods_spec.rb +68 -0
  106. data/spec/chewy/index/observe/callback_spec.rb +139 -0
  107. data/spec/chewy/index/observe_spec.rb +143 -0
  108. data/spec/chewy/index/settings_spec.rb +3 -1
  109. data/spec/chewy/index/specification_spec.rb +32 -33
  110. data/spec/chewy/{type → index}/syncer_spec.rb +14 -19
  111. data/spec/chewy/{type → index}/witchcraft_spec.rb +34 -21
  112. data/spec/chewy/index/wrapper_spec.rb +100 -0
  113. data/spec/chewy/index_spec.rb +99 -114
  114. data/spec/chewy/journal_spec.rb +56 -101
  115. data/spec/chewy/minitest/helpers_spec.rb +122 -14
  116. data/spec/chewy/minitest/search_index_receiver_spec.rb +24 -26
  117. data/spec/chewy/multi_search_spec.rb +84 -0
  118. data/spec/chewy/rake_helper_spec.rb +325 -101
  119. data/spec/chewy/rspec/build_query_spec.rb +34 -0
  120. data/spec/chewy/rspec/helpers_spec.rb +61 -0
  121. data/spec/chewy/rspec/update_index_spec.rb +106 -102
  122. data/spec/chewy/runtime_spec.rb +2 -2
  123. data/spec/chewy/search/loader_spec.rb +19 -53
  124. data/spec/chewy/search/pagination/kaminari_examples.rb +3 -5
  125. data/spec/chewy/search/pagination/kaminari_spec.rb +1 -1
  126. data/spec/chewy/search/parameters/collapse_spec.rb +5 -0
  127. data/spec/chewy/search/parameters/ignore_unavailable_spec.rb +67 -0
  128. data/spec/chewy/search/parameters/indices_spec.rb +99 -0
  129. data/spec/chewy/search/parameters/none_spec.rb +1 -1
  130. data/spec/chewy/search/parameters/order_spec.rb +18 -11
  131. data/spec/chewy/search/parameters/query_storage_examples.rb +67 -21
  132. data/spec/chewy/search/parameters/search_after_spec.rb +4 -1
  133. data/spec/chewy/search/parameters/source_spec.rb +8 -2
  134. data/spec/chewy/search/parameters/track_total_hits_spec.rb +5 -0
  135. data/spec/chewy/search/parameters_spec.rb +39 -8
  136. data/spec/chewy/search/query_proxy_spec.rb +68 -17
  137. data/spec/chewy/search/request_spec.rb +360 -149
  138. data/spec/chewy/search/response_spec.rb +35 -25
  139. data/spec/chewy/search/scrolling_spec.rb +28 -26
  140. data/spec/chewy/search_spec.rb +73 -53
  141. data/spec/chewy/stash_spec.rb +16 -26
  142. data/spec/chewy/strategy/active_job_spec.rb +23 -10
  143. data/spec/chewy/strategy/atomic_no_refresh_spec.rb +60 -0
  144. data/spec/chewy/strategy/atomic_spec.rb +9 -10
  145. data/spec/chewy/strategy/delayed_sidekiq_spec.rb +190 -0
  146. data/spec/chewy/strategy/lazy_sidekiq_spec.rb +214 -0
  147. data/spec/chewy/strategy/sidekiq_spec.rb +14 -10
  148. data/spec/chewy/strategy_spec.rb +19 -15
  149. data/spec/chewy_spec.rb +17 -110
  150. data/spec/spec_helper.rb +7 -22
  151. data/spec/support/active_record.rb +43 -5
  152. metadata +123 -198
  153. data/.travis.yml +0 -53
  154. data/Appraisals +0 -79
  155. data/LEGACY_DSL.md +0 -497
  156. data/gemfiles/rails.4.0.activerecord.gemfile +0 -14
  157. data/gemfiles/rails.4.1.activerecord.gemfile +0 -14
  158. data/gemfiles/rails.4.2.activerecord.gemfile +0 -15
  159. data/gemfiles/rails.4.2.mongoid.5.1.gemfile +0 -15
  160. data/gemfiles/rails.5.0.activerecord.gemfile +0 -15
  161. data/gemfiles/rails.5.0.mongoid.6.0.gemfile +0 -15
  162. data/gemfiles/rails.5.1.activerecord.gemfile +0 -15
  163. data/gemfiles/rails.5.1.mongoid.6.1.gemfile +0 -15
  164. data/gemfiles/sequel.4.45.gemfile +0 -11
  165. data/lib/chewy/backports/deep_dup.rb +0 -46
  166. data/lib/chewy/backports/duplicable.rb +0 -91
  167. data/lib/chewy/query/compose.rb +0 -68
  168. data/lib/chewy/query/criteria.rb +0 -191
  169. data/lib/chewy/query/filters.rb +0 -227
  170. data/lib/chewy/query/loading.rb +0 -111
  171. data/lib/chewy/query/nodes/and.rb +0 -25
  172. data/lib/chewy/query/nodes/base.rb +0 -17
  173. data/lib/chewy/query/nodes/bool.rb +0 -34
  174. data/lib/chewy/query/nodes/equal.rb +0 -34
  175. data/lib/chewy/query/nodes/exists.rb +0 -20
  176. data/lib/chewy/query/nodes/expr.rb +0 -28
  177. data/lib/chewy/query/nodes/field.rb +0 -110
  178. data/lib/chewy/query/nodes/has_child.rb +0 -15
  179. data/lib/chewy/query/nodes/has_parent.rb +0 -15
  180. data/lib/chewy/query/nodes/has_relation.rb +0 -59
  181. data/lib/chewy/query/nodes/match_all.rb +0 -11
  182. data/lib/chewy/query/nodes/missing.rb +0 -20
  183. data/lib/chewy/query/nodes/not.rb +0 -25
  184. data/lib/chewy/query/nodes/or.rb +0 -25
  185. data/lib/chewy/query/nodes/prefix.rb +0 -19
  186. data/lib/chewy/query/nodes/query.rb +0 -20
  187. data/lib/chewy/query/nodes/range.rb +0 -63
  188. data/lib/chewy/query/nodes/raw.rb +0 -15
  189. data/lib/chewy/query/nodes/regexp.rb +0 -35
  190. data/lib/chewy/query/nodes/script.rb +0 -20
  191. data/lib/chewy/query/pagination.rb +0 -25
  192. data/lib/chewy/query.rb +0 -1098
  193. data/lib/chewy/search/pagination/will_paginate.rb +0 -43
  194. data/lib/chewy/search/parameters/types.rb +0 -20
  195. data/lib/chewy/strategy/resque.rb +0 -27
  196. data/lib/chewy/strategy/shoryuken.rb +0 -40
  197. data/lib/chewy/type/actions.rb +0 -43
  198. data/lib/chewy/type/adapter/mongoid.rb +0 -69
  199. data/lib/chewy/type/adapter/sequel.rb +0 -95
  200. data/lib/chewy/type/crutch.rb +0 -32
  201. data/lib/chewy/type/import/bulk_builder.rb +0 -122
  202. data/lib/chewy/type/observe.rb +0 -78
  203. data/lib/chewy/type.rb +0 -117
  204. data/lib/sequel/plugins/chewy_observe.rb +0 -78
  205. data/spec/chewy/query/criteria_spec.rb +0 -700
  206. data/spec/chewy/query/filters_spec.rb +0 -201
  207. data/spec/chewy/query/loading_spec.rb +0 -124
  208. data/spec/chewy/query/nodes/and_spec.rb +0 -12
  209. data/spec/chewy/query/nodes/bool_spec.rb +0 -14
  210. data/spec/chewy/query/nodes/equal_spec.rb +0 -32
  211. data/spec/chewy/query/nodes/exists_spec.rb +0 -18
  212. data/spec/chewy/query/nodes/has_child_spec.rb +0 -59
  213. data/spec/chewy/query/nodes/has_parent_spec.rb +0 -59
  214. data/spec/chewy/query/nodes/match_all_spec.rb +0 -11
  215. data/spec/chewy/query/nodes/missing_spec.rb +0 -16
  216. data/spec/chewy/query/nodes/not_spec.rb +0 -13
  217. data/spec/chewy/query/nodes/or_spec.rb +0 -12
  218. data/spec/chewy/query/nodes/prefix_spec.rb +0 -16
  219. data/spec/chewy/query/nodes/query_spec.rb +0 -12
  220. data/spec/chewy/query/nodes/range_spec.rb +0 -32
  221. data/spec/chewy/query/nodes/raw_spec.rb +0 -11
  222. data/spec/chewy/query/nodes/regexp_spec.rb +0 -43
  223. data/spec/chewy/query/nodes/script_spec.rb +0 -15
  224. data/spec/chewy/query/pagination/kaminari_spec.rb +0 -5
  225. data/spec/chewy/query/pagination/will_paginate_spec.rb +0 -5
  226. data/spec/chewy/query/pagination_spec.rb +0 -39
  227. data/spec/chewy/query_spec.rb +0 -636
  228. data/spec/chewy/search/pagination/will_paginate_examples.rb +0 -63
  229. data/spec/chewy/search/pagination/will_paginate_spec.rb +0 -23
  230. data/spec/chewy/search/parameters/indices_boost_spec.rb +0 -83
  231. data/spec/chewy/search/parameters/types_spec.rb +0 -5
  232. data/spec/chewy/strategy/resque_spec.rb +0 -46
  233. data/spec/chewy/strategy/shoryuken_spec.rb +0 -64
  234. data/spec/chewy/type/actions_spec.rb +0 -50
  235. data/spec/chewy/type/adapter/mongoid_spec.rb +0 -372
  236. data/spec/chewy/type/adapter/sequel_spec.rb +0 -472
  237. data/spec/chewy/type/import/bulk_builder_spec.rb +0 -279
  238. data/spec/chewy/type/mapping_spec.rb +0 -142
  239. data/spec/chewy/type/observe_spec.rb +0 -137
  240. data/spec/chewy/type/wrapper_spec.rb +0 -98
  241. data/spec/chewy/type_spec.rb +0 -55
  242. data/spec/support/mongoid.rb +0 -93
  243. data/spec/support/sequel.rb +0 -80
@@ -10,8 +10,12 @@ describe Chewy::Fields::Base do
10
10
  specify { expect(field.compose(double(value: 'hello'))).to eq(name: 'hello') }
11
11
  specify { expect(field.compose(double(value: %w[hello world]))).to eq(name: %w[hello world]) }
12
12
 
13
- specify { expect(described_class.new(:name, value: :last_name).compose(double(last_name: 'hello'))).to eq(name: 'hello') }
14
- specify { expect(described_class.new(:name, value: :last_name).compose('last_name' => 'hello')).to eq(name: 'hello') }
13
+ specify do
14
+ expect(described_class.new(:name, value: :last_name).compose(double(last_name: 'hello'))).to eq(name: 'hello')
15
+ end
16
+ specify do
17
+ expect(described_class.new(:name, value: :last_name).compose('last_name' => 'hello')).to eq(name: 'hello')
18
+ end
15
19
  specify { expect(described_class.new(:name).compose(double(name: 'hello'))).to eq(name: 'hello') }
16
20
  specify { expect(described_class.new(:false_value).compose(false_value: false)).to eq(false_value: false) }
17
21
  specify { expect(described_class.new(:true_value).compose(true_value: true)).to eq(true_value: true) }
@@ -63,7 +67,7 @@ describe Chewy::Fields::Base do
63
67
  end
64
68
 
65
69
  context 'implicit values' do
66
- let(:field) { described_class.new(:name, type: 'string') }
70
+ let(:field) { described_class.new(:name, type: 'integer') }
67
71
  before do
68
72
  field.children.push(described_class.new(:name))
69
73
  field.children.push(described_class.new(:untouched))
@@ -87,8 +91,8 @@ describe Chewy::Fields::Base do
87
91
 
88
92
  describe '#mappings_hash' do
89
93
  let(:field) { described_class.new(:name, type: :object) }
90
- let(:fields1) { Array.new(2) { |i| described_class.new("name#{i + 1}", type: "string#{i + 1}") } }
91
- let(:fields2) { Array.new(2) { |i| described_class.new("name#{i + 3}", type: "string#{i + 3}") } }
94
+ let(:fields1) { Array.new(2) { |i| described_class.new("name#{i + 1}", type: "integer#{i + 1}") } }
95
+ let(:fields2) { Array.new(2) { |i| described_class.new("name#{i + 3}", type: "integer#{i + 3}") } }
92
96
  before do
93
97
  fields1.each { |m| field.children.push(m) }
94
98
  fields2.each { |m| fields1[0].children.push(m) }
@@ -96,226 +100,262 @@ describe Chewy::Fields::Base do
96
100
 
97
101
  specify do
98
102
  expect(field.mappings_hash).to eq(name: {type: :object, properties: {
99
- name1: {type: 'string1', fields: {
100
- name3: {type: 'string3'}, name4: {type: 'string4'}
101
- }}, name2: {type: 'string2'}
103
+ name1: {type: 'integer1', fields: {
104
+ name3: {type: 'integer3'}, name4: {type: 'integer4'}
105
+ }}, name2: {type: 'integer2'}
102
106
  }})
103
107
  end
104
108
 
105
109
  context do
106
- let(:field) { described_class.new(:name, type: :string) }
107
- let(:fields1) { Array.new(2) { |i| described_class.new("name#{i + 1}") } }
110
+ let(:field) { described_class.new(:name, type: :integer) }
111
+ let(:fields1) do
112
+ [described_class.new(:name1), described_class.new(:name2, type: 'integer')]
113
+ end
108
114
 
109
115
  specify do
110
- expect(field.mappings_hash).to eq(name: {type: :string, fields: {
116
+ expect(field.mappings_hash).to eq(name: {type: :integer, fields: {
111
117
  name1: {type: 'object', properties: {
112
- name3: {type: 'string3'}, name4: {type: 'string4'}
113
- }}, name2: {type: 'string'}
118
+ name3: {type: 'integer3'}, name4: {type: 'integer4'}
119
+ }}, name2: {type: 'integer'}
114
120
  }})
115
121
  end
116
122
  end
117
123
  end
118
124
 
119
125
  context 'integration' do
120
- context 'objects, hashes and arrays' do
126
+ context 'default field type' do
121
127
  before do
122
128
  stub_index(:events) do
123
- define_type :event do
129
+ field :id
130
+ field :category do
124
131
  field :id
125
- field :category do
132
+ field :licenses do
126
133
  field :id
127
- field :licenses do
128
- field :id
129
- field :name
130
- end
134
+ field :created_at, type: 'time'
131
135
  end
132
136
  end
133
137
  end
134
138
  end
135
139
 
136
- specify do
137
- expect(EventsIndex::Event.mappings_hash).to eq(event: {
138
- properties: {
139
- id: {type: 'string'},
140
- category: {
141
- type: 'object',
142
- properties: {
143
- id: {type: 'string'},
144
- licenses: {
145
- type: 'object',
146
- properties: {
147
- id: {type: 'string'},
148
- name: {type: 'string'}
149
- }
150
- }
151
- }
152
- }
153
- }
154
- })
140
+ around do |example|
141
+ previous_type = Chewy.default_field_type
142
+ Chewy.default_field_type = 'integer'
143
+ example.run
144
+ Chewy.default_field_type = previous_type
155
145
  end
156
146
 
157
- context 'default field type' do
158
- around do |example|
159
- previous_type = Chewy.default_field_type
160
- Chewy.default_field_type = 'text'
161
- example.run
162
- Chewy.default_field_type = previous_type
163
- end
164
-
165
- specify do
166
- expect(EventsIndex::Event.mappings_hash).to eq(event: {
147
+ specify do
148
+ expect(EventsIndex.mappings_hash).to eq(
149
+ mappings: {
167
150
  properties: {
168
- id: {type: 'text'},
151
+ id: {type: 'integer'},
169
152
  category: {
170
153
  type: 'object',
171
154
  properties: {
172
- id: {type: 'text'},
155
+ id: {type: 'integer'},
173
156
  licenses: {
174
157
  type: 'object',
175
158
  properties: {
176
- id: {type: 'text'},
177
- name: {type: 'text'}
159
+ id: {type: 'integer'},
160
+ created_at: {type: 'time'}
178
161
  }
179
162
  }
180
163
  }
181
164
  }
182
165
  }
183
- })
166
+ }
167
+ )
168
+ end
169
+ end
170
+
171
+ context 'objects, hashes and arrays' do
172
+ before do
173
+ stub_index(:events) do
174
+ field :id
175
+ field :category do
176
+ field :id
177
+ field :licenses do
178
+ field :id
179
+ field :name
180
+ end
181
+ end
184
182
  end
185
183
  end
186
184
 
187
185
  specify do
188
- expect(EventsIndex::Event.root_object.compose(
189
- id: 1, category: {id: 2, licenses: {id: 3, name: 'Name'}}
190
- )).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
186
+ expect(
187
+ EventsIndex.root.compose({id: 1, category: {id: 2, licenses: {id: 3, name: 'Name'}}})
188
+ ).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
191
189
  end
192
190
 
193
191
  specify do
194
- expect(EventsIndex::Event.root_object.compose(id: 1, category: [
195
- {id: 2, 'licenses' => {id: 3, name: 'Name1'}},
196
- {id: 4, licenses: nil}
197
- ])).to eq('id' => 1, 'category' => [
192
+ expect(
193
+ EventsIndex.root.compose({id: 1, category: [
194
+ {id: 2, 'licenses' => {id: 3, name: 'Name1'}},
195
+ {id: 4, licenses: nil}
196
+ ]})
197
+ ).to eq('id' => 1, 'category' => [
198
198
  {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name1'}},
199
199
  {'id' => 4, 'licenses' => nil.as_json}
200
200
  ])
201
201
  end
202
202
 
203
203
  specify do
204
- expect(EventsIndex::Event.root_object.compose('id' => 1, category: {id: 2, licenses: [
205
- {id: 3, name: 'Name1'}, {id: 4, name: 'Name2'}
206
- ]})).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => [
207
- {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
208
- ]})
204
+ expect(
205
+ EventsIndex.root.compose({
206
+ 'id' => 1,
207
+ category: {
208
+ id: 2, licenses: [
209
+ {id: 3, name: 'Name1'},
210
+ {id: 4, name: 'Name2'}
211
+ ]
212
+ }
213
+ })
214
+ ).to eq(
215
+ 'id' => 1,
216
+ 'category' => {
217
+ 'id' => 2,
218
+ 'licenses' => [
219
+ {'id' => 3, 'name' => 'Name1'},
220
+ {'id' => 4, 'name' => 'Name2'}
221
+ ]
222
+ }
223
+ )
209
224
  end
210
225
 
211
226
  specify do
212
- expect(EventsIndex::Event.root_object.compose(id: 1, category: [
213
- {id: 2, licenses: [
214
- {id: 3, 'name' => 'Name1'}, {id: 4, name: 'Name2'}
215
- ]},
216
- {id: 5, licenses: []}
217
- ])).to eq('id' => 1, 'category' => [
218
- {'id' => 2, 'licenses' => [
219
- {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
220
- ]},
221
- {'id' => 5, 'licenses' => []}
222
- ])
227
+ expect(
228
+ EventsIndex.root.compose({id: 1, category: [
229
+ {id: 2, licenses: [
230
+ {id: 3, 'name' => 'Name1'}, {id: 4, name: 'Name2'}
231
+ ]},
232
+ {id: 5, licenses: []}
233
+ ]})
234
+ ).to eq(
235
+ 'id' => 1,
236
+ 'category' => [
237
+ {'id' => 2, 'licenses' => [
238
+ {'id' => 3, 'name' => 'Name1'},
239
+ {'id' => 4, 'name' => 'Name2'}
240
+ ]},
241
+ {'id' => 5, 'licenses' => []}
242
+ ]
243
+ )
223
244
  end
224
-
225
245
  specify do
226
- expect(EventsIndex::Event.root_object.compose(
227
- double(id: 1, category: double(id: 2, licenses: double(id: 3, name: 'Name')))
228
- )).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
246
+ expect(
247
+ EventsIndex.root.compose(double(id: 1, category: double(id: 2, licenses: double(id: 3, name: 'Name'))))
248
+ ).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
229
249
  end
230
250
 
231
251
  specify do
232
- expect(EventsIndex::Event.root_object.compose(double(id: 1, category: [
233
- double(id: 2, licenses: double(id: 3, name: 'Name1')),
234
- double(id: 4, licenses: nil)
235
- ]))).to eq('id' => 1, 'category' => [
252
+ expect(
253
+ EventsIndex.root.compose(double(id: 1, category: [
254
+ double(id: 2, licenses: double(id: 3, name: 'Name1')),
255
+ double(id: 4, licenses: nil)
256
+ ]))
257
+ ).to eq('id' => 1, 'category' => [
236
258
  {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name1'}},
237
259
  {'id' => 4, 'licenses' => nil.as_json}
238
260
  ])
239
261
  end
240
262
 
241
263
  specify do
242
- expect(EventsIndex::Event.root_object.compose(double(id: 1, category: double(id: 2, licenses: [
243
- double(id: 3, name: 'Name1'), double(id: 4, name: 'Name2')
244
- ])))).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => [
264
+ expect(
265
+ EventsIndex.root.compose(double(id: 1, category: double(id: 2, licenses: [
266
+ double(id: 3, name: 'Name1'), double(id: 4, name: 'Name2')
267
+ ])))
268
+ ).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => [
245
269
  {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
246
270
  ]})
247
271
  end
248
272
 
249
273
  specify do
250
- expect(EventsIndex::Event.root_object.compose(double(id: 1, category: [
251
- double(id: 2, licenses: [
252
- double(id: 3, name: 'Name1'), double(id: 4, name: 'Name2')
253
- ]),
254
- double(id: 5, licenses: [])
255
- ]))).to eq('id' => 1, 'category' => [
256
- {'id' => 2, 'licenses' => [
257
- {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
258
- ]},
259
- {'id' => 5, 'licenses' => []}
260
- ])
274
+ expect(
275
+ EventsIndex.root.compose(double(id: 1, category: [
276
+ double(id: 2, licenses: [
277
+ double(id: 3, name: 'Name1'), double(id: 4, name: 'Name2')
278
+ ]),
279
+ double(id: 5, licenses: [])
280
+ ]))
281
+ ).to eq(
282
+ 'id' => 1, 'category' => [
283
+ {'id' => 2, 'licenses' => [
284
+ {'id' => 3, 'name' => 'Name1'}, {'id' => 4, 'name' => 'Name2'}
285
+ ]},
286
+ {'id' => 5, 'licenses' => []}
287
+ ]
288
+ )
261
289
  end
262
290
  end
263
291
 
264
292
  context 'custom methods' do
265
293
  before do
266
294
  stub_index(:events) do
267
- define_type :event do
268
- field :id
269
- field :category, value: -> { categories } do
270
- field :id
271
- field :licenses, value: -> { license } do
272
- field :id
273
- field :name
274
- end
295
+ field :id, type: 'integer'
296
+ field :category, value: -> { categories } do
297
+ field :id, type: 'integer'
298
+ field :licenses, value: -> { license } do
299
+ field :id, type: 'integer'
300
+ field :name
275
301
  end
276
302
  end
277
303
  end
278
304
  end
279
305
 
280
306
  specify do
281
- expect(EventsIndex::Event.root_object.compose(
282
- double(id: 1, categories: double(id: 2, license: double(id: 3, name: 'Name')))
283
- )).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
307
+ expect(
308
+ EventsIndex.root.compose(
309
+ double(
310
+ id: 1, categories: double(
311
+ id: 2, license: double(
312
+ id: 3, name: 'Name'
313
+ )
314
+ )
315
+ )
316
+ )
317
+ ).to eq('id' => 1, 'category' => {'id' => 2, 'licenses' => {'id' => 3, 'name' => 'Name'}})
284
318
  end
285
319
  end
286
320
 
287
321
  context 'objects and multi_fields' do
288
322
  before do
289
323
  stub_index(:events) do
290
- define_type :event do
291
- field :id
292
- field :name, type: 'string' do
293
- field :raw, analyzer: 'my_own'
294
- end
295
- field :category, type: 'object'
324
+ field :id, type: 'integer'
325
+ field :name, type: 'integer' do
326
+ field :raw, analyzer: 'my_own'
296
327
  end
328
+ field :category, type: 'object'
297
329
  end
298
330
  end
299
331
 
300
332
  specify do
301
- expect(EventsIndex::Event.mappings_hash).to eq(event: {
302
- properties: {
303
- id: {type: 'string'},
304
- name: {
305
- type: 'string',
306
- fields: {
307
- raw: {analyzer: 'my_own', type: 'string'}
308
- }
309
- },
310
- category: {type: 'object'}
333
+ expect(EventsIndex.mappings_hash).to eq(
334
+ mappings: {
335
+ properties: {
336
+ id: {type: 'integer'},
337
+ name: {
338
+ type: 'integer',
339
+ fields: {
340
+ raw: {analyzer: 'my_own', type: Chewy.default_field_type}
341
+ }
342
+ },
343
+ category: {type: 'object'}
344
+ }
311
345
  }
312
- })
346
+ )
313
347
  end
314
348
 
315
349
  specify do
316
- expect(EventsIndex::Event.root_object.compose(
317
- double(id: 1, name: 'Jonny', category: double(id: 2, as_json: {'name' => 'Borogoves'}))
318
- )).to eq(
350
+ expect(
351
+ EventsIndex.root.compose(
352
+ double(
353
+ id: 1, name: 'Jonny', category: double(
354
+ id: 2, as_json: {'name' => 'Borogoves'}
355
+ )
356
+ )
357
+ )
358
+ ).to eq(
319
359
  'id' => 1,
320
360
  'name' => 'Jonny',
321
361
  'category' => {'name' => 'Borogoves'}
@@ -323,12 +363,14 @@ describe Chewy::Fields::Base do
323
363
  end
324
364
 
325
365
  specify do
326
- expect(EventsIndex::Event.root_object.compose(
327
- double(id: 1, name: 'Jonny', category: [
328
- double(id: 2, as_json: {'name' => 'Borogoves1'}),
329
- double(id: 3, as_json: {'name' => 'Borogoves2'})
330
- ])
331
- )).to eq(
366
+ expect(
367
+ EventsIndex.root.compose(
368
+ double(id: 1, name: 'Jonny', category: [
369
+ double(id: 2, as_json: {'name' => 'Borogoves1'}),
370
+ double(id: 3, as_json: {'name' => 'Borogoves2'})
371
+ ])
372
+ )
373
+ ).to eq(
332
374
  'id' => 1,
333
375
  'name' => 'Jonny',
334
376
  'category' => [
@@ -339,56 +381,298 @@ describe Chewy::Fields::Base do
339
381
  end
340
382
  end
341
383
 
342
- context 'objects and scopes', :orm do
384
+ context 'ignore_blank option for field method', :orm do
343
385
  before do
386
+ stub_model(:location)
344
387
  stub_model(:city)
345
388
  stub_model(:country)
346
389
 
347
- case adapter
348
- when :active_record
349
- City.belongs_to :country
350
- if ActiveRecord::VERSION::MAJOR >= 4
351
- Country.has_many :cities, -> { order :id }
352
- else
353
- Country.has_many :cities, order: :id
354
- end
355
- when :mongoid
356
- if Mongoid::VERSION.start_with?('6')
357
- City.belongs_to :country, optional: true
358
- else
359
- City.belongs_to :country
360
- end
361
- Country.has_many :cities, order: :id.asc
362
- when :sequel
363
- City.many_to_one :country
364
- Country.one_to_many :cities, order: :id
365
- end
390
+ City.belongs_to :country
391
+ Location.belongs_to :city
392
+ City.has_one :location, -> { order :id }
393
+ Country.has_many :cities, -> { order :id }
394
+ end
366
395
 
367
- stub_index(:countries) do
368
- define_type Country do
396
+ context 'text fields with and without ignore_blank option' do
397
+ before do
398
+ stub_index(:countries) do
399
+ index_scope Country
369
400
  field :id
370
401
  field :cities do
371
402
  field :id
372
403
  field :name
404
+ field :historical_name, ignore_blank: false
405
+ field :description, ignore_blank: true
373
406
  end
374
407
  end
375
408
  end
409
+
410
+ let(:country_with_cities) do
411
+ cities = [
412
+ City.create!(id: 1, name: '', historical_name: '', description: ''),
413
+ City.create!(id: 2, name: '', historical_name: '', description: '')
414
+ ]
415
+
416
+ Country.create!(id: 1, cities: cities)
417
+ end
418
+
419
+ specify do
420
+ expect(CountriesIndex.root.compose(country_with_cities)).to eq(
421
+ 'id' => 1, 'cities' => [
422
+ {'id' => 1, 'name' => '', 'historical_name' => ''},
423
+ {'id' => 2, 'name' => '', 'historical_name' => ''}
424
+ ]
425
+ )
426
+ end
427
+ specify { expect(CountriesIndex.reset).to eq(true) }
376
428
  end
377
429
 
378
- let(:country_with_cities) do
379
- cities = [City.create!(id: 1, name: 'City1'), City.create!(id: 2, name: 'City2')]
430
+ context 'nested fields' do
431
+ context 'with ignore_blank: true option' do
432
+ before do
433
+ stub_index(:countries) do
434
+ index_scope Country
435
+ field :id
436
+ field :cities, ignore_blank: true do
437
+ field :id
438
+ field :name
439
+ field :historical_name, ignore_blank: true
440
+ field :description
441
+ end
442
+ end
443
+ end
380
444
 
381
- if adapter == :sequel
382
- Country.create(id: 1).tap do |country|
383
- cities.each { |city| country.add_city(city) }
445
+ let(:country) { Country.create!(id: 1, cities: cities) }
446
+ context('without cities') do
447
+ let(:cities) { [] }
448
+ specify do
449
+ expect(CountriesIndex.root.compose(country))
450
+ .to eq('id' => 1)
451
+ end
452
+ end
453
+ context('with cities') do
454
+ let(:cities) { [City.create!(id: 1, name: '', historical_name: '')] }
455
+ specify do
456
+ expect(CountriesIndex.root.compose(country)).to eq(
457
+ 'id' => 1, 'cities' => [
458
+ {'id' => 1, 'name' => '', 'description' => nil}
459
+ ]
460
+ )
461
+ end
462
+ end
463
+ end
464
+
465
+ context 'with ignore_blank: false option' do
466
+ before do
467
+ stub_index(:countries) do
468
+ index_scope Country
469
+ field :id
470
+ field :cities, ignore_blank: false do
471
+ field :id
472
+ field :name
473
+ field :historical_name
474
+ field :description
475
+ end
476
+ end
477
+ end
478
+
479
+ let(:country_with_cities) { Country.create!(id: 1) }
480
+
481
+ specify do
482
+ expect(CountriesIndex.root.compose(country_with_cities))
483
+ .to eq('id' => 1, 'cities' => [])
484
+ end
485
+ end
486
+
487
+ context 'without ignore_blank: true option' do
488
+ before do
489
+ stub_index(:countries) do
490
+ index_scope Country
491
+ field :id
492
+ field :cities do
493
+ field :id
494
+ field :name
495
+ field :historical_name
496
+ field :description
497
+ end
498
+ end
499
+ end
500
+
501
+ let(:country_with_cities) { Country.create!(id: 1) }
502
+
503
+ specify do
504
+ expect(CountriesIndex.root.compose(country_with_cities))
505
+ .to eq('id' => 1, 'cities' => [])
506
+ end
507
+ end
508
+ end
509
+
510
+ context 'geo_point field type' do
511
+ context 'with ignore_blank: true option' do
512
+ before do
513
+ stub_index(:countries) do
514
+ index_scope Country
515
+ field :id
516
+ field :cities do
517
+ field :id
518
+ field :name
519
+ field :location, type: :geo_point, ignore_blank: true do
520
+ field :lat
521
+ field :lon
522
+ end
523
+ end
524
+ end
525
+ end
526
+
527
+ specify do
528
+ expect(
529
+ CountriesIndex.root.compose({
530
+ 'id' => 1,
531
+ 'cities' => [
532
+ {'id' => 1, 'name' => 'City1', 'location' => {}},
533
+ {'id' => 2, 'name' => 'City2', 'location' => {}}
534
+ ]
535
+ })
536
+ ).to eq(
537
+ 'id' => 1, 'cities' => [
538
+ {'id' => 1, 'name' => 'City1'},
539
+ {'id' => 2, 'name' => 'City2'}
540
+ ]
541
+ )
542
+ end
543
+ end
544
+
545
+ context 'join field type' do
546
+ before do
547
+ stub_model(:comment)
548
+ stub_index(:comments) do
549
+ index_scope Comment
550
+ field :id
551
+ field :hierarchy, type: :join, relations: {question: %i[answer comment], answer: :vote, vote: :subvote}, join: {type: :comment_type, id: :commented_id}
552
+ end
553
+ end
554
+
555
+ specify do
556
+ expect(
557
+ CommentsIndex.root.compose(
558
+ {'id' => 1, 'comment_type' => 'question'}
559
+ )
560
+ ).to eq(
561
+ {'id' => 1, 'hierarchy' => 'question'}
562
+ )
563
+
564
+ expect(
565
+ CommentsIndex.root.compose(
566
+ {'id' => 2, 'comment_type' => 'answer', 'commented_id' => 1}
567
+ )
568
+ ).to eq(
569
+ {'id' => 2, 'hierarchy' => {'name' => 'answer', 'parent' => 1}}
570
+ )
571
+
572
+ expect do
573
+ CommentsIndex.root.compose(
574
+ {'id' => 2, 'comment_type' => 'asd', 'commented_id' => 1}
575
+ )
576
+ end.to raise_error Chewy::InvalidJoinFieldType
577
+ end
578
+ end
579
+
580
+ context 'without ignore_blank option' do
581
+ before do
582
+ stub_index(:countries) do
583
+ index_scope Country
584
+ field :id
585
+ field :cities do
586
+ field :id
587
+ field :name
588
+ field :location, type: :geo_point do
589
+ field :lat
590
+ field :lon
591
+ end
592
+ end
593
+ end
594
+ end
595
+
596
+ specify do
597
+ expect(
598
+ CountriesIndex.root.compose({
599
+ 'id' => 1,
600
+ 'cities' => [
601
+ {'id' => 1, 'name' => 'City1', 'location' => {}},
602
+ {'id' => 2, 'name' => 'City2', 'location' => {}}
603
+ ]
604
+ })
605
+ ).to eq(
606
+ 'id' => 1, 'cities' => [
607
+ {'id' => 1, 'name' => 'City1'},
608
+ {'id' => 2, 'name' => 'City2'}
609
+ ]
610
+ )
611
+ end
612
+ end
613
+
614
+ context 'with ignore_blank: false flag' do
615
+ before do
616
+ stub_index(:countries) do
617
+ index_scope Country
618
+ field :id
619
+ field :cities do
620
+ field :id
621
+ field :name
622
+ field :location, type: :geo_point, ignore_blank: false do
623
+ field :lat
624
+ field :lon
625
+ end
626
+ end
627
+ end
628
+ end
629
+
630
+ specify do
631
+ expect(
632
+ CountriesIndex.root.compose({
633
+ 'id' => 1,
634
+ 'cities' => [
635
+ {'id' => 1, 'location' => {}, 'name' => 'City1'},
636
+ {'id' => 2, 'location' => '', 'name' => 'City2'}
637
+ ]
638
+ })
639
+ ).to eq(
640
+ 'id' => 1, 'cities' => [
641
+ {'id' => 1, 'location' => {}, 'name' => 'City1'},
642
+ {'id' => 2, 'location' => '', 'name' => 'City2'}
643
+ ]
644
+ )
645
+ end
646
+ end
647
+ end
648
+ end
649
+
650
+ context 'objects and scopes', :orm do
651
+ before do
652
+ stub_model(:city)
653
+ stub_model(:country)
654
+
655
+ City.belongs_to :country
656
+ Country.has_many :cities, -> { order :id }
657
+
658
+ stub_index(:countries) do
659
+ index_scope Country
660
+ field :id
661
+ field :cities do
662
+ field :id
663
+ field :name
384
664
  end
385
- else
386
- Country.create!(id: 1, cities: cities)
387
665
  end
388
666
  end
389
667
 
668
+ let(:country_with_cities) do
669
+ cities = [City.create!(id: 1, name: 'City1'), City.create!(id: 2, name: 'City2')]
670
+
671
+ Country.create!(id: 1, cities: cities)
672
+ end
673
+
390
674
  specify do
391
- expect(CountriesIndex::Country.root_object.compose(country_with_cities)).to eq('id' => 1, 'cities' => [
675
+ expect(CountriesIndex.root.compose(country_with_cities)).to eq('id' => 1, 'cities' => [
392
676
  {'id' => 1, 'name' => 'City1'}, {'id' => 2, 'name' => 'City2'}
393
677
  ])
394
678
  end
@@ -396,20 +680,19 @@ describe Chewy::Fields::Base do
396
680
  context 'nested object' do
397
681
  before do
398
682
  stub_index(:cities) do
399
- define_type City do
683
+ index_scope City
684
+ field :id
685
+ field :country do
400
686
  field :id
401
- field :country do
402
- field :id
403
- field :name
404
- end
687
+ field :name
405
688
  end
406
689
  end
407
690
  end
408
691
 
409
692
  specify do
410
- expect(CitiesIndex::City.root_object.compose(
411
- City.create!(id: 1, country: Country.create!(id: 1, name: 'Country'))
412
- )).to eq('id' => 1, 'country' => {'id' => 1, 'name' => 'Country'})
693
+ expect(
694
+ CitiesIndex.root.compose(City.create!(id: 1, country: Country.create!(id: 1, name: 'Country')))
695
+ ).to eq('id' => 1, 'country' => {'id' => 1, 'name' => 'Country'})
413
696
  end
414
697
  end
415
698
  end