mongoid 7.0.13 → 8.0.8

data/spec/mongoid/persistable/upsertable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Persistable::Upsertable do
@@ -29,7 +31,7 @@ describe Mongoid::Persistable::Upsertable do
     context "when the document is new" do
 
       let!(:existing) do
-        Band.create(name: "Photek")
+        Band.create!(name: "Photek")
       end
 
       context "when a matching document exists in the db" do
@@ -51,6 +53,20 @@ describe Mongoid::Persistable::Upsertable do
         it "flags the document as persisted" do
           expect(existing).to be_persisted
         end
+
+        context 'when existing document contains other fields' do
+          let!(:existing) do
+            Band.create!(name: "Photek", views: 42)
+          end
+
+          it 'removes the existing fields' do
+            Band.count.should == 1
+
+            existing.reload
+            existing.views.should be nil
+            existing.name.should == 'Tool'
+          end
+        end
       end
 
       context "when no matching document exists in the db" do
@@ -80,7 +96,7 @@ describe Mongoid::Persistable::Upsertable do
     context "when the document is not new" do
 
       let!(:existing) do
-        Band.create(name: "Photek")
+        Band.create!(name: "Photek")
       end
 
       context "when updating fields outside of the id" do

data/spec/mongoid/persistable_spec.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Persistable do
 
+  class PersistableSpecTestException < StandardError; end
+
   describe "#atomically" do
 
     let(:document) do
-      Band.create(member_count: 0, likes: 60, origin: "London")
+      Band.create!(member_count: 0, likes: 60, origin: "London")
     end
 
     context "when providing a block" do
@@ -173,8 +177,8 @@ describe Mongoid::Persistable do
 
         before do
           class Band
-            def my_updates
-              atomically do |d|
+            def my_updates(**args)
+              atomically(**args) do |d|
                 d.set(name: "Placebo")
                 d.unset(:origin)
               end
@@ -182,15 +186,87 @@ describe Mongoid::Persistable do
           end
         end
 
-        let!(:update) do
-          document.atomically do |doc|
-            doc.inc(member_count: 10)
-            doc.bit(likes: { and: 13 })
-            doc.my_updates
+        context "when given join_context: false" do
+
+          let(:run_update) do
+            document.atomically do |doc|
+              doc.set origin: "Paris"
+              doc.atomically(join_context: false) do |doc2|
+                doc2.inc(member_count: 10)
+              end
+              doc.inc likes: 1
+              raise PersistableSpecTestException, "oops"
+            end
+          end
+
+          it_behaves_like "an atomically updatable root document" do
+            let!(:update) do
+              document.atomically do |doc|
+                doc.inc(member_count: 10)
+                doc.my_updates join_context: false
+                doc.bit(likes: { and: 13 })
+              end
+            end
+          end
+
+          it "independently persists the non-joining block's operations" do
+            begin run_update; rescue PersistableSpecTestException; end
+
+            document.reload
+
+            expect(document.origin).to eq "London"
+            expect(document.likes).to eq 60
+            expect(document.member_count).to eq 10
+          end
+
+          it "resets in-memory changes that did not successfully persist" do
+            begin run_update; rescue PersistableSpecTestException; end
+
+            expect(document.origin).to eq "London"
+            expect(document.likes).to eq 60
+            expect(document.member_count).to eq 10
           end
         end
 
-        it_behaves_like "an atomically updatable root document"
+        context "when given join_context: true" do
+
+          let(:run_update) do
+            document.atomically do |doc|
+              doc.inc(member_count: 10)
+              doc.my_updates join_context: true
+              doc.bit(likes: { and: 13 })
+            end
+          end
+
+          it_behaves_like "an atomically updatable root document" do
+            let!(:update) { run_update }
+          end
+
+          it "performs an update_one exactly once" do
+            expect_any_instance_of(Mongo::Collection::View).to receive(:update_one).exactly(:once).and_call_original
+            run_update
+          end
+
+          it "resets in-memory changes that did not successfully persist" do
+            begin
+              document.atomically do |doc|
+                doc.set origin: "Paris"
+                doc.atomically(join_context: true) do |doc2|
+                  doc2.inc(member_count: 10)
+                end
+                doc.atomically(join_context: true) do |doc3|
+                  doc.inc likes: 1
+                end
+                raise PersistableSpecTestException, "oops"
+              end
+            rescue PersistableSpecTestException
+            end
+
+            expect(document.origin).to eq "London"
+            expect(document.likes).to eq 60
+            expect(document.member_count).to eq 0
+          end
+        end
       end
     end
 

data/spec/mongoid/persistence_context_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::PersistenceContext do
@@ -37,7 +39,6 @@ describe Mongoid::PersistenceContext do
     end
   end
 
-
   describe '.get' do
 
     let(:options) do
@@ -132,6 +133,32 @@ describe Mongoid::PersistenceContext do
         end
       end
     end
+
+    context 'with reusable client' do
+      let(:options) do
+        {client: :some_client}
+      end
+
+      let(:cluster) do
+        double(Mongo::Cluster)
+      end
+
+      let(:client) do
+        double(Mongo::Client).tap do |client|
+          allow(client).to receive(:cluster).and_return(cluster)
+        end
+      end
+
+      before do
+        expect(Mongoid::Clients).to receive(:with_name).with(:some_client).and_return(client)
+        expect(client).not_to receive(:close)
+      end
+
+      it 'does not close the client' do
+        described_class.set(object, options)
+        described_class.clear(object, cluster.dup)
+      end
+    end
   end
 
   describe '#initialize' do
@@ -691,4 +718,28 @@ describe Mongoid::PersistenceContext do
       end
     end
   end
+
+  context "when using an alternate database to update a document" do
+    let(:user) do
+      User.new(name: '1')
+    end
+
+    before do
+      user.with(database: database_id_alt) do |u|
+        u.save!
+      end
+
+      expect do
+        user.with(database: database_id_alt) do |u|
+          u.update(name:'2')
+        end
+      end.to_not raise_error
+    end
+
+    it "persists the update" do
+      User.with("database" => database_id_alt) do |klass|
+        expect(klass.find(user._id).name).to eq("2")
+      end
+    end
+  end
 end

data/spec/mongoid/positional_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Positional do

data/spec/mongoid/query_cache_middleware_spec.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongoid::QueryCache::Middleware do
+
+  let :middleware do
+    Mongoid::QueryCache::Middleware.new(app)
+  end
+
+  context "when not touching mongoid on the app" do
+
+    let(:app) do
+      ->(env) { @enabled = Mongoid::QueryCache.enabled?; [200, env, "app"] }
+    end
+
+    it "returns success" do
+      code, _ = middleware.call({})
+      expect(code).to eq(200)
+    end
+
+    it "enables the query cache" do
+      middleware.call({})
+      expect(@enabled).to be true
+    end
+  end
+
+  context "when querying on the app" do
+
+    let(:app) do
+      ->(env) {
+        Band.all.to_a
+        [200, env, "app"]
+      }
+    end
+
+    it "returns success" do
+      code, _ = middleware.call({})
+      expect(code).to eq(200)
+    end
+
+    context 'with driver query cache' do
+
+      it "cleans the query cache after it responds" do
+        middleware.call({})
+        expect(Mongo::QueryCache.send(:cache_table)).to be_empty
+      end
+    end
+  end
+end