mongoid 9.0.11 → 9.1.0

data/spec/integration/matcher_operator_data/in.yml

@@ -114,16 +114,16 @@
   document:
     name: [Boris]
   query:
-    count:
+    name:
       $in:
         - !ruby/regexp /..ris/
-  matches: false
+  matches: true
 
 - name: array field - does not match native regexp as element value
   document:
     name: [Boris]
   query:
-    count:
+    name:
       $in:
         - !ruby/regexp /ri$/
   matches: false
@@ -132,18 +132,18 @@
   document:
     name: [Boris]
   query:
-    count:
+    name:
       $in:
         - !ruby/object:BSON::Regexp::Raw
           pattern: ..ris
           options: ''
-  matches: false
+  matches: true
 
 - name: array field - does not match bson regexp as element value
   document:
     name: [Boris]
   query:
-    count:
+    name:
       $in:
         - !ruby/object:BSON::Regexp::Raw
           pattern: ..ri$

data/spec/integration/matcher_operator_spec.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 
 def mop_error?(spec, kind)
-  unless %w(matcher driver dsl).include?(kind)
-    raise ArgumentError, "Bogus kind: #{kind}"
-  end
+  raise ArgumentError, "Bogus kind: #{kind}" unless %w[matcher driver dsl].include?(kind)
 
   spec['error'] == true || spec['error'] == kind ||
-    spec['error'].is_a?(Array) && spec['error'].include?(kind)
+    (spec['error'].is_a?(Array) && spec['error'].include?(kind))
 end
 
 describe 'Matcher operators' do
@@ -42,7 +39,6 @@ describe 'Matcher operators' do
 
       specs.each do |spec|
         context spec['name'] do
-
           if spec['pending']
             before do
               # Cannot use `pending` here because some of the queries may work
@@ -51,9 +47,7 @@ describe 'Matcher operators' do
             end
           end
 
-          if spec['min_server_version']
-            min_server_version spec['min_server_version'].to_s
-          end
+          min_server_version spec['min_server_version'].to_s if spec['min_server_version']
 
           let(:query) { spec.fetch('query') }
           let(:result) { spec.fetch('matches') }
@@ -80,14 +74,12 @@ describe 'Matcher operators' do
             context 'via driver' do
               if mop_error?(spec, 'driver')
                 it 'produces an error' do
-                  begin
-                    Mop.collection.find(query).any?
-                  rescue Mongo::Error::OperationFailure
-                  rescue Mongo::Error::InvalidDocument
-                  rescue BSON::Error::UnserializableClass
-                  else
-                    fail "Expected an exception to be raised"
-                  end
+                  Mop.collection.find(query).any?
+                rescue Mongo::Error::OperationFailure
+                rescue Mongo::Error::InvalidDocument
+                rescue BSON::Error::UnserializableClass
+                else
+                  raise 'Expected an exception to be raised'
                 end
               else
                 it 'produces the correct result' do
@@ -99,15 +91,13 @@ describe 'Matcher operators' do
             context 'via Mongoid DSL' do
               if mop_error?(spec, 'dsl')
                 it 'produces an error' do
-                  begin
-                    Mop.where(query).any?
-                  rescue Mongo::Error::OperationFailure
-                  rescue BSON::Error::UnserializableClass
-                  rescue Mongoid::Errors::InvalidQuery
-                  rescue Mongoid::Errors::CriteriaArgumentRequired
-                  else
-                    fail "Expected the query to raise an error"
-                  end
+                  Mop.where(query).any?
+                rescue Mongo::Error::OperationFailure
+                rescue BSON::Error::UnserializableClass
+                rescue Mongoid::Errors::InvalidQuery
+                rescue Mongoid::Errors::CriteriaArgumentRequired
+                else
+                  raise 'Expected the query to raise an error'
                 end
               else
                 it 'produces the correct result' do

data/spec/integration/matcher_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 
@@ -15,30 +14,30 @@ describe 'Matcher operators' do
   end
 
   shared_examples 'is false' do
