chewy 7.1.0 → 7.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (131) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ruby.yml +58 -0
  3. data/.rubocop.yml +13 -8
  4. data/.rubocop_todo.yml +110 -22
  5. data/CHANGELOG.md +53 -0
  6. data/Gemfile +0 -7
  7. data/Guardfile +3 -1
  8. data/README.md +282 -245
  9. data/chewy.gemspec +3 -5
  10. data/gemfiles/rails.5.2.activerecord.gemfile +8 -14
  11. data/gemfiles/rails.6.0.activerecord.gemfile +8 -14
  12. data/gemfiles/rails.6.1.activerecord.gemfile +8 -14
  13. data/lib/chewy.rb +21 -75
  14. data/lib/chewy/config.rb +40 -40
  15. data/lib/chewy/errors.rb +0 -12
  16. data/lib/chewy/fields/base.rb +11 -1
  17. data/lib/chewy/fields/root.rb +3 -4
  18. data/lib/chewy/index.rb +46 -87
  19. data/lib/chewy/index/actions.rb +51 -32
  20. data/lib/chewy/{type → index}/adapter/active_record.rb +12 -3
  21. data/lib/chewy/{type → index}/adapter/base.rb +2 -3
  22. data/lib/chewy/{type → index}/adapter/object.rb +27 -31
  23. data/lib/chewy/{type → index}/adapter/orm.rb +11 -14
  24. data/lib/chewy/{type → index}/crutch.rb +5 -5
  25. data/lib/chewy/{type → index}/import.rb +36 -27
  26. data/lib/chewy/{type → index}/import/bulk_builder.rb +15 -13
  27. data/lib/chewy/{type → index}/import/bulk_request.rb +6 -6
  28. data/lib/chewy/{type → index}/import/journal_builder.rb +10 -10
  29. data/lib/chewy/{type → index}/import/routine.rb +15 -14
  30. data/lib/chewy/{type → index}/mapping.rb +26 -31
  31. data/lib/chewy/{type → index}/observe.rb +9 -19
  32. data/lib/chewy/index/specification.rb +1 -0
  33. data/lib/chewy/{type → index}/syncer.rb +60 -57
  34. data/lib/chewy/{type → index}/witchcraft.rb +11 -7
  35. data/lib/chewy/{type → index}/wrapper.rb +2 -2
  36. data/lib/chewy/journal.rb +8 -8
  37. data/lib/chewy/minitest/helpers.rb +9 -13
  38. data/lib/chewy/minitest/search_index_receiver.rb +22 -26
  39. data/lib/chewy/railtie.rb +4 -2
  40. data/lib/chewy/rake_helper.rb +82 -107
  41. data/lib/chewy/rspec/update_index.rb +47 -43
  42. data/lib/chewy/search.rb +4 -17
  43. data/lib/chewy/search/loader.rb +18 -30
  44. data/lib/chewy/search/parameters.rb +4 -2
  45. data/lib/chewy/search/parameters/concerns/query_storage.rb +2 -2
  46. data/lib/chewy/search/parameters/source.rb +5 -1
  47. data/lib/chewy/search/query_proxy.rb +9 -2
  48. data/lib/chewy/search/request.rb +82 -86
  49. data/lib/chewy/search/response.rb +4 -4
  50. data/lib/chewy/search/scoping.rb +6 -7
  51. data/lib/chewy/search/scrolling.rb +11 -11
  52. data/lib/chewy/stash.rb +14 -22
  53. data/lib/chewy/strategy.rb +3 -19
  54. data/lib/chewy/strategy/sidekiq.rb +1 -0
  55. data/lib/chewy/version.rb +1 -1
  56. data/lib/generators/chewy/install_generator.rb +1 -1
  57. data/lib/tasks/chewy.rake +10 -22
  58. data/migration_guide.md +14 -0
  59. data/spec/chewy/config_spec.rb +14 -39
  60. data/spec/chewy/fields/base_spec.rb +412 -148
  61. data/spec/chewy/fields/root_spec.rb +16 -24
  62. data/spec/chewy/fields/time_fields_spec.rb +5 -5
  63. data/spec/chewy/index/actions_spec.rb +270 -24
  64. data/spec/chewy/{type → index}/adapter/active_record_spec.rb +68 -40
  65. data/spec/chewy/{type → index}/adapter/object_spec.rb +21 -6
  66. data/spec/chewy/{type → index}/import/bulk_builder_spec.rb +23 -31
  67. data/spec/chewy/{type → index}/import/bulk_request_spec.rb +5 -6
  68. data/spec/chewy/{type → index}/import/journal_builder_spec.rb +9 -15
  69. data/spec/chewy/{type → index}/import/routine_spec.rb +16 -16
  70. data/spec/chewy/{type → index}/import_spec.rb +102 -98
  71. data/spec/chewy/{type → index}/mapping_spec.rb +46 -54
  72. data/spec/chewy/index/observe_spec.rb +116 -0
  73. data/spec/chewy/index/settings_spec.rb +3 -1
  74. data/spec/chewy/index/specification_spec.rb +7 -17
  75. data/spec/chewy/{type → index}/syncer_spec.rb +14 -19
  76. data/spec/chewy/{type → index}/witchcraft_spec.rb +20 -22
  77. data/spec/chewy/index/wrapper_spec.rb +100 -0
  78. data/spec/chewy/index_spec.rb +59 -102
  79. data/spec/chewy/journal_spec.rb +9 -22
  80. data/spec/chewy/minitest/helpers_spec.rb +13 -15
  81. data/spec/chewy/minitest/search_index_receiver_spec.rb +22 -26
  82. data/spec/chewy/multi_search_spec.rb +4 -5
  83. data/spec/chewy/rake_helper_spec.rb +145 -55
  84. data/spec/chewy/rspec/update_index_spec.rb +74 -71
  85. data/spec/chewy/search/loader_spec.rb +19 -37
  86. data/spec/chewy/search/pagination/kaminari_examples.rb +3 -5
  87. data/spec/chewy/search/pagination/kaminari_spec.rb +1 -1
  88. data/spec/chewy/search/parameters/indices_spec.rb +2 -8
  89. data/spec/chewy/search/parameters/order_spec.rb +1 -1
  90. data/spec/chewy/search/parameters/query_storage_examples.rb +67 -21
  91. data/spec/chewy/search/parameters/search_after_spec.rb +4 -1
  92. data/spec/chewy/search/parameters/source_spec.rb +8 -2
  93. data/spec/chewy/search/parameters_spec.rb +12 -3
  94. data/spec/chewy/search/query_proxy_spec.rb +68 -17
  95. data/spec/chewy/search/request_spec.rb +222 -74
  96. data/spec/chewy/search/response_spec.rb +12 -12
  97. data/spec/chewy/search/scrolling_spec.rb +7 -9
  98. data/spec/chewy/search_spec.rb +32 -35
  99. data/spec/chewy/stash_spec.rb +9 -21
  100. data/spec/chewy/strategy/active_job_spec.rb +8 -8
  101. data/spec/chewy/strategy/atomic_spec.rb +9 -10
  102. data/spec/chewy/strategy/sidekiq_spec.rb +8 -8
  103. data/spec/chewy/strategy_spec.rb +19 -15
  104. data/spec/chewy_spec.rb +14 -100
  105. data/spec/spec_helper.rb +2 -21
  106. data/spec/support/active_record.rb +15 -5
  107. metadata +44 -103
  108. data/.circleci/config.yml +0 -214
  109. data/Appraisals +0 -81
  110. data/gemfiles/rails.5.2.mongoid.6.4.gemfile +0 -17
  111. data/gemfiles/sequel.4.45.gemfile +0 -11
  112. data/lib/chewy/search/pagination/will_paginate.rb +0 -43
  113. data/lib/chewy/strategy/resque.rb +0 -27
  114. data/lib/chewy/strategy/shoryuken.rb +0 -40
  115. data/lib/chewy/type.rb +0 -120
  116. data/lib/chewy/type/actions.rb +0 -43
  117. data/lib/chewy/type/adapter/mongoid.rb +0 -67
  118. data/lib/chewy/type/adapter/sequel.rb +0 -93
  119. data/lib/sequel/plugins/chewy_observe.rb +0 -63
  120. data/spec/chewy/search/pagination/will_paginate_examples.rb +0 -63
  121. data/spec/chewy/search/pagination/will_paginate_spec.rb +0 -23
  122. data/spec/chewy/strategy/resque_spec.rb +0 -46
  123. data/spec/chewy/strategy/shoryuken_spec.rb +0 -70
  124. data/spec/chewy/type/actions_spec.rb +0 -50
  125. data/spec/chewy/type/adapter/mongoid_spec.rb +0 -372
  126. data/spec/chewy/type/adapter/sequel_spec.rb +0 -472
  127. data/spec/chewy/type/observe_spec.rb +0 -137
  128. data/spec/chewy/type/wrapper_spec.rb +0 -100
  129. data/spec/chewy/type_spec.rb +0 -55
  130. data/spec/support/mongoid.rb +0 -93
  131. data/spec/support/sequel.rb +0 -80
