mongoid 8.0.9 → 8.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49662a14c4c7135e3403cab365f7e46928baf2efca9ede4e673269d39c5a7292
-  data.tar.gz: a69c22af01dbba7be588e2b4a9a63a1f58323ddd3395771969652323b2d7ecaf
+  metadata.gz: 78040726b40c1709f9218bc28850b802cf5aedfbdd178c2ed90322ffb16ba0ee
+  data.tar.gz: 438d1fee26567d71150518c5df2f764d6671c49ea6cc02c0582a7cd15e80fd7a
 SHA512:
-  metadata.gz: cdde64cee0c2f085b6f250aae4e0f31340a9b79d04177e69f9c287170d8bb2eaba435873d680f77181587624244c1ba5885eff2d3964f3ebbe5f0924a70b1347
-  data.tar.gz: 2d065d480c992dc3a2e772b7c33a0b50805d981c4f150f06b93f0ad9c89fd6b9c138c64354f8353c1a9849d9ddef45eae382bfc3ca1e4bb6aead94e60c5e6324
+  metadata.gz: 8420a185b4baf6c1183ff188bc16f5d79fc75f44f1784c37df163836b70939250efbefceaeb53269a9d97f0b7bc9ae997a6586306223bea424db8738a3f2513e
+  data.tar.gz: 1f8dc137d3de2c5bc6ff676f8330471e4a792fe259839e6edec6107e145fd3b81bd4013df64e4b2410a62793ce2d35855069672a4a8784cf2de076f3ac4fda61

data/Rakefile

@@ -10,16 +10,16 @@ $: << File.join(ROOT, 'spec/shared/lib')
 require "rake"
 require "rspec/core/rake_task"
 
-# stands in for the Bundler-provided `build` task, which builds the
-# gem for this project. Our release process builds the gems in a
-# particular way, in a GitHub action. This task is just to help remind
-# developers of that fact.
+if File.exist?('./spec/shared/lib/tasks/candidate.rake')
+  load 'spec/shared/lib/tasks/candidate.rake'
+end
+
+desc 'Build the gem'
 task :build do
-  abort <<~WARNING
-    `rake build` does nothing in this project. The gem must be built via
-    the `Mongoid Release` action on GitHub, which is triggered manually when
-    a new release is ready.
-  WARNING
+  command = %w[ gem build ]
+  command << "--output=#{ENV['GEM_FILE_NAME']}" if ENV['GEM_FILE_NAME']
+  command << (ENV['GEMSPEC'] || 'mongoid.gemspec')
+  system(*command)
 end
 
 # `rake version` is used by the deployment system so get the release version

data/lib/mongoid/association/embedded/embeds_one/proxy.rb

@@ -32,8 +32,8 @@ module Mongoid
               bind_one
               characterize_one(_target)
               update_attributes_hash(_target)
-              _base._reset_memoized_descendants!
               _target.save if persistable?
+              _base._reset_memoized_descendants!
             end
           end
 

data/lib/mongoid/association/referenced/has_many/enumerable.rb

@@ -422,11 +422,28 @@ module Mongoid
           #
           # @return [ Integer ] The size of the enumerable.
           def size
-            count = (_unloaded ? _unloaded.count : _loaded.count)
-            if count.zero?
-              count + _added.count
+            # If _unloaded is present, then it will match the set of documents
+            # that belong to this association, which have already been persisted
+            # to the database. This set of documents must be considered when
+            # computing the size of the association, along with anything that has
+            # since been added.
+            if _unloaded
+              if _added.any?
+                # Note that _added may include records that _unloaded already
+                # matches. This is the case if the association is assigned an array
+                # of items and some of them were already elements of the association.
+                #
+                # we need to thus make sure _unloaded.count excludes any elements
+                # that already exist in _added.
+
+                count = _unloaded.not(:_id.in => _added.values.map(&:id)).count
+                count + _added.values.count
+              else
+                _unloaded.count
+              end
+
             else
-              count + _added.values.count { |d| d.new_record? }
+              _loaded.count + _added.count
             end
           end
 

data/lib/mongoid/validatable/associated.rb

