mongoid 6.4.8 → 7.0.13

data/spec/mongoid/relations/proxy_spec.rb

@@ -1,124 +1,124 @@
-require "spec_helper"
-
-describe Mongoid::Relations::Proxy do
-
-  describe '#with', if: non_legacy_server? do
-
-    let(:circus) do
-      Circus.new
-    end
-
-    let(:animal) do
-      Animal.new
-    end
-
-    before do
-      circus.animals << animal
-      circus.save
-    end
-
-    it 'uses the new persistence options' do
-      expect {
-        animal.with(write: { w: 100 }) do |an|
-          an.update_attribute(:name, 'kangaroo')
-        end
-      }.to raise_exception(Mongo::Error::OperationFailure)
-    end
-  end
-
-  describe "#find" do
-    let(:person) do
-      Person.create
-    end
-
-    let(:messages) do
-      person.messages
-    end
-
-    let(:msg1) do
-      messages.create(body: 'msg1')
-    end
-
-    it "returns nil with no arguments" do
-      expect(messages.find).to be_nil
-      expect(messages.send(:find)).to be_nil
-      expect(messages.__send__(:find)).to be_nil
-      expect(messages.public_send(:find)).to be_nil
-    end
-
-    it "returns the object corresponding to the id" do
-      expect(messages.find(msg1.id)).to eq(msg1)
-      expect(messages.send(:find, msg1.id)).to eq(msg1)
-      expect(messages.__send__(:find, msg1.id)).to eq(msg1)
-      expect(messages.public_send(:find, msg1.id)).to eq(msg1)
-    end
-  end
-
-  describe "#extend" do
-
-    before(:all) do
-      Person.reset_callbacks(:validate)
-      module Testable
-      end
-    end
-
-    after(:all) do
-      Object.send(:remove_const, :Testable)
-    end
-
-    let(:person) do
-      Person.create
-    end
-
-    let(:name) do
-      person.build_name
-    end
-
-    before do
-      name.namable.extend(Testable)
-    end
-
-    it "extends the proxied object" do
-      expect(person).to be_a(Testable)
-    end
-
-    context "when extending from the relation definition" do
-
-      let!(:address) do
-        person.addresses.create(street: "hobrecht")
-      end
-
-      let(:found) do
-        person.addresses.find_by_street("hobrecht")
-      end
-
-      it "extends the proxy" do
-        expect(found).to eq(address)
-      end
-    end
-  end
-
-  describe "equality" do
-    let(:messages) do
-      Person.create.messages
-    end
-
-    it "is #equal? to itself" do
-      expect(messages.equal?(messages)).to eq(true)
-    end
-
-    it "is == to itself" do
-      expect(messages == messages).to eq(true)
-    end
-
-    it "is not #equal? to its target" do
-      expect(messages.equal?(messages.target)).to eq(false)
-      expect(messages.target.equal?(messages)).to eq(false)
-    end
-
-    it "is == to its target" do
-      expect(messages == messages.target).to eq(true)
-      expect(messages.target == messages).to eq(true)
-    end
-  end
-end
+# require "spec_helper"
+#
+# describe Mongoid::Relations::Proxy do
+#
+#   describe '#with' do
+#
+#     let(:circus) do
+#       Circus.new
+#     end
+#
+#     let(:animal) do
+#       Animal.new
+#     end
+#
+#     before do
+#       circus.animals << animal
+#       circus.save
+#     end
+#
+#     it 'uses the new persistence options' do
+#       expect {
+#         animal.with(write: { w: 100 }) do |an|
+#           an.update_attribute(:name, 'kangaroo')
+#         end
+#       }.to raise_exception(Mongo::Error::OperationFailure)
+#     end
+#   end
+#
+#   describe "#find" do
+#     let(:person) do
+#       Person.create
+#     end
+#
+#     let(:messages) do
+#       person.messages
+#     end
+#
+#     let(:msg1) do
+#       messages.create(body: 'msg1')
+#     end
+#
+#     it "returns nil with no arguments" do
+#       expect(messages.find).to be_nil
+#       expect(messages.send(:find)).to be_nil
+#       expect(messages.__send__(:find)).to be_nil
+#       expect(messages.public_send(:find)).to be_nil
+#     end
+#
+#     it "returns the object corresponding to the id" do
+#       expect(messages.find(msg1.id)).to eq(msg1)
+#       expect(messages.send(:find, msg1.id)).to eq(msg1)
+#       expect(messages.__send__(:find, msg1.id)).to eq(msg1)
+#       expect(messages.public_send(:find, msg1.id)).to eq(msg1)
+#     end
+#   end
+#
+#   describe "#extend" do
+#
+#     before(:all) do
+#       Person.reset_callbacks(:validate)
+#       module Testable
+#       end
+#     end
+#
+#     after(:all) do
+#       Object.send(:remove_const, :Testable)
+#     end
+#
+#     let(:person) do
+#       Person.create
+#     end
+#
+#     let(:name) do
+#       person.build_name
+#     end
+#
+#     before do
+#       name.namable.extend(Testable)
+#     end
+#
+#     it "extends the proxied object" do
+#       expect(person).to be_a(Testable)
+#     end
+#
+#     context "when extending from the relation definition" do
+#
+#       let!(:address) do
+#         person.addresses.create(street: "hobrecht")
+#       end
+#
+#       let(:found) do
+#         person.addresses.find_by_street("hobrecht")
+#       end
+#
+#       it "extends the proxy" do
+#         expect(found).to eq(address)
+#       end
+#     end
+#   end
+#
+#   describe "equality" do
+#     let(:messages) do
+#       Person.create.messages
+#     end
+#
+#     it "is #equal? to itself" do
+#       expect(messages.equal?(messages)).to eq(true)
+#     end
+#
+#     it "is == to itself" do
+#       expect(messages == messages).to eq(true)
+#     end
+#
+#     it "is not #equal? to its target" do
+#       expect(messages.equal?(messages.target)).to eq(false)
+#       expect(messages.target.equal?(messages)).to eq(false)
+#     end
+#
+#     it "is == to its target" do
+#       expect(messages == messages.target).to eq(true)
+#       expect(messages.target == messages).to eq(true)
+#     end
+#   end
+# end