@@ -3,10 +3,8 @@ require 'spec_helper'
3
3
  describe :update_index do
4
4
  before do
5
5
  stub_index(:dummies) do
6
- define_type :dummy
7
6
  end
8
7
  stub_index(:dummies2) do
9
- define_type :dummy
10
8
  end
11
9
  end
12
10
 
@@ -16,16 +14,16 @@ describe :update_index do
16
14
  end
17
15
 
18
16
  specify { expect {}.not_to update_index(DummiesIndex) }
19
- specify { expect { DummiesIndex::Dummy.bulk body: [] }.not_to update_index(DummiesIndex) }
17
+ specify { expect { DummiesIndex.bulk body: [] }.not_to update_index(DummiesIndex) }
20
18
 
21
19
  specify do
22
- expect { expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42}}] }.not_to update_index(DummiesIndex) }
20
+ expect { expect { DummiesIndex.bulk body: [{index: {_id: 42}}] }.not_to update_index(DummiesIndex) }
23
21
  .to fail_with(/Expected index .* not to be updated, but it was with/)
24
22
  end
25
23
 
26
24
  specify do
27
25
  expect do
28
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}]
26
+ DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}]
29
27
  end.to update_index(DummiesIndex).and_reindex(41, 42).only
30
28
  end
31
29
 
