mongoid 7.0.13 → 8.0.8

data/spec/mongoid/clients/transactions_spec.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Clients::Sessions do
   before(:all) do
-    unless Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) < Gem::Version.new('2.6')
       skip 'Driver does not support transactions'
     end
   end
 
   before(:all) do
-    if Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) >= Gem::Version.new('2.6')
       CONFIG[:clients][:other] = CONFIG[:clients][:default].dup
       CONFIG[:clients][:other][:database] = 'other'
       Mongoid::Clients.clients.values.each(&:close)
@@ -18,7 +20,7 @@ describe Mongoid::Clients::Sessions do
   end
 
   after(:all) do
-    if Mongo::VERSION >= '2.6'
+    if Gem::Version.new(Mongo::VERSION) >= Gem::Version.new('2.6')
       Mongoid::Clients.with_name(:other).close
       Mongoid::Clients.clients.delete(:other)
     end
@@ -59,9 +61,12 @@ describe Mongoid::Clients::Sessions do
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         Mongoid::Clients.with_name(:other).command(create: :people)
         Mongoid::Clients.with_name(:other).command(create: :posts)
+        Mongoid::Clients.with_name(:other).command(create: :canvases)
         subscriber.clear_events!
-        Person.with(client: :other) do
-          example.run
+        Canvas.with(client: :other) do
+          Person.with(client: :other) do
+            example.run
+          end
         end
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
       end
@@ -71,9 +76,9 @@ describe Mongoid::Clients::Sessions do
         let!(:last_use_diff) do
           Person.with_session do |s|
             s.start_transaction
-            Person.create
-            Person.create
-            Thread.new { Person.create }.value
+            Person.create!
+            Person.create!
+            Thread.new { Person.create! }.value
             s.commit_transaction
           end
         end
@@ -91,8 +96,8 @@ describe Mongoid::Clients::Sessions do
         before do
           Person.with_session do |s|
             s.start_transaction
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
             s.commit_transaction
           end
         end
@@ -112,9 +117,9 @@ describe Mongoid::Clients::Sessions do
             Post.with(client: :other) do
               Person.with_session do |s|
                 s.start_transaction
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             end
@@ -134,9 +139,9 @@ describe Mongoid::Clients::Sessions do
             begin
               Person.with_session do |s|
                 s.start_transaction
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -166,8 +171,8 @@ describe Mongoid::Clients::Sessions do
               Person.with_session do |s|
                 s.start_transaction
                 s.start_transaction
-                Person.create
-                Post.create
+                Person.create!
+                Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -187,6 +192,26 @@ describe Mongoid::Clients::Sessions do
           end
         end
       end
+
+      context 'When reloading an embedded document created inside a transaction' do
+        it 'does not raise an error and has the correct document' do
+          Canvas.with_session do |s|
+            s.start_transaction
+
+            p = Palette.new
+            c = Canvas.new(palette: p)
+            c.save!
+
+            expect do
+              p.reload
+            end.to_not raise_error
+
+            expect(c.palette).to eq(p)
+
+            s.commit_transaction
+          end
+        end
+      end
     end
 
     context 'when sessions are supported but transactions are not' do
@@ -199,7 +224,7 @@ describe Mongoid::Clients::Sessions do
         begin
           Person.with_session do |s|
             s.start_transaction
-            Person.create
+            Person.create!
             s.commit_transaction
           end
         rescue => ex
@@ -219,7 +244,7 @@ describe Mongoid::Clients::Sessions do
 
     let!(:person) do
       Person.with(client: :other) do |klass|
-        klass.create
+        klass.create!
       end
     end
 
@@ -243,9 +268,9 @@ describe Mongoid::Clients::Sessions do
           person.with_session do |s|
             s.start_transaction
             person.username = 'Emily'
-            person.save
+            person.save!
             person.age = 80
-            person.save
+            person.save!
             s.commit_transaction
           end
         end
@@ -267,8 +292,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do |s|
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             end
@@ -293,8 +318,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do |s|
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -324,8 +349,8 @@ describe Mongoid::Clients::Sessions do
                 s.start_transaction
                 s.start_transaction
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
                 s.commit_transaction
               end
             rescue => ex
