mongoid 8.0.3 → 8.1.0

data/spec/mongoid/persistence_context_spec.rb

@@ -411,19 +411,12 @@ describe Mongoid::PersistenceContext do
         end
 
         context 'when there is a database override' do
+          persistence_context_override :database, :other
 
           before do
             object.store_in database: :musique
           end
 
-          before do
-            Mongoid::Threaded.database_override = :other
-          end
-
-          after do
-            Mongoid::Threaded.database_override = nil
-          end
-
           it 'uses the override' do
             expect(persistence_context.database_name).to eq(:other)
           end
@@ -458,14 +451,7 @@ describe Mongoid::PersistenceContext do
         end
 
         context 'when there is a database override' do
-
-          before do
-            Mongoid::Threaded.database_override = :other
-          end
-
-          after do
-            Mongoid::Threaded.database_override = nil
-          end
+          persistence_context_override :database, :other
 
           it 'uses the persistence context options' do
             expect(persistence_context.database_name).to eq(:musique)
@@ -517,14 +503,7 @@ describe Mongoid::PersistenceContext do
         end
 
         context 'when there is a database override' do
-
-          before do
-            Mongoid::Threaded.database_override = :other
-          end
-
-          after do
-            Mongoid::Threaded.database_override = nil
-          end
+          persistence_context_override :database, :other
 
           it 'uses the persistence context options' do
             expect(persistence_context.database_name).to eq(:musique)
@@ -535,14 +514,7 @@ describe Mongoid::PersistenceContext do
       context 'when there are no options passed to the Persistence Context' do
 
         context 'when there is a database override' do
-
-          before do
-            Mongoid::Threaded.database_override = :other
-          end
-
-          after do
-            Mongoid::Threaded.database_override = nil
-          end
+          persistence_context_override :database, :other
 
           it 'uses the database override options' do
             expect(persistence_context.database_name).to eq(Mongoid::Threaded.database_override)
@@ -585,15 +557,7 @@ describe Mongoid::PersistenceContext do
       end
 
       context 'when there is a client override' do
-
-        before do
-          Mongoid::Threaded.client_override = :other
-        end
-
-        after do
-          persistence_context.client.close
-          Mongoid::Threaded.client_override = nil
-        end
+        persistence_context_override :client, :other
 
         it 'uses the client option' do
           expect(persistence_context.client).to eq(Mongoid::Clients.with_name(:alternative))
@@ -637,14 +601,7 @@ describe Mongoid::PersistenceContext do
       end
 
       context 'when there is a client override' do
-
-        before do
-          Mongoid::Threaded.client_override = :alternative
-        end
-
-        after do
-          Mongoid::Threaded.client_override = nil
-        end
+        persistence_context_override :client, :alternative
 
         it 'uses the client override' do
           expect(persistence_context.client).to eq(Mongoid::Clients.with_name(:alternative))
@@ -680,14 +637,7 @@ describe Mongoid::PersistenceContext do
         end
 
         context 'when there is a client override' do
-
-          before do
-            Mongoid::Threaded.client_override = :alternative
-          end
-
-          after do
-            Mongoid::Threaded.client_override = nil
-          end
+          persistence_context_override :client, :alternative
 
           it 'uses the client override' do
             expect(persistence_context.client).to eq(Mongoid::Clients.with_name(:alternative))

data/spec/mongoid/query_cache_spec.rb

@@ -24,21 +24,12 @@ describe Mongoid::QueryCache do
     Mrss::SessionRegistry.instance.verify_sessions_ended!
   end
 
-  let(:reset_legacy_qc_warning) do
-    begin
-      Mongoid::QueryCache.remove_instance_variable('@legacy_query_cache_warned')
-    rescue NameError
-      # raised if the instance variable wasn't set
-    end
-  end
-
   describe '#cache' do
+
     context 'with driver query cache' do
 
       context 'when query cache is not enabled' do
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
+        override_query_cache false
 
         it 'turns on the query cache within the block' do
           expect(Mongoid::QueryCache.enabled?).to be false