@@ -33,7 +31,7 @@ describe :update_index do
33
31
  let(:expectation) do
34
32
  expect do
35
33
  expect do
36
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42}}, {index: {_id: 41}}, {index: {_id: 42}}]
34
+ DummiesIndex.bulk body: [{index: {_id: 42}}, {index: {_id: 41}}, {index: {_id: 42}}]
37
35
  end.not_to update_index(DummiesIndex)
38
36
  end
39
37
  end
@@ -45,8 +43,8 @@ describe :update_index do
45
43
  context 'compound matchers' do
46
44
  specify do
47
45
  expect do
48
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}]
49
- Dummies2Index::Dummy.bulk body: [{index: {_id: 43, data: {}}}]
46
+ DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}]
47
+ Dummies2Index.bulk body: [{index: {_id: 43, data: {}}}]
50
48
  end.to update_index(DummiesIndex).and_reindex(41, 42).only
51
49
  .and update_index(Dummies2Index).and_reindex(43).only
52
50
  end
@@ -55,7 +53,7 @@ describe :update_index do
55
53
  let(:expectation) do
56
54
  expect do
57
55
  expect do
58
- Dummies2Index::Dummy.bulk body: [{index: {_id: 43, data: {}}}]
56
+ Dummies2Index.bulk body: [{index: {_id: 43, data: {}}}]
59
57
  end.to update_index(DummiesIndex).and_reindex(41, 42).only
60
58
  .and update_index(Dummies2Index).and_reindex(43).only
61
59
  end
@@ -67,96 +65,91 @@ describe :update_index do
67
65
 
68
66
  context '#only' do
69
67
  specify do
70
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
68
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
71
69
  .to update_index(DummiesIndex).and_reindex(41, 42).only
72
70
  end
73
71
  specify do
74
72
  expect do
75
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
73
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
76
74
  .to update_index(DummiesIndex).and_reindex(41).only
77
- end
78
- .to fail_matching 'to update documents ["41"] only, but ["42"] was updated also'
75
+ end.to fail_matching 'to update documents ["41"] only, but ["42"] was updated also'
79
76
  end
80
77
  specify do
81
78
  expect do
82
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
79
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
83
80
  .to update_index(DummiesIndex).and_reindex(41, times: 2).only
84
- end
85
- .to fail_matching 'to update documents ["41"] only, but ["42"] was updated also'
81
+ end.to fail_matching 'to update documents ["41"] only, but ["42"] was updated also'
86
82
  end
