mongoid 7.5.4 → 8.0.1

data/spec/mongoid/interceptable_spec_models.rb

@@ -21,13 +21,165 @@ module InterceptableSpec
         %i(before after).each do |whn|
           send("#{whn}_#{what}", "#{whn}_#{what}_stub".to_sym)
           define_method("#{whn}_#{what}_stub") do
-            callback_registry.record_call(self.class, "#{whn}_#{what}".to_sym)
+            callback_registry&.record_call(self.class, "#{whn}_#{what}".to_sym)
+          end
+        end
+        unless what == :validation
+          send("around_#{what}", "around_#{what}_stub".to_sym)
+          define_method("around_#{what}_stub") do |&block|
+            callback_registry&.record_call(self.class, "around_#{what}_open".to_sym)
+            block.call
+            callback_registry&.record_call(self.class, "around_#{what}_close".to_sym)
           end
         end
       end
     end
   end
 
+  class CbHasOneParent
+    include Mongoid::Document
+
+    has_one :child, autosave: true, class_name: "CbHasOneChild", inverse_of: :parent
+
+    def initialize(callback_registry)
+      @callback_registry = callback_registry
+      super()
+    end
+
+    attr_accessor :callback_registry
+
+    def insert_as_root
+      @callback_registry&.record_call(self.class, :insert_into_database)
+      super
+    end
+
+    include CallbackTracking
+  end
+
+  class CbHasOneChild
+    include Mongoid::Document
+
+    belongs_to :parent, class_name: "CbHasOneParent", inverse_of: :child
+
+    def initialize(callback_registry)
+      @callback_registry = callback_registry
+      super()
+    end
+
+    attr_accessor :callback_registry
+
+    include CallbackTracking
+  end
+
+  class CbHasManyParent
+    include Mongoid::Document
+
+    has_many :children, autosave: true, class_name: "CbHasManyChild", inverse_of: :parent
+
+    def initialize(callback_registry)
+      @callback_registry = callback_registry
+      super()
+    end
+
+    attr_accessor :callback_registry
+
+    def insert_as_root
+      @callback_registry&.record_call(self.class, :insert_into_database)
+      super
+    end
+
+    include CallbackTracking
+  end
+
+  class CbHasManyChild
+    include Mongoid::Document
+
+    belongs_to :parent, class_name: "CbHasManyParent", inverse_of: :children
+
+    def initialize(callback_registry)
+      @callback_registry = callback_registry
+      super()
+    end
+
+    attr_accessor :callback_registry
+
+    include CallbackTracking
+  end
+
+  class CbEmbedsOneParent
+    include Mongoid::Document
+
+    field :name
+
+    embeds_one :child, cascade_callbacks: true, class_name: "CbEmbedsOneChild", inverse_of: :parent
+
+    def initialize(callback_registry)
+      @callback_registry = callback_registry
+      super()
+    end
+
+    attr_accessor :callback_registry
+
+    def insert_as_root
+      @callback_registry&.record_call(self.class, :insert_into_database)
+      super
+    end
+
+    include CallbackTracking
+  end
+
+  class CbEmbedsOneChild
+    include Mongoid::Document
+
+    field :age
+
+    embedded_in :parent, class_name: "CbEmbedsOneParent", inverse_of: :child
+
+    def initialize(callback_registry)
+      @callback_registry = callback_registry
+      super()
+    end
+
+    attr_accessor :callback_registry
+
+    include CallbackTracking
+  end
+
+  class CbEmbedsManyParent
+    include Mongoid::Document
+
+    embeds_many :children, cascade_callbacks: true, class_name: "CbEmbedsManyChild", inverse_of: :parent
+
+    def initialize(callback_registry)
+      @callback_registry = callback_registry
+      super()
+    end
+
+    attr_accessor :callback_registry
+
+    def insert_as_root
+      @callback_registry&.record_call(self.class, :insert_into_database)
+      super
+    end
+
+    include CallbackTracking
+  end
+
+  class CbEmbedsManyChild
+    include Mongoid::Document
+
+    embedded_in :parent, class_name: "CbEmbedsManyParent", inverse_of: :children
+
+    def initialize(callback_registry)
+      @callback_registry = callback_registry
+      super()
+    end
+
+    attr_accessor :callback_registry
+
+    include CallbackTracking
+  end
+
   class CbParent
     include Mongoid::Document
 
@@ -36,7 +188,7 @@ module InterceptableSpec
       super()
     end
 
