mongoid 9.0.0 → 9.0.1

data/spec/mongoid/interceptable_spec.rb

@@ -2594,4 +2594,35 @@ describe Mongoid::Interceptable do
       end
     end
   end
+
+  context "when around callbacks for embedded children are enabled" do
+    config_override :around_callbacks_for_embeds, true
+
+    context "when around callback is defined without a yield" do
+      class Mother
+        include Mongoid::Document
+        embeds_many :daughters, cascade_callbacks: true
+      end
+
+      class Daughter
+        include Mongoid::Document
+        embedded_in :mother
+        around_save :log_callback
+
+        private
+
+        def log_callback
+          logger.debug('callback invoked')
+        end
+      end
+
+      let(:mom) { Mother.create(daughters: [ Daughter.new, Daughter.new ]) }
+
+      it "raises an InvalidAroundCallback error" do
+        expect do
+          mom.save
+        end.to raise_error(Mongoid::Errors::InvalidAroundCallback)
+      end
+    end
+  end
 end

data/spec/mongoid/scopable_spec.rb

@@ -3,6 +3,19 @@
 
 require "spec_helper"
 
+# Retrieve the singleton class for the given class.
+def singleton_class_for(klass)
+  class <<klass; self; end
+end
+
+# Helper method for removing a declared scope
+def remove_scope(klass, scope)
+  if klass._declared_scopes[scope]
+    singleton_class_for(klass).remove_method(scope)
+    klass._declared_scopes.delete(scope)
+  end
+end
+
 describe Mongoid::Scopable do
 
   describe ".default_scope" do
@@ -349,6 +362,10 @@ describe Mongoid::Scopable do
           Band.create!(name: 'testing')
         end
 
+        after do
+          remove_scope(Band, :tests)
+        end
+
         it 'applies the collation' do
           expect(Band.tests.first['name']).to eq('testing')
         end
@@ -365,10 +382,7 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Band
-            undef_method :active
-          end
-          Band._declared_scopes.clear
+          remove_scope(Band, :active)
         end
 
         let(:scope) do
@@ -390,10 +404,7 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Record
-            undef_method :tool
-          end
-          Record._declared_scopes.clear
+          remove_scope(Record, :tool)
         end
 
         context "when calling the scope" do
@@ -423,10 +434,7 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Band
-            undef_method :active
-          end
-          Band._declared_scopes.clear
+          remove_scope(Band, :active)
         end
 
         it "adds a method for the scope" do
@@ -461,10 +469,7 @@ describe Mongoid::Scopable do
             end
 
             after do
-              class << Band
-                undef_method :english
-              end
-              Band._declared_scopes.clear
+              remove_scope(Band, :english)
             end
 
             let(:scope) do
@@ -527,10 +532,7 @@ describe Mongoid::Scopable do
           config_override :scope_overwrite_exception, true
 
           after do
-            class << Band
-              undef_method :active
-            end
-            Band._declared_scopes.clear
+            remove_scope(Band, :active)
           end
 
           it "raises an exception" do
@@ -545,10 +547,7 @@ describe Mongoid::Scopable do
           config_override :scope_overwrite_exception, false
 
           after do
-            class << Band
-              undef_method :active
-            end
-            Band._declared_scopes.clear
+            remove_scope(Band, :active)
           end
 
           it "raises no exception" do
@@ -589,10 +588,7 @@ describe Mongoid::Scopable do
           end
 
           after do
-            class << Band
-              undef_method :active
-            end
-            Band._declared_scopes.clear
+            remove_scope(Band, :active)
           end
 
           let(:scope) do
@@ -652,11 +648,8 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Band
-            undef_method :active
-            undef_method :named_by
-          end
-          Band._declared_scopes.clear
+          remove_scope(Band, :active)
+          remove_scope(Band, :named_by)
         end
 
         it "adds a method for the scope" do
@@ -698,10 +691,7 @@ describe Mongoid::Scopable do
             end
 
             after do
-              class << Band
-                undef_method :english
-              end
-              Band._declared_scopes.clear
+              remove_scope(Band, :english)
             end
 
             let(:scope) do
@@ -775,15 +765,9 @@ describe Mongoid::Scopable do
             end
 
             after do