@@ -372,7 +397,7 @@ describe Mongoid::Clients::Sessions do
           person.with_session do |s|
             s.start_transaction
             person.username = 'Emily'
-            person.save
+            person.save!
             s.commit_transaction
           end
         rescue => ex

data/spec/mongoid/clients_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Clients do
@@ -789,18 +791,18 @@ describe Mongoid::Clients do
         end
       end
 
-      describe ".create" do
+      describe ".create!" do
 
         let!(:band) do
           Band.with(database: database_id_alt) do |klass|
-            klass.create
+            klass.create!
           end
         end
 
         it "does not persist to the default database" do
           expect {
             Band.find(band.id)
-          }.to raise_error(Mongoid::Errors::DocumentNotFound)
+          }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
         end
 
         let(:from_db) do
@@ -827,18 +829,18 @@ describe Mongoid::Clients do
 
     context "when sending operations to a different collection" do
 
-      describe ".create" do
+      describe ".create!" do
 
         let!(:band) do
           Band.with(collection: "artists") do |klass|
-            klass.create
+            klass.create!
           end
         end
 
         it "does not persist to the default database" do
           expect {
             Band.find(band.id)
-          }.to raise_error(Mongoid::Errors::DocumentNotFound)
+          }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
         end
 
         let(:from_db) do
@@ -942,7 +944,7 @@ describe Mongoid::Clients do
       describe ".save" do
 
         before do
-          Person.create(ssn: "432-97-1113")
+          Person.create!(ssn: "432-97-1113")
         end
 
         context "when a mongodb error occurs" do
@@ -1010,6 +1012,61 @@ describe Mongoid::Clients do
         end
       end
     end
+
+    context 'when requesting named client' do
+      let(:secondary_client) do
+        double(Mongo::Client).tap do |client|
+          allow(client).to receive(:cluster).and_return(double("cluster"))
+        end
+      end
+
+      before do
+        expect(Mongoid::Clients::Factory).to receive(:create)
+          .with(:secondary)
+          .and_return(secondary_client)
+      end
+
+      after do
+        Mongoid::Clients.clients.delete(:secondary)
+      end
+
+      it 'does not close the client' do
+        expect(secondary_client).not_to receive(:close)
+
+        Band.with(client: :default) do |klass|
+          klass.mongo_client
+        end
+
+        Band.with(client: :secondary) do |klass|
+          klass.mongo_client
+        end
+      end
+    end
+
+    context 'when using on different objects' do
+      require_mri
+
+      let(:first_band) do
+        Band.create!(name: "The Beatles")
+      end
+
+      let(:second_band) do
+        Band.create!(name: 'Led Zeppelin')
+      end
+
+      it 'does not create extra symbols symbols' do
+        first_band.with(write: { w: 0, j: false }) do |band|
+          band.set(active: false)
+        end
+        initial_symbols_count = Symbol.all_symbols.size
+        second_band.with(write: { w: 0, j: false }) do |band|
+          band.set(active: false)
+        end
+        expect(Symbol.all_symbols.size).to eq(initial_symbols_count)
+      end
+
+    end
+
   end
 
   context "when overriding the default database" do
@@ -1035,7 +1092,7 @@ describe Mongoid::Clients do
       end
 
       let!(:band) do
-        Band.create(name: "Tool")
+        Band.create!(name: "Tool")
       end
 
       it "persists to the overridden database" do

data/spec/mongoid/composable_spec.rb

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

data/spec/mongoid/config/environment_spec.rb

@@ -1,10 +1,22 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Config::Environment do
 
-  after(:all) do
-    Rails = RailsTemp
-    Object.send(:remove_const, :RailsTemp)
+  around do |example|
+    if defined?(Rails)
+      SavedRails = Rails
+      example.run
+      Object.send(:remove_const, :Rails) if defined?(Rails)
+      Rails = SavedRails
+      Object.send(:remove_const, :SavedRails)
+    else
+      example.run
+      if defined?(Rails)
+        Object.send(:remove_const, :Rails)
+      end
+    end
   end
 
   describe "#env_name" do
@@ -21,11 +33,6 @@ describe Mongoid::Config::Environment do
           end
         end
 
-        after do
-          RailsTemp = Rails
-          Object.send(:remove_const, :Rails)
-        end
-
         it "returns the rails environment" do
           expect(described_class.env_name).to eq("production")
         end