-    attr_reader :callback_registry
+    attr_accessor :callback_registry
 
     embeds_many :cb_children
     embeds_many :cb_cascaded_children, cascade_callbacks: true
@@ -54,7 +206,7 @@ module InterceptableSpec
       super(options)
     end
 
-    attr_reader :callback_registry
+    attr_accessor :callback_registry
 
     include CallbackTracking
   end
@@ -69,8 +221,87 @@ module InterceptableSpec
       super(options)
     end
 
-    attr_reader :callback_registry
+    attr_accessor :callback_registry
 
     include CallbackTracking
   end
 end
+
+class InterceptableBand
+  include Mongoid::Document
+
+  has_many :songs, class_name: "InterceptableSong"
+  field :name
+end
+
+class InterceptableSong
+  include Mongoid::Document
+
+  belongs_to :band, class_name: "InterceptableBand"
+  field :band_name, default: -> { band.name }
+  field :name
+end
+
+class InterceptablePlane
+  include Mongoid::Document
+
+  has_many :wings, class_name: "InterceptableWing"
+end
+
+class InterceptableWing
+  include Mongoid::Document
+
+  belongs_to :plane, class_name: "InterceptablePlane"
+  has_one :engine, autobuild: true, class_name: "InterceptableEngine"
+
+  field :_id, type: String, default: -> { 'hello-wing' }
+
+  field :p_id, type: String, default: -> { plane&.id }
+  field :e_id, type: String, default: -> { engine&.id }
+end
+
+class InterceptableEngine
+  include Mongoid::Document
+
+  belongs_to :wing, class_name: "InterceptableWing"
+
+  field :_id, type: String, default: -> { "hello-engine-#{wing&.id}" }
+end
+
+class InterceptableCompany
+  include Mongoid::Document
+
+  has_many :users, class_name: "InterceptableUser"
+  has_many :shops, class_name: "InterceptableShop"
+end
+
+class InterceptableShop
+  include Mongoid::Document
+
+  embeds_one :address, class_name: "InterceptableAddress"
+  belongs_to :company, class_name: "InterceptableCompany"
+
+  after_initialize :build_address1
+
+  def build_address1
+    self.address ||= Address.new
+  end
+end
+
+class InterceptableAddress
+  include Mongoid::Document
+  embedded_in :shop, class_name: "InterceptableShop"
+end
+
+class InterceptableUser
+  include Mongoid::Document
+
+  belongs_to :company, class_name: "InterceptableCompany"
+
+  validate :break_mongoid
+
+  def break_mongoid
+    company.shop_ids
+  end
+end
+

data/spec/mongoid/matcher/extract_attribute_spec.rb

@@ -5,11 +5,7 @@ require 'spec_helper'
 describe 'Matcher.extract_attribute' do
   Dir[File.join(File.dirname(__FILE__), 'extract_attribute_data', '*.yml')].sort.each do |path|
     context File.basename(path) do
-      specs = if RUBY_VERSION.start_with?("2.5")
-                YAML.safe_load(File.read(path), [], [], true)
-              else
-                YAML.safe_load(File.read(path), aliases: true)
-              end
+      specs = YAML.safe_load(File.read(path), aliases: true)
 
       specs.each do |spec|
         context spec['name'] do

data/spec/mongoid/mongoizable_spec.rb