87
83
 
88
84
  specify do
89
- expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
85
+ expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
90
86
  .to update_index(DummiesIndex).and_delete(41, 42).only
91
87
  end
92
88
  specify do
93
89
  expect do
94
- expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
90
+ expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
95
91
  .to update_index(DummiesIndex).and_delete(41).only
96
- end
97
- .to fail_matching 'to delete documents ["41"] only, but ["42"] was deleted also'
92
+ end.to fail_matching 'to delete documents ["41"] only, but ["42"] was deleted also'
98
93
  end
99
94
  specify do
100
95
  expect do
101
- expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
96
+ expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
102
97
  .to update_index(DummiesIndex).and_delete(41, times: 2).only
103
- end
104
- .to fail_matching 'to delete documents ["41"] only, but ["42"] was deleted also'
98
+ end.to fail_matching 'to delete documents ["41"] only, but ["42"] was deleted also'
105
99
  end
106
100
 
107
101
  specify do
108
102
  expect do
109
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}] }
103
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}] }
110
104
  .to update_index(DummiesIndex).and_reindex(42).only
111
- end
112
- .to fail_matching 'to update documents ["42"] only, but ["41"] was deleted also'
105
+ end.to fail_matching 'to update documents ["42"] only, but ["41"] was deleted also'
113
106
  end
114
107
  specify do
115
108
  expect do
116
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}, {delete: {_id: 41}}] }
117
- .to update_index(DummiesIndex).and_reindex(42).only
118
- end
119
- .to fail_matching 'to update documents ["42"] only, but ["43"] was updated and ["41"] was deleted also'
109
+ expect do
110
+ DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}},
111
+ {delete: {_id: 41}}]
112
+ end.to update_index(DummiesIndex).and_reindex(42).only
113
+ end.to fail_matching 'to update documents ["42"] only, but ["43"] was updated and ["41"] was deleted also'
120
114
  end
121
115
  specify do
122
116
  expect do
123
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}] }
117
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}] }
124
118
  .to update_index(DummiesIndex).and_delete(41).only
125
- end
126
- .to fail_matching 'to delete documents ["41"] only, but ["42"] was updated also'
119
+ end.to fail_matching 'to delete documents ["41"] only, but ["42"] was updated also'
127
120
  end
128
121
  specify do
129
122
  expect do
130
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}, {delete: {_id: 43}}] }
131
- .to update_index(DummiesIndex).and_delete(41).only
132
- end
133
- .to fail_matching 'to delete documents ["41"] only, but ["42"] was updated and ["43"] was deleted also'
123
+ expect do
124
+ DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}, {delete: {_id: 43}}]
125
+ end.to update_index(DummiesIndex).and_delete(41).only
126
+ end.to fail_matching 'to delete documents ["41"] only, but ["42"] was updated and ["43"] was deleted also'
134
127
  end
135
128
  end
136
129
 
137
130
  context '#and_reindex' do
138
- specify { expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42}}] }.to update_index(DummiesIndex) }
131
+ specify { expect { DummiesIndex.bulk body: [{index: {_id: 42}}] }.to update_index(DummiesIndex) }
139
132
  specify do
140
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}] }
133
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}] }
141
134
  .to update_index(DummiesIndex).and_reindex(42)
142
135
  end
143
136
  specify do
144
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
137
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
145
138
  .to update_index(DummiesIndex).and_reindex(double(id: 42))
146
139
  end
147
140
  specify do
148
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
141
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
149
142
  .to update_index(DummiesIndex).and_reindex(double(id: 42), double(id: 43))
150
143
  end
151
144
  specify do
152
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
145
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
153
146
  .to update_index(DummiesIndex).and_reindex([double(id: 42), 43])
154
147
  end
155
148
 
156
149
  specify do
157
150
  expect do
158
151
  expect do
159
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
152
+ DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
160
153
  end.to update_index(DummiesIndex).and_reindex([44, 43])
161
154
  end.to fail_matching 'Expected document with id `44` to be reindexed, but it was not'
162
155
  end
@@ -165,8 +158,9 @@ describe :update_index do
165
158
  let(:expectation) do
166
159
  expect do
167
160
  expect do
168
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
169
- end.to update_index(DummiesIndex).and_reindex(44, double(id: 47)) end
161
+ DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
162
+ end.to update_index(DummiesIndex).and_reindex(44, double(id: 47))
163
+ end
170
164
  end