@@ -52,9 +43,7 @@ describe Mongoid::QueryCache do
       end
 
       context 'when query cache is enabled' do
-        before do
-          Mongoid::QueryCache.enabled = true
-        end
+        override_query_cache true
 
         it 'keeps the query cache enabled within the block' do
           expect(Mongoid::QueryCache.enabled?).to be true
@@ -84,12 +73,11 @@ describe Mongoid::QueryCache do
   end
 
   describe '#uncached' do
+
     context 'with driver query cache' do
 
       context 'when query cache is not enabled' do
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
+        override_query_cache false
 
         it 'keeps the query cache turned off within the block' do
           expect(Mongoid::QueryCache.enabled?).to be false
@@ -103,9 +91,7 @@ describe Mongoid::QueryCache do
       end
 
       context 'when query cache is enabled' do
-        before do
-          Mongoid::QueryCache.enabled = true
-        end
+        override_query_cache true
 
         it 'turns off the query cache within the block' do
           expect(Mongoid::QueryCache.enabled?).to be true
@@ -159,10 +145,7 @@ describe Mongoid::QueryCache do
       end
 
       context 'does not query for the relation and instead sets the base' do
-
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
+        override_query_cache false
 
         it 'queries for each access to the base' do
           expect(server).to receive(:with_connection).exactly(0).times.and_call_original
@@ -180,10 +163,7 @@ describe Mongoid::QueryCache do
       end
 
       context 'when query cache is disabled' do
-
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
+        override_query_cache false
 
         it 'does not query for access to the base' do
           expect(server).to receive(:context).exactly(0).times.and_call_original
@@ -194,10 +174,7 @@ describe Mongoid::QueryCache do
       end
 
       context 'when query cache is enabled' do
-
-        before do
-          Mongoid::QueryCache.enabled = true
-        end
+        override_query_cache true
 
         it 'does not query for access to the base' do
           expect(server).to receive(:context).exactly(0).times.and_call_original
@@ -243,10 +220,7 @@ describe Mongoid::QueryCache do
     end
 
     context 'when block is cached' do
-
-      before do
-        Mongoid::QueryCache.enabled = false
-      end
+      override_query_cache false
 
       it 'uses the driver query cache' do
         expect(Mongo::QueryCache).to receive(:cache).and_call_original
@@ -259,10 +233,7 @@ describe Mongoid::QueryCache do
     end
 
     context 'when block is uncached' do
-
-      before do
-        Mongoid::QueryCache.enabled = true
-      end
+      override_query_cache true
 
       it 'uses the driver query cache' do
         expect(Mongo::QueryCache).to receive(:uncached).and_call_original
@@ -314,10 +285,7 @@ describe Mongoid::QueryCache do
       end
 
       context "when query cache is disabled" do
-
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
+        override_query_cache false
 
         it "queries again" do
           expect_query(1) do
@@ -440,10 +408,7 @@ describe Mongoid::QueryCache do
     end
 
     context "when query cache is disabled" do
-
-      before do
-        Mongoid::QueryCache.enabled = false
-      end
+      override_query_cache false
 
       it "queries again" do
         expect_query(1) do
@@ -669,13 +634,7 @@ describe Mongoid::QueryCache do
    end
 
     context "when query caching is enabled and the batch_size is set" do
-
-      around(:each) do |example|
-        query_cache_enabled = Mongoid::QueryCache.enabled?
-        Mongoid::QueryCache.enabled = true
-        example.run
-        Mongoid::QueryCache.enabled = query_cache_enabled
-      end
+      override_query_cache true
 
       it "does not raise an error when requesting the second batch" do
         expect {
@@ -684,7 +643,6 @@ describe Mongoid::QueryCache do
           end
         }.not_to raise_error
       end
-
     end
   end
 
@@ -752,10 +710,7 @@ describe Mongoid::QueryCache do
     end
 
     context 'when query cache is disabled' do
-
-      before do
-        Mongoid::QueryCache.enabled = false
-      end
+      override_query_cache false
 
       it "queries again" do
         band = Band.find(band_id)