@@ -0,0 +1,285 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# This file is for testing the functionality of uncastable values for all
+# mongoizable classes.
+describe "mongoize/demongoize/evolve methods" do
+
+  shared_examples "handles unmongoizable values" do
+
+    context "when passing an invalid value" do
+      context "to mongoize" do
+        it "returns nil" do
+          expect(klass.mongoize(invalid_value)).to be_nil
+        end
+      end
+
+      context "when assigning an invalid value to a field" do
+        let(:catalog) { Catalog.create!(field_name => invalid_value) }
+
+        it "returns nil" do
+          catalog.attributes[field_name].should be_nil
+        end
+
+        it "persists nil" do
+          Catalog.find(catalog._id).attributes[field_name].should be_nil
+        end
+      end
+    end
+  end
+
+  shared_examples "handles undemongoizable values" do
+
+    context "when passing an invalid value" do
+      context "to demongoize" do
+        it "returns nil" do
+          expect(klass.demongoize(invalid_value)).to be_nil
+        end
+      end
+
+      context "when retrieving an invalid value from the db" do
+
+        before do
+          Catalog.collection.insert_one(field_name => invalid_value)
+        end
+
+        let(:catalog) { Catalog.first }
+
+        it "returns nil" do
+          catalog.send(field_name).should be_nil
+        end
+      end
+    end
+  end
+
+  shared_examples "pushes through unmongoizable values" do
+
+    context "when passing an invalid value" do
+      context "to mongoize" do
+        it "returns that value" do
+          expect(klass.mongoize(invalid_value)).to eq(mongoized_value)
+        end
+      end
+    end
+
+    context "when assigning an invalid value to a field" do
+      let!(:catalog) { Catalog.create!(field_name => invalid_value) }
+      let(:from_db) { Catalog.find(catalog._id) }
+
+      it "returns the inputted value" do
+        catalog.attributes[field_name].should be_nil
+      end
+
+      it "persists the inputted value" do
+        from_db.attributes[field_name].should be_nil
+      end
+    end
+  end
+
+  shared_examples "pushes through undemongoizable values" do
+
+    context "when reading an invalid value from the db" do
+      before do
+        Catalog.collection.insert_one(field_name => invalid_value)
+      end
+
+      let(:from_db) { Catalog.first }
+
+      it "reads the inputted value" do
+        from_db.send(field_name).should eq(demongoized_value)
+      end
+    end
+  end
+
+  shared_examples "pushes through unevolvable values" do
+
+    context "when passing an uncastable value to evolve" do
+
+      it "pushes the value through" do
+        expect(klass.evolve(invalid_value)).to eq(mongoized_value)
+      end
+    end
+  end
+
+  shared_examples "pushes through uncastable values" do
+    include_examples "pushes through unmongoizable values"
+    include_examples "pushes through undemongoizable values"
+  end
+
+  shared_examples "handles uncastable values" do
+    include_examples "handles unmongoizable values"
+    include_examples "handles undemongoizable values"
+  end
+
+  let(:mongoized_value) { invalid_value }
+  let(:demongoized_value) { invalid_value }
+
+  describe Array do
+    let(:invalid_value) { 1 }
+    let(:klass) { Array }
+    let(:field_name) { :array_field }
+
+    include_examples "handles unmongoizable values"
+    include_examples "pushes through undemongoizable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe BigDecimal do
+    let(:invalid_value) { "bogus" }
+    let(:klass) { described_class }
+    let(:field_name) { :big_decimal_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Mongoid::Boolean do
+    let(:invalid_value) { "invalid_value" }
+    let(:klass) { described_class }
+    let(:field_name) { :boolean_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Date do
+    let(:invalid_value) { :hello }
+    let(:klass) { described_class }
+    let(:field_name) { :date_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe DateTime do
+    let(:invalid_value) { :hello }
+    let(:klass) { described_class }
+    let(:field_name) { :date_time_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Float do
+    let(:invalid_value) { [] }
+    let(:klass) { described_class }
+    let(:field_name) { :float_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Hash do
+    let(:invalid_value) { 1 }
+    let(:klass) { described_class }
+    let(:field_name) { :hash_field }
+
+    include_examples "handles unmongoizable values"
+    include_examples "pushes through undemongoizable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Integer do
+    let(:invalid_value) { [] }
+    let(:klass) { described_class }
+    let(:field_name) { :integer_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe BSON::ObjectId do
+    let(:invalid_value) { "invalid value" }
+    let(:klass) { described_class }
+    let(:field_name) { :object_id_field }
+
+    include_examples "pushes through uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe BSON::Binary do
+    let(:invalid_value) { true }
+    let(:klass) { described_class }
+    let(:field_name) { :binary_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Range do
+    let(:invalid_value) { "invalid value" }
+    let(:klass) { described_class }
+    let(:field_name) { :range_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Regexp do
+    let(:invalid_value) { 1 }
+    let(:klass) { described_class }
+    let(:field_name) { :regexp_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Set do
+    let(:invalid_value) { 1 }
+    let(:klass) { described_class }
+    let(:field_name) { :set_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe String do
+    let(:invalid_value) { 1 }
+    let(:mongoized_value) { "1" }
+    let(:demongoized_value) { "1" }
+    let(:klass) { described_class }
+    let(:field_name) { :string_field }
+
+    include_examples "pushes through uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Mongoid::StringifiedSymbol do
+    let(:invalid_value) { [] }
+    let(:mongoized_value) { "[]" }
+    let(:demongoized_value) { :[] }
+    let(:klass) { described_class }
+    let(:field_name) { :stringified_symbol_field }
+
+    include_examples "pushes through uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Symbol do
+    let(:invalid_value) { Time.new }
+    let(:klass) { described_class }
+    let(:field_name) { :symbol_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe Time do
+    let(:invalid_value) { "invalid value" }
+    let(:klass) { described_class }
+    let(:field_name) { :time_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+
+  describe ActiveSupport::TimeWithZone do
+    let(:invalid_value) { "invalid value" }
+    let(:klass) { described_class }
+    let(:field_name) { :time_with_zone_field }
+
+    include_examples "handles uncastable values"
+    include_examples "pushes through unevolvable values"
+  end
+end

data/spec/mongoid/persistable/creatable_spec.rb

@@ -234,11 +234,11 @@ describe Mongoid::Persistable::Creatable do
       end
 
       let(:attributes) do
-        collection.find({ name: "Testy"}).first
+        collection.find({ name: "Testy" }).first
       end
 
       before do
-        Browser.create(name: 'Safari', version: '4.0.0')
+        Browser.create(name: 'Safari', version: 4.0)
       end
 
       it "persists the versions" do

data/spec/mongoid/persistable/deletable_spec.rb

@@ -33,7 +33,7 @@ describe Mongoid::Persistable::Deletable do
       it 'deletes the matching document from the database' do
         lambda do
           person.reload
-        end.should raise_error(Mongoid::Errors::DocumentNotFound)
+        end.should raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Person with id\(s\)/)
       end
     end
 
@@ -46,7 +46,7 @@ describe Mongoid::Persistable::Deletable do
       it "deletes the document from the collection" do
         expect {
           Person.find(person.id)
-        }.to raise_error(Mongoid::Errors::DocumentNotFound)
+        }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Person with id\(s\)/)
       end
 
       it "returns true" do

data/spec/mongoid/persistable/destroyable_spec.rb

@@ -33,7 +33,7 @@ describe Mongoid::Persistable::Destroyable do
       it 'deletes the matching document from the database' do
         lambda do
           person.reload
-        end.should raise_error(Mongoid::Errors::DocumentNotFound)
+        end.should raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Person with id\(s\)/)
       end
     end
 
@@ -46,7 +46,7 @@ describe Mongoid::Persistable::Destroyable do
       it "destroys the document from the collection" do
         expect {
           Person.find(person.id)
-        }.to raise_error(Mongoid::Errors::DocumentNotFound)
+        }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Person with id\(s\)/)
       end
 
       it "returns true" do

data/spec/mongoid/persistable/upsertable_spec.rb

@@ -53,6 +53,20 @@ describe Mongoid::Persistable::Upsertable do
         it "flags the document as persisted" do
           expect(existing).to be_persisted
         end
+
+        context 'when existing document contains other fields' do
+          let!(:existing) do
+            Band.create!(name: "Photek", views: 42)
+          end
+
+          it 'removes the existing fields' do
+            Band.count.should == 1
+
+            existing.reload
+            existing.views.should be nil
+            existing.name.should == 'Tool'
+          end
+        end
       end
 
       context "when no matching document exists in the db" do

data/spec/mongoid/persistence_context_spec.rb

@@ -718,4 +718,28 @@ describe Mongoid::PersistenceContext do
       end
     end
   end
+
+  context "when using an alternate database to update a document" do
+    let(:user) do
+      User.new(name: '1')
+    end
+
+    before do
+      user.with(database: database_id_alt) do |u|
+        u.save!
+      end
+
+      expect do
+        user.with(database: database_id_alt) do |u|
+          u.update(name:'2')
+        end
+      end.to_not raise_error
+    end
+
+    it "persists the update" do
+      User.with("database" => database_id_alt) do |klass|
+        expect(klass.find(user._id).name).to eq("2")
+      end
+    end
+  end
 end

data/spec/mongoid/query_cache_middleware_spec.rb

@@ -40,29 +40,11 @@ describe Mongoid::QueryCache::Middleware do
     end
 
     context 'with driver query cache' do
-      min_driver_version '2.14'
 
       it "cleans the query cache after it responds" do
         middleware.call({})
         expect(Mongo::QueryCache.send(:cache_table)).to be_empty
       end
     end
-
-    context 'with mongoid query cache' do
-      max_driver_version '2.13'
-
-      it "cleans the query cache after it responds" do
-        middleware.call({})
-        expect(Mongoid::QueryCache.cache_table).to be_empty
-      end
-    end
-  end
-
-  context 'when driver implements query cache middleware' do
-    min_driver_version '2.15'
-
-    it 'uses the driver query cache middleware' do
-      Mongoid::QueryCache::Middleware.should be Mongo::QueryCache::Middleware
-    end
   end
 end