mongoid 7.1.0.rc0 → 7.2.0.rc1

data/spec/mongoid/relations/proxy_spec.rb

@@ -5,7 +5,7 @@
 #
 # describe Mongoid::Relations::Proxy do
 #
-#   describe '#with', if: non_legacy_server? do
+#   describe '#with' do
 #
 #     let(:circus) do
 #       Circus.new

data/spec/mongoid/reloadable_spec.rb

@@ -353,5 +353,77 @@ describe Mongoid::Reloadable do
         expect(reloaded.readonly?).to be(false)
       end
     end
+
+    context 'on sharded cluster' do
+      require_topology :sharded
+
+      before(:all) do
+        CONFIG[:clients][:other] = CONFIG[:clients][:default].dup
+        CONFIG[:clients][:other][:database] = 'other'
+        Mongoid::Clients.clients.values.each(&:close)
+        Mongoid::Config.send(:clients=, CONFIG[:clients])
+        Mongoid::Clients.with_name(:other).subscribe(Mongo::Monitoring::COMMAND, EventSubscriber.new)
+      end
+
+      let(:subscriber) do
+        client = Mongoid::Clients.with_name(:other)
+        monitoring = client.send(:monitoring)
+        subscriber = monitoring.subscribers['Command'].find do |s|
+          s.is_a?(EventSubscriber)
+        end
+      end
+
+      let(:find_events) do
+        find_events = subscriber.started_events.select { |event| event.command_name.to_s == 'find' }
+      end
+
+      before do
+        subscriber.clear_events!
+      end
+
+      context 'without embedded document' do
+        let(:profile) do
+          Profile.with(client: :other) do |klass|
+            klass.create
+          end
+        end
+
+        before do
+          Profile.with(client: :other) do
+            profile.reload
+          end
+        end
+
+        it 'uses the shard key to reload the document' do
+          expect(find_events.length). to eq(1)
+
+          event = find_events.first
+          expect(event.command['filter'].keys).to include('name')
+        end
+      end
+
+
+      context 'with embedded document' do
+        let(:profile_image) do
+          Profile.with(client: :other) do |klass|
+            profile = klass.create
+            ProfileImage.create(profile: profile)
+          end
+        end
+
+        before do
+          Profile.with(client: :other) do
+            profile_image.reload
+          end
+        end
+
+        it 'uses the shard key to reload the embedded document' do
+          expect(find_events.length). to eq(1)
+
+          event = find_events.first
+          expect(event.command['filter'].keys).to include('name')
+        end
+      end
+    end
   end
 end

data/spec/mongoid/scopable_spec.rb

@@ -230,7 +230,8 @@ describe Mongoid::Scopable do
 
     context "when provided a criteria" do
 
-      context 'when a collation is defined on the criteria', if: collation_supported? do
+      context 'when a collation is defined on the criteria' do
+        min_server_version '3.4'
 
         before do
           Band.scope(:tests, ->{ Band.where(name: 'TESTING').collation(locale: 'en_US', strength: 2) })

data/spec/mongoid/serializable_spec.rb

@@ -7,40 +7,144 @@ describe Mongoid::Serializable do
 
   describe "#field_names" do
 
-    let(:band) do
-      Band.new
+    let(:guitar) do
+      Guitar.new
     end
 
     it "does not duplicate fields" do
-      expect(band.send(:field_names, {})).to eq(band.fields.except("_type").keys.sort)
+      expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("_type").keys.sort)
     end
-  end
 
-  describe ".include_root_in_json" do
+    context "when using a custom discriminator_key" do 
+      before do 
+        Instrument.discriminator_key = "dkey"
+      end
 
-    let(:person) do
-      Person.new
+      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
     end
+  end
 
-    context "when config set to true" do
+  %i(include_root_in_json include_root_in_json?).each do |meth|
+    describe ".#{meth}" do
 
       before do
-        Mongoid.include_root_in_json = true
+        reload_model(:Minim)
+      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
+
+        it "returns true" do
+          expect(Minim.public_send(meth)).to be true
+        end
+
+        context 'when value is overridden to false in the model class' do
+          before do
+            Minim.include_root_in_json = false
+          end
+
+          it 'returns false' do
+            expect(Minim.public_send(meth)).to be false
+          end
+        end
       end
 
-      it "returns true" do
-        expect(person.include_root_in_json).to be true
+      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
+
+        context 'when value is overridden to true in the model class' do
+          before do
+            Minim.include_root_in_json = true
+          end
+
+          it 'returns true' do
+            expect(Minim.public_send(meth)).to be true
+          end
+        end
       end
     end
 
-    context "when config set to false" do
+    describe "#include_root_in_json" do
 
       before do
+        reload_model(:Minim)
+      end
+
+      after do
         Mongoid.include_root_in_json = false
+        reload_model(:Minim)
+      end
+
+      let(:minim) do
+        Minim.new
+      end
+
+      context "when global config is set to true" do
+
+        before do
+          Minim.include_root_in_json.should be false
+          Mongoid.include_root_in_json = true
+        end
+
+        it "returns true" do
+          expect(minim.public_send(meth)).to be true
+        end
+
+        context 'when value is overridden to false in the model class' do
+          before do
+            Minim.include_root_in_json = false
+          end
+
+          it 'returns false' do
+            expect(minim.public_send(meth)).to be false
+          end
+        end
       end
 
-      it "returns false" do
-        expect(person.include_root_in_json).to be false
+      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
+
+        context 'when value is overridden to true in the model class' do
+          before do
+            Minim.include_root_in_json = true
+          end
+
+          it 'returns true' do
+            expect(minim.public_send(meth)).to be true
+          end
+        end
       end
     end
   end