data/spec/mongoid/scopable_spec.rb

@@ -227,7 +227,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/shardable_spec.rb

@@ -49,23 +49,43 @@ describe Mongoid::Shardable do
     end
   end
 
-  describe "#shard_key_selector" do
+  describe '#shard_key_selector' do
+    subject { instance.shard_key_selector }
+    let(:klass) { Band }
+    let(:value) { 'a-brand-name' }
 
-    let(:klass) do
-      Band
-    end
+    before { klass.shard_key(:name) }
 
-    let(:object) do
-      klass.new
-    end
+    context 'when record is new' do
+      let(:instance) { klass.new(name: value) }
 
-    before do
-      klass.shard_key(:name)
-      object.name = "Jo"
+      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 { is_expected.to eq({ 'name' => new_value }) }
+      end
     end
 
-    it "returns a hash of shard key names and values" do
-      expect(object.shard_key_selector).to eq({ "name" => "Jo" })
+    context 'when record is persisted' do
+      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 { is_expected.to eq({ 'name' => value }) }
+      end
     end
   end
 end

data/spec/mongoid/tasks/database_rake_spec.rb

@@ -45,7 +45,7 @@ shared_context "rails rake task" do
   end
 end
 
-describe "db:drop", if: non_legacy_server? do
+describe "db:drop" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -58,7 +58,7 @@ describe "db:drop", if: non_legacy_server? do
   end
 end
 
-describe "db:purge", if: non_legacy_server? do
+describe "db:purge" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -71,7 +71,7 @@ describe "db:purge", if: non_legacy_server? do
   end
 end
 
-describe "db:seed", if: non_legacy_server? do
+describe "db:seed" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -85,7 +85,7 @@ describe "db:seed", if: non_legacy_server? do
   end
 end
 
-describe "db:setup", if: non_legacy_server? do
+describe "db:setup" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -117,7 +117,7 @@ describe "db:setup", if: non_legacy_server? do
   end
 end
 
-describe "db:reset", if: non_legacy_server? do
+describe "db:reset" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -135,7 +135,7 @@ describe "db:reset", if: non_legacy_server? do
   end
 end
 