-              class << Article
-                undef_method :is_public
-                undef_method :authored
-              end
-              Article._declared_scopes.clear
-              class << Author
-                undef_method :author
-              end
-              Author._declared_scopes.clear
+              remove_scope(Article, :is_public)
+              remove_scope(Article, :authored)
+              remove_scope(Author, :author)
             end
 
             context "when calling another model's scope from within a scope" do
@@ -816,10 +800,7 @@ describe Mongoid::Scopable do
           config_override :scope_overwrite_exception, true
 
           after do
-            class << Band
-              undef_method :active
-            end
-            Band._declared_scopes.clear
+            remove_scope(Band, :active)
           end
 
           it "raises an exception" do
@@ -834,10 +815,7 @@ describe Mongoid::Scopable do
           config_override :scope_overwrite_exception, false
 
           after do
-            class << Band
-              undef_method :active
-            end
-            Band._declared_scopes.clear
+            remove_scope(Band, :active)
           end
 
           it "raises no exception" do
@@ -867,11 +845,8 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Band
-            undef_method :xxx
-            undef_method :yyy
-          end
-          Band._declared_scopes.clear
+          remove_scope(Band, :xxx)
+          remove_scope(Band, :yyy)
         end
 
         let(:criteria) do
@@ -901,15 +876,8 @@ describe Mongoid::Scopable do
       end
 
       after do
-        class << Shape
-          undef_method :located_at
-        end
-        Shape._declared_scopes.clear
-
-        class << Circle
-          undef_method :with_radius
-        end
-        Circle._declared_scopes.clear
+        remove_scope(Shape, :located_at)
+        remove_scope(Circle, :with_radius)
       end
 
       let(:shape_scope_keys) do
@@ -950,16 +918,9 @@ describe Mongoid::Scopable do
       end
 
       after do
-        class << Shape
-          undef_method :visible
-          undef_method :large
-        end
-        Shape._declared_scopes.clear
-
-        class << Circle
-          undef_method :large
-        end
-        Circle._declared_scopes.clear
+        remove_scope(Shape, :visible)
+        remove_scope(Shape, :large)
+        remove_scope(Circle, :large)
       end
 
       it "uses subclass context for all the other used scopes" do
@@ -1099,9 +1060,7 @@ describe Mongoid::Scopable do
           end
 
           after do
-            class << Band
-              undef_method :active
-            end
+            remove_scope(Band, :active)
           end
 
           let(:unscoped) do
@@ -1143,10 +1102,7 @@ describe Mongoid::Scopable do
         end
 
         after do
-          class << Band
-            undef_method :skipped
-          end
-          Band._declared_scopes.clear
+          remove_scope(Band, :skipped)
         end
 
         it "does not allow the default scope to be applied" do
@@ -1290,4 +1246,51 @@ describe Mongoid::Scopable do
       end
     end
   end
+
+  describe "scoped queries" do
+    context "with a default scope" do
+      let(:criteria) do
+        Band.where(name: "Depeche Mode")
+      end
+
+      before do
+        Band.default_scope ->{ criteria }
+        Band.scope :unscoped_everyone, -> { unscoped }
+        Band.scope :removed_default, -> { scoped.remove_scoping(all) }
+
+        Band.create name: 'Depeche Mode'
+        Band.create name: 'They Might Be Giants'
+      end
+
+      after do
+        Band.default_scoping = nil
+        remove_scope Band, :unscoped_everyone
+        remove_scope Band, :removed_default
+      end
+
+      context "when allow_scopes_to_unset_default_scope == false" do # default for <= 9
+        config_override :allow_scopes_to_unset_default_scope, false
+
+        it 'merges the default scope into the query with unscoped' do
+          expect(Band.unscoped_everyone.selector).to include('name' => 'Depeche Mode')
+        end
+
+        it 'merges the default scope into the query with remove_scoping' do
+          expect(Band.removed_default.selector).to include('name' => 'Depeche Mode')
+        end
+      end
+
+      context "when allow_scopes_to_unset_default_scope == true" do # default for >= 10
+        config_override :allow_scopes_to_unset_default_scope, true
+
+        it 'does not merge the default scope into the query with unscoped' do
+          expect(Band.unscoped_everyone.selector).not_to include('name' => 'Depeche Mode')
+        end
+
+        it 'does not merge merges the default scope into the query with remove_scoping' do
+          expect(Band.removed_default.selector).not_to include('name' => 'Depeche Mode')
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/touchable_spec.rb

