mongoid 6.4.2 → 7.0.3

data/lib/mongoid/validatable.rb

@@ -127,14 +127,14 @@ module Mongoid
       # was not provided or set to true.
       #
       # @example Set up validation.
-      #   Person.validates_relation(metadata)
+      #   Person.validates_relation(association)
       #
-      # @param [ Metadata ] metadata The relation metadata.
+      # @param [ Association ] association The association metadata.
       #
       # @since 2.0.0.rc.1
-      def validates_relation(metadata)
-        if metadata.validate?
-          validates_associated(metadata.name)
+      def validates_relation(association)
+        if association.validate?
+          validates_associated(association.name)
         end
       end
 
@@ -154,9 +154,9 @@ module Mongoid
       def validates_with(*args, &block)
         if args.first == PresenceValidator
           args.last[:attributes].each do |name|
-            metadata = relations[name.to_s]
-            if metadata && metadata[:autosave] != false
-              autosave(metadata.merge!(autosave: true))
+            association = relations[name.to_s]
+            if association && association.autosave?
+              Association::Referenced::AutoSave.define_autosave!(association)
             end
           end
         end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "6.4.2"
+  VERSION = "7.0.3"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -149,6 +149,9 @@ development:
     # Application name that is printed to the mongodb logs upon establishing a
     # connection in server versions >= 3.4. Note that the name cannot exceed 128 bytes.
     # app_name: MyApplicationName
+
+    # Use background indexes by default if `background` option not specified. (default: false)
+    # background_indexing: false
 test:
   clients:
     default:

data/spec/app/models/animal.rb

@@ -9,7 +9,8 @@ class Animal
   field :tags, type: Array
 
   embedded_in :person
-  embedded_in :circus
+  embedded_in :circus, class_name: 'Circus' # class_name is necessary because ActiveRecord think the singular of Circus
+                                            # is Circu
 
   validates_format_of :name, without: /\$\$\$/
 

data/spec/app/models/bomb.rb

@@ -1,4 +1,4 @@
 class Bomb
   include Mongoid::Document
-  has_one :explosion, dependent: :delete, autobuild: true
+  has_one :explosion, dependent: :delete_all, autobuild: true
 end

data/spec/app/models/message.rb

@@ -5,7 +5,7 @@ class Message
   field :priority, type: Integer
 
   embedded_in :person
-  has_and_belongs_to_many :receviers, class_name: "Person", inverse_of: nil
+  has_and_belongs_to_many :receivers, class_name: "Person", inverse_of: nil
 
   has_one :post, as: :posteable
 end

data/spec/app/models/minim.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Minimal model, do not add any fields
+class Minim
+  include Mongoid::Document
+  field :name
+end

data/spec/app/models/person.rb

@@ -85,7 +85,7 @@ class Person
 
   has_many \
     :posts,
-    dependent: :delete,
+    dependent: :delete_all,
     validate: false do
     def extension
       "Testing"
@@ -105,7 +105,7 @@ class Person
   has_one :account, validate: false
   has_one :cat, dependent: :nullify, validate: false, primary_key: :username
   has_one :book, autobuild: true, validate: false
-  has_one :home, dependent: :delete, validate: false
+  has_one :home, dependent: :delete_all, validate: false
 
   has_and_belongs_to_many \
     :administrated_events,
@@ -114,6 +114,9 @@ class Person
     dependent:  :nullify,
     validate: false
 
+  belongs_to :mother, class_name: 'Person'
+  has_many :children, class_name: 'Person'
+
   accepts_nested_attributes_for :addresses
   accepts_nested_attributes_for :name, update_only: true
   accepts_nested_attributes_for :pet, allow_destroy: true

data/spec/app/models/shipment_address.rb

@@ -1,2 +1,3 @@
 class ShipmentAddress < Address
+  field :shipping_name, localize: true
 end