@@ -819,8 +774,9 @@ describe Mongoid::QueryCache do
   end
 
   context 'when the initial query does not exhaust the results' do
+    override_query_cache true
+
     before do
-      Mongoid::QueryCache.enabled = true
       10.times { Band.create! }
 
       Band.batch_size(4).to_a
@@ -867,4 +823,43 @@ describe Mongoid::QueryCache do
       school.students.to_a.length.should == 5
     end
   end
+
+  describe 'deprecation warnings' do
+
+    context '#cache' do
+      it 'should raise a warning' do
+        expect(Mongoid::Warnings).to receive(:warn_mongoid_query_cache)
+        Mongoid::QueryCache.cache {}
+      end
+    end
+
+    context '#uncached' do
+      it 'should raise a warning' do
+        expect(Mongoid::Warnings).to receive(:warn_mongoid_query_cache)
+        Mongoid::QueryCache.uncached {}
+      end
+    end
+
+    context '#clear_cache' do
+      it 'should raise a warning' do
+        expect(Mongoid::Warnings).to receive(:warn_mongoid_query_cache_clear)
+        Mongoid::QueryCache.clear_cache
+      end
+    end
+
+    context '#enabled?' do
+      it 'should raise a warning' do
+        expect(Mongoid::Warnings).to receive(:warn_mongoid_query_cache)
+        Mongoid::QueryCache.enabled?
+      end
+    end
+
+    context '#enabled=' do
+      it 'should raise a warning' do
+        old_enabled = Mongoid::QueryCache.enabled?
+        expect(Mongoid::Warnings).to receive(:warn_mongoid_query_cache)
+        Mongoid::QueryCache.enabled = old_enabled
+      end
+    end
+  end
 end

data/spec/mongoid/reloadable_spec.rb

@@ -488,12 +488,32 @@ describe Mongoid::Reloadable do
         Person.create!
       end
 
-      let(:reloaded) do
-        Person.only(:name).first.reload
+      context "when legacy_readonly is on" do
+        config_override :legacy_readonly, true
+
+        let(:reloaded) do
+          Person.only(:name).first.reload
+        end
+
+        it 'resets the readonly state after reloading' do
+          expect(reloaded.readonly?).to be(false)
+        end
       end
 
-      it 'resets the readonly state after reloading' do
-        expect(reloaded.readonly?).to be(false)
+      context "when legacy_readonly is off" do
+        config_override :legacy_readonly, false
+
+        let(:reloaded) do
+          Person.only(:name).first.tap do |doc|
+            doc.readonly!
+            expect(doc.readonly?).to be true
+            doc.reload
+          end
+        end
+
+        it 'does not reset the readonly state after reloading' do
+          expect(reloaded.readonly?).to be(true)
+        end
       end
     end
 

data/spec/mongoid/scopable_spec.rb

@@ -121,6 +121,76 @@ describe Mongoid::Scopable do
         expect(selector).to eq({'active' => true})
       end
     end
+
+    context "when the default scope is dotted" do
+
+      let(:criteria) do
+        Band.where('tags.foo' => 'bar')
+      end
+
+      before do
+        Band.default_scope ->{ criteria }
+      end
+
+      after do
+        Band.default_scoping = nil
+      end
+
+      let!(:band) do
+        Band.create!
+      end
+
+      it "adds the scope as a dotted key attribute" do
+        expect(band.attributes['tags.foo']).to eq('bar')
+      end
+
+      it "adds the default scope to the class" do
+        expect(Band.default_scoping.call).to eq(criteria)
+      end
+
+      it "flags as being default scoped" do
+        expect(Band).to be_default_scoping
+      end
+
+      it "does not find the correct document" do
+        expect(Band.count).to eq(0)
+      end
+    end
+
+    context "when the default scope is dotted with a query" do
+
+      let(:criteria) do
+        Band.where('tags.foo' => {'$eq' => 'bar'})
+      end
+
+      before do
+        Band.default_scope ->{ criteria }
+      end
+
+      after do
+        Band.default_scoping = nil
+      end
+
+      let!(:band) do
+        Band.create!('tags' => { 'foo' => 'bar' })
+      end
+
+      it "does not add the scope as a dotted key attribute" do
+        expect(band.attributes).to_not have_key('tags.foo')
+      end
+
+      it "adds the default scope to the class" do
+        expect(Band.default_scoping.call).to eq(criteria)
+      end
+
+      it "flags as being default scoped" do
+        expect(Band).to be_default_scoping
+      end
+
+      it "finds the correct document" do
+        expect(Band.where.first).to eq(band)
+      end
+    end
   end
 
   describe ".default_scopable?" do

