mongoid 7.0.13 → 8.0.8

data/spec/mongoid/findable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Findable do
@@ -5,8 +7,8 @@ describe Mongoid::Findable do
   describe ".distinct" do
 
     before do
-      Band.create(name: "Tool")
-      Band.create(name: "Photek")
+      Band.create!(name: "Tool")
+      Band.create!(name: "Photek")
     end
 
     it "returns the distinct values for the field" do
@@ -17,7 +19,7 @@ describe Mongoid::Findable do
   describe ".each" do
 
     let!(:band) do
-      Band.create
+      Band.create!
     end
 
     it "iterates through all documents" do
@@ -30,7 +32,7 @@ describe Mongoid::Findable do
   describe ".each_with_index" do
 
     let!(:band) do
-      Band.create
+      Band.create!
     end
 
     it "iterates through all documents" do
@@ -43,7 +45,7 @@ describe Mongoid::Findable do
   describe ".find_one_and_update" do
 
     let!(:person) do
-      Person.create(title: "Senior")
+      Person.create!(title: "Senior")
     end
 
     it "returns the document" do
@@ -56,7 +58,7 @@ describe Mongoid::Findable do
     context "when collection is a embeds_many" do
 
       let(:person) do
-        Person.create(title: "sir")
+        Person.create!(title: "sir")
       end
 
       let!(:message) do
@@ -83,7 +85,7 @@ describe Mongoid::Findable do
           it "raises an error" do
             expect {
               person.messages.find_by(body: 'bar')
-            }.to raise_error(Mongoid::Errors::DocumentNotFound)
+            }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document not found for class Message with attributes/)
           end
         end
 
@@ -105,7 +107,7 @@ describe Mongoid::Findable do
     context "when the document is found" do
 
       let!(:person) do
-        Person.create(title: "sir")
+        Person.create!(title: "sir")
       end
 
       context "when no block is provided" do
@@ -142,7 +144,7 @@ describe Mongoid::Findable do
         it "raises an error" do
           expect {
             Person.find_by(ssn: "333-22-1111")
-          }.to raise_error(Mongoid::Errors::DocumentNotFound)
+          }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document not found for class Person with attributes/)
         end
       end
 
@@ -182,7 +184,7 @@ describe Mongoid::Findable do
     context "when the document is found" do
 
       let!(:person) do
-        Person.create(title: "sir")
+        Person.create!(title: "sir")
       end
 
       context "when no block is provided" do
@@ -211,7 +213,7 @@ describe Mongoid::Findable do
       it "raises an error" do
         expect {
           Person.find_by!(ssn: "333-22-1111")
-        }.to raise_error(Mongoid::Errors::DocumentNotFound)
+        }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document not found for class Person with attributes/)
       end
     end
   end
@@ -221,12 +223,30 @@ describe Mongoid::Findable do
     describe "##{method}" do
 
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       it "returns the first matching document" do
         expect(Person.send(method)).to eq(person)
       end
+
+      it "passes the limit through" do
+        expect(Person.last(1)).to eq([ person ])
+      end
+    end
+  end
+
+  describe "#last" do
+    let!(:person) do
+      Person.create!
+    end
+
+    it "returns the first matching document" do
+      expect(Person.last).to eq(person)
+    end
+
+    it "passes the limit through" do
+      expect(Person.last(1)).to eq([ person ])
     end
   end
 
@@ -235,7 +255,7 @@ describe Mongoid::Findable do
     context "when the document is found" do
 
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       it "returns the document" do
@@ -248,7 +268,7 @@ describe Mongoid::Findable do
       context "when providing a document" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:from_db) do
@@ -303,7 +323,7 @@ describe Mongoid::Findable do
     context "when the document is found" do
 
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       it "returns the document" do
@@ -316,7 +336,7 @@ describe Mongoid::Findable do
       context "when providing a document" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:found) do
@@ -377,7 +397,7 @@ describe Mongoid::Findable do
   describe ".none" do
 
     let!(:depeche) do
-      Band.create(name: "Depeche Mode", likes: 3)
+      Band.create!(name: "Depeche Mode", likes: 3)
     end
 
     context "when not chaining any criteria" do
@@ -442,15 +462,15 @@ describe Mongoid::Findable do
   describe ".pluck" do
 
     let!(:depeche) do
-      Band.create(name: "Depeche Mode", likes: 3)
+      Band.create!(name: "Depeche Mode", likes: 3)
     end
 
     let!(:tool) do
-      Band.create(name: "Tool", likes: 3)
+      Band.create!(name: "Tool", likes: 3)
     end
 
     let!(:photek) do
-      Band.create(name: "Photek", likes: 1)
+      Band.create!(name: "Photek", likes: 1)
     end
 
     context "when field values exist" do
@@ -470,12 +490,44 @@ describe Mongoid::Findable do
         Band.pluck(:follows)
       end
 