@@ -73,7 +73,7 @@ module Mongoid
           # use map.all? instead of just all?, because all? will do short-circuit
           # evaluation and terminate on the first failed validation.
           list.map do |value|
-            if value && !value.flagged_for_destroy?
+            if value && !value.flagged_for_destroy? && (!value.persisted? || value.changed?)
               value.validated? ? true : value.valid?
             else
               true

data/lib/mongoid/validatable/macros.rb

@@ -84,6 +84,21 @@ module Mongoid
       def validates_presence_of(*args)
         validates_with(PresenceValidator, _merge_attributes(args))
       end
+
+      # Validates whether or not a field contains a numeric value.
+      #
+      # @example
+      #   class Person
+      #     include Mongoid::Document
+      #     field :cost
+      #
+      #     validates_numericality_of :cost
+      #   end
+      #
+      # @param [ Object... ] *args The names of the field(s) to validate.
+      def validates_numericality_of(*args)
+        validates_with(NumericalityValidator, _merge_attributes(args))
+      end
     end
   end
 end

data/lib/mongoid/validatable/numericality.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Mongoid
+  module Validatable
+    # A specialization of the ActiveModel numericality validator, which adds
+    # logic to recognize and accept BSON::Decimal128 as a number.
+    class NumericalityValidator < ActiveModel::Validations::NumericalityValidator
+      private
+
+      # Ensure that BSON::Decimal128 is treated as a BigDecimal during the
+      # validation step.
+      def prepare_value_for_validation(value, record, attr_name)
+        result = super
+
+        result.is_a?(BSON::Decimal128) ? result.to_big_decimal : result
+      end
+    end
+  end
+end

data/lib/mongoid/validatable.rb

@@ -5,6 +5,7 @@ require "mongoid/validatable/localizable"
 require "mongoid/validatable/associated"
 require "mongoid/validatable/format"
 require "mongoid/validatable/length"
+require "mongoid/validatable/numericality"
 require "mongoid/validatable/queryable"
 require "mongoid/validatable/presence"
 require "mongoid/validatable/uniqueness"

data/lib/mongoid/version.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
 module Mongoid
-  VERSION = "8.0.9"
+  # The current version of Mongoid
+  #
+  # Note that this file is automatically updated via `rake candidate:create`.
+  # Manual changes to this file will be overwritten by that rake task.
+  VERSION = '8.0.11'
 end

data/spec/integration/app_spec.rb

@@ -16,6 +16,10 @@ describe 'Mongoid application tests' do
       skip 'Set APP_TESTS=1 in environment to run application tests'
     end
 
+    if SpecConfig.instance.rails_version < '7.1'
+      skip 'App tests require Rails > 7.0 (see https://stackoverflow.com/questions/79360526)'
+    end
+
     require 'fileutils'
     require 'mrss/child_process_helper'
     require 'open-uri'
@@ -87,6 +91,12 @@ describe 'Mongoid application tests' do
   end
 
   context 'new application - rails' do
+    before(:all) do
+      if SpecConfig.instance.rails_version < '7.1'
+        skip '`rails new` with rails < 7.1 fails because modern concurrent-ruby removed logger dependency'
+      end
+    end
+
     it 'creates' do
       install_rails
 

data/spec/integration/associations/embeds_one_spec.rb

@@ -3,8 +3,7 @@
 require 'spec_helper'
 
 describe 'embeds_one associations' do
-
-  context 're-associating the same object' do
+  context 'when re-associating the same object' do
     context 'with dependent: destroy' do
       let(:canvas) do
         Canvas.create!(palette: Palette.new)
@@ -16,7 +15,7 @@ describe 'embeds_one associations' do
         canvas.palette = canvas.palette
         canvas.save!
         canvas.reload
-        canvas.palette.should == palette
+        expect(canvas.palette).to eq palette
       end
     end
   end
@@ -30,12 +29,33 @@ describe 'embeds_one associations' do
     end
 
     it 'loads the association correctly' do
-      expect { klass }.to_not raise_error
-      expect { klass.new.address }.to_not raise_error
+      expect { klass }.not_to raise_error
+      expect { klass.new.address }.not_to raise_error
       instance = klass.new
       address = Address.new
       instance.address = address
       expect(instance.address).to eq address
     end
   end
