mongoid 7.2.0.rc1 → 7.3.0

data/spec/mongoid/clients/factory_spec.rb

@@ -47,6 +47,7 @@ describe Mongoid::Clients::Factory do
 
           before do
             Mongoid::Config.send(:clients=, config)
+            # TODO: We should restore overwritten configuration in after block
           end
 
           after do
@@ -124,6 +125,7 @@ describe Mongoid::Clients::Factory do
 
           before do
             Mongoid::Config.send(:clients=, config)
+            # TODO: We should restore overwritten configuration in after block
           end
 
           after do
@@ -168,6 +170,7 @@ describe Mongoid::Clients::Factory do
 
             before do
               Mongoid::Config.send(:clients=, config)
+              # TODO: We should restore overwritten configuration in after block
             end
 
             after do
@@ -206,6 +209,7 @@ describe Mongoid::Clients::Factory do
 
             before do
               Mongoid::Config.send(:clients=, config)
+              # TODO: We should restore overwritten configuration in after block
             end
 
             after do
@@ -253,6 +257,7 @@ describe Mongoid::Clients::Factory do
 
       before do
         Mongoid::Config.send(:clients=, config)
+        # TODO: We should restore overwritten configuration in after block
       end
 
       after do
@@ -284,6 +289,7 @@ describe Mongoid::Clients::Factory do
 
       before do
         Mongoid.clients[:default] = nil
+        # TODO: We should restore overwritten configuration in after block
       end
 
       it "raises NoClientsConfig error" do
@@ -300,6 +306,7 @@ describe Mongoid::Clients::Factory do
 
     before do
       Mongoid::Config.send(:clients=, config)
+      # TODO: We should restore overwritten configuration in after block
     end
 
     after do
@@ -342,6 +349,7 @@ describe Mongoid::Clients::Factory do
 
     before do
       Mongoid::Config.send(:clients=, config)
+      # TODO: We should restore overwritten configuration in after block
     end
 
     after do
@@ -378,4 +386,44 @@ describe Mongoid::Clients::Factory do
       expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
     end
   end
+
+  context "unexpected config options" do
+    let(:unknown_opts) do
+      {
+        bad_one: 1,
+        another_one: "here"
+      }
+    end
+
+    let(:config) do
+      {
+        default: { hosts: SpecConfig.instance.addresses, database: database_id },
+        good_one: { hosts: [ "127.0.0.1:1234" ], database: database_id},
+        bad_one: { hosts: [ "127.0.0.1:1234" ], database: database_id}.merge(unknown_opts),
+        good_two: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/#{database_id}" },
+        bad_two: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/#{database_id}" }.merge(unknown_opts)
+      }
+    end
+
+    around(:each) do |example|
+      old_config = Mongoid::Config.clients
+      Mongoid::Config.send(:clients=, config)
+      example.run
+      Mongoid::Config.send(:clients=, old_config)
+    end
+
+    [:bad_one, :bad_two].each do |env|
+      it 'does not log a warning if none' do
+        expect(described_class.send(:default_logger)).not_to receive(:warn)
+        described_class.create(env).close
+      end
+    end
+
+    [:bad_one, :bad_two].each do |env|
+      it 'logs a warning if some' do
+        expect(described_class.send(:default_logger)).not_to receive(:warn)
+        described_class.create(env).close
+      end
+    end
+  end
 end

data/spec/mongoid/config_spec.rb

@@ -545,4 +545,36 @@ describe Mongoid::Config do
       expect(Mongoid::Config.log_level).to eq(2)
     end
   end
+
+  context "with an overridden database" do
+    let(:database) do
+      "test_purge_#{Time.now.to_i}"
+    end
+
+    before do
+      Mongoid.override_database(database)
+    end
+
+    after do
+      Mongoid.override_database(nil)
+    end
+
+    describe "#purge!" do
+      it 'respects persistence context overrides' do
+        House.create!(name: '1', model: 'Big')
+        expect(House.count).to eq(1)
+        Mongoid.purge!
+        expect(House.count).to eq(0)
+      end
+    end
+
+    describe "#truncate!" do
+      it 'respects persistence context overrides' do
+        House.create!(name: '1', model: 'Big')
+        expect(House.count).to eq(1)
+        Mongoid.truncate!
+        expect(House.count).to eq(0)
+      end
+    end
+  end
 end

data/spec/mongoid/contextual/atomic_spec.rb

@@ -753,12 +753,25 @@ describe Mongoid::Contextual::Atomic do
       context.set(name: "Recoil")
     end
 
-    it "sets existing fields" do
-      expect(depeche_mode.reload.name).to eq("Recoil")
+    shared_examples 'writes as expected' do
+      it "sets existing fields" do
+        expect(depeche_mode.reload.name).to eq("Recoil")
+      end
+
+      it "sets non existent fields" do
+        expect(smiths.reload.name).to eq("Recoil")
+      end
     end
 
-    it "sets non existent fields" do
-      expect(smiths.reload.name).to eq("Recoil")
+    include_examples 'writes as expected'
+
+    context 'when fields being set have been projected out' do
+
+      let(:criteria) do
+        Band.only(:genres)
+      end
+
+      include_examples 'writes as expected'
     end
   end
 