-      it "returns a array with nil values" do
+      it "returns an array with nil values" do
         expect(plucked).to eq([nil, nil, nil])
       end
     end
   end
 
+  describe '.count' do
+    context 'when the collection is not empty' do
+      before do
+        Band.create!(name: "Tool")
+        Band.create!(name: "Photek")
+      end
+
+      it 'returns the currect count' do
+        expect(Band.count).to eq(2)
+      end
+    end
+  end
+
+  describe '.estimated_count' do
+    context 'when the collection is not empty' do
+      before do
+        Band.create!(name: "Tool")
+        Band.create!(name: "Photek")
+      end
+
+      it 'returns the correct count' do
+        expect(Band.estimated_count).to eq(2)
+      end
+    end
+
+    context 'when the collection is empty' do
+      it 'returns the correct count' do
+        expect(Band.estimated_count).to eq(0)
+      end
+    end
+  end
+
   Mongoid::Criteria::Queryable::Selectable.forwardables.each do |method|
 
     describe "##{method}" do
@@ -487,21 +539,46 @@ describe Mongoid::Findable do
   end
 
   context 'when Mongoid is configured to use activesupport time zone' do
+    config_override :use_utc, false
+    config_override :use_activesupport_time_zone, true
 
     before do
-      Mongoid.use_utc = false
-      Mongoid.use_activesupport_time_zone = true
       Time.zone = "Asia/Kolkata"
     end
 
     let!(:time) do
       Time.zone.now.tap do |t|
-        User.create(last_login: t, name: 'Tom')
+        User.create!(last_login: t, name: 'Tom')
+      end
+    end
+
+    context 'when distinct does not demongoize' do
+      config_override :legacy_pluck_distinct, true
+
+      let(:distinct) do
+        User.distinct(:last_login).first
+      end
+
+      it 'uses activesupport time zone' do
+        distinct.should be_a(ActiveSupport::TimeWithZone)
+        expect(distinct.to_s).to eql(time.in_time_zone('Asia/Kolkata').to_s)
       end
     end
 
-    it 'uses activesupport time zone' do
-      expect(User.distinct(:last_login).first.to_s).to eql(time.in_time_zone('Asia/Kolkata').to_s)
+    context 'when distinct demongoizes' do
+      config_override :legacy_pluck_distinct, false
+
+      let(:distinct) do
+        User.distinct(:last_login).first
+      end
+
+      it 'uses activesupport time zone' do
+        distinct.should be_a(DateTime)
+        # Time and DateTime have different stringifications:
+        # 2022-03-16T21:12:32+00:00
+        # 2022-03-16 21:12:32 UTC
+        expect(distinct.to_s).to eql(time.in_time_zone('Asia/Kolkata').to_datetime.to_s)
+      end
     end
 
     it 'loads other fields accurately' do
@@ -510,20 +587,42 @@ describe Mongoid::Findable do
   end
 
   context 'when Mongoid is not configured to use activesupport time zone' do
-
-    before do
-      Mongoid.use_utc = true
-      Mongoid.use_activesupport_time_zone = false
-    end
+    config_override :use_utc, true
+    config_override :use_activesupport_time_zone, false
 
     let!(:time) do
       Time.now.tap do |t|
-        User.create(last_login: t, name: 'Tom')
+        User.create!(last_login: t, name: 'Tom')
+      end
+    end
+
+    context 'when distinct does not demongoize' do
+      config_override :legacy_pluck_distinct, true
+
+      let(:distinct) do
+        User.distinct(:last_login).first
+      end
+
+      it 'uses utc' do
+        distinct.should be_a(Time)
+        expect(distinct.to_s).to eql(time.utc.to_s)
       end
     end
 
-    it 'uses utc' do
-      expect(User.distinct(:last_login).first.to_s).to eql(time.utc.to_s)
+    context 'when distinct demongoizes' do
+      config_override :legacy_pluck_distinct, false
+
+      let(:distinct) do
+        User.distinct(:last_login).first
+      end
+
+      it 'uses utc' do
+        distinct.should be_a(DateTime)
+        # Time and DateTime have different stringifications:
+        # 2022-03-16T21:12:32+00:00
+        # 2022-03-16 21:12:32 UTC
+        expect(distinct.to_s).to eql(time.utc.to_datetime.to_s)
+      end
     end
 
     it 'loads other fields accurately' do

data/spec/mongoid/indexable/specification_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Indexable::Specification do
@@ -83,7 +85,7 @@ describe Mongoid::Indexable::Specification do
         Band,
         { name: 1, title: 1, years: -1 },
         background: true,
-        drop_dups: true
+        unique: true
       )
     end
 
@@ -96,7 +98,7 @@ describe Mongoid::Indexable::Specification do
     end
 
     it "normalizes the options" do
-      expect(spec.options).to eq(background: true, drop_dups: true)
+      expect(spec.options).to eq(background: true, unique: true)
     end
   end
 

