chewy 5.2.0 → 6.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (103) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +36 -10
  3. data/CHANGELOG.md +219 -326
  4. data/Gemfile +1 -1
  5. data/README.md +9 -21
  6. data/chewy.gemspec +1 -1
  7. data/gemfiles/rails.6.1.activerecord.gemfile +1 -1
  8. data/lib/chewy/config.rb +2 -20
  9. data/lib/chewy/fields/base.rb +0 -6
  10. data/lib/chewy/index.rb +2 -0
  11. data/lib/chewy/index/actions.rb +5 -1
  12. data/lib/chewy/multi_search.rb +62 -0
  13. data/lib/chewy/search.rb +1 -4
  14. data/lib/chewy/search/pagination/will_paginate.rb +1 -1
  15. data/lib/chewy/search/parameters/none.rb +1 -3
  16. data/lib/chewy/search/request.rb +25 -24
  17. data/lib/chewy/search/scrolling.rb +4 -1
  18. data/lib/chewy/type.rb +4 -1
  19. data/lib/chewy/type/adapter/orm.rb +6 -3
  20. data/lib/chewy/type/import.rb +1 -0
  21. data/lib/chewy/type/syncer.rb +4 -5
  22. data/lib/chewy/type/witchcraft.rb +3 -1
  23. data/lib/chewy/type/wrapper.rb +11 -1
  24. data/lib/chewy/version.rb +1 -1
  25. data/migration_guide.md +18 -0
  26. data/spec/chewy/config_spec.rb +0 -21
  27. data/spec/chewy/index/actions_spec.rb +24 -0
  28. data/spec/chewy/index_spec.rb +16 -39
  29. data/spec/chewy/journal_spec.rb +21 -17
  30. data/spec/chewy/minitest/search_index_receiver_spec.rb +11 -9
  31. data/spec/chewy/multi_search_spec.rb +85 -0
  32. data/spec/chewy/rake_helper_spec.rb +102 -87
  33. data/spec/chewy/rspec/update_index_spec.rb +47 -46
  34. data/spec/chewy/runtime_spec.rb +2 -2
  35. data/spec/chewy/search/parameters/indices_spec.rb +6 -7
  36. data/spec/chewy/search/parameters/none_spec.rb +1 -1
  37. data/spec/chewy/search/parameters_spec.rb +1 -1
  38. data/spec/chewy/search/request_spec.rb +82 -67
  39. data/spec/chewy/search/response_spec.rb +19 -15
  40. data/spec/chewy/search/scrolling_spec.rb +25 -16
  41. data/spec/chewy/search_spec.rb +45 -41
  42. data/spec/chewy/stash_spec.rb +14 -12
  43. data/spec/chewy/type/adapter/active_record_spec.rb +13 -1
  44. data/spec/chewy/type/import/bulk_builder_spec.rb +9 -94
  45. data/spec/chewy/type/import/journal_builder_spec.rb +9 -7
  46. data/spec/chewy/type/mapping_spec.rb +3 -1
  47. data/spec/chewy/type/witchcraft_spec.rb +15 -0
  48. data/spec/chewy/type/wrapper_spec.rb +3 -1
  49. data/spec/chewy_spec.rb +0 -7
  50. data/spec/spec_helper.rb +0 -7
  51. data/spec/support/active_record.rb +20 -0
  52. metadata +8 -78
  53. data/LEGACY_DSL.md +0 -497
  54. data/gemfiles/ruby3.gemfile +0 -10
  55. data/lib/chewy/query.rb +0 -1142
  56. data/lib/chewy/query/compose.rb +0 -68
  57. data/lib/chewy/query/criteria.rb +0 -191
  58. data/lib/chewy/query/filters.rb +0 -244
  59. data/lib/chewy/query/loading.rb +0 -110
  60. data/lib/chewy/query/nodes/and.rb +0 -25
  61. data/lib/chewy/query/nodes/base.rb +0 -17
  62. data/lib/chewy/query/nodes/bool.rb +0 -34
  63. data/lib/chewy/query/nodes/equal.rb +0 -34
  64. data/lib/chewy/query/nodes/exists.rb +0 -20
  65. data/lib/chewy/query/nodes/expr.rb +0 -28
  66. data/lib/chewy/query/nodes/field.rb +0 -110
  67. data/lib/chewy/query/nodes/has_child.rb +0 -15
  68. data/lib/chewy/query/nodes/has_parent.rb +0 -15
  69. data/lib/chewy/query/nodes/has_relation.rb +0 -59
  70. data/lib/chewy/query/nodes/match_all.rb +0 -11
  71. data/lib/chewy/query/nodes/missing.rb +0 -20
  72. data/lib/chewy/query/nodes/not.rb +0 -25
  73. data/lib/chewy/query/nodes/or.rb +0 -25
  74. data/lib/chewy/query/nodes/prefix.rb +0 -19
  75. data/lib/chewy/query/nodes/query.rb +0 -20
  76. data/lib/chewy/query/nodes/range.rb +0 -63
  77. data/lib/chewy/query/nodes/raw.rb +0 -15
  78. data/lib/chewy/query/nodes/regexp.rb +0 -35
  79. data/lib/chewy/query/nodes/script.rb +0 -20
  80. data/lib/chewy/query/pagination.rb +0 -25
  81. data/spec/chewy/query/criteria_spec.rb +0 -700
  82. data/spec/chewy/query/filters_spec.rb +0 -201
  83. data/spec/chewy/query/loading_spec.rb +0 -124
  84. data/spec/chewy/query/nodes/and_spec.rb +0 -12
  85. data/spec/chewy/query/nodes/bool_spec.rb +0 -14
  86. data/spec/chewy/query/nodes/equal_spec.rb +0 -32
  87. data/spec/chewy/query/nodes/exists_spec.rb +0 -18
  88. data/spec/chewy/query/nodes/has_child_spec.rb +0 -59
  89. data/spec/chewy/query/nodes/has_parent_spec.rb +0 -59
  90. data/spec/chewy/query/nodes/match_all_spec.rb +0 -11
  91. data/spec/chewy/query/nodes/missing_spec.rb +0 -16
  92. data/spec/chewy/query/nodes/not_spec.rb +0 -14
  93. data/spec/chewy/query/nodes/or_spec.rb +0 -12
  94. data/spec/chewy/query/nodes/prefix_spec.rb +0 -16
  95. data/spec/chewy/query/nodes/query_spec.rb +0 -12
  96. data/spec/chewy/query/nodes/range_spec.rb +0 -32
  97. data/spec/chewy/query/nodes/raw_spec.rb +0 -11
  98. data/spec/chewy/query/nodes/regexp_spec.rb +0 -43
  99. data/spec/chewy/query/nodes/script_spec.rb +0 -15
  100. data/spec/chewy/query/pagination/kaminari_spec.rb +0 -5
  101. data/spec/chewy/query/pagination/will_paginate_spec.rb +0 -5
  102. data/spec/chewy/query/pagination_spec.rb +0 -39
  103. data/spec/chewy/query_spec.rb +0 -637
