mongoid 7.0.10 → 7.4.0

data/spec/mongoid/selectable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Selectable do
@@ -9,7 +11,7 @@ describe Mongoid::Selectable do
       context "when the document has a shard key" do
 
         let(:profile) do
-          Profile.create(name: "google")
+          Profile.create!(name: "google")
         end
 
         let!(:selector) do
@@ -26,7 +28,7 @@ describe Mongoid::Selectable do
         context "when using object ids" do
 
           let(:band) do
-            Band.create
+            Band.create!
           end
 
           let(:selector) do
@@ -41,7 +43,7 @@ describe Mongoid::Selectable do
         context "when using a custom id" do
 
           let(:account) do
-            Account.create(name: "savings")
+            Account.create!(name: "savings")
           end
 
           let(:selector) do
@@ -73,7 +75,7 @@ describe Mongoid::Selectable do
     context "when the document is embedded" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       context "when the document is an embeds one" do
@@ -92,7 +94,7 @@ describe Mongoid::Selectable do
       context "when the document is an embeds many" do
 
         let(:address) do
-          person.addresses.create(street: "kreuzbergstr")
+          person.addresses.create!(street: "kreuzbergstr")
         end
 
         it "returns the hash with the selector" do
@@ -115,7 +117,7 @@ describe Mongoid::Selectable do
         context "when the document is embedded multiple levels" do
 
           let(:location) do
-            address.locations.create
+            address.locations.create!
           end
 
           it "returns a hash with the selector" do

data/spec/mongoid/serializable_spec.rb

@@ -1,43 +1,149 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 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
 
-      it "returns true" do
-        expect(person.include_root_in_json).to be true
+      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
+
+      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
 
-      it "returns false" do
-        expect(person.include_root_in_json).to be false
+      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
+
+      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
@@ -234,7 +340,7 @@ describe Mongoid::Serializable do
 
       context "when only two attributes are loaded" do
         before do
-          person.save
+          person.save!
         end
 
         let(:from_db) do
@@ -301,7 +407,7 @@ describe Mongoid::Serializable do
       context "when the model is saved before the relation is added" do
 
         before do
-          person.save
+          person.save!
         end
 
         context "when a model has an embeds many" do
@@ -311,7 +417,7 @@ describe Mongoid::Serializable do
           end
 
           before do
-            person.save
+            person.save!
           end
 
           it "includes the relation" do
@@ -325,7 +431,7 @@ describe Mongoid::Serializable do
           end
 
           before do
-            person.save
+            person.save!
           end
 
           it "includes the relation" do
@@ -343,7 +449,7 @@ describe Mongoid::Serializable do
           end
 
           before do
-            person.save
+            person.save!
           end
 
           it "includes the relation" do
@@ -357,7 +463,7 @@ describe Mongoid::Serializable do
           end
 
           before do
-            person.save
+            person.save!
           end
 
           it "includes the relation" do
@@ -397,7 +503,7 @@ describe Mongoid::Serializable do
           context "when the ids were not loaded" do
 
             before do
-              person.save
+              person.save!
             end
 
             let(:from_db) do
@@ -505,10 +611,10 @@ describe Mongoid::Serializable do
                 end
 
                 before do
-                  person.save
+                  person.save!
                 end
 
-                it "includes the specific ralations" do
+                it "includes the specific relations" do
                   expect(relation_hash[0]["locations"].map do |location|
                     location["name"]
                   end).to include "Home"
@@ -770,32 +876,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

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require "spec_helper"
+require_relative './shardable_models'
 
 describe Mongoid::Shardable do
 
@@ -21,30 +24,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
+
+        it 'sets shard config' do
+          SmActor.shard_config.should == {
+            key: {age: 1, gender: 'hashed', hello: 'hashed'},
+            options: {},
+          }
+        end
+
+        it 'sets hashed to string' do
+          SmActor.shard_config[:key][:gender].should == 'hashed'
+        end
+      end
 