-describe "db:create", if: non_legacy_server? do
+describe "db:create" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -144,7 +144,7 @@ describe "db:create", if: non_legacy_server? do
   end
 end
 
-describe "db:migrate", if: non_legacy_server? do
+describe "db:migrate" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -153,7 +153,7 @@ describe "db:migrate", if: non_legacy_server? do
   end
 end
 
-describe "db:test:prepare", if: non_legacy_server? do
+describe "db:test:prepare" do
   include_context "rake task"
   include_context "rails rake task"
 
@@ -174,7 +174,7 @@ describe "db:test:prepare", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:create_indexes", if: non_legacy_server? do
+describe "db:mongoid:create_indexes" do
   include_context "rake task"
 
   it_behaves_like "create_indexes"
@@ -198,7 +198,7 @@ describe "db:mongoid:create_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:remove_undefined_indexes", if: non_legacy_server? do
+describe "db:mongoid:remove_undefined_indexes" do
   include_context "rake task"
 
   it "receives remove_undefined_indexes" do
@@ -224,7 +224,7 @@ describe "db:mongoid:remove_undefined_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:remove_indexes", if: non_legacy_server? do
+describe "db:mongoid:remove_indexes" do
   include_context "rake task"
 
   it "receives remove_indexes" do
@@ -250,7 +250,7 @@ describe "db:mongoid:remove_indexes", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:drop", if: non_legacy_server? do
+describe "db:mongoid:drop" do
   include_context "rake task"
 
   it "works" do
@@ -266,7 +266,7 @@ describe "db:mongoid:drop", if: non_legacy_server? do
   end
 end
 
-describe "db:mongoid:purge", if: non_legacy_server? do
+describe "db:mongoid:purge" do
   include_context "rake task"
 
   it "receives a purge" do

data/spec/mongoid/tasks/database_spec.rb

@@ -133,7 +133,7 @@ describe "Mongoid::Tasks::Database" do
       expect(removed_indexes).to be_empty
     end
 
-    context 'when the index is a text index', if: non_legacy_server? do
+    context 'when the index is a text index' do
 
       before do
         class Band

data/spec/mongoid/{relations/touchable_spec.rb → touchable_spec.rb}

@@ -1,11 +1,36 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Touchable do
+describe Mongoid::Touchable do
 
   describe "#touch" do
 
+    context "when the document has no associations" do
+      let(:updatable) do
+        Updatable.create
+      end
+
+      it "responds to #touch" do
+        expect(updatable).to respond_to(:touch)
+      end
+
+      it "updates the timestamp when called" do
+        expect(updatable.updated_at).to be_nil
+
+        updatable.touch
+        updated_at = updatable.updated_at
+        expect(updated_at).not_to be_nil
+
+        updatable.touch
+        expect(updatable.updated_at).to be > updated_at
+      end
+    end
+
     context "when the document is embedded" do
 
+      before do
+        Label.send(:include, Mongoid::Touchable::InstanceMethods)
+      end
+
       let(:band) do
         Band.create(name: "Placebo")
       end
@@ -29,6 +54,11 @@ describe Mongoid::Relations::Touchable do
 
     context "when no relations have touch options" do
 
+      before do
+        Person.send(:include, Mongoid::Touchable::InstanceMethods)
+        Agent.send(:include, Mongoid::Touchable::InstanceMethods)
+      end
+
       context "when no updated at is defined" do
 
         let(:person) do
@@ -209,6 +239,11 @@ describe Mongoid::Relations::Touchable do
 
       context "when the relation is a parent of an embedded doc" do
 
+        before do
+          Page.send(:include, Mongoid::Touchable::InstanceMethods)
+          Edit.send(:include, Mongoid::Touchable::InstanceMethods)
+        end
+
         let(:page) do
           WikiPage.create(title: "test")
         end
@@ -229,6 +264,10 @@ describe Mongoid::Relations::Touchable do
 
       context "when the parent of embedded doc has cascade callbacks" do
 
+        before do
+          Band.send(:include, Mongoid::Touchable::InstanceMethods)
+        end
+
         let!(:book) do
           Book.new
         end

data/spec/mongoid/validatable/associated_spec.rb

@@ -171,7 +171,7 @@ describe Mongoid::Validatable::AssociatedValidator do
         end
       end
 