171
165
 
172
166
  specify { expectation.to fail_matching('Expected document with id `44` to be reindexed, but it was not') }
@@ -176,24 +170,27 @@ describe :update_index do
176
170
  context ':times' do
177
171
  specify do
178
172
  expect do
179
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
180
- DummiesIndex::Dummy.bulk body: [{index: {_id: 43, data: {}}}, {index: {_id: 44, data: {}}}]
181
- end.to update_index(DummiesIndex).and_reindex(42, 44, times: 1).and_reindex(43, times: 2) end
173
+ DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
174
+ DummiesIndex.bulk body: [{index: {_id: 43, data: {}}}, {index: {_id: 44, data: {}}}]
175
+ end.to update_index(DummiesIndex).and_reindex(42, 44, times: 1).and_reindex(43, times: 2)
176
+ end
182
177
 
183
178
  specify do
184
179
  expect do
185
180
  expect do
186
- DummiesIndex::Dummy.bulk body: [{index: {_id: 43, data: {a: '1'}}}]
181
+ DummiesIndex.bulk body: [{index: {_id: 43, data: {a: '1'}}}]
187
182
  end.to update_index(DummiesIndex).and_reindex(42, times: 3)
188
- end.to fail_matching('Expected document with id `42` to be reindexed, but it was not') end
183
+ end.to fail_matching('Expected document with id `42` to be reindexed, but it was not')
184
+ end
189
185
 
190
186
  context do
191
187
  let(:expectation) do
192
188
  expect do
193
189
  expect do
194
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
195
- DummiesIndex::Dummy.bulk body: [{index: {_id: 43, data: {}}}, {index: {_id: 44, data: {}}}]
196
- end.to update_index(DummiesIndex).and_reindex(42, times: 3).and_reindex(44, 43, times: 4) end
190
+ DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
191
+ DummiesIndex.bulk body: [{index: {_id: 43, data: {}}}, {index: {_id: 44, data: {}}}]
192
+ end.to update_index(DummiesIndex).and_reindex(42, times: 3).and_reindex(44, 43, times: 4)
193
+ end
197
194
  end
198
195
 
199
196
  specify { expectation.to fail_matching 'Expected document with id `44` to be reindexed' }
@@ -206,20 +203,23 @@ describe :update_index do
206
203
  context ':with' do
207
204
  specify do
208
205
  expect do
209
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {a: '1'}}}, {index: {_id: 42, data: {'a' => 2}}}]
210
- end.to update_index(DummiesIndex).and_reindex(42, with: {a: 2}) end
206
+ DummiesIndex.bulk body: [{index: {_id: 42, data: {a: '1'}}}, {index: {_id: 42, data: {'a' => 2}}}]
207
+ end.to update_index(DummiesIndex).and_reindex(42, with: {a: 2})
208
+ end
211
209
 
212
210
  specify do
213
211
  expect do
214
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {a: '1'}}}, {index: {_id: 42, data: {'b' => 2}}}]
215
- end.to update_index(DummiesIndex).and_reindex(42, with: {a: '1', b: 2}) end
212
+ DummiesIndex.bulk body: [{index: {_id: 42, data: {a: '1'}}}, {index: {_id: 42, data: {'b' => 2}}}]
213
+ end.to update_index(DummiesIndex).and_reindex(42, with: {a: '1', b: 2})
214
+ end
216
215
 
217
216
  specify do
218
217
  expect do
219
218
  expect do
220
- DummiesIndex::Dummy.bulk body: [{index: {_id: 43, data: {a: '1'}}}]
219
+ DummiesIndex.bulk body: [{index: {_id: 43, data: {a: '1'}}}]
221
220
  end.to update_index(DummiesIndex).and_reindex(42, with: {a: 1})
222
- end.to fail_matching('Expected document with id `42` to be reindexed, but it was not') end
221
+ end.to fail_matching('Expected document with id `42` to be reindexed, but it was not')
222
+ end
223
223
 
224
224
  [
225
225
  [{a: %w[one two]}, {a: %w[one two]}],
@@ -230,8 +230,9 @@ describe :update_index do
230
230
  ].each do |(data, with)|
231
231
  specify do
232
232
  expect do