+
+  context 'when parent is persisted' do
+    let!(:person) do
+      Person.create!
+    end
+
+    context 'when assigning the new child' do
+      context 'when assigning an attribute to the child' do
+        before do
+          # person.reload
+          person.name = Name.new
+          person.name.first_name = 'Dmitry'
+          person.save!
+        end
+
+        it 'persists the child' do
+          expect(person.reload.name.first_name).to eq 'Dmitry'
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/association/referenced/has_and_belongs_to_many/proxy_spec.rb

@@ -1757,43 +1757,6 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
       end
     end
 
-    describe "#any?" do
-
-      let(:person) do
-        Person.create!
-      end
-
-      context "when nothing exists on the relation" do
-
-        context "when no document is added" do
-
-          let!(:sandwich) do
-            Sandwich.create!
-          end
-
-          it "returns false" do
-            expect(sandwich.meats.any?).to be false
-          end
-        end
-
-        context "when the document is destroyed" do
-
-          before do
-            Meat.create!
-          end
-
-          let!(:sandwich) do
-            Sandwich.create!
-          end
-
-          it "returns false" do
-            sandwich.destroy
-            expect(sandwich.meats.any?).to be false
-          end
-        end
-      end
-    end
-
     context "when documents have been persisted" do
 
       let!(:preference) do
@@ -3063,6 +3026,34 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
         end
       end
 
+      # MONGOID-5844
+      #
+      # Specifically, this tests the case where the association is
+      # initialized with a single element (so that Proxy#push does not take
+      # the `concat` route), which causes `reset_unloaded` to be called, which
+      # sets the `_unloaded` Criteria object to match only the specific element
+      # that was given.
+      #
+      # The issue now is that when the events list is updated to be both events,
+      # _unloaded matches one of them already, and the other has previously been
+      # persisted so `new_record?` won't match it. We need to make sure the
+      # `#size` logic properly accounts for this case.
+      context 'when documents have been previously persisted' do
+        let(:person1) { Person.create! }
+        let(:person2) { Person.create! }
+        let(:event1) { Event.create!(administrators: [ person1 ]) }
+        let(:event2) { Event.create!(administrators: [ person2 ]) }
+
+        before do
+          person1.administrated_events = [ event1, event2 ]
+        end
+
+        it 'returns the number of associated documents [MONGOID-5844]' do
+          expect(person1.administrated_events.to_a.size).to eq(2)
+          expect(person1.administrated_events.size).to eq(2)
+        end
+      end
+
       context "when documents have not been persisted" do
 
         before do

data/spec/mongoid/association_spec.rb

@@ -100,66 +100,6 @@ describe Mongoid::Association do
         expect(name).to_not be_an_embedded_many
       end
     end
-
-    context "when validation depends on association" do
-      before(:all) do
-        class Author
-          include Mongoid::Document
-          embeds_many :books, cascade_callbacks: true
-          field :condition, type: Boolean
-        end
-
-        class Book
-          include Mongoid::Document
-          embedded_in :author
-          validate :parent_condition_is_not_true
-
-          def parent_condition_is_not_true
-            return unless author&.condition
-            errors.add :base, "Author condition is true."
-          end
-        end
-
-        Author.delete_all
-        Book.delete_all
-      end
-
-      let(:author) { Author.new }
-      let(:book) { Book.new }
-
-      context "when author is not persisted" do
-        it "is valid without books" do
-          expect(author.valid?).to be true
-        end
-
-        it "is valid with a book" do
-          author.books << book
-          expect(author.valid?).to be true
-        end
-
-        it "is not valid when condition is true with a book" do
-          author.condition = true
-          author.books << book
-          expect(author.valid?).to be false
-        end
-      end
-
-      context "when author is persisted" do
-        before do
-          author.books << book
-          author.save
-        end
-
-        it "remains valid initially" do
-          expect(author.valid?).to be true
-        end
-
-        it "becomes invalid when condition is set to true" do
-          author.update_attributes(condition: true)
-          expect(author.valid?).to be false
-        end
-      end
-    end
   end
 
   describe "#embedded_one?" do