data/spec/mongoid/contextual/mongo_spec.rb

@@ -1442,8 +1442,8 @@ describe Mongoid::Contextual::Mongo do
     describe "##{method}" do
 
       before do
-        Band.create(name: "Depeche Mode")
-        Band.create(name: "New Order")
+        Band.create!(name: "Depeche Mode")
+        Band.create!(name: "New Order")
       end
 
       context "when the criteria has a limit" do

data/spec/mongoid/copyable_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-# -*- coding: utf-8 -*-
 require "spec_helper"
 
 require_relative './copyable_spec_models'
@@ -65,30 +64,58 @@ describe Mongoid::Copyable do
 
       context "when a document has fields from a legacy schema" do
 
-        let!(:actor) do
-          Actor.create(name: "test")
-        end
+        shared_examples 'behaves as expected' do
+          let!(:instance) do
+            cls.create(name: "test")
+          end
 
-        before do
-          legacy_fields = { "this_is_not_a_field" => 1, "this_legacy_field_is_nil" => nil }
-          Actor.collection.find(_id: actor.id).update_one("$set" => legacy_fields)
-        end
+          before do
+            legacy_fields = { "this_is_not_a_field" => 1, "this_legacy_field_is_nil" => nil }
+            cls.collection.find(_id: instance.id).update_one("$set" => legacy_fields)
+          end
 
-        let(:cloned) do
-          actor.reload.send(method)
-        end
+          let(:cloned) do
+            instance.reload.send(method)
+          end
+
+          it "sets the legacy attribute" do
+            expect(cloned.attributes['this_is_not_a_field']).to eq(1)
+          end
+
+          it "contains legacy attributes that are nil" do
+            expect(cloned.attributes.key?('this_legacy_field_is_nil')).to eq(true)
+          end
 
-        it "sets the legacy attribute" do
-          expect(cloned.attributes['this_is_not_a_field']).to eq(1)
+          it "copies the known attributes" do
+            expect(cloned.name).to eq('test')
+          end
+
+          it 'calls constructor with explicitly declared attributes only' do
+            expect(cls).to receive(:new).with('name' => 'test').and_call_original
+            cloned
+          end
         end
 
-        it "contains legacy attributes that are nil" do
-          expect(cloned.attributes.key?('this_legacy_field_is_nil')).to eq(true)
+        context 'without Attributes::Dynamic' do
+          let(:cls) { CopyableSpec::Reg }
+
+          before do
+            cls.should_not include(Mongoid::Attributes::Dynamic)
+          end
+
+          include_examples 'behaves as expected'
         end
 
-        it "copies the known attributes" do
-          expect(cloned.name).to eq('test')
+        context 'with Attributes::Dynamic' do
+          let(:cls) { CopyableSpec::Dyn }
+
+          before do
+            cls.should include(Mongoid::Attributes::Dynamic)
+          end
+
+          include_examples 'behaves as expected'
         end
+
       end
 
       context "when using store_as" do

data/spec/mongoid/copyable_spec_models.rb

@@ -31,4 +31,18 @@ module CopyableSpec
   class Blurb
     include Mongoid::Document
   end
+
+  # Do not include Attributes::Dynamic
+  class Reg
+    include Mongoid::Document
+
+    field :name, type: String
+  end
+
+  class Dyn
+    include Mongoid::Document
+    include Mongoid::Attributes::Dynamic
+
+    field :name, type: String
+  end
 end

data/spec/mongoid/criteria/modifiable_spec.rb

@@ -705,7 +705,7 @@ describe Mongoid::Criteria::Modifiable do
           end
 
           it 'uses the values from the attributes' do
-            expect(document.map).to eq({ foo: :bar })
+            expect(document.map).to eq('foo' => :bar )
           end
         end
 

data/spec/mongoid/criteria/queryable/expandable_spec.rb

@@ -9,79 +9,6 @@ describe Mongoid::Criteria::Queryable::Expandable do
     Mongoid::Query.new
   end
 
-  describe '#expand_condition' do
-
-    let(:expanded) do
-      query.send(:expand_condition, condition)
-    end
-
-    context 'field name => value' do
-      shared_examples_for 'expands' do
-
-        it 'expands' do
-          expanded.should == {'foo' => 'bar'}
-        end
-      end
-
-      context 'string key' do
-        let(:condition) do
-          {'foo' => 'bar'}
-        end
-
-        it_behaves_like 'expands'
-      end
-
-      context 'symbol key' do
-        let(:condition) do
-          {foo: 'bar'}
-        end
-
-        it_behaves_like 'expands'
-      end
-    end
-
-    context 'Key instance => value' do
-      let(:key) do
-        Mongoid::Criteria::Queryable::Key.new(:foo, :__override__, '$gt')
-      end
-
-      let(:condition) do
-        {key => 'bar'}
-      end
-
-      it 'expands' do
-        expanded.should == {'foo' => {'$gt' => 'bar'}}
-      end
-    end
-
-=begin
-    context 'operator => operator value expression' do
-      shared_examples_for 'expands' do
-
-        it 'expands' do
-          expanded.should == {'foo' => 'bar'}
-        end
-      end
-
-      context 'string key' do
-        let(:condition) do
-          {'$in' => %w(bar)}
-        end
-
-        it_behaves_like 'expands'
-      end
-
-      context 'symbol key' do
-        let(:condition) do
-          {:$in => %w(bar)}
-        end
-
-        it_behaves_like 'expands'
-      end
-    end
-=end
-  end
-
   describe '#expand_condition_to_array_values' do
     shared_examples_for 'expands' do
 

