mongoid 8.0.3 → 8.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/Rakefile +25 -0
- data/lib/mongoid/association/embedded/embeds_many/proxy.rb +17 -15
- data/lib/mongoid/association/referenced/has_and_belongs_to_many/proxy.rb +4 -0
- data/lib/mongoid/association/referenced/has_many/proxy.rb +4 -0
- data/lib/mongoid/atomic.rb +7 -0
- data/lib/mongoid/changeable.rb +1 -3
- data/lib/mongoid/criteria/queryable/extensions/array.rb +1 -1
- data/lib/mongoid/criteria/queryable/extensions/hash.rb +1 -1
- data/lib/mongoid/criteria/queryable/extensions/numeric.rb +0 -8
- data/lib/mongoid/criteria/queryable/extensions/string.rb +1 -11
- data/lib/mongoid/criteria/queryable/extensions/symbol.rb +0 -10
- data/lib/mongoid/criteria/translator.rb +45 -0
- data/lib/mongoid/criteria.rb +1 -0
- data/lib/mongoid/document.rb +50 -13
- data/lib/mongoid/factory.rb +21 -8
- data/lib/mongoid/matcher.rb +21 -6
- data/lib/mongoid/reloadable.rb +3 -5
- data/lib/mongoid/shardable.rb +35 -11
- data/lib/mongoid/threaded.rb +30 -0
- data/lib/mongoid/traversable.rb +1 -1
- data/lib/mongoid/version.rb +1 -1
- data/spec/mongoid/association/embedded/embeds_many/proxy_spec.rb +37 -32
- data/spec/mongoid/association/referenced/has_and_belongs_to_many/proxy_spec.rb +143 -197
- data/spec/mongoid/association/referenced/has_many/proxy_spec.rb +102 -114
- data/spec/mongoid/attributes_spec.rb +2 -2
- data/spec/mongoid/criteria/queryable/extensions/string_spec.rb +0 -59
- data/spec/mongoid/criteria/queryable/extensions/symbol_spec.rb +0 -59
- data/spec/mongoid/criteria/queryable/optional_spec.rb +15 -0
- data/spec/mongoid/criteria/translator_spec.rb +132 -0
- data/spec/mongoid/reloadable_spec.rb +24 -0
- data/spec/mongoid/shardable_models.rb +14 -0
- data/spec/mongoid/shardable_spec.rb +153 -61
- data/spec/mongoid_spec.rb +1 -1
- data.tar.gz.sig +0 -0
- metadata +656 -648
- metadata.gz.sig +0 -0
@@ -27,11 +27,11 @@ describe Mongoid::Shardable do
|
|
27
27
|
context 'when full syntax is used' do
|
28
28
|
context 'with symbol value' do
|
29
29
|
it 'sets shard key fields to symbol value' do
|
30
|
-
SmProducer.shard_key_fields.
|
30
|
+
expect(SmProducer.shard_key_fields).to be == %i(age gender)
|
31
31
|
end
|
32
32
|
|
33
33
|
it 'sets shard config' do
|
34
|
-
SmProducer.shard_config.
|
34
|
+
expect(SmProducer.shard_config).to be == {
|
35
35
|
key: {age: 1, gender: 'hashed'},
|
36
36
|
options: {
|
37
37
|
unique: true,
|
@@ -41,37 +41,37 @@ describe Mongoid::Shardable do
|
|
41
41
|
end
|
42
42
|
|
43
43
|
it 'keeps hashed as string' do
|
44
|
-
SmProducer.shard_config[:key][:gender].
|
44
|
+
expect(SmProducer.shard_config[:key][:gender]).to be == 'hashed'
|
45
45
|
end
|
46
46
|
end
|
47
47
|
|
48
48
|
context 'with string value' do
|
49
49
|
it 'sets shard key fields to symbol value' do
|
50
|
-
SmActor.shard_key_fields.
|
50
|
+
expect(SmActor.shard_key_fields).to be == %i(age gender hello)
|
51
51
|
end
|
52
52
|
|
53
53
|
it 'sets shard config' do
|
54
|
-
SmActor.shard_config.
|
54
|
+
expect(SmActor.shard_config).to be == {
|
55
55
|
key: {age: 1, gender: 'hashed', hello: 'hashed'},
|
56
56
|
options: {},
|
57
57
|
}
|
58
58
|
end
|
59
59
|
|
60
60
|
it 'sets hashed to string' do
|
61
|
-
SmActor.shard_config[:key][:gender].
|
61
|
+
expect(SmActor.shard_config[:key][:gender]).to be == 'hashed'
|
62
62
|
end
|
63
63
|
end
|
64
64
|
|
65
65
|
context 'when passed association name' do
|
66
66
|
it 'uses foreign key as shard key in shard config' do
|
67
|
-
SmDriver.shard_config.
|
67
|
+
expect(SmDriver.shard_config).to be == {
|
68
68
|
key: {age: 1, agency_id: 'hashed'},
|
69
69
|
options: {},
|
70
70
|
}
|
71
71
|
end
|
72
72
|
|
73
73
|
it 'uses foreign key as shard key in shard key fields' do
|
74
|
-
SmDriver.shard_key_fields.
|
74
|
+
expect(SmDriver.shard_key_fields).to be == %i(age agency_id)
|
75
75
|
end
|
76
76
|
end
|
77
77
|
end
|
@@ -79,26 +79,26 @@ describe Mongoid::Shardable do
|
|
79
79
|
context 'when shorthand syntax is used' do
|
80
80
|
context 'with symbol value' do
|
81
81
|
it 'sets shard key fields to symbol value' do
|
82
|
-
SmMovie.shard_key_fields.
|
82
|
+
expect(SmMovie.shard_key_fields).to be == %i(year)
|
83
83
|
end
|
84
84
|
end
|
85
85
|
|
86
86
|
context 'with string value' do
|
87
87
|
it 'sets shard key fields to symbol value' do
|
88
|
-
SmTrailer.shard_key_fields.
|
88
|
+
expect(SmTrailer.shard_key_fields).to be == %i(year)
|
89
89
|
end
|
90
90
|
end
|
91
91
|
|
92
92
|
context 'when passed association name' do
|
93
93
|
it 'uses foreign key as shard key in shard config' do
|
94
|
-
SmDirector.shard_config.
|
94
|
+
expect(SmDirector.shard_config).to be == {
|
95
95
|
key: {agency_id: 1},
|
96
96
|
options: {},
|
97
97
|
}
|
98
98
|
end
|
99
99
|
|
100
100
|
it 'uses foreign key as shard key in shard key fields' do
|
101
|
-
SmDirector.shard_key_fields.
|
101
|
+
expect(SmDirector.shard_key_fields).to be == %i(agency_id)
|
102
102
|
end
|
103
103
|
end
|
104
104
|
end
|
@@ -106,41 +106,80 @@ describe Mongoid::Shardable do
|
|
106
106
|
|
107
107
|
describe '#shard_key_selector' do
|
108
108
|
subject { instance.shard_key_selector }
|
109
|
-
|
110
|
-
|
109
|
+
|
110
|
+
context 'when key is an immediate attribute' do
|
111
|
+
let(:klass) { Band }
|
112
|
+
let(:value) { 'a-brand-name' }
|
111
113
|
|
112
|
-
|
114
|
+
before { klass.shard_key(:name) }
|
113
115
|
|
114
|
-
|
115
|
-
|
116
|
+
context 'when record is new' do
|
117
|
+
let(:instance) { klass.new(name: value) }
|
116
118
|
|
117
|
-
|
119
|
+
it { is_expected.to eq({ 'name' => value }) }
|
118
120
|
|
119
|
-
|
120
|
-
|
121
|
+
context 'changing shard key value' do
|
122
|
+
let(:new_value) { 'a-new-value' }
|
121
123
|
|
122
|
-
|
123
|
-
|
124
|
+
before do
|
125
|
+
instance.name = new_value
|
126
|
+
end
|
127
|
+
|
128
|
+
it { is_expected.to eq({ 'name' => new_value }) }
|
124
129
|
end
|
130
|
+
end
|
131
|
+
|
132
|
+
context 'when record is persisted' do
|
133
|
+
let(:instance) { klass.create!(name: value) }
|
125
134
|
|
126
|
-
it { is_expected.to eq({ 'name' =>
|
135
|
+
it { is_expected.to eq({ 'name' => value }) }
|
136
|
+
|
137
|
+
context 'changing shard key value' do
|
138
|
+
let(:new_value) { 'a-new-value' }
|
139
|
+
|
140
|
+
before do
|
141
|
+
instance.name = new_value
|
142
|
+
end
|
143
|
+
|
144
|
+
it { is_expected.to eq({ 'name' => new_value }) }
|
145
|
+
end
|
127
146
|
end
|
128
147
|
end
|
129
148
|
|
130
|
-
context 'when
|
131
|
-
let(:
|
149
|
+
context 'when key is an embedded attribute' do
|
150
|
+
let(:klass) { SmReview }
|
151
|
+
let(:value) { 'Arthur Conan Doyle' }
|
152
|
+
let(:key) { 'author.name' }
|
132
153
|
|
133
|
-
|
154
|
+
context 'when record is new' do
|
155
|
+
let(:instance) { klass.new(author: { name: value }) }
|
134
156
|
|
135
|
-
|
136
|
-
let(:new_value) { 'a-new-value' }
|
157
|
+
it { is_expected.to eq({ key => value }) }
|
137
158
|
|
138
|
-
|
139
|
-
|
159
|
+
context 'changing shard key value' do
|
160
|
+
let(:new_value) { 'Jules Verne' }
|
161
|
+
|
162
|
+
before do
|
163
|
+
instance.author.name = new_value
|
164
|
+
end
|
165
|
+
|
166
|
+
it { is_expected.to eq({ key => new_value }) }
|
140
167
|
end
|
168
|
+
end
|
169
|
+
|
170
|
+
context 'when record is persisted' do
|
171
|
+
let(:instance) { klass.create!(author: { name: value }) }
|
172
|
+
|
173
|
+
it { is_expected.to eq({ key => value }) }
|
174
|
+
|
175
|
+
context 'changing shard key value' do
|
176
|
+
let(:new_value) { 'Jules Verne' }
|
141
177
|
|
142
|
-
|
143
|
-
|
178
|
+
before do
|
179
|
+
instance.author.name = new_value
|
180
|
+
end
|
181
|
+
|
182
|
+
it { is_expected.to eq({ 'author.name' => new_value }) }
|
144
183
|
end
|
145
184
|
end
|
146
185
|
end
|
@@ -148,56 +187,109 @@ describe Mongoid::Shardable do
|
|
148
187
|
|
149
188
|
describe '#shard_key_selector_in_db' do
|
150
189
|
subject { instance.shard_key_selector_in_db }
|
151
|
-
let(:klass) { Band }
|
152
|
-
let(:value) { 'a-brand-name' }
|
153
190
|
|
154
|
-
|
191
|
+
context 'when key is an immediate attribute' do
|
192
|
+
let(:klass) { Band }
|
193
|
+
let(:value) { 'a-brand-name' }
|
155
194
|
|
156
|
-
|
157
|
-
let(:instance) { klass.new(name: value) }
|
195
|
+
before { klass.shard_key(:name) }
|
158
196
|
|
159
|
-
|
197
|
+
context 'when record is new' do
|
198
|
+
let(:instance) { klass.new(name: value) }
|
160
199
|
|
161
|
-
|
162
|
-
let(:new_value) { 'a-new-value' }
|
200
|
+
it { is_expected.to eq({ 'name' => value }) }
|
163
201
|
|
164
|
-
|
165
|
-
|
166
|
-
|
202
|
+
context 'changing shard key value' do
|
203
|
+
let(:new_value) { 'a-new-value' }
|
204
|
+
|
205
|
+
before do
|
206
|
+
instance.name = new_value
|
207
|
+
end
|
167
208
|
|
168
|
-
|
169
|
-
subject.should == { 'name' => new_value }
|
209
|
+
it { is_expected.to eq({ 'name' => new_value }) }
|
170
210
|
end
|
171
211
|
end
|
172
|
-
end
|
173
212
|
|
174
|
-
|
175
|
-
|
213
|
+
context 'when record is persisted' do
|
214
|
+
let(:instance) { klass.create!(name: value) }
|
215
|
+
|
216
|
+
it { is_expected.to eq({ 'name' => value }) }
|
217
|
+
|
218
|
+
context 'changing shard key value' do
|
219
|
+
let(:new_value) { 'a-new-value' }
|
176
220
|
|
177
|
-
|
221
|
+
before do
|
222
|
+
instance.name = new_value
|
223
|
+
end
|
178
224
|
|
179
|
-
|
180
|
-
|
225
|
+
it { is_expected.to eq({ 'name' => value }) }
|
226
|
+
end
|
227
|
+
end
|
228
|
+
|
229
|
+
context "when record is not found" do
|
230
|
+
let!(:instance) { klass.create!(name: value) }
|
181
231
|
|
182
232
|
before do
|
183
|
-
instance.
|
233
|
+
instance.destroy
|
184
234
|
end
|
185
235
|
|
186
|
-
it
|
236
|
+
it "raises a DocumentNotFound error with the shard key in the description on reload" do
|
237
|
+
expect do
|
238
|
+
instance.reload
|
239
|
+
end.to raise_error(Mongoid::Errors::DocumentNotFound, /Document not found for class Band with id #{instance.id.to_s} and shard key name: a-brand-name./)
|
240
|
+
end
|
187
241
|
end
|
188
242
|
end
|
189
243
|
|
190
|
-
context
|
191
|
-
let
|
244
|
+
context 'when key is an embedded attribute' do
|
245
|
+
let(:klass) { SmReview }
|
246
|
+
let(:value) { 'Arthur Conan Doyle' }
|
247
|
+
let(:key) { 'author.name' }
|
248
|
+
|
249
|
+
context 'when record is new' do
|
250
|
+
let(:instance) { klass.new(author: { name: value }) }
|
251
|
+
|
252
|
+
it { is_expected.to eq({ key => value }) }
|
192
253
|
|
193
|
-
|
194
|
-
|
254
|
+
context 'changing shard key value' do
|
255
|
+
let(:new_value) { 'Jules Verne' }
|
256
|
+
|
257
|
+
before do
|
258
|
+
instance.author.name = new_value
|
259
|
+
end
|
260
|
+
|
261
|
+
it { is_expected.to eq({ key => new_value }) }
|
262
|
+
end
|
195
263
|
end
|
196
264
|
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
265
|
+
context 'when record is persisted' do
|
266
|
+
let(:instance) { klass.create!(author: { name: value }) }
|
267
|
+
|
268
|
+
it { is_expected.to eq({ key => value }) }
|
269
|
+
|
270
|
+
context 'changing shard key value' do
|
271
|
+
let(:new_value) { 'Jules Verne' }
|
272
|
+
|
273
|
+
before do
|
274
|
+
instance.author.name = new_value
|
275
|
+
end
|
276
|
+
|
277
|
+
it { is_expected.to eq({ key => value }) }
|
278
|
+
end
|
279
|
+
|
280
|
+
context "when record is not found" do
|
281
|
+
let!(:instance) { klass.create!(author: { name: value }) }
|
282
|
+
|
283
|
+
before do
|
284
|
+
instance.destroy
|
285
|
+
end
|
286
|
+
|
287
|
+
it "raises a DocumentNotFound error with the shard key in the description on reload" do
|
288
|
+
expect do
|
289
|
+
instance.reload
|
290
|
+
end.to raise_error(Mongoid::Errors::DocumentNotFound, /Document not found for class SmReview with id #{instance.id.to_s} and shard key author.name: Arthur Conan Doyle./)
|
291
|
+
end
|
292
|
+
end
|
201
293
|
end
|
202
294
|
end
|
203
295
|
end
|
data/spec/mongoid_spec.rb
CHANGED
@@ -52,7 +52,7 @@ describe Mongoid do
|
|
52
52
|
|
53
53
|
it "disconnects from all active clients" do
|
54
54
|
clients.each do |client|
|
55
|
-
expect(client
|
55
|
+
expect(client).to receive(:close).and_call_original
|
56
56
|
end
|
57
57
|
Mongoid.disconnect_clients
|
58
58
|
end
|
data.tar.gz.sig
CHANGED
Binary file
|