-    context 'when a relation is used as the shard key' do
+      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
 
-      let(:klass) do
-        Game
+    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
 
-      before do
-        Game.shard_key(:person)
+      context 'with string value' do
+        it 'sets shard key fields to symbol value' do
+          SmTrailer.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 '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
@@ -73,7 +128,51 @@ describe Mongoid::Shardable do
     end
 
     context 'when record is persisted' do
-      let(:instance) { klass.create(name: value) }
+      let(:instance) { klass.create!(name: value) }
+
+      it { is_expected.to eq({ 'name' => value }) }
+
+      context 'changing shard key value' do
+        let(:new_value) { 'a-new-value' }
+
+        before do
+          instance.name = new_value
+        end
+
+        it 'uses the newly set shard key value' do
+          subject.should == { 'name' => new_value }
+        end
+      end
+    end
+  end
+
+  describe '#shard_key_selector_in_db' do
+    subject { instance.shard_key_selector_in_db }
+    let(:klass) { Band }
+    let(:value) { 'a-brand-name' }
+
+    before { klass.shard_key(:name) }
+
+    context 'when record is new' do
+      let(:instance) { klass.new(name: value) }
+
+      it { is_expected.to eq({ 'name' => value }) }
+
+      context 'changing shard key value' do
+        let(:new_value) { 'a-new-value' }
+
+        before do
+          instance.name = new_value
+        end
+
+        it 'uses the existing shard key value' do
+          subject.should == { 'name' => new_value }
+        end
+      end
+    end
+
+    context 'when record is persisted' do
+      let(:instance) { klass.create!(name: value) }
 
       it { is_expected.to eq({ 'name' => value }) }
 

data/spec/mongoid/stateful_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Stateful do
@@ -50,7 +52,7 @@ describe Mongoid::Stateful do
 
     context "when the object has been destroyed" do
       before do
-        person.save
+        person.save!
         person.destroy
       end
 

data/spec/mongoid/tasks/database_rake_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rake"
 require "spec_helper"
 

data/spec/mongoid/tasks/database_spec.rb

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

data/spec/mongoid/threaded_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Threaded do
@@ -16,7 +18,7 @@ describe Mongoid::Threaded do
       described_class.stack("load").clear
     end
 
-    it "adds a boolen to the load stack" do
+    it "adds a boolean to the load stack" do
       expect(described_class.stack("load")).to eq([ true ])
     end
   end
@@ -101,7 +103,7 @@ describe Mongoid::Threaded do
       described_class.stack("load").clear
     end
 
-    it "removes a boolen from the stack" do
+    it "removes a boolean from the stack" do
       expect(described_class.stack("load")).to be_empty
     end
   end

data/spec/mongoid/timestamps/created/short_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Created::Short do
@@ -37,7 +39,7 @@ describe Mongoid::Timestamps::Created::Short do
   context "when the document is created" do
 
     let(:quiz) do
-      ShortQuiz.create
+      ShortQuiz.create!
     end
 
     it "runs the created callbacks" do

data/spec/mongoid/timestamps/created_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Created do
@@ -33,7 +35,7 @@ describe Mongoid::Timestamps::Created do
   context "when the document is created" do
 
     let(:quiz) do
-      Quiz.create
+      Quiz.create!
     end
 
     it "runs the created callbacks" do

data/spec/mongoid/timestamps/timeless_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Timeless do
@@ -86,7 +88,7 @@ describe Mongoid::Timestamps::Timeless do
         end
 
         before do
-          document.timeless.save
+          document.timeless.save!
         end
 
         it "does not set the created timestamp" do
@@ -116,7 +118,7 @@ describe Mongoid::Timestamps::Timeless do
       context "when used on the class" do
 
         let!(:document) do
-          Dokument.timeless.create
+          Dokument.timeless.create!
         end
 
         it "does not set the created timestamp" do