@@ -733,6 +733,81 @@ describe Mongoid::Touchable do
       end
     end
 
+    context "when a custom field is specified" do
+
+      shared_examples "updates the child's updated_at" do
+
+        let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }
+
+        let(:update_time) { Timecop.freeze(Time.at(Time.now.to_i) + 2) }
+
+        after do
+          Timecop.return
+        end
+
+        let!(:label) do
+          TouchableSpec::Referenced::Label.create!
+        end
+
+        let(:band) do
+          TouchableSpec::Referenced::Band.create!(label: label)
+        end
+
+        before do
+          update_time
+          band.send(meth)
+        end
+
+        it "updates the child's timestamp" do
+          expect(band.updated_at).to eq(update_time)
+          expect(band.reload.updated_at).to eq(update_time)
+        end
+      end
+
+      shared_examples "updates the parent's custom field and updated_at" do
+
+        let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }
+
+        let(:update_time) { Timecop.freeze(Time.at(Time.now.to_i) + 2) }
+
+        after do
+          Timecop.return
+        end
+
+        let!(:label) do
+          TouchableSpec::Referenced::Label.create!
+        end
+
+        let!(:band) do
+          TouchableSpec::Referenced::Band.create!(label: label)
+        end
+
+        before do
+          update_time
+          band.send(meth)
+        end
+
+        it "updates the parent's custom field" do
+          expect(label.bands_updated_at).to eq(update_time)
+          expect(label.reload.bands_updated_at).to eq(update_time)
+        end
+
+        it "updates the parent's timestamp" do
+          expect(label.updated_at).to eq(update_time)
+          expect(label.reload.updated_at).to eq(update_time)
+        end
+
+      end
+
+      [:save, :destroy, :touch].each do |meth|
+        context "with #{meth} on referenced associations" do
+          let(:meth) { meth }
+          include_examples "updates the child's updated_at" unless meth == :destroy
+          include_examples "updates the parent's custom field and updated_at"
+        end
+      end
+    end
+
     context 'multi-level' do
 
       let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }

data/spec/mongoid/touchable_spec_models.rb

@@ -150,5 +150,21 @@ module TouchableSpec
 
       embedded_in :floor, touch: true, class_name: "TouchableSpec::Referenced::Floor"
     end
+
+    class Label
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      field :bands_updated_at, type: DateTime
+      has_many :bands, class_name: "TouchableSpec::Referenced::Band"
+    end
+    
+    class Band
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      belongs_to :label, touch: :bands_updated_at, class_name: "TouchableSpec::Referenced::Label"
+    end
+    
   end
 end

data/spec/support/models/band.rb

@@ -26,6 +26,7 @@ class Band
   field :mojo, type: Object
   field :tags, type: Hash
   field :fans
+  field :location, type: LatLng
 
   alias_attribute :d, :deleted
 

data/spec/support/models/lat_lng.rb

@@ -5,6 +5,8 @@ class LatLng
   attr_accessor :lat, :lng
 
   def self.demongoize(object)
+    return if object.nil?
+
     LatLng.new(object[1], object[0])
   end
 
@@ -15,4 +17,8 @@ class LatLng
   def mongoize
     [ lng, lat ]
   end
+
+  def ==(other)
+    lat == other.lat && lng == other.lng
+  end
 end

metadata

@@ -1,41 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.0.1
 platform: ruby
 authors:
 - The MongoDB Ruby Team