-    it 'is false 'do
+    it 'is false' do
       result.should be false
     end
   end
 
   context 'when comparing Time objects' do
-    let(:time) {Time.utc(2021, 10, 25, 10, 30, 30, 581345)}
+    let(:time) { Time.utc(2021, 10, 25, 10, 30, 30, 581_345) }
     let(:document) do
-      ConsumptionPeriod.new(:started_at => time)
+      ConsumptionPeriod.new(started_at: time)
     end
 
     context 'comparing millisecond precision' do
-      let(:time_millis) {Time.utc(2021, 10, 25, 10, 30, 30, 581774)}
+      let(:time_millis) { Time.utc(2021, 10, 25, 10, 30, 30, 581_774) }
 
       context 'with exact match' do
         let(:query) do
-          {'started_at' => time_millis}
+          { 'started_at' => time_millis }
         end
 
         it_behaves_like 'is true'
 
         context 'and query has different timezone' do
           let(:time_millis) do
-            Time.utc(2021, 10, 25, 10, 30, 30, 581345).in_time_zone("Stockholm")
+            Time.utc(2021, 10, 25, 10, 30, 30, 581_345).in_time_zone('Stockholm')
           end
 
           it_behaves_like 'is true'
@@ -47,7 +46,7 @@ describe 'Matcher operators' do
 
       context 'with $in' do
         let(:query) do
-          {'started_at' => {:$in => [time_millis]}}
+          { 'started_at' => { :$in => [ time_millis ] } }
         end
 
         it_behaves_like 'is true'
@@ -55,12 +54,12 @@ describe 'Matcher operators' do
 
       context 'when matching an element in an array' do
         let(:document) do
-          Mop.new(:array_field => [time])
+          Mop.new(array_field: [ time ])
         end
 
         context 'with equals match' do
           let(:query) do
-            {'array_field' => time_millis}
+            { 'array_field' => time_millis }
           end
 
           it_behaves_like 'is true'
@@ -73,14 +72,14 @@ describe 'Matcher operators' do
     context 'embeds_one' do
       let(:document) do
         Canvas.new(
-          writer: Writer.new(speed: 3),
+          writer: Writer.new(speed: 3)
         )
       end
 
       context 'implicit $eq' do
         context 'matches' do
           let(:query) do
-            {'writer.speed' => 3}
+            { 'writer.speed' => 3 }
           end
 
           it_behaves_like 'is true'
@@ -88,7 +87,7 @@ describe 'Matcher operators' do
 
         context 'does not match' do
           let(:query) do
-            {'speed' => 3}
+            { 'speed' => 3 }
           end
 
           it_behaves_like 'is false'
@@ -97,11 +96,11 @@ describe 'Matcher operators' do
 
       context 'field operator' do
         # Test string and symbol operators
-        ['$gt', :$gt].each do |op|
+        [ '$gt', :$gt ].each do |op|
           context op.inspect do
             context 'matches' do
               let(:query) do
-                {'writer.speed' => {op => 2}}
+                { 'writer.speed' => { op => 2 } }
               end
 
               it_behaves_like 'is true'
@@ -109,7 +108,7 @@ describe 'Matcher operators' do
 
             context 'does not match' do
               let(:query) do
-                {'writer.speed' => {op => 3}}
+                { 'writer.speed' => { op => 3 } }
               end
 
               it_behaves_like 'is false'
@@ -122,7 +121,7 @@ describe 'Matcher operators' do
         context 'scalar field in embedded document' do
           context 'matches' do
             let(:query) do
-              {writer: {speed: 3}}
+              { writer: { speed: 3 } }
             end
 
             it_behaves_like 'is true'
@@ -130,7 +129,7 @@ describe 'Matcher operators' do
 
           context 'does not match' do
             let(:query) do
-              {writer: {slow: 3}}
+              { writer: { slow: 3 } }
             end
 
             it_behaves_like 'is false'