233
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: data}}]
234
- end.to update_index(DummiesIndex).and_reindex(42, with: with) end
233
+ DummiesIndex.bulk body: [{index: {_id: 42, data: data}}]
234
+ end.to update_index(DummiesIndex).and_reindex(42, with: with)
235
+ end
235
236
  end
236
237
 
237
238
  [
@@ -244,17 +245,19 @@ describe :update_index do
244
245
  specify do
245
246
  expect do
246
247
  expect do
247
- DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: data}}]
248
+ DummiesIndex.bulk body: [{index: {_id: 42, data: data}}]
248
249
  end.to update_index(DummiesIndex).and_reindex(42, with: with)
249
- end.to fail_matching('Expected document with id `42` to be reindexed') end
250
+ end.to fail_matching('Expected document with id `42` to be reindexed')
251
+ end
250
252
  end
251
253
 
252
254
  context do
253
255
  let(:expectation) do
254
256
  expect do
255
257
  expect do
256
- DummiesIndex::Dummy.bulk body: [{index: {_id: 43, data: {a: '1'}}}, {index: {_id: 42, data: {'a' => 2}}}]
257
- end.to update_index(DummiesIndex).and_reindex(43, times: 2, with: {a: 2}) end
258
+ DummiesIndex.bulk body: [{index: {_id: 43, data: {a: '1'}}}, {index: {_id: 42, data: {'a' => 2}}}]
259
+ end.to update_index(DummiesIndex).and_reindex(43, times: 2, with: {a: 2})
260
+ end
258
261
  end
259
262
 
260
263
  specify { expectation.to fail_matching 'Expected document with id `43` to be reindexed' }
@@ -266,26 +269,26 @@ describe :update_index do
266
269
 
267
270
  context '#and_delete' do
268
271
  specify do
269
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 43}}] }
272
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 43}}] }
270
273
  .to update_index(DummiesIndex).and_reindex(42).and_delete(double(id: 43))
271
274
  end
272
275
  specify do
273
- expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
276
+ expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
274
277
  .to update_index(DummiesIndex).and_delete(42).and_delete(double(id: 43))
275
278
  end
276
279
  specify do
277
- expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
280
+ expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
278
281
  .to update_index(DummiesIndex).and_delete(42, double(id: 43))
279
282
  end
280
283
  specify do
281
- expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
284
+ expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
282
285
  .to update_index(DummiesIndex).and_delete([43, double(id: 42)])
283
286
  end
284
287
 
285
288
  context do
286
289
  let(:expectation) do
287
290
  expect do
288
- expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 43}}] }
291
+ expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 43}}] }
289
292
  .to update_index(DummiesIndex).and_reindex(43).and_delete(double(id: 42))
290
293
  end
291
294
  end
@@ -297,7 +300,7 @@ describe :update_index do
297
300
  context do
298
301
  let(:expectation) do
299
302
  expect do
300
- expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42, data: {}}}, {delete: {_id: 42}}] }
303
+ expect { DummiesIndex.bulk body: [{delete: {_id: 42, data: {}}}, {delete: {_id: 42}}] }
301
304
  .to update_index(DummiesIndex).and_delete(44, times: 2).and_delete(double(id: 42), times: 3)
302
305
  end
303
306
  end
@@ -8,17 +8,15 @@ describe Chewy::Search::Loader do
8
8
  stub_model(:country)
9
9
 
10
10
  stub_index(:cities) do
11
- define_type City do
12
- field :name
13
- field :rating, type: 'integer'
14
- end
11
+ index_scope City
12
+ field :name
13
+ field :rating, type: 'integer'
15
14
  end
16
15
 
17
16
  stub_index(:countries) do
18
- define_type Country do
19
- field :name
20
- field :rating, type: 'integer'
21
- end
17
+ index_scope Country
18
+ field :name
19
+ field :rating, type: 'integer'
22
20
  end
23
21
  end
24
22
 
@@ -33,18 +31,18 @@ describe Chewy::Search::Loader do
33
31
  let(:options) { {} }
34
32
  subject { described_class.new(indexes: [CitiesIndex, CountriesIndex], **options) }
35
33
 