data/spec/mongoid/validatable/numericality_spec.rb

@@ -28,5 +28,21 @@ describe ActiveModel::Validations::NumericalityValidator do
         expect(model).to_not be_valid
       end
     end
+
+    context 'when the value is numeric' do
+      let(:model) { TestModel.new(amount: '15.0') }
+
+      it 'returns true' do
+        expect(model).to be_valid
+      end
+    end
+
+    context 'when the value is a BSON::Decimal128' do
+      let(:model) { TestModel.new(amount: BSON::Decimal128.new('15.0')) }
+
+      it 'returns true' do
+        expect(model).to be_valid
+      end
+    end
   end
 end

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

data/spec/shared/bin/s3-copy

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

data/spec/shared/bin/s3-upload

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'aws-sdk-s3'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: s3-upload 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 S3 upload") do |v|
+    options[:params] ||= {}
+    k, v = v.split('=', 2)
+    options[:params][k.to_sym] = v
+  end
+
+  opts.on("-f", "--file=PATH", "Path to the file to upload, - to upload standard input") do |v|
+    options[:file] = v
+  end
+
+  opts.on("-w", "--write=BUCKET:PATH", "Bucket name and key (or path) to upload to") do |v|
+    options[:write] = v
+  end
+
+  opts.on("-c", "--copy=BUCKET:PATH", "Bucket name and key (or path) to copy to (may be specified more than once)") do |v|
+    options[:copy] ||= []
+    options[:copy] << v
+  end
+end.parse!
+
+ENV['AWS_REGION'] ||= options[:region] || 'us-east-1'
+
+def upload(f, options)
+  s3 = Aws::S3::Client.new
+  write = options.fetch(:write)
+  STDERR.puts "Writing #{write}"
+  bucket, key = write.split(':', 2)
+  s3.put_object(
+    body: f.read,
+    bucket: bucket,
+    key: key,
+    **options[:params] || {},
+  )
+  if copy = options[:copy]
+    copy.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
+  end
+end
+
+if options[:file] == '-'
+  upload(STDIN, options)
+elsif options[:file]
+  File.open(options[:file]) do |f|
+    upload(f, options)
+  end
+else
+  upload(STDIN, options)
+end

data/spec/shared/lib/mrss/child_process_helper.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+autoload :ChildProcess, 'childprocess'
+autoload :Tempfile, 'tempfile'
+
+module Mrss
+  module ChildProcessHelper
+    class SpawnError < StandardError; end
+
+    module_function def call(cmd, env: nil, cwd: nil)
+      process = ChildProcess.new(*cmd)
+      process.io.inherit!
+      if cwd
+        process.cwd = cwd
+      end
+      if env
+        env.each do |k, v|
+          process.environment[k.to_s] = v
+        end
+      end
+      process.start
+      process.wait
+      process
+    end
+
+    module_function def check_call(cmd, env: nil, cwd: nil)
+      process = call(cmd, env: env, cwd: cwd)
+      unless process.exit_code == 0
+        raise SpawnError, "Failed to execute: #{cmd}"
+      end
+    end
+
+    module_function def get_output(cmd, env: nil, cwd: nil)
+      process = ChildProcess.new(*cmd)
+      process.io.inherit!
+      if cwd
+        process.cwd = cwd
+      end
+      if env
+        env.each do |k, v|
+          process.environment[k.to_s] = v
+        end
+      end
+
+      output = ''
+      r, w = IO.pipe
+
+      begin
+        process.io.stdout = w
+        process.start
+        w.close
+
+        thread = Thread.new do
+          begin
+            loop do
+              output << r.readpartial(16384)
+            end
+          rescue EOFError
+          end
+        end
+
+        process.wait
+        thread.join
+      ensure
+        r.close
+      end
+
+      [process, output]
+    end
+
+    module_function def check_output(*args)
+      process, output = get_output(*args)
+      unless process.exit_code == 0
+        raise SpawnError,"Failed to execute: #{args}"
+      end
+      output
+    end
+  end
+end