@@ -0,0 +1,85 @@
1
+ require 'spec_helper'
2
+ require 'chewy/multi_search'
3
+
4
+ describe Chewy::MultiSearch do
5
+ before { Chewy.massacre }
6
+
7
+ before do
8
+ stub_model(:city)
9
+ stub_model(:country)
10
+
11
+ stub_index(:cities) do
12
+ def self.aggregate_by_country
13
+ aggs(country: {terms: {field: :country_id}})
14
+ end
15
+
16
+ define_type City do
17
+ field :name, type: 'keyword'
18
+ field :country_id, type: 'keyword'
19
+ end
20
+ end
21
+ end
22
+
23
+ let(:places_query) { CitiesIndex.all }
24
+
25
+ describe '#queries' do
26
+ specify 'returns the queries that are a part of the multi search' do
27
+ multi_search = described_class.new([places_query])
28
+ expect(multi_search.queries).to contain_exactly(places_query)
29
+ end
30
+ end
31
+
32
+ describe '#add_query' do
33
+ specify 'adds a query to the multi search' do
34
+ multi_search = described_class.new([])
35
+ expect do
36
+ multi_search.add_query(places_query)
37
+ end.to change {
38
+ multi_search.queries
39
+ }.from([]).to([places_query])
40
+ end
41
+ end
42
+
43
+ context 'when given two queries' do
44
+ let(:queries) { [aggregates, results] }
45
+ let(:aggregates) { CitiesIndex.aggregate_by_country.limit(0) }
46
+ let(:results) { CitiesIndex.limit(10) }
47
+ let(:multi_search) { described_class.new(queries) }
48
+ let(:cities) { Array.new(3) { |i| City.create! name: "Name#{i + 2}", country_id: i + 1 } }
49
+ before { CitiesIndex.import! city: cities }
50
+
51
+ describe '#perform' do
52
+ specify 'performs each query' do
53
+ expect { multi_search.perform }
54
+ .to change(aggregates, :performed?).from(false).to(true)
55
+ .and change(results, :performed?).from(false).to(true)
56
+ end
57
+
58
+ specify 'issues a single request using the msearch endpoint', :aggregate_failures do
59
+ expect(Chewy.client).to receive(:msearch).once.and_return('responses' => [])
60
+ expect(Chewy.client).to_not receive(:search)
61
+ multi_search.perform
62
+ end
63
+ end
64
+
65
+ describe '#responses' do
66
+ subject(:responses) { multi_search.responses }
67
+
68
+ context 'on a previously performed multi search' do
69
+ before { multi_search.perform }
70
+
71
+ it 'does not perform the query again' do
72
+ expect(Chewy.client).to_not receive(:msearch)
73
+ multi_search.responses
74
+ end
75
+ end
76
+
77
+ specify 'returns the results of each query', :aggregate_failures do
78
+ is_expected.to have(2).responses
79
+ expect(responses[0]).to be_a(Chewy::Search::Response)
80
+ expect(responses[1]).to be_a(Chewy::Search::Response)
81
+ expect(responses[1].wrappers).to all(be_a CitiesIndex::City)
82
+ end
83
+ end
84
+ end
85
+ end
@@ -7,16 +7,18 @@ describe Chewy::RakeHelper, :orm do
7
7
  stub_model(:city)