-      context "when the assocation has all valid documents" do
+      context "when the association has all valid documents" do
 
         let(:associated) do
           double(valid?: true, flagged_for_destroy?: false)

data/spec/mongoid/validatable/presence_spec.rb

@@ -211,13 +211,14 @@ describe Mongoid::Validatable::PresenceValidator do
 
     context "when the relation is a has one" do
 
-      before do
+      around do |example|
+        original_relations = Person.relations
+        Person.has_one :game, autosave: true
         Person.validates :game, presence: true
-      end
-
-      after do
+        example.run
         Person.reset_callbacks(:save)
         Person.reset_callbacks(:validate)
+        Person.relations = original_relations
       end
 
       context "when the relation is new" do
@@ -249,7 +250,7 @@ describe Mongoid::Validatable::PresenceValidator do
     context "when the relation is a has one and autosave is false" do
 
       before do
-        Person.relations["game"][:autosave] = false
+        Person.relations["game"].options[:autosave] = false
         Person.validates :game, presence: true
       end
 
@@ -258,7 +259,7 @@ describe Mongoid::Validatable::PresenceValidator do
       end
 
       it "does not change autosave on the relation" do
-        expect(Person.relations["game"][:autosave]).to be false
+        expect(Person.relations["game"].autosave?).to be false
       end
 
       context "when the relation is new" do

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -796,20 +796,47 @@ describe Mongoid::Validatable::UniquenessValidator do
           end
         end
 
-        context "when a range scope is provided" do
+        context "when a range condition is provided" do
 
           before do
-            Dictionary.validates_uniqueness_of(:name, :scope => Dictionary.where(:year.gte => 1900, :year.lt => 2000))
-            Dictionary.create(name: "French-English", year: 1950)
-            Dictionary.create(name: "French-English", year: 1960)
+            Dictionary.validates_uniqueness_of(:name,
+              conditions: -> { Dictionary.where(:year.gte => 1900, :year.lt => 2000) })
           end
 
           after do
             Dictionary.reset_callbacks(:validate)
           end
 
-          it "successfully prevents uniqueness violation" do
-            expect(Dictionary.all.size).to eq(1)
+          context 'when multiple documents would match the condition' do
+            it "prevents creation of new document" do
+              Dictionary.create!(name: "French-English", year: 1950)
+
+              expect do
+                Dictionary.create!(name: "French-English", year: 1960)
+              end.to raise_error(Mongoid::Errors::Validations, /Name is already taken/)
+
+              expect(Dictionary.all.size).to eq(1)
+            end
+          end
+
+          context 'when only new document would match the condition' do
+            it 'creates the new document' do
+              Dictionary.create!(name: "French-English", year: 950)
+              expect do
+                Dictionary.create!(name: "French-English", year: 1950)
+              end.not_to raise_error
+            end
+          end
+
+          context 'when only existing document matches the condition' do
+            it 'creates the new document' do
+              pending 'https://jira.mongodb.org/browse/MONGOID-4815'
+
+              Dictionary.create!(name: "French-English", year: 1950)
+              expect do
+                Dictionary.create!(name: "French-English", year: 950)
+              end.not_to raise_error
+            end
           end
         end
 

data/spec/mongoid/validatable_spec.rb

@@ -34,7 +34,7 @@ describe Mongoid::Validatable do
       end
 
       let(:documents) do
-        Mongoid::Relations::Targets::Enumerable.new([ address ])
+        Mongoid::Association::Referenced::HasMany::Targets::Enumerable.new([ address ])
       end
 
       before do

data/spec/shared/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2020 MongoDB, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/spec/shared/bin/get-mongodb-download-url

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+desired_version, arch = ARGV
+if arch.nil?
+  STDERR.puts "Usage: get-mongodb-download-url desired-version arch"
+  exit 1
+end
+
+$: << File.join(File.dirname(__FILE__), '../lib')
+require 'mrss/server_version_registry'
+
+begin
+  puts Mrss::ServerVersionRegistry.new(desired_version, arch).download_url
+rescue Mrss::ServerVersionRegistry::Error => exc
+  STDERR.puts "Error: #{exc}"
+  exit 2
+end