data/spec/app/models/store_as_dup_test3.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class StoreAsDupTest3
+  include Mongoid::Document
+  embeds_many :store_as_dup_test4s, :store_as => :t
+  field :name
+end

data/spec/app/models/store_as_dup_test4.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class StoreAsDupTest4
+  include Mongoid::Document
+  embedded_in :store_as_dup_test3
+  field :name
+end

data/spec/app/models/updatable.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Updatable
+  include Mongoid::Document
+
+  field :updated_at, type: BSON::Timestamp
+end

data/spec/app/models/vertex.rb

@@ -0,0 +1,6 @@
+class Vertex
+  include Mongoid::Document
+
+  has_and_belongs_to_many :parents, inverse_of: :children, class_name: 'Vertex'
+  has_and_belongs_to_many :children, inverse_of: :parents, class_name: 'Vertex'
+end

data/spec/app/models/wiki_page.rb

@@ -9,6 +9,6 @@ class WikiPage
 
   embeds_many :edits, validate: false
   has_many :comments, dependent: :destroy, validate: false
-  has_many :child_pages, class_name: "WikiPage", dependent: :delete, inverse_of: :parent_pages
+  has_many :child_pages, class_name: "WikiPage", dependent: :delete_all, inverse_of: :parent_pages
   belongs_to :parent_pages, class_name: "WikiPage", inverse_of: :child_pages
 end

data/spec/config/mongoid.yml

@@ -3,7 +3,9 @@ test:
     default:
       database: mongoid_test
       hosts:
-        - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
+        <% SpecConfig.instance.addresses.each do |address| %>
+          - <%= address %>
+        <% end %>
       options:
         user: "mongoid-user"
         password: "password"
@@ -13,14 +15,18 @@ test:
           tag_sets:
             - use: web
         max_pool_size: 1
+        server_selection_timeout: 3.14
     reports:
       database: reports
       hosts:
-        - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
+        <% SpecConfig.instance.addresses.each do |address| %>
+          - <%= address %>
+        <% end %>
       options:
         user: "mongoid-user"
         password: "password"
         auth_source: "admin"
+        server_selection_timeout: 3.14
   options:
     include_root_in_json: false
     include_type_for_serialization: false
@@ -32,13 +38,17 @@ test:
     log_level: :warn
     belongs_to_required_by_default: false
     app_name: 'testing'
+    background_indexing: false
 test_with_max_staleness:
   clients:
     default:
       database: mongoid_test
       hosts:
-        - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
+        <% SpecConfig.instance.addresses.each do |address| %>
+          - <%= address %>
+        <% end %>
       options:
         read:
           mode: :primary_preferred
           max_staleness: 100
+        server_selection_timeout: 3.14

data/spec/integration/associations/belongs_to_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require_relative '../../mongoid/association/referenced/has_one_models'
+
+describe 'belongs_to associations' do
+  context 'referencing top level classes when source class is namespaced' do
+    let(:college) { HomCollege.create! }
+    let(:child) { HomAccreditation::Child.new(hom_college: college) }
+
+    it 'works' do
+      expect(child).to be_valid
+    end
+  end
+end

