mongoid 7.1.6 → 7.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dc047b0566d39e527a503400ca7bd624afcea9aebd7db795870333a795644c3
-  data.tar.gz: 600c7431bf9a3464f24794c02807510f22b56d74a3981826cb1c6f2013a6c5e5
+  metadata.gz: 93d8b658e53d12f1deb7a131e3d58155fead7576955078187f3b3181072c193f
+  data.tar.gz: 35e629224f7495969e5a695a9641043ad61b92d61b57926b1d1956bd2f5e1d7c
 SHA512:
-  metadata.gz: 6a430d43d0646baa0424f06471f4891330470d85dc23af4e2166779e36fa2e58cc44e1d645062290e8ec30dbad583dfc42f4d898b66ff5995422489e8868f577
-  data.tar.gz: d35537d5127ff1840f4b8c920a446a22bee7bedcf675fe8212989798cc949d1d0e01c03e6df1b782def1956bbd4ecc81f1812d3b768e17029cd87e5e6583df96
+  metadata.gz: 33920733722a4da26c23190788ef198d86d0d3edfcedc3d53bc7364d9abfbda7c54634af875c678757745c1d18b225457ef8e0a5b5711db7e76b93350548d14b
+  data.tar.gz: cb0acea4219ce1972fe67b63f988b0f31197ab44142288e5af4fe84e63f602dbc9b7dcc23edbf54cc5e465288c23346f62d3cf0632e0b37a59fabc6acb1c6925

data/lib/mongoid/criteria/queryable/selector.rb

@@ -123,10 +123,6 @@ module Mongoid
               # {'foo' => {'$lt' => 5}}. This step should be done after all
               # value-based processing is complete.
               if key.is_a?(Key)
-                if serializer && evolved_value != value
-                  raise NotImplementedError, "This method is not prepared to handle key being a Key and serializer being not nil"
-                end
-
                 evolved_value = key.transform_value(evolved_value)
               end
 

data/lib/mongoid/document.rb

@@ -229,8 +229,9 @@ module Mongoid
       became = klass.new(clone_document)
       became._id = _id
       became.instance_variable_set(:@changed_attributes, changed_attributes)
-      became.instance_variable_set(:@errors, ActiveModel::Errors.new(became))
-      became.errors.instance_variable_set(:@messages, errors.instance_variable_get(:@messages))
+      new_errors = ActiveModel::Errors.new(became)
+      new_errors.copy!(errors)
+      became.instance_variable_set(:@errors, new_errors)
       became.instance_variable_set(:@new_record, new_record?)
       became.instance_variable_set(:@destroyed, destroyed?)
       became.changed_attributes["_type"] = self.class.to_s

data/lib/mongoid/interceptable.rb

@@ -234,9 +234,11 @@ module Mongoid
     #   document.halted_callback_hook(filter)
     #
     # @param [ Symbol ] filter The callback that halted.
+    # @param [ Symbol ] name The name of the callback that was halted
+    #   (requires Rails 6.1+)
     #
     # @since 3.0.3
-    def halted_callback_hook(filter)
+    def halted_callback_hook(filter, name = nil)
       @before_callback_halted = true
     end
 

data/lib/mongoid/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 module Mongoid
-  VERSION = "7.1.6"
+  VERSION = "7.1.7"
 end

data/spec/app/models/customer.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Customer
+  include Mongoid::Document
+
+  field :name
+
+  embeds_one :home_address, class_name: 'CustomerAddress', as: :addressable
+  embeds_one :work_address, class_name: 'CustomerAddress', as: :addressable
+end

data/spec/app/models/customer_address.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class CustomerAddress
+  include Mongoid::Document
+
+  field :street, type: String
+  field :city, type: String
+  field :state, type: String
+
+  embedded_in :addressable, polymorphic: true
+end

data/spec/app/models/dictionary.rb

@@ -6,7 +6,13 @@ class Dictionary
   field :name, type: String
   field :publisher, type: String
   field :year, type: Integer
+
+  # This field must be a Time
   field :published, type: Time
+
+  # This field must be a Date
+  field :submitted_on, type: Date
+
   field :description, type: String, localize: true
   field :l, type: String, as: :language
   has_many :words, validate: false

data/spec/integration/app_spec.rb

@@ -150,7 +150,7 @@ describe 'Mongoid application tests' do
                 end
                 index.should be nil
 