data/spec/mongoid/indexable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Indexable do
@@ -188,6 +190,32 @@ describe Mongoid::Indexable do
         expect(spec.options).to eq(unique: false, background: true)
       end
     end
+
+    context "when using a custom discriminator_key" do
+      context "when indexes have not been added" do
+        let(:klass) do
+          Class.new do
+            include Mongoid::Document
+            self.discriminator_key = "dkey"
+            def self.hereditary?
+              true
+            end
+          end
+        end
+
+        before do
+          klass.add_indexes
+        end
+
+        let(:spec) do
+          klass.index_specification(dkey: 1)
+        end
+
+        it "adds the _type index" do
+          expect(spec.options).to eq(unique: false, background: true)
+        end
+      end
+    end
   end
 
   describe ".index" do
@@ -195,8 +223,11 @@ describe Mongoid::Indexable do
     let(:klass) do
       Class.new do
         include Mongoid::Document
-        field :a, as: :authentication_token
+
         store_in collection: :specs
+
+        field :a, as: :authentication_token
+        field :username
       end
     end
 
@@ -234,21 +265,6 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when providing a drop_dups option" do
-
-      before do
-        klass.index({ name: 1 }, drop_dups: true)
-      end
-
-      let(:options) do
-        klass.index_specification(name: 1).options
-      end
-
-      it "sets the index with drop_dups option" do
-        expect(options).to eq(drop_dups: true)
-      end
-    end
-
     context "when providing a sparse option" do
 
       before do
@@ -380,7 +396,7 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when providing a geospacial index" do
+    context "when providing a geospatial index" do
 
       before do
         klass.index({ location: "2d" }, { min: -200, max: 200, bits: 32 })
@@ -390,7 +406,7 @@ describe Mongoid::Indexable do
         klass.index_specification(location: "2d").options
       end
 
-      it "sets the geospacial index" do
+      it "sets the geospatial index" do
         expect(options).to eq({ min: -200, max: 200, bits: 32 })
       end
     end
@@ -410,6 +426,18 @@ describe Mongoid::Indexable do
       end
     end
 
+    context "when providing a geo haystack index with a bucket_size" do
+
+      let(:message) do
+        'The geoHaystack type is deprecated.'
+      end
+
+      it "logs a deprecation warning" do
+        expect(Mongoid::Warnings).to receive(:warn_geo_haystack_deprecated)
+        klass.index({ location: "geoHaystack" }, { min: -200, max: 200, bucket_size: 0.5 })
+      end
+    end
+
     context "when providing a Spherical Geospatial index" do
 
       before do
@@ -563,6 +591,25 @@ describe Mongoid::Indexable do
       end
     end
 
+    context "when using a wildcard index" do
+
+      before do
+        klass.index({ '$**': 1 }, wildcard_projection: { _id: 1, username: 0 })
+      end
+
+      let(:spec) do
+        klass.index_specification('$**': 1)
+      end
+
+      it "creates the index" do
+        expect(spec).to be_a(Mongoid::Indexable::Specification)
+      end
+
+      it "sets the index with correct options" do
+        expect(spec.options).to eq(wildcard_projection: { _id: 1, username: 0 })
+      end
+    end
+
     context "when providing an invalid option" do
 
       it "raises an error" do

data/spec/mongoid/inspectable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Inspectable do
@@ -23,12 +25,39 @@ describe Mongoid::Inspectable do
       end
 
       it "displays defined fields" do
-        expect(inspected).to include("title: \"CEO\"")
+        expect(inspected).to include(%q,title: "CEO",)
       end
 
       it "displays field aliases" do
         expect(inspected).to include("t(test):")
       end
+
+      it "displays the default discriminator key" do
+        expect(inspected).to include(%q,_type: "Person",)
+      end
+    end
+
+    context "when using a custom discriminator key" do
+
+      before do
+        Person.discriminator_key = "dkey"
+      end
+
+      after do
+        Person.discriminator_key = nil
+      end
+
+      let(:person) do
+        Person.new(title: "CEO")
+      end
+
+      let(:inspected) do
+        person.inspect
+      end
+
+      it "displays the new discriminator key" do
+        expect(inspected).to include(%q,dkey: "Person",)
+      end
     end
 
     context "when allowing dynamic fields" do
@@ -42,7 +71,15 @@ describe Mongoid::Inspectable do
       end
 
       it "includes dynamic attributes" do
-        expect(inspected).to include("some_attribute: \"foo\"")
+        expect(inspected).to include(%q,some_attribute: "foo",)
+      end
+    end
+
+    context 'when id is unaliased' do
+      let(:shirt) { Shirt.new(id: 1, _id: 2) }
+
+      it 'shows the correct _id and id values' do
+        shirt.inspect.should == "#<Shirt _id: 2, color: nil, id: \"1\">"
       end
     end
   end