36
- describe '#derive_type' do
37
- specify { expect(subject.derive_type('cities', 'city')).to eq(CitiesIndex::City) }
38
- specify { expect(subject.derive_type('cities_suffix', 'city')).to eq(CitiesIndex::City) }
34
+ describe '#derive_index' do
35
+ specify { expect(subject.derive_index('cities')).to eq(CitiesIndex) }
36
+ specify { expect(subject.derive_index('cities_suffix')).to eq(CitiesIndex) }
39
37
 
40
- specify { expect { subject.derive_type('whatever', 'city') }.to raise_error(Chewy::UnderivableType) }
41
- specify { expect { subject.derive_type('citiessuffix', 'city') }.to raise_error(Chewy::UnderivableType) }
38
+ specify { expect { subject.derive_index('whatever') }.to raise_error(Chewy::UndefinedIndex) }
39
+ specify { expect { subject.derive_index('citiessuffix') }.to raise_error(Chewy::UndefinedIndex) }
42
40
 
43
41
  context do
44
42
  before { CitiesIndex.index_name :boro_goves }
45
43
 
46
- specify { expect(subject.derive_type('boro_goves', 'city')).to eq(CitiesIndex::City) }
47
- specify { expect(subject.derive_type('boro_goves_suffix', 'city')).to eq(CitiesIndex::City) }
44
+ specify { expect(subject.derive_index('boro_goves')).to eq(CitiesIndex) }
45
+ specify { expect(subject.derive_index('boro_goves_suffix')).to eq(CitiesIndex) }
48
46
  end
49
47
  end
50
48
 
@@ -60,19 +58,7 @@ describe Chewy::Search::Loader do
60
58
  end
61
59
 
62
60
  context do
63
- let(:options) { {country: {scope: -> { where('rating > 2') }}} }
64
- specify { expect(subject.load(hits)).to eq([*cities, nil, countries.last]) }
65
- end
66
- end
67
-
68
- context 'scopes', :mongoid do
69
- context do
70
- let(:options) { {scope: -> { where(:rating.gt => 2) }} }
71
- specify { expect(subject.load(hits)).to eq([nil, nil, nil, countries.last]) }
72
- end
73
-
74
- context do
75
- let(:options) { {country: {scope: -> { where(:rating.gt => 2) }}} }
61
+ let(:options) { {countries: {scope: -> { where('rating > 2') }}} }
76
62
  specify { expect(subject.load(hits)).to eq([*cities, nil, countries.last]) }
77
63
  end
78
64
  end
@@ -80,21 +66,17 @@ describe Chewy::Search::Loader do
80
66
  context 'objects' do
81
67
  before do
82
68
  stub_index(:cities) do
83
- define_type :city do
84
- field :name
85
- field :rating, type: 'integer'
86
- end
69
+ field :name
70
+ field :rating, type: 'integer'
87
71
  end
88
72
 
89
73
  stub_index(:countries) do
90
- define_type :country do
91
- field :name
92
- field :rating, type: 'integer'
93
- end
74
+ field :name
75
+ field :rating, type: 'integer'
94
76
  end
95
77
  end
96
78
 
97
- specify { expect(subject.load(hits).map(&:class).uniq).to eq([CitiesIndex::City, CountriesIndex::Country]) }
79
+ specify { expect(subject.load(hits).map(&:class).uniq).to eq([CitiesIndex, CountriesIndex]) }
98
80
  specify { expect(subject.load(hits).map(&:rating)).to eq([*cities, *countries].map(&:rating)) }
99
81
  end
100
82
  end
@@ -5,10 +5,8 @@ shared_examples :kaminari do |request_base_class|
5
5
 
6
6
  before do
7
7
  stub_index(:products) do
8
- define_type(:product) do
9
- field :name
10
- field :age, type: 'integer'
11
- end
8
+ field :name
9
+ field :age, type: 'integer'
12
10
  end
13
11
  end
14
12
 
@@ -25,7 +23,7 @@ shared_examples :kaminari do |request_base_class|
25
23
  context do
26
24
  let(:data) { Array.new(10) { |i| {id: i.next.to_s, name: "Name#{i.next}", age: 10 * i.next}.stringify_keys! } }
27
25
 
28
- before { ProductsIndex::Product.import!(data.map { |h| double(h) }) }
26
+ before { ProductsIndex.import!(data.map { |h| double(h) }) }
29
27
  before { allow(::Kaminari.config).to receive_messages(default_per_page: 3) }
30
28
 
31
29
  describe '#per, #page' do