data/spec/mongoid/criteria/queryable/extensions/boolean_spec.rb

@@ -3,7 +3,7 @@
 
 require "spec_helper"
 
-describe Boolean do
+describe Mongoid::Boolean do
 
   describe ".evolve" do
 

data/spec/mongoid/criteria/queryable/mergeable_spec.rb

@@ -44,7 +44,7 @@ describe Mongoid::Criteria::Queryable::Mergeable do
 
   describe '#_mongoid_expand_keys' do
     it 'expands simple keys' do
-      query.send(:_mongoid_expand_keys, {a: 1}).should == {a: 1}
+      query.send(:_mongoid_expand_keys, {a: 1}).should == {'a' => 1}
     end
 
     let(:gt) do
@@ -68,18 +68,116 @@ describe Mongoid::Criteria::Queryable::Mergeable do
         'age' => {'$gt' => 42, '$lt' => 50}}
     end
 
-    it 'expands simple and Key instances on the same field' do
-      query.send(:_mongoid_expand_keys, {'age' => 42, lt => 50}).should == {
-        'age' => {'$eq' => 42, '$lt' => 50}}
+    context 'given implicit equality and Key instance on the same field' do
+      [42, 'infinite', [nil]].each do |value|
+        context "for non-regular expression value #{value}" do
+          context 'implicit equality then Key instance' do
+            it 'expands implicit equality with $eq and combines with Key operator' do
+              query.send(:_mongoid_expand_keys, {'age' => value, lt => 50}).should == {
+                'age' => {'$eq' => value, '$lt' => 50}}
+            end
+          end
+
+          context 'symbol operator then implicit equality' do
+            it 'expands implicit equality with $eq and combines with Key operator' do
+              query.send(:_mongoid_expand_keys, {gt => 42, 'age' => value}).should == {
+                'age' => {'$gt' => 42, '$eq' => value}}
+            end
+          end
+        end
+      end
     end
 
-    it 'expands Key and simple instances on the same field' do
-      query.send(:_mongoid_expand_keys, {gt => 42, 'age' => 50}).should == {
-        'age' => {'$gt' => 42, '$eq' => 50}}
+    context 'given implicit equality with Regexp argument and Key instance on the same field' do
+      [/42/, BSON::Regexp::Raw.new('42')].each do |value|
+        context "for regular expression value #{value}" do
+          context 'implicit equality then Key instance' do
+            it 'expands implicit equality with $eq and combines with Key operator' do
+              query.send(:_mongoid_expand_keys, {'age' => value, lt => 50}).should == {
+                'age' => {'$regex' => value, '$lt' => 50}}
+            end
+          end
+
+          context 'Key instance then implicit equality' do
+            it 'expands implicit equality with $eq and combines with Key operator' do
+              query.send(:_mongoid_expand_keys, {gt => 50, 'age' => value}).should == {
+                'age' => {'$gt' => 50, '$regex' => value}}
+            end
+          end
+        end
+      end
     end
 
     it 'Ruby does not allow same symbol operator with different values' do
       {gt => 42, gtp => 50}.should == {gtp => 50}
     end
+
+    let(:expanded) do
+      query.send(:_mongoid_expand_keys, condition)
+    end
+
+    context 'field name => value' do
+      shared_examples_for 'expands' do
+
+        it 'expands' do
+          expanded.should == {'foo' => 'bar'}
+        end
+      end
+
+      context 'string key' do
+        let(:condition) do
+          {'foo' => 'bar'}
+        end
+
+        it_behaves_like 'expands'
+      end
+
+      context 'symbol key' do
+        let(:condition) do
+          {foo: 'bar'}
+        end
+
+        it_behaves_like 'expands'
+      end
+    end
+
+    context 'Key instance => value' do
+      let(:key) do
+        Mongoid::Criteria::Queryable::Key.new(:foo, :__override__, '$gt')
+      end
+
+      let(:condition) do
+        {key => 'bar'}
+      end
+
+      it 'expands' do
+        expanded.should == {'foo' => {'$gt' => 'bar'}}
+      end
+    end
+
+    context 'operator => operator value expression' do
+      shared_examples_for 'expands' do
+
+        it 'expands' do
+          expanded.should == {'foo' => {'$in' => ['bar']}}
+        end
+      end
+
+      context 'string key' do
+        let(:condition) do
+          {foo: {'$in' => %w(bar)}}
+        end
+
+        it_behaves_like 'expands'
+      end
+
+      context 'symbol key' do
+        let(:condition) do
+          {foo: {:$in => %w(bar)}}
+        end
+
+        it_behaves_like 'expands'
+      end
+    end
   end
 end