@@ -83,4 +90,115 @@ describe Mongoid::Config::Environment do
       end
     end
   end
+
+  describe "#load_yaml" do
+    let(:path) { 'mongoid.yml' }
+    let(:environment) {}
+    before { allow(Rails).to receive('env').and_return('test') }
+
+    subject { described_class.load_yaml(path, environment) }
+
+    context 'when file not found' do
+      let(:path) { 'not/a/valid/path'}
+
+      it { expect { subject }.to raise_error(Errno::ENOENT) }
+    end
+
+    context 'when file found' do
+      before do
+        allow(File).to receive(:read).with('mongoid.yml').and_return(file_contents)
+      end
+
+      let(:file_contents) do
+        <<~FILE
+          test:
+            clients: ['test']
+          development:
+            clients: ['dev']
+        FILE
+      end
+
+      context 'when file cannot be parsed as YAML' do
+        let(:file_contents) { "*\nbad:%123abc" }
+
+        it { expect { subject }.to raise_error(Psych::SyntaxError) }
+      end
+
+      context 'when file contains ERB errors' do
+        let(:file_contents) { '<%= foo %>' }
+
+        it { expect { subject }.to raise_error(NameError) }
+      end
+
+      context 'when file is empty' do
+        let(:file_contents) { '' }
+
+        it { expect { subject }.to raise_error(Mongoid::Errors::EmptyConfigFile) }
+      end
+
+      context 'when file does not contain a YAML Hash object' do
+        let(:file_contents) { '["this", "is", "an", "array"]' }
+
+        it { expect { subject }.to raise_error(Mongoid::Errors::InvalidConfigFile) }
+      end
+
+      context 'when environment not specified' do
+        it 'uses the rails environment' do
+          is_expected.to eq("clients"=>["test"])
+        end
+      end
+
+      context 'when environment is specified' do
+        let(:environment) { 'development' }
+
+        it 'uses the specified environment' do
+          is_expected.to eq("clients"=>["dev"])
+        end
+      end
+
+      context 'when environment is missing' do
+        let(:environment) { 'staging' }
+
+        it { is_expected.to be_nil }
+      end
+    end
+
+    context 'when configuration includes schema map' do
+      paths = Dir.glob(File.join(File.dirname(__FILE__), '../../support/schema_maps/*.json'))
+
+      if paths.empty?
+        raise "Expected to find some schema maps"
+      end
+
+      before do
+        allow(File).to receive(:read).with('mongoid.yml').and_return(file_contents)
+      end
+
+      let(:file_contents) do
+        <<~FILE
+          test:
+            clients:
+              default:
+                database: mongoid_test
+                hosts: [localhost]
+                options:
+                  auto_encryption_options:
+                    schema_map: #{schema_map.to_yaml.sub(/\A---/, '').gsub(/\n/, "\n" + ' '*100)}
+        FILE
+      end
+
+      paths.each do |path|
+        context File.basename(path) do
+          let(:schema_map) do
+            BSON::ExtJSON.parse(File.read(path))
+          end
+
+          it 'loads successfully' do
+            subject.should be_a(Hash)
+            subject.fetch('clients').fetch('default').fetch('options').fetch('auto_encryption_options').fetch('schema_map').should be_a(Hash)
+          end
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/config/options_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Config::Options do
@@ -18,7 +20,7 @@ describe Mongoid::Config::Options do
     context "when a default is provided" do
 
       after do
-        config.preload_models = false
+        config.reset
       end
 
       it "defines a getter" do
@@ -26,11 +28,28 @@ describe Mongoid::Config::Options do
       end
 
       it "defines a setter" do
-        (config.preload_models = expect(true)).to be true
+        expect(config.preload_models = true).to be true
+        expect(config.preload_models).to be true
       end
 
       it "defines a presence check" do
-        expect(config).to_not be_preload_models
+        expect(config.preload_models?).to be false
+      end
+    end
+
+    context 'when option is not a boolean' do
+      before do
+        config.app_name = 'foo'
+      end
+
+      after do
+        config.reset
+      end
+
+      context 'presence check' do
+        it 'is a boolean' do
+          expect(config.app_name?).to be true
+        end
       end
     end
   end