-autorequire:
+autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEeDCCAuCgAwIBAgIBATANBgkqhkiG9w0BAQsFADBBMREwDwYDVQQDDAhkYngt
-  cnVieTEXMBUGCgmSJomT8ixkARkWB21vbmdvZGIxEzARBgoJkiaJk/IsZAEZFgNj
-  b20wHhcNMjQwMjA5MTc0NzIyWhcNMjUwMjA4MTc0NzIyWjBBMREwDwYDVQQDDAhk
-  YngtcnVieTEXMBUGCgmSJomT8ixkARkWB21vbmdvZGIxEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC0/Veq9l47cTfX
-  tQ+kHq2NOCwJuJGt1iXWQ/vH/yp7pZ/bLej7gPDl2CfIngAXRjM7r1FkR9ya7VAm
-  IneBFcVU3HhpIXWi4ByXGjBOXFD1Dfbz4C4zedIWRk/hNzXa+rQY4KPwpOwG/hZg
-  id+rSXWSbNlkyN97XfonweVh7JsIa9X/2JY9ADYjhCfEZF+b0+Wl7+jgwzLWb46I
-  0WH0bZBIZ0BbKAwUXIgvq5mQf9PzukmMVYCwnkJ/P4wrHO22HuwnbMyvJuGjVwqi
-  j1NRp/2vjmKBFWxIfhlSXEIiqAmeEVNXzhPvTVeyo+rma+7R3Bo+4WHkcnPpXJJZ
-  Jd63qXMvTB0GplEcMJPztWhrJOmcxIOVoQyigEPSQT8JpzFVXby4SGioizv2eT7l
-  VYSiCHuc3yEDyq5M+98WGX2etbj6esYtzI3rDevpIAHPB6HQmtoJIA4dSl3gjFb+
-  D+YQSuB2qYu021FI9zeY9sbZyWysEXBxhwrmTk+XUV0qz+OQZkMCAwEAAaN7MHkw
-  CQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFH4nnr4tYlatU57RbExW
-  jG86YM5nMB8GA1UdEQQYMBaBFGRieC1ydWJ5QG1vbmdvZGIuY29tMB8GA1UdEgQY
-  MBaBFGRieC1ydWJ5QG1vbmdvZGIuY29tMA0GCSqGSIb3DQEBCwUAA4IBgQBKGtHA
-  fpi3N/BL1J5O4CBsAjtF4jHDiw2r5MwK+66NzMh3uedjgPI7MoosemLy++SB+8BR
-  SE8bDkb6gfDQQzrI6KSXXyqH2TbQXpY5Tac7/yqXRiu8G2qOrOj4czB/Hq7j09CV
-  YoH88v6hL11i5jt6jPjFh8hXYG0hDQxhi3atRz5Wwd98tUf2DSbyJXJiRgCBeZjl
-  rP7AnKsWMu0C+zPlL+nXtQr+nTFtkKXRWfUJMqePpBqtriQvgQ+Y1ItqYVTSLuiM
-  iwUMcn/rGhdCMBSaKDXdFkIveCHQE2f2WBo2EdErrcTrgEKYYdNfzcb/43j7L1kx
-  AUwyTtk+HFrviBynQbKN82rjbZE+5gukVea5c7idQPkqacPYsoU37DI+hTlUyJkV
-  dcTtfEg44lLlfNukBslfiQf54r+uWbyB0m0rDUN/py7/Ghyzt5GLBU91uCO3dGoI
-  55uFRHMvEcJMTDeImC/nuucPCAiEGMHggr9+NPC0tqpxjGKTo7lS7GzUFjg=
-  -----END CERTIFICATE-----
-date: 2024-05-01 00:00:00.000000000 Z
+cert_chain: []
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -305,6 +278,7 @@ files:
 - lib/mongoid/errors/empty_config_file.rb
 - lib/mongoid/errors/immutable_attribute.rb
 - lib/mongoid/errors/in_memory_collation_not_supported.rb
+- lib/mongoid/errors/invalid_around_callback.rb
 - lib/mongoid/errors/invalid_async_query_executor.rb
 - lib/mongoid/errors/invalid_auto_encryption_configuration.rb
 - lib/mongoid/errors/invalid_collection.rb
@@ -912,29 +886,6 @@ files:
 - spec/mongoid_spec.rb
 - spec/rails/controller_extension/controller_runtime_spec.rb
 - spec/rails/mongoid_spec.rb
-- spec/shared/LICENSE
-- spec/shared/bin/get-mongodb-download-url
-- spec/shared/bin/s3-copy
-- spec/shared/bin/s3-upload
-- spec/shared/lib/mrss/child_process_helper.rb
-- spec/shared/lib/mrss/cluster_config.rb
-- spec/shared/lib/mrss/constraints.rb
-- spec/shared/lib/mrss/docker_runner.rb
-- spec/shared/lib/mrss/eg_config_utils.rb
-- spec/shared/lib/mrss/event_subscriber.rb
-- spec/shared/lib/mrss/lite_constraints.rb
-- spec/shared/lib/mrss/server_version_registry.rb
-- spec/shared/lib/mrss/session_registry.rb
-- spec/shared/lib/mrss/session_registry_legacy.rb
-- spec/shared/lib/mrss/spec_organizer.rb
-- spec/shared/lib/mrss/utils.rb
-- spec/shared/share/Dockerfile.erb
-- spec/shared/share/haproxy-1.conf
-- spec/shared/share/haproxy-2.conf
-- spec/shared/shlib/config.sh
-- spec/shared/shlib/distro.sh
-- spec/shared/shlib/server.sh
-- spec/shared/shlib/set_env.sh
 - spec/spec_helper.rb
 - spec/support/authorization.rb
 - spec/support/client_registry.rb