@@ -140,13 +139,13 @@ describe 'Matcher operators' do
         context 'hash field' do
           let(:document) do
             Bar.new(
-              writer: {speed: 3},
+              writer: { speed: 3 }
             )
           end
 
           context 'matches' do
             let(:query) do
-              {writer: {speed: 3}}
+              { writer: { speed: 3 } }
             end
 
             it_behaves_like 'is true'
@@ -154,7 +153,7 @@ describe 'Matcher operators' do
 
           context 'does not match' do
             let(:query) do
-              {writer: {slow: 3}}
+              { writer: { slow: 3 } }
             end
 
             it_behaves_like 'is false'
@@ -166,19 +165,19 @@ describe 'Matcher operators' do
     context 'embeds_many' do
       let(:document) do
         Survey.new(
-          questions: [Question.new(
+          questions: [ Question.new(
             answers: [
               Answer.new(position: 3),
-              Answer.new(position: 4),
-            ],
-          )],
+              Answer.new(position: 4)
+            ]
+          ) ]
         )
       end
 
       context 'implicit $eq' do
         context 'matches' do
           let(:query) do
-            {'questions.answers.position' => 3}
+            { 'questions.answers.position' => 3 }
           end
 
           it_behaves_like 'is true'
@@ -186,7 +185,7 @@ describe 'Matcher operators' do
 
         context 'does not match' do
           let(:query) do
-            {'questions.answers.position' => 2}
+            { 'questions.answers.position' => 2 }
           end
 
           it_behaves_like 'is false'
@@ -195,11 +194,11 @@ describe 'Matcher operators' do
 
       context 'field operator' do
         # Test string and symbol operators
-        ['$gt', :$gt].each do |op|
+        [ '$gt', :$gt ].each do |op|
           context op.inspect do
             context 'matches' do
               let(:query) do
-                {'questions.answers.position' => {op => 2}}
+                { 'questions.answers.position' => { op => 2 } }
               end
 
               it_behaves_like 'is true'
@@ -207,7 +206,7 @@ describe 'Matcher operators' do
 
             context 'does not match' do
               let(:query) do
-                {'questions.answers.position' => {op => 4}}
+                { 'questions.answers.position' => { op => 4 } }
               end
 
               it_behaves_like 'is false'
@@ -219,7 +218,7 @@ describe 'Matcher operators' do
       context 'array index' do
         context 'matches' do
           let(:query) do
-            {'questions.answers.1' => {position: 4}}
+            { 'questions.answers.1' => { position: 4 } }
           end
 
           it_behaves_like 'is true'
@@ -227,7 +226,7 @@ describe 'Matcher operators' do
 
         context 'does not match' do
           let(:query) do
-            {'questions.answers.0' => {position: 4}}
+            { 'questions.answers.0' => { position: 4 } }
           end
 
           it_behaves_like 'is false'

data/spec/integration/persistence/collection_options_spec.rb

@@ -2,8 +2,6 @@
 
 require 'spec_helper'
 
-# rubocop:disable RSpec/LeakyConstantDeclaration
-# rubocop:disable Lint/ConstantDefinitionInBlock
 describe 'Collection options' do
   before(:all) do
     class CollectionOptionsCapped

data/spec/integration/persistence/range_field_spec.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 
 describe 'Range field persistence' do
-  let!(:person) { Person.create!(field => value).reload }
   subject { person.send(field) }
+
+  let!(:person) { Person.create!(field => value).reload }
   let(:now_utc) { Time.now }
   let(:later_utc) { now_utc + 10.minutes }
   let(:now_in_zone) { now_utc.in_time_zone('Asia/Tokyo') }
@@ -16,6 +16,7 @@ describe 'Range field persistence' do
 
     context 'when Integer' do
       let(:value) { 1..3 }
+
       it do
         expect(subject).to eq(1..3)
       end
@@ -23,50 +24,59 @@ describe 'Range field persistence' do
 
     context 'when Integer exclude_end' do
       let(:value) { 1...3 }
+
       it { expect(subject).to eq(1...3) }
     end
 
     context 'when endless' do
       ruby_version_gte '2.6'
       let(:value) { eval('3..') }