data/spec/lite_spec_helper.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require "mongoid"
+require "rspec"
+
+# MRI 2.5 and JRuby 9.2 change visibility of Object#pp when 'pp' is required,
+# which happens when RSpec reports anything. This creates an issue for tests
+# that verify method forwarding. Work around by proactively loading 'pp'.
+# https://github.com/jruby/jruby/issues/5599
+require 'pp'
+
+require 'support/spec_config'
+
+unless SpecConfig.instance.ci?
+  begin
+    require 'byebug'
+  rescue LoadError
+    # jruby - try pry
+    begin
+      require 'pry'
+    # jruby likes to raise random error classes, in this case
+    # NameError in addition to LoadError
+    rescue Exception
+    end
+  end
+end
+
+if SpecConfig.instance.mri?
+  require 'timeout_interrupt'
+else
+  require 'timeout'
+  TimeoutInterrupt = Timeout
+end
+
+RSpec.configure do |config|
+  if SpecConfig.instance.ci?
+    config.add_formatter(RSpec::Core::Formatters::JsonFormatter, File.join(File.dirname(__FILE__), '../tmp/rspec.json'))
+  end
+
+  if SpecConfig.instance.ci?
+    # Allow a max of 30 seconds per test.
+    # Tests should take under 10 seconds ideally but it seems
+    # we have some that run for more than 10 seconds in CI.
+    config.around(:each) do |example|
+      TimeoutInterrupt.timeout(30) do
+        example.run
+      end
+    end
+  end
+end
+
+# require all shared examples
+Dir['./spec/support/shared/*.rb'].sort.each { |file| require file }

data/spec/mongoid/{relations → association}/accessors_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Accessors do
+describe Mongoid::Association::Accessors do
 
   describe "\#{getter}?" do
 
@@ -687,6 +687,45 @@ describe Mongoid::Relations::Accessors do
     end
   end
 
+  context 'when setting associations to nil values' do
+    context 'when the document embeds one' do
+      let(:definitions) do
+        class AccessorEmbedding
+          include Mongoid::Document
+
+          embeds_one :accessor_embedded
+        end
+
+        class AccessorEmbedded
+          include Mongoid::Document
+
+          embedded_in :accessor_embedding
+        end
+
+        define_embedded
+      end
+
+      let(:embedding) do
+        AccessorEmbedding.create!
+      end
+
+      let(:define_embedded) do
+        AccessorEmbedded.create!(accessor_embedding: embedding)
+      end
+
+      it 'successfully removes the embedded document' do
+        definitions
+
+        expect(embedding.accessor_embedded).not_to be_nil
+
+        embedding.accessor_embedded = nil
+        embedding.save!
+
+        expect(embedding.reload.accessor_embedded).to be_nil
+      end
+    end
+  end
+
   context "when setting association foreign keys" do
 
     let(:game) do

data/spec/mongoid/{relations → association}/auto_save_spec.rb

@@ -1,11 +1,12 @@
 require "spec_helper"
 
-describe Mongoid::Relations::AutoSave do
+describe Mongoid::Association::Referenced::AutoSave do
 
   describe ".auto_save" do
 
     before(:all) do
-      Person.autosave(Person.relations["account"].merge!(autosave: true))
+      Person.has_many :drugs, validate: false, autosave: true
+      Person.has_one :account, validate: false, autosave: true
     end
 
     after(:all) do
@@ -42,13 +43,8 @@ describe Mongoid::Relations::AutoSave do
 
       context "when the relation has already had the autosave callback added" do
 
-        let(:metadata) do
-          Person.relations["drugs"].merge!(autosave: true)
-        end
-
         before do
-          Person.autosave(metadata)
-          Person.autosave(metadata)
+          Person.has_many :drugs, validate: false, autosave: true
         end
 
         let(:drug) do
@@ -71,6 +67,11 @@ describe Mongoid::Relations::AutoSave do
         context "when saving a new parent document" do
 
           context 'when persistence options are not set on the parent' do
+
+            before do
+              Person.has_many :drugs, validate: false, autosave: true
+            end
+
             before do
               person.drugs << drug
               person.save
@@ -254,10 +255,6 @@ describe Mongoid::Relations::AutoSave do
 
       context "when it has two relations with autosaves" do
 
-        before do
-          Person.autosave(Person.relations["drugs"].merge!(autosave: true))
-        end
-
         let!(:person) do
           Person.create(drugs: [percocet], account: account)
         end
@@ -309,6 +306,57 @@ describe Mongoid::Relations::AutoSave do
           end
         end
       end