data/spec/mongoid/serializable_spec.rb

@@ -14,19 +14,19 @@ describe Mongoid::Serializable do
       expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("_type").keys.sort)
     end
 
-    context "when using a custom discriminator_key" do 
-      before do 
+    context "when using a custom discriminator_key" do
+      before do
         Instrument.discriminator_key = "dkey"
       end
 
-      after do 
+      after do
         Instrument.discriminator_key = nil
       end
 
       let(:guitar) do
         Guitar.new
       end
-  
+
       it "includes _type but does not include the new discriminator key" do
         expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("dkey").keys.sort)
       end
@@ -41,15 +41,11 @@ describe Mongoid::Serializable do
       end
 
       after do
-        Mongoid.include_root_in_json = false
         reload_model(:Minim)
       end
 
       context "when global config is set to true" do
-
-        before do
-          Mongoid.include_root_in_json = true
-        end
+        config_override :include_root_in_json, true
 
         it "returns true" do
           expect(Minim.public_send(meth)).to be true
@@ -67,10 +63,7 @@ describe Mongoid::Serializable do
       end
 
       context "when global config set to false" do
-
-        before do
-          Mongoid.include_root_in_json = false
-        end
+        config_override :include_root_in_json, false
 
         it "returns false" do
           expect(Minim.public_send(meth)).to be false
@@ -89,13 +82,13 @@ describe Mongoid::Serializable do
     end
 
     describe "#include_root_in_json" do
+      config_override :include_root_in_json, false
 
       before do
         reload_model(:Minim)
       end
 
       after do
-        Mongoid.include_root_in_json = false
         reload_model(:Minim)
       end
 
@@ -127,10 +120,6 @@ describe Mongoid::Serializable do
 
       context "when global config set to false" do
 
-        before do
-          Mongoid.include_root_in_json = false
-        end
-
         it "returns false" do
           expect(minim.public_send(meth)).to be false
         end
@@ -297,14 +286,7 @@ describe Mongoid::Serializable do
       end
 
       context "when include_type_for_serialization is true" do
-
-        before do
-          Mongoid.include_type_for_serialization = true
-        end
-
-        after do
-          Mongoid.include_type_for_serialization = false
-        end
+        config_override :include_type_for_serialization, true
 
         it "includes _type field" do
           expect(person.serializable_hash.keys).to include '_type'
@@ -881,16 +863,13 @@ describe Mongoid::Serializable do
     end
 
     context "when including root in json via Mongoid" do
+      config_override :include_root_in_json, false
 
       before do
         account.include_root_in_json.should be false
         Mongoid.include_root_in_json = true
       end
 
-      after do
-        Mongoid.include_root_in_json = false
-      end
-
       it "uses the mongoid configuration" do
         expect(JSON.parse(account.to_json)).to have_key("account")
       end

data/spec/mongoid/shardable_models.rb

@@ -59,3 +59,17 @@ end
 class SmNotSharded
   include Mongoid::Document
 end
+
+class SmReviewAuthor
+  include Mongoid::Document
+  embedded_in :review, class_name: "SmReview", touch: false
+  field :name, type: String
+end
+
+class SmReview
+  include Mongoid::Document
+
+  embeds_one :author, class_name: "SmReviewAuthor"
+
+  shard_key "author.name" => 1
+end