8
8
  stub_model(:country)
9
9
 
10
- stub_index(:places) do
10
+ stub_index(:cities) do
11
11
  define_type City do
12
12
  field :name
13
13
  field :updated_at, type: 'date'
14
14
  end
15
+ end
16
+ stub_index(:countries) do
15
17
  define_type Country
16
18
  end
17
19
  stub_index(:users)
18
20
 
19
- allow(described_class).to receive(:all_indexes) { [PlacesIndex, UsersIndex] }
21
+ allow(described_class).to receive(:all_indexes) { [CitiesIndex, CountriesIndex, UsersIndex] }
20
22
  end
21
23
 
22
24
  let!(:cities) { Array.new(3) { |i| City.create!(name: "Name#{i + 1}") } }
@@ -24,7 +26,7 @@ describe Chewy::RakeHelper, :orm do
24
26
  let(:journal) do
25
27
  Chewy::Stash::Journal.import([
26
28
  {
27
- index_name: 'places',
29
+ index_name: 'cities',
28
30
  type_name: 'city',
29
31
  action: 'index',
30
32
  references: cities.first(2).map(&:id).map(&:to_s)
@@ -32,7 +34,7 @@ describe Chewy::RakeHelper, :orm do
32
34
  created_at: 2.minutes.since
33
35
  },
34
36
  {
35
- index_name: 'places',
37
+ index_name: 'countries',
36
38
  type_name: 'country',
37
39
  action: 'index',
38
40
  references: [Base64.encode64(countries.first.id.to_s.to_json)],
@@ -47,14 +49,17 @@ describe Chewy::RakeHelper, :orm do
47
49
  specify do
48
50
  output = StringIO.new
49
51
  expect { described_class.reset(output: output) }
50
- .to update_index(PlacesIndex::City)
52
+ .to update_index(CitiesIndex)
51
53
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
52
- \\AResetting PlacesIndex
53
- Imported PlacesIndex::City in \\d+s, stats: index 3
54
- Imported PlacesIndex::Country in \\d+s, stats: index 2
55
- Applying journal to \\[PlacesIndex::City, PlacesIndex::Country\\], 3 entries, stage 1
56
- Imported PlacesIndex::City in \\d+s, stats: index 2
57
- Imported PlacesIndex::Country in \\d+s, stats: index 1
54
+ \\AResetting CitiesIndex
55
+ Imported CitiesIndex::City in \\d+s, stats: index 3
56
+ Applying journal to \\[CitiesIndex::City\\], 2 entries, stage 1
57
+ Imported CitiesIndex::City in \\d+s, stats: index 2
58
+ Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
59
+ Resetting CountriesIndex
60
+ Imported CountriesIndex::Country in \\d+s, stats: index 2
61
+ Applying journal to \\[CountriesIndex::Country\\], 1 entries, stage 1
62
+ Imported CountriesIndex::Country in \\d+s, stats: index 1
58
63
  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
59
64
  Resetting UsersIndex
60
65
  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
@@ -64,15 +69,13 @@ Total: \\d+s\\Z
64
69
 
65
70
  specify do
66
71
  output = StringIO.new
67
- expect { described_class.reset(only: 'places', output: output) }
68
- .to update_index(PlacesIndex::City)
72
+ expect { described_class.reset(only: 'cities', output: output) }
73
+ .to update_index(CitiesIndex)
69
74
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
70
- \\AResetting PlacesIndex
71
- Imported PlacesIndex::City in \\d+s, stats: index 3
72
- Imported PlacesIndex::Country in \\d+s, stats: index 2
73
- Applying journal to \\[PlacesIndex::City, PlacesIndex::Country\\], 3 entries, stage 1
74
- Imported PlacesIndex::City in \\d+s, stats: index 2
75
- Imported PlacesIndex::Country in \\d+s, stats: index 1
75
+ \\AResetting CitiesIndex
76
+ Imported CitiesIndex::City in \\d+s, stats: index 3
77
+ Applying journal to \\[CitiesIndex::City\\], 2 entries, stage 1
78
+ Imported CitiesIndex::City in \\d+s, stats: index 2
76
79
  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
77
80
  Total: \\d+s\\Z
78
81
  OUTPUT
@@ -80,8 +83,8 @@ Total: \\d+s\\Z
80
83
 
81
84
  specify do
82
85
  output = StringIO.new
83
- expect { described_class.reset(except: PlacesIndex, output: output) }
84
- .not_to update_index(PlacesIndex::City)
86
+ expect { described_class.reset(except: [CitiesIndex, CountriesIndex], output: output) }
87
+ .not_to update_index(CitiesIndex)
85
88
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
86
89
  \\AResetting UsersIndex
87
90
  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
@@ -94,11 +97,13 @@ Total: \\d+s\\Z
94
97
  specify do
95
98
  output = StringIO.new
96
99
  expect { described_class.upgrade(output: output) }
97
- .to update_index(PlacesIndex::City)
100
+ .to update_index(CitiesIndex)
98
101
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
99
- \\AResetting PlacesIndex
100
- Imported PlacesIndex::City in \\d+s, stats: index 3
101
- Imported PlacesIndex::Country in \\d+s, stats: index 2
102
+ \\AResetting CitiesIndex
103
+ Imported CitiesIndex::City in \\d+s, stats: index 3
104
+ Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
105
+ Resetting CountriesIndex
106
+ Imported CountriesIndex::Country in \\d+s, stats: index 2
102
107
  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
103
108
  Resetting UsersIndex
104
109
  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
@@ -107,14 +112,18 @@ Total: \\d+s\\Z
107
112
  end
108
113
 
109
114
  context do
110
- before { PlacesIndex.reset! }
115
+ before do
116
+ CitiesIndex.reset!
117
+ CountriesIndex.reset!
118
+ end
111
119
 
112
120
  specify do
113
121
  output = StringIO.new
114
122
  expect { described_class.upgrade(output: output) }
115
- .not_to update_index(PlacesIndex::City)
123
+ .not_to update_index(CitiesIndex)
116
124
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
117
- \\ASkipping PlacesIndex, the specification didn't change
125
+ \\ASkipping CitiesIndex, the specification didn't change
126
+ Skipping CountriesIndex, the specification didn't change
118
127
  Resetting UsersIndex
119
128
  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
120
129
  Total: \\d+s\\Z
@@ -123,8 +132,8 @@ Total: \\d+s\\Z
123
132
 
124
133
  specify do
125
134
  output = StringIO.new
126
- expect { described_class.upgrade(except: PlacesIndex, output: output) }
127
- .not_to update_index(PlacesIndex::City)
135
+ expect { described_class.upgrade(except: [CitiesIndex, CountriesIndex], output: output) }
136
+ .not_to update_index(CitiesIndex)
128
137
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
129
138
  \\AResetting UsersIndex
130
139
  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
@@ -137,8 +146,8 @@ Total: \\d+s\\Z
137
146
 
138
147
  specify do
139
148
  output = StringIO.new
140
- expect { described_class.upgrade(except: ['places'], output: output) }
141
- .not_to update_index(PlacesIndex::City)
149
+ expect { described_class.upgrade(except: %w[cities countries], output: output) }
150
+ .not_to update_index(CitiesIndex)
142
151
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
143
152
  \\ANo index specification was changed
144
153
  Total: \\d+s\\Z
@@ -152,45 +161,51 @@ Total: \\d+s\\Z
152
161
  specify do
153
162
  output = StringIO.new
154
163
  expect { described_class.update(output: output) }
155
- .not_to update_index(PlacesIndex::City)
164
+ .not_to update_index(CitiesIndex)
156
165
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
157
- \\ASkipping PlacesIndex, it does not exists \\(use rake chewy:reset\\[places\\] to create and update it\\)
166
+ \\ASkipping CitiesIndex, it does not exists \\(use rake chewy:reset\\[cities\\] to create and update it\\)
167
+ Skipping CountriesIndex, it does not exists \\(use rake chewy:reset\\[countries\\] to create and update it\\)
168
+ Total: \\d+s\\Z
158
169
  OUTPUT
159
170
  end
160
171
 
161
172
  context do
162
- before { PlacesIndex.reset! }
173
+ before do
174
+ CitiesIndex.reset!
175
+ CountriesIndex.reset!
176
+ end
163
177
 
164
178
  specify do
165
179
  output = StringIO.new
166
180
  expect { described_class.update(output: output) }
167
- .to update_index(PlacesIndex::City)
181
+ .to update_index(CitiesIndex)
168
182
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
169
- \\AUpdating PlacesIndex
170
- Imported PlacesIndex::City in \\d+s, stats: index 3
171
- Imported PlacesIndex::Country in \\d+s, stats: index 2
183
+ \\AUpdating CitiesIndex
184
+ Imported CitiesIndex::City in \\d+s, stats: index 3
185
+ Updating CountriesIndex
186
+ Imported CountriesIndex::Country in \\d+s, stats: index 2
172
187
  Total: \\d+s\\Z
173
188
  OUTPUT
174
189
  end
175
190
 
176
191
  specify do
177
192
  output = StringIO.new
178
- expect { described_class.update(only: 'places#country', output: output) }
179
- .not_to update_index(PlacesIndex::City)
193
+ expect { described_class.update(only: 'countries', output: output) }
194
+ .not_to update_index(CitiesIndex)
180
195
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
181
- \\AUpdating PlacesIndex
182
- Imported PlacesIndex::Country in \\d+s, stats: index 2
196
+ \\AUpdating CountriesIndex
197
+ Imported CountriesIndex::Country in \\d+s, stats: index 2
183
198
  Total: \\d+s\\Z
184
199
  OUTPUT
185
200
  end
186
201
 
187
202
  specify do
188
203
  output = StringIO.new
189
- expect { described_class.update(except: PlacesIndex::Country, output: output) }
190
- .to update_index(PlacesIndex::City)
204
+ expect { described_class.update(except: CountriesIndex, output: output) }
205
+ .to update_index(CitiesIndex)
191
206
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
192
- \\AUpdating PlacesIndex
193
- Imported PlacesIndex::City in \\d+s, stats: index 3
207
+ \\AUpdating CitiesIndex
208
+ Imported CitiesIndex::City in \\d+s, stats: index 3
194
209
  Total: \\d+s\\Z
195
210
  OUTPUT
196
211
  end
@@ -201,15 +216,15 @@ Total: \\d+s\\Z
201
216
  specify do
202
217
  output = StringIO.new
203
218
  expect { described_class.sync(output: output) }
204
- .to update_index(PlacesIndex::City)
219
+ .to update_index(CitiesIndex)
205
220
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
206
- \\ASynchronizing PlacesIndex::City
207
- Imported PlacesIndex::City in \\d+s, stats: index 3
221
+ \\ASynchronizing CitiesIndex::City
222
+ Imported CitiesIndex::City in \\d+s, stats: index 3
208
223
  Missing documents: \\[[^\\]]+\\]
209
224
  Took \\d+s
210
- Synchronizing PlacesIndex::Country
211
- PlacesIndex::Country doesn't support outdated synchronization
212
- Imported PlacesIndex::Country in \\d+s, stats: index 2
225
+ Synchronizing CountriesIndex::Country
226
+ CountriesIndex::Country doesn't support outdated synchronization
227
+ Imported CountriesIndex::Country in \\d+s, stats: index 2
213
228
  Missing documents: \\[[^\\]]+\\]
214
229
  Took \\d+s
215
230
  Total: \\d+s\\Z
@@ -218,8 +233,8 @@ Total: \\d+s\\Z
218
233
 
219
234
  context do
220
235
  before do
221
- PlacesIndex::City.import(cities.first(2))
222
- PlacesIndex::Country.import
236
+ CitiesIndex.import(cities.first(2))
237
+ CountriesIndex.import
223
238
 
224
239
  sleep(1) if ActiveSupport::VERSION::STRING < '4.1.0'
225
240
  cities.first.update(name: 'Name5')
@@ -228,16 +243,16 @@ Total: \\d+s\\Z
228
243
  specify do
229
244
  output = StringIO.new
230
245
  expect { described_class.sync(output: output) }
231
- .to update_index(PlacesIndex::City)
246
+ .to update_index(CitiesIndex)
232
247
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
233
- \\ASynchronizing PlacesIndex::City
234
- Imported PlacesIndex::City in \\d+s, stats: index 2
248
+ \\ASynchronizing CitiesIndex::City
249
+ Imported CitiesIndex::City in \\d+s, stats: index 2
235
250
  Missing documents: \\["#{cities.last.id}"\\]
236
251
  Outdated documents: \\["#{cities.first.id}"\\]
237
252
  Took \\d+s
238
- Synchronizing PlacesIndex::Country
239
- PlacesIndex::Country doesn't support outdated synchronization
240
- Skipping PlacesIndex::Country, up to date
253
+ Synchronizing CountriesIndex::Country
254
+ CountriesIndex::Country doesn't support outdated synchronization
255
+ Skipping CountriesIndex::Country, up to date
241
256
  Took \\d+s
242
257
  Total: \\d+s\\Z
243
258
  OUTPUT
@@ -245,11 +260,11 @@ Total: \\d+s\\Z
245
260
 
246
261
  specify do
247
262
  output = StringIO.new
248
- expect { described_class.sync(only: PlacesIndex::City, output: output) }
249
- .to update_index(PlacesIndex::City)
263
+ expect { described_class.sync(only: CitiesIndex, output: output) }
264
+ .to update_index(CitiesIndex)
250
265
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
251
- \\ASynchronizing PlacesIndex::City
252
- Imported PlacesIndex::City in \\d+s, stats: index 2
266
+ \\ASynchronizing CitiesIndex::City
267
+ Imported CitiesIndex::City in \\d+s, stats: index 2
253
268
  Missing documents: \\["#{cities.last.id}"\\]
254
269
  Outdated documents: \\["#{cities.first.id}"\\]
255
270
  Took \\d+s
@@ -259,12 +274,12 @@ Total: \\d+s\\Z
259
274
 
260
275
  specify do
261
276
  output = StringIO.new
262
- expect { described_class.sync(except: ['places#city'], output: output) }
263
- .not_to update_index(PlacesIndex::City)
277
+ expect { described_class.sync(except: ['cities'], output: output) }
278
+ .not_to update_index(CitiesIndex)
264
279
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
265
- \\ASynchronizing PlacesIndex::Country
266
- PlacesIndex::Country doesn't support outdated synchronization
267
- Skipping PlacesIndex::Country, up to date
280
+ \\ASynchronizing CountriesIndex::Country
281
+ CountriesIndex::Country doesn't support outdated synchronization
282
+ Skipping CountriesIndex::Country, up to date
268
283
  Took \\d+s
269
284
  Total: \\d+s\\Z
270
285
  OUTPUT
@@ -290,12 +305,12 @@ Total: \\d+s\\Z
290
305
  specify do
291
306
  output = StringIO.new
292
307
  expect { described_class.journal_apply(time: Time.now, output: output) }
293
- .to update_index(PlacesIndex::City)
308
+ .to update_index(CitiesIndex)
294
309
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
295
310
  \\AApplying journal entries created after [+-:\\d\\s]+
296
- Applying journal to \\[PlacesIndex::City, PlacesIndex::Country\\], 3 entries, stage 1
297
- Imported PlacesIndex::City in \\d+s, stats: index 2
298
- Imported PlacesIndex::Country in \\d+s, stats: index 1
311
+ Applying journal to \\[CitiesIndex::City, CountriesIndex::Country\\], 3 entries, stage 1
312
+ Imported CitiesIndex::City in \\d+s, stats: index 2
313
+ Imported CountriesIndex::Country in \\d+s, stats: index 1
299
314
  Total: \\d+s\\Z
300
315
  OUTPUT
301
316
  end
@@ -303,35 +318,35 @@ Total: \\d+s\\Z
303
318
  specify do
304
319
  output = StringIO.new
305
320
  expect { described_class.journal_apply(time: 3.minutes.since, output: output) }
306
- .not_to update_index(PlacesIndex::City)
321
+ .not_to update_index(CitiesIndex)
307
322
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
308
323
  \\AApplying journal entries created after [+-:\\d\\s]+
309
- Applying journal to \\[PlacesIndex::Country\\], 1 entries, stage 1
310
- Imported PlacesIndex::Country in \\d+s, stats: index 1
324
+ Applying journal to \\[CountriesIndex::Country\\], 1 entries, stage 1
325
+ Imported CountriesIndex::Country in \\d+s, stats: index 1
311
326
  Total: \\d+s\\Z
312
327
  OUTPUT
313
328
  end
314
329
 
315
330
  specify do
316
331
  output = StringIO.new
317
- expect { described_class.journal_apply(time: Time.now, only: PlacesIndex::City, output: output) }
318
- .to update_index(PlacesIndex::City)
332
+ expect { described_class.journal_apply(time: Time.now, only: CitiesIndex, output: output) }
333
+ .to update_index(CitiesIndex)
319
334
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
320
335
  \\AApplying journal entries created after [+-:\\d\\s]+
321
- Applying journal to \\[PlacesIndex::City\\], 2 entries, stage 1
322
- Imported PlacesIndex::City in \\d+s, stats: index 2
336
+ Applying journal to \\[CitiesIndex::City\\], 2 entries, stage 1
337
+ Imported CitiesIndex::City in \\d+s, stats: index 2
323
338
  Total: \\d+s\\Z
324
339
  OUTPUT
325
340
  end
326
341
 
327
342
  specify do
328
343
  output = StringIO.new
329
- expect { described_class.journal_apply(time: Time.now, except: PlacesIndex::City, output: output) }
330
- .not_to update_index(PlacesIndex::City)
344
+ expect { described_class.journal_apply(time: Time.now, except: CitiesIndex, output: output) }
345
+ .not_to update_index(CitiesIndex)
331
346
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
332
347
  \\AApplying journal entries created after [+-:\\d\\s]+
333
- Applying journal to \\[PlacesIndex::Country\\], 1 entries, stage 1
334
- Imported PlacesIndex::Country in \\d+s, stats: index 1
348
+ Applying journal to \\[CountriesIndex::Country\\], 1 entries, stage 1
349
+ Imported CountriesIndex::Country in \\d+s, stats: index 1
335
350
  Total: \\d+s\\Z
336
351
  OUTPUT
337
352
  end
@@ -362,7 +377,7 @@ Total: \\d+s\\Z
362
377
 
363
378
  specify do
364
379
  output = StringIO.new
365
- described_class.journal_clean(only: PlacesIndex::City, output: output)
380
+ described_class.journal_clean(only: CitiesIndex, output: output)
366
381
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
367
382
  \\ACleaned up 1 journal entries
368
383
  Total: \\d+s\\Z
@@ -371,7 +386,7 @@ Total: \\d+s\\Z
371
386
 
372
387
  specify do
373
388
  output = StringIO.new
374
- described_class.journal_clean(except: PlacesIndex::City, output: output)
389
+ described_class.journal_clean(except: CitiesIndex, output: output)
375
390
  expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
376
391
  \\ACleaned up 1 journal entries
377
392
  Total: \\d+s\\Z