+
+      context 'when the autosave should be cascaded' do
+
+        before do
+          class King
+            include Mongoid::Document
+            has_one :peasant, autosave: true
+          end
+
+          class Peasant
+            include Mongoid::Document
+            belongs_to :king
+            has_one :harvest, autosave: true
+          end
+
+          class Harvest
+            include Mongoid::Document
+            field :season, type: String
+            belongs_to :peasant
+          end
+        end
+
+        after do
+          Object.send(:remove_const, :King)
+          Object.send(:remove_const, :Peasant)
+          Object.send(:remove_const, :Harvest)
+        end
+
+        let(:king) do
+          King.create
+        end
+
+        let(:peasant) do
+          Peasant.create
+        end
+
+        let(:harvest) do
+          Harvest.create(season: 'Summer')
+        end
+
+        before do
+          peasant.harvest = harvest
+          king.peasant = peasant
+          harvest.season = 'Fall'
+          king.save
+        end
+
+        it 'cascades the save' do
+          expect(harvest.reload.season).to eq('Fall')
+        end
+      end
     end
   end
 end

data/spec/mongoid/{relations → association}/builders_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Builders do
+describe Mongoid::Association::Builders do
 
   describe "#build_#\{name}" do
 

data/spec/mongoid/association/constrainable_spec.rb

@@ -0,0 +1,115 @@
+require "spec_helper"
+
+describe Mongoid::Association::Constrainable do
+
+  describe "#convert_to_foreign_key" do
+
+    context "when the id's class stores object ids" do
+
+      before(:all) do
+        Person.field(
+          :_id,
+          type: BSON::ObjectId,
+          pre_processed: true,
+          default: ->{ BSON::ObjectId.new },
+          overwrite: true
+        )
+      end
+
+      let(:constrainable) do
+        Post.belongs_to :person
+      end
+
+      context "when provided an object id" do
+
+        let(:object) do
+          BSON::ObjectId.new
+        end
+
+        it "returns the object id" do
+          expect(constrainable.convert_to_foreign_key(object)).to eq(object)
+        end
+      end
+
+      context "when provided a string" do
+
+        let(:object) do
+          BSON::ObjectId.new
+        end
+
+        it "returns an object id from the string" do
+          expect(constrainable.convert_to_foreign_key(object.to_s)).to eq(object)
+        end
+      end
+    end
+
+    context "when the id's class does not store object ids" do
+
+      let(:constrainable) do
+        Alert.belongs_to :account
+      end
+
+      it "returns the object" do
+        expect(constrainable.convert_to_foreign_key("testing")).to eq("testing")
+      end
+    end
+
+    context 'when the association is polymorphic' do
+
+      let(:constrainable) do
+        Post.relations['posteable']
+      end
+
+      let(:result) do
+        constrainable.convert_to_foreign_key(object)
+      end
+
+      context 'when a BSON::ObjectId is passed' do
+
+        let(:object) do
+          BSON::ObjectId.new
+        end
+
+        it 'returns the object id' do
+          expect(result).to eq(object)
+        end
+      end
+
+      context 'when a string is passed' do
+
+        context 'when the string represents an ObjectId' do
+
+          let(:object) do
+            BSON::ObjectId.new.to_s
+          end
+
+          it 'returns the object id' do
+            expect(result).to eq(BSON::ObjectId.from_string(object))
+          end
+        end
+
+        context 'when the string does not represent an ObjectId' do
+
+          let(:object) do
+            'some-other-string'
+          end
+
+          it 'returns the object' do
+            expect(result).to eq(object)
+          end
+        end
+      end
+
+      context 'when a model object is passed' do
+
+        let(:object) do
+          Post.new
+        end
+
+        it 'returns the id' do
+          expect(result).to eq(object.id)
+        end
+      end
+    end
+  end
+end

data/spec/mongoid/{relations → association}/counter_cache_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::CounterCache do
+describe Mongoid::Association::Referenced::CounterCache do
 
   describe "#reset_counters" do