-                ChildProcessHelper.check_call(%w(rake db:mongoid:create_indexes),
+                ChildProcessHelper.check_call(%w(bundle exec rake db:mongoid:create_indexes),
                   cwd: APP_PATH, env: env)
 
                 index = client['posts'].indexes.detect do |index|
@@ -181,11 +181,44 @@ describe 'Mongoid application tests' do
     end
   end
 
+  def parse_mongodb_uri(uri)
+    pre, query = uri.split('?', 2)
+    if pre =~ %r,\A(mongodb(?:.*?))://([^/]+)(?:/(.*))?\z,
+      protocol = $1
+      hosts = $2
+      database = $3
+      if database == ''
+        database = nil
+      end
+    else
+      raise ArgumentError, "Invalid MongoDB URI: #{uri}"
+    end
+    if query == ''
+      query = nil
+    end
+    {
+      protocol: protocol,
+      hosts: hosts,
+      database: database,
+      query: query,
+    }
+  end
+
+  def build_mongodb_uri(parts)
+    "#{parts.fetch(:protocol)}://#{parts.fetch(:hosts)}/#{parts[:database]}?#{parts[:query]}"
+  end
+
   def write_mongoid_yml
+    # HACK: the driver does not provide a MongoDB URI parser and assembler,
+    # and the Ruby standard library URI module doesn't handle multiple hosts.
+    parts = parse_mongodb_uri(SpecConfig.instance.uri_str)
+    parts[:database] = 'mongoid_test'
+    uri = build_mongodb_uri(parts)
+    p uri
     env_config = {'clients' => {'default' => {
       # TODO massive hack, will fail if uri specifies a database name or
       # any uri options
-      'uri' => "#{SpecConfig.instance.uri_str}/mongoid_test",
+      'uri' => uri,
     }}}
     config = {'development' => env_config, 'production' => env_config}
     File.open('config/mongoid.yml', 'w') do |f|

data/spec/integration/callbacks_models.rb

@@ -0,0 +1,49 @@
+class Galaxy
+  include Mongoid::Document
+
+  field :age, type: Integer
+
+  before_validation :set_age
+
+  embeds_many :stars
+
+  private
+
+  def set_age
+    self.age ||= 100_000
+  end
+end
+
+class Star
+  include Mongoid::Document
+
+  embedded_in :galaxy
+
+  field :age, type: Integer
+
+  before_validation :set_age
+
+  embeds_many :planets
+
+  private
+
+  def set_age
+    self.age ||= 42_000
+  end
+end
+
+class Planet
+  include Mongoid::Document
+
+  embedded_in :star
+
+  field :age, type: Integer
+
+  before_validation :set_age
+
+  private
+
+  def set_age
+    self.age ||= 2_000
+  end
+end

data/spec/integration/callbacks_spec.rb

@@ -0,0 +1,216 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+require_relative './callbacks_models'
+
+describe 'callbacks integration tests' do
+  context 'when modifying attributes in a callback' do
+
+    context 'when creating top-level document' do
+      context 'top level document' do
+        let(:instance) do
+          Galaxy.create!
+        end
+
+        it 'writes the attribute value into the model' do
+          instance.age.should == 100_000
+        end
+
+        it 'persists the attribute value' do
+          Galaxy.find(instance.id).age.should == 100_000
+        end
+      end
+
+      context 'embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.age.should == 42_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.age.should == 42_000
+          end
+        end
+
+        context 'set as a document instance' do
+          let(:instance) do
+            Galaxy.create!(stars: [Star.new])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          let(:instance) do
+            Galaxy.create!(stars: [{}])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+
+      context 'nested embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.planets.first.age.should == 2_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.planets.first.age.should == 2_000
+          end
+        end
+
+        context 'set as a document instance' do
+          let(:instance) do
+            Galaxy.create!(stars: [Star.new(
+              planets: [Planet.new],
+            )])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          let(:instance) do
+            Galaxy.create!(stars: [
+              planets: [{}],
+            ])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+    end
+
+    context 'when updating top-level document via #save' do
+      let!(:instance) do
+        Galaxy.create!
+      end
+
+      context 'embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.age.should == 42_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.age.should == 42_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.stars = [Star.new]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.stars = [{}]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+
+      context 'nested embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.planets.first.age.should == 2_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.planets.first.age.should == 2_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.stars = [Star.new(planets: [Planet.new])]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.stars = [planets: [{}]]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+    end
+
+    context 'when updating top-level document via #update_attributes' do
+      let!(:instance) do
+        Galaxy.create!
+      end
+
+      context 'embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.age.should == 42_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.age.should == 42_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.update_attributes(stars: [Star.new])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.update_attributes(stars: [{}])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+
+      context 'nested embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.planets.first.age.should == 2_000
+          end
+
+          it 'persists the attribute value' do
+            pending 'MONGOID-4476'
+
+            Galaxy.find(instance.id).stars.first.planets.first.age.should == 2_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.update_attributes(stars: [Star.new(planets: [Planet.new])])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.update_attributes(stars: [planets: [{}]])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+    end
+  end
+end

data/spec/lite_spec_helper.rb

@@ -50,7 +50,7 @@ RSpec.configure do |config|
     config.add_formatter(RSpec::Core::Formatters::JsonFormatter, File.join(File.dirname(__FILE__), '../tmp/rspec.json'))
   end
 
-  if SpecConfig.instance.ci?
+  if SpecConfig.instance.ci? && !%w(1 true yes).include?(ENV['INTERACTIVE']&.downcase)
     timeout = if SpecConfig.instance.app_tests?
       # Allow 5 minutes per test for the app tests, since they install
       # gems for Rails applications which can take a long time.

data/spec/mongoid/association/embedded/embedded_in/proxy_spec.rb

@@ -507,4 +507,54 @@ describe Mongoid::Association::Embedded::EmbeddedIn::Proxy do
       end
     end
   end
+
+  context "when the same class is embedded multiple times" do
+
+    let(:customer) do
+      Customer.new
+    end
+
+    context "assignment after saving" do
+
+      it "correctly sets the association for the embedded class" do
+        pending 'MONGOID-5039'
+
+        customer.home_address = CustomerAddress.new
+        customer.work_address = CustomerAddress.new
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+
+        customer.save!
+
+        customer.home_address = CustomerAddress.new
+        customer.work_address = CustomerAddress.new
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+      end
+    end
+
+    context "inverse assignment" do
+
+      it "correctly sets the association for the embedded class" do
+        pending 'MONGOID-5039'
+
+        customer.work_address = CustomerAddress.new
+        customer.work_address.addressable = customer
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+      end
+    end
+  end
 end