@@ -773,32 +877,57 @@ describe Mongoid::Serializable do
 
   describe "#to_json" do
 
-    let(:person) do
-      Person.new
+    let(:account) do
+      Account.new
     end
 
-    context "when including root in json" do
+    context "when including root in json via Mongoid" do
 
       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(person.to_json).to include("person")
+        expect(JSON.parse(account.to_json)).to have_key("account")
+      end
+    end
+
+    context "when including root in json via class" do
+
+      before do
+        account.include_root_in_json.should be false
+        Account.include_root_in_json = true
+      end
+
+      after do
+        Account.include_root_in_json = false
+      end
+
+      it "uses the class configuration" do
+        expect(JSON.parse(account.to_json)).to have_key("account")
       end
     end
 
     context "when not including root in json" do
 
       before do
-        Mongoid.include_root_in_json = false
+        account.include_root_in_json.should be false
       end
 
       it "uses the mongoid configuration" do
-        expect(person.to_json).to_not include("person")
+        expect(JSON.parse(account.to_json)).not_to have_key("account")
       end
     end
 
+    let(:person) do
+      Person.new
+    end
+
     context "when serializing a relation directly" do
 
       context "when serializing an embeds many" do

data/spec/mongoid/shardable_models.rb

@@ -0,0 +1,61 @@
+class SmMovie
+  include Mongoid::Document
+
+  field :year, type: Integer
+
+  index year: 1
+  shard_key :year
+end
+
+class SmTrailer
+  include Mongoid::Document
+
+  index year: 1
+  shard_key 'year'
+end
+
+class SmActor
+  include Mongoid::Document
+
+  # This is not a usable shard configuration for the server.
+  # We just have it for unit tests.
+  shard_key age: 1, 'gender' => :hashed, 'hello' => :hashed
+end
+
+class SmAssistant
+  include Mongoid::Document
+
+  field :gender, type: String
+
+  index gender: 1
+  shard_key 'gender' => :hashed
+end
+
+class SmProducer
+  include Mongoid::Document
+
+  index age: 1, gender: 1
+  shard_key({age: 1, gender: 'hashed'}, unique: true, numInitialChunks: 2)
+end
+
+class SmDirector
+  include Mongoid::Document
+
+  belongs_to :agency
+
+  index age: 1
+  shard_key :agency
+end
+
+class SmDriver
+  include Mongoid::Document
+
+  belongs_to :agency
+
+  index age: 1, agency: 1
+  shard_key age: 1, agency: :hashed
+end
+
+class SmNotSharded
+  include Mongoid::Document
+end

data/spec/mongoid/shardable_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require "spec_helper"
+require_relative './shardable_models'
 
 describe Mongoid::Shardable do
 
@@ -24,30 +25,82 @@ describe Mongoid::Shardable do
 
   describe ".shard_key" do
 
-    let(:klass) do
-      Band
-    end
+    context 'when full syntax is used' do
+      context 'with symbol value' do
+        it 'sets shard key fields to symbol value' do
+          SmProducer.shard_key_fields.should == %i(age gender)
+        end
 
-    before do
-      Band.shard_key(:name)
-    end
+        it 'sets shard config' do
+          SmProducer.shard_config.should == {
+            key: {age: 1, gender: 'hashed'},
+            options: {
+              unique: true,
+              numInitialChunks: 2,
+            },
+          }
+        end
 
-    it "specifies a shard key on the collection" do
-      expect(klass.shard_key_fields).to eq([:name])
-    end
+        it 'keeps hashed as string' do
+          SmProducer.shard_config[:key][:gender].should == 'hashed'
+        end
+      end
+
+      context 'with string value' do
+        it 'sets shard key fields to symbol value' do
+          SmActor.shard_key_fields.should == %i(age gender hello)
+        end
 
-    context 'when a relation is used as the shard key' do
+        it 'sets shard config' do
+          SmActor.shard_config.should == {
+            key: {age: 1, gender: 'hashed', hello: 'hashed'},
+            options: {},
+          }
+        end
 
-      let(:klass) do
-        Game
+        it 'sets hashed to string' do
+          SmActor.shard_config[:key][:gender].should == 'hashed'
+        end
       end
 
-      before do
-        Game.shard_key(:person)
+      context 'when passed association name' do
+        it 'uses foreign key as shard key in shard config' do
+          SmDriver.shard_config.should == {
+            key: {age: 1, agency_id: 'hashed'},
+            options: {},
+          }
+        end
+
+        it 'uses foreign key as shard key in shard key fields' do
+          SmDriver.shard_key_fields.should == %i(age agency_id)
+        end
+      end
+    end
+
+    context 'when shorthand syntax is used' do
+      context 'with symbol value' do
+        it 'sets shard key fields to symbol value' do
+          SmMovie.shard_key_fields.should == %i(year)
+        end
       end
 
-      it "converts the shard key to the foreign key field" do
-        expect(klass.shard_key_fields).to eq([:person_id])
+      context 'with string value' do
+        it 'sets shard key fields to symbol value' do
+          SmTrailer.shard_key_fields.should == %i(year)
+        end
+      end
+
+      context 'when passed association name' do
+        it 'uses foreign key as shard key in shard config' do
+          SmDirector.shard_config.should == {
+            key: {agency_id: 1},
+            options: {},
+          }
+        end
+
+        it 'uses foreign key as shard key in shard key fields' do
+          SmDirector.shard_key_fields.should == %i(agency_id)
+        end
       end
     end
   end