@@ -1229,7 +1180,7 @@ metadata:
   documentation_uri: https://www.mongodb.com/docs/mongoid/
   homepage_uri: https://mongoid.org/
   source_code_uri: https://github.com/mongodb/mongoid
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1244,8 +1195,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.3.15
-signing_key:
+rubygems_version: 3.4.19
+signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.
 test_files:
@@ -1655,29 +1606,6 @@ test_files:
 - spec/mongoid_spec.rb
 - spec/rails/controller_extension/controller_runtime_spec.rb
 - spec/rails/mongoid_spec.rb
-- spec/shared/LICENSE
-- spec/shared/bin/get-mongodb-download-url
-- spec/shared/bin/s3-copy
-- spec/shared/bin/s3-upload
-- spec/shared/lib/mrss/child_process_helper.rb
-- spec/shared/lib/mrss/cluster_config.rb
-- spec/shared/lib/mrss/constraints.rb
-- spec/shared/lib/mrss/docker_runner.rb
-- spec/shared/lib/mrss/eg_config_utils.rb
-- spec/shared/lib/mrss/event_subscriber.rb
-- spec/shared/lib/mrss/lite_constraints.rb
-- spec/shared/lib/mrss/server_version_registry.rb
-- spec/shared/lib/mrss/session_registry.rb
-- spec/shared/lib/mrss/session_registry_legacy.rb
-- spec/shared/lib/mrss/spec_organizer.rb
-- spec/shared/lib/mrss/utils.rb
-- spec/shared/share/Dockerfile.erb
-- spec/shared/share/haproxy-1.conf
-- spec/shared/share/haproxy-2.conf
-- spec/shared/shlib/config.sh
-- spec/shared/shlib/distro.sh
-- spec/shared/shlib/server.sh
-- spec/shared/shlib/set_env.sh
 - spec/spec_helper.rb
 - spec/support/authorization.rb
 - spec/support/client_registry.rb

checksums.yaml.gz.sig

@@ -1 +0,0 @@
-:6����K�ZP�����恦��gO��h3yL���yٍA=��Pve�����T����HߺL�*�m(F!t1�]����\

data/spec/shared/LICENSE

@@ -1,20 +0,0 @@
-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

@@ -1,17 +0,0 @@
-#!/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

data/spec/shared/bin/s3-copy

@@ -1,45 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require 'aws-sdk-s3'
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: s3-copy options"
-
-  opts.on("-r", "--region=REGION", "AWS region to use (default us-east-1)") do |v|
-    options[:region] = v
-  end
-
-  opts.on("-p", "--param=KEY=VALUE", "Specify parameter for new files") do |v|
-    options[:params] ||= {}
-    k, v = v.split('=', 2)
-    options[:params][k.to_sym] = v
-  end
-
-  opts.on("-f", "--from=BUCKET:PATH", "Bucket name and key (or path) to copy from") do |v|
-    options[:from] = v
-  end
-
-  opts.on("-t", "--to=BUCKET:PATH", "Bucket name and key (or path) to write to (may be specified more than once)") do |v|
-    options[:to] ||= []
-    options[:to] << v
-  end
-end.parse!
-
-ENV['AWS_REGION'] ||= options[:region] || 'us-east-1'
-
-bucket, key = options.fetch(:from).split(':', 2)
-
-s3 = Aws::S3::Client.new
-
-options.fetch(:to).each do |dest|
-  STDERR.puts "Copying to #{dest}"
-  dbucket, dkey = dest.split(':', 2)
-  s3.copy_object(
-    bucket: dbucket,
-    key: dkey,
-    copy_source: "/#{bucket}/#{key}",
-    **options[:params] || {},
-  )
-end