+
       it { expect(subject).to eq(eval('3..')) }
     end
 
     context 'when endless exclude_end' do
       ruby_version_gte '2.6'
       let(:value) { eval('3...') }
+
       it { expect(subject).to eq(eval('3...')) }
     end
 
     context 'when beginning-less' do
       ruby_version_gte '2.7'
       let(:value) { eval('..3') }
+
       it { expect(subject).to eq(eval('..3')) }
     end
 
     context 'when beginning-less exclude_end' do
       ruby_version_gte '2.7'
       let(:value) { eval('...3') }
+
       it { expect(subject).to eq(eval('...3')) }
     end
 
     context 'when Hash<String, Integer>' do
       let(:value) { { 'min' => 1, 'max' => 3 } }
+
       it { expect(subject).to eq(1..3) }
     end
 
     context 'when Hash<String, Integer> exclude_end' do
       let(:value) { { 'min' => 1, 'max' => 3, 'exclude_end' => true } }
+
       it { expect(subject).to eq(1...3) }
     end
 
     context 'when Hash<Symbol, Integer>' do
       let(:value) { { min: 1, max: 3 } }
+
       it { expect(subject).to eq(1..3) }
     end
 
     context 'when Hash<Symbol, Integer> exclude_end' do
       let(:value) { { min: 1, max: 3, exclude_end: true } }
+
       it { expect(subject).to eq(1...3) }
     end
 
@@ -180,6 +190,7 @@ describe 'Range field persistence' do
 
     context 'when Integer' do
       let(:value) { 1..3 }
+
       it do
         expect(subject).to eq('max' => 3, 'min' => 1)
       end
@@ -187,60 +198,71 @@ describe 'Range field persistence' do
 
     context 'when Integer exclude_end' do
       let(:value) { 1...3 }
+
       it { expect(subject).to eq('max' => 3, 'min' => 1, 'exclude_end' => true) }
     end
 
     context 'when descending' do
       let(:value) { 3..1 }
+
       it { expect(subject).to eq('max' => 1, 'min' => 3) }
     end
 
     context 'when descending exclude_end' do
       let(:value) { 3...1 }
+
       it { expect(subject).to eq('max' => 1, 'min' => 3, 'exclude_end' => true) }
     end
 
     context 'when endless' do
       ruby_version_gte '2.6'
       let(:value) { eval('3..') }
+
       it { expect(subject).to eq('min' => 3) }
     end
 
     context 'when endless exclude_end' do
       ruby_version_gte '2.6'
       let(:value) { eval('3...') }
+
       it { expect(subject).to eq('min' => 3, 'exclude_end' => true) }
     end
 
     context 'when beginning-less' do
       ruby_version_gte '2.7'
       let(:value) { eval('..3') }
+
       it { expect(subject).to eq('max' => 3) }
     end
 
     context 'when beginning-less exclude_end' do
       ruby_version_gte '2.7'
       let(:value) { eval('...3') }
+
       it { expect(subject).to eq('max' => 3, 'exclude_end' => true) }
     end
 
     context 'when Hash<String, Integer>' do
       let(:value) { { 'min' => 1, 'max' => 3 } }
+
       it { expect(subject).to eq('max' => 3, 'min' => 1) }
     end
 
     context 'when Hash<String, Integer> exclude_end' do
       let(:value) { { 'min' => 1, 'max' => 3, 'exclude_end' => true } }
+
       it { expect(subject).to eq('max' => 3, 'min' => 1, 'exclude_end' => true) }
     end
 
     context 'when Hash<Symbol, Integer>' do
       let(:value) { { min: 1, max: 3 } }
+
       it { expect(subject).to eq('max' => 3, 'min' => 1) }
     end
 
     context 'when Hash<Symbol, Integer> exclude_end' do
       let(:value) { { min: 1, max: 3, exclude_end: true } }
+
       it { expect(subject).to eq('max' => 3, 'min' => 1, 'exclude_end' => true) }
     end