mongoid 7.2.4 → 7.3.2

data/spec/mongoid/attributes/projector_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Mongoid::Attributes::Projector do
+  Dir[File.join(File.dirname(__FILE__), 'projector_data', '*.yml')].sort.each do |path|
+    context File.basename(path) do
+      specs = YAML.load(File.read(path))
+
+      specs.each do |spec|
+        context spec['name'] do
+
+          if spec['pending']
+            pending spec['pending'].to_s
+          end
+
+          let(:projection) do
+            spec['projection']
+          end
+
+          let(:projector) do
+            Mongoid::Attributes::Projector.new(projection)
+          end
+
+          spec.fetch('queries').each do |query_spec|
+            context query_spec.fetch('query').inspect do
+              let(:query) { query_spec['query'] }
+
+              context 'attribute_or_path_allowed?' do
+                it "is #{query_spec.fetch('allowed')}" do
+                  projector.attribute_or_path_allowed?(query).should be query_spec['allowed']
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/mongoid/attributes_spec.rb

@@ -96,6 +96,49 @@ describe Mongoid::Attributes do
             it "does not raise an error" do
               expect(from_db.map).to eq(map)
             end
+
+            context 'when only one of the hash fields is projected' do
+
+              let(:map) do
+                { 'dates' => { 'y' => { '2016' => 'Berlin', '2017' => 'Munich' } } }
+              end
+
+              let(:expected) do
+                { 'dates' => { 'y' => {
+                  '2016' => 'Berlin',
+                } } }
+              end
+
+              it 'retrieves only the projected fields' do
+                expect(from_db.map).to eq(expected)
+              end
+            end
+
+            context 'when several of the hash fields is projected' do
+
+              let(:map) do
+                { 'dates' => { 'y' => {
+                  '2016' => 'Berlin',
+                  '2017' => 'Munich',
+                  '2018' => 'Krakow',
+                } } }
+              end
+
+              let(:expected) do
+                { 'dates' => { 'y' => {
+                  '2016' => 'Berlin',
+                  '2018' => 'Krakow',
+                } } }
+              end
+
+              let(:from_db) do
+                Person.only('map.dates.y.2016', 'map.dates.y.2018').first
+              end
+
+              it 'retrieves only the projected fields' do
+                expect(from_db.map).to eq(expected)
+              end
+            end
           end
         end
 
@@ -298,16 +341,12 @@ describe Mongoid::Attributes do
           context 'when retrieving a field of the association using the dot notation' do
 
             it 'retrieves the field' do
-              pending 'MONGOID-5032, fixed in 7.3'
-
               expect(from_db['name.first_name']).to eq 'Jose'
             end
           end
 
           context 'when retrieving a field of a nested association using the dot notation' do
             it 'retrieves the field' do
-              pending 'MONGOID-5032, fixed in 7.3'
-
               expect(from_db['name.language.name']).to eq 'es'
             end
           end
@@ -320,8 +359,6 @@ describe Mongoid::Attributes do
 
           context 'when retrieving a field under the projected sub-association' do
             it 'retrieves the field' do
-              pending 'MONGOID-5032, fixed in 7.3'
-
               expect(from_db['name.language.name']).to eq 'es'
             end
           end
@@ -1892,6 +1929,61 @@ describe Mongoid::Attributes do
     end
   end
 
+  describe '#unalias_attribute' do
+    let(:shirt) { Shirt.new }
+    let(:id) { '1234' }
+
+    context 'when creating object' do
+      let(:shirt) { Shirt.new(id: id) }
+
+      it 'id and _id are not the same' do
+        expect(shirt.id).to eq(id)
+        expect(shirt._id).not_to eq(id)
+      end
+    end
+
+    context 'update' do
+      before do
+        shirt.update(id: id)
+      end
+
+      it 'updates id but not_id' do
+        expect(shirt.id).to eq(id)
+        expect(shirt._id).not_to eq(id)
+      end
+    end
+
+    context 'id=' do
+      before do
+        shirt.id = id
+      end
+
+      it 'sets id and not _id' do
+        expect(shirt.id).to eq(id)
+        expect(shirt._id).not_to eq(id)
+      end
+    end
+
+    context 'id?' do
+      context 'with null id' do
+        it 'returns false' do
+          expect(shirt.id?).to be false
+          expect(shirt._id?).to be true
+        end
+      end
+
+      context 'with id' do
+        before do
+          shirt.id = id
+        end
+
+        it 'returns true' do
+          expect(shirt.id?).to be true
+        end
+      end
+    end
+  end
+
   describe "#alias_attribute" do
 
     let(:product) do

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/clients/options_spec.rb

@@ -141,6 +141,8 @@ describe Mongoid::Clients::Options, retry: 3 do
           end
 
           it 'does not disconnect the original cluster' do
+            skip 'https://jira.mongodb.org/browse/MONGOID-5130'
+
             expect(connections_after).to eq(connections_before)
             expect(cluster_before).to be(cluster_after)
           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/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/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