mongoid 7.1.5 → 7.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06912d432d08b07e80bad71d5073cf2d5a4924f097cdefed959107c6cad245ef'
-  data.tar.gz: d6880896621095c3d3017207d9966f99c17f7aea9a1d7366746e287e4c2cea04
+  metadata.gz: 2dc047b0566d39e527a503400ca7bd624afcea9aebd7db795870333a795644c3
+  data.tar.gz: 600c7431bf9a3464f24794c02807510f22b56d74a3981826cb1c6f2013a6c5e5
 SHA512:
-  metadata.gz: 9b9a2bcc459c5ae8f2d7dd5585e7c0c39869f6a860067ae4ab36c5df64efb524ef688d5ab087e1a52a9d6ea3101df66213ad607c62df7499e5706bcce3f0974c
-  data.tar.gz: cafe608ad57c0b91593bd570024c74aa6ed203f14e6ebe61b026601ef7c64ab8bc28d944a42e73aa6c1b1aea1510f83e9a64f869bee15ce549db2ade75e56295
+  metadata.gz: 6a430d43d0646baa0424f06471f4891330470d85dc23af4e2166779e36fa2e58cc44e1d645062290e8ec30dbad583dfc42f4d898b66ff5995422489e8868f577
+  data.tar.gz: d35537d5127ff1840f4b8c920a446a22bee7bedcf675fe8212989798cc949d1d0e01c03e6df1b782def1956bbd4ecc81f1812d3b768e17029cd87e5e6583df96

data/Rakefile

@@ -22,11 +22,8 @@ task :install => :build do
   system "sudo gem install mongoid-#{Mongoid::VERSION}.gem"
 end
 
-task :release => :build do
-  system "git tag -a v#{Mongoid::VERSION} -m 'Tagging #{Mongoid::VERSION}'"
-  system "git push --tags"
-  system "gem push mongoid-#{Mongoid::VERSION}.gem"
-  system "rm mongoid-#{Mongoid::VERSION}.gem"
+task :release do
+  raise "Please use ./release.sh to release"
 end
 
 RSpec::Core::RakeTask.new("spec") do |spec|
@@ -59,5 +56,3 @@ namespace :release do
     end
   end
 end
-
-task :release => ['release:check_private_key', 'release:do']

data/lib/mongoid/association/referenced/has_one/proxy.rb

@@ -54,9 +54,14 @@ module Mongoid
           #
           # @since 2.0.0.rc.1
           def substitute(replacement)
+            # If the same object currently associated is being assigned,
+            # rebind the association and save the target but do not destroy
+            # the target.
+
             unbind_one
             if persistable?
-              if _association.destructive?
+              # TODO can this entire method be skipped if self == replacement?
+              if _association.destructive? && self != replacement
                 send(_association.dependent)
               else
                 save if persisted?

data/lib/mongoid/version.rb

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

data/spec/app/models/person.rb

@@ -80,6 +80,7 @@ class Person
   end
   embeds_one :quiz, validate: false
 
+  # Must have dependent: :destroy
   has_one :game, dependent: :destroy, validate: false do
     def extension
       "Testing"
@@ -105,6 +106,7 @@ class Person
   has_and_belongs_to_many :ordered_preferences, order: :value.desc, validate: false
 
   has_many :drugs, validate: false
+  # Must not have dependent: :destroy
   has_one :account, validate: false
   has_one :cat, dependent: :nullify, validate: false, primary_key: :username
   has_one :book, autobuild: true, validate: false

data/spec/app/models/series.rb

@@ -3,5 +3,6 @@
 
 class Series
   include Mongoid::Document
+  # Must not have dependent: :destroy
   has_many :books
 end

data/spec/app/models/wiki_page.rb

@@ -11,6 +11,7 @@ class WikiPage
   field :description, type: String, localize: true
 
   embeds_many :edits, validate: false
+  # Must have dependent: :destroy
   has_many :comments, dependent: :destroy, validate: false
   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

data/spec/integration/associations/embeds_many_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe 'embeds_many associations' do
+
+  context 're-associating the same object' do
+    context 'with dependent: destroy' do
+      let(:canvas) do
+        Canvas.create!(shapes: [Shape.new])
+      end
+
+      let!(:shape) { canvas.shapes.first }
+
+      it 'does not destroy the dependent object' do
+        canvas.shapes = [shape]
+        canvas.save!
+        canvas.reload
+        canvas.shapes.should == [shape]
+      end
+    end
+  end
+end

data/spec/integration/associations/embeds_one_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe 'embeds_one associations' do
+
+  context 're-associating the same object' do
+    context 'with dependent: destroy' do
+      let(:canvas) do
+        Canvas.create!(palette: Palette.new)
+      end
+
+      let!(:palette) { canvas.palette }
+
+      it 'does not destroy the dependent object' do
+        canvas.palette = canvas.palette
+        canvas.save!
+        canvas.reload
+        canvas.palette.should == palette
+      end
+    end
+  end
+end

data/spec/integration/associations/has_many_spec.rb

@@ -31,4 +31,46 @@ describe 'has_many associations' do
       Album.count.should == 0
     end
   end
+
+  context 're-associating the same object' do
+    context 'with dependent: destroy' do
+      let(:wiki_page) do
+        WikiPage.create!
+      end
+
+      let!(:comment) do
+        Comment.create!(wiki_page: wiki_page, title: 'hi') do
+          wiki_page.reload
+        end
+      end
+
+      it 'does not destroy the dependent object' do
+        wiki_page.comments.should == [comment]
+        wiki_page.comments = [comment]
+        wiki_page.save!
+        wiki_page.reload
+        wiki_page.comments.should == [comment]
+      end
+    end
+
+    context 'without dependent: destroy' do
+      let(:series) do
+        Series.create!
+      end
+
+      let!(:book) do
+        Book.create!(series: series).tap do
+          series.reload
+        end
+      end
+
+      it 'does not destroy the dependent object' do
+        series.books.should == [book]
+        series.books = [book]
+        series.save!
+        series.reload
+        series.books.should == [book]
+      end
+    end
+  end
 end

data/spec/integration/associations/has_one_spec.rb

@@ -31,4 +31,46 @@ describe 'has_one associations' do
       Game.count.should == 0
     end
   end
+
+  context 're-associating the same object' do
+    context 'with dependent: destroy' do
+      let(:person) do
+        Person.create!
+      end
+
+      let!(:game) do
+        Game.create!(person: person) do
+          person.reload
+        end
+      end
+
+      it 'does not destroy the dependent object' do
+        person.game.should == game
+        person.game = person.game
+        person.save!
+        person.reload
+        person.game.should == game
+      end
+    end
+
+    context 'without dependent: destroy' do
+      let(:person) do
+        Person.create!
+      end
+
+      let!(:account) do
+        Account.create!(person: person, name: 'foo').tap do
+          person.reload
+        end
+      end
+
+      it 'does not destroy the dependent object' do
+        person.account.should == account
+        person.account = person.account
+        person.save!
+        person.reload
+        person.account.should == account
+      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/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

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

@@ -0,0 +1,211 @@
+# ClusterConfig requires ClientRegistry class provided by the host project.
+
+require 'singleton'
+
+module Mrss
+  class ClusterConfig
+    include Singleton
+    include RSpec::Core::Pending
+
+    def single_server?
+      determine_cluster_config
+      @single_server
+    end
+
+    def replica_set_name
+      determine_cluster_config
+      @replica_set_name
+    end
+
+    def server_version
+      determine_cluster_config
+      @server_version
+    end
+
+    def enterprise?
+      determine_cluster_config
+      @enterprise
+    end
+
+    def short_server_version
+      server_version.split('.')[0..1].join('.')
+    end
+
+    def fcv
+      determine_cluster_config
+      @fcv
+    end
+
+    # Per https://jira.mongodb.org/browse/SERVER-39052, working with FCV
+    # in sharded topologies is annoying. Also, FCV doesn't exist in servers
+    # less than 3.4. This method returns FCV on 3.4+ servers when in single
+    # or RS topologies, and otherwise returns the major.minor server version.
+    def fcv_ish
+      if server_version.nil?
+        raise "Deployment server version not known - check that connection to deployment succeeded"
+      end
+
+      if server_version >= '3.4' && topology != :sharded
+        fcv
+      else
+        if short_server_version == '4.1'
+          '4.2'
+        else
+          short_server_version
+        end
+      end
+    end
+
+    # @return [ Mongo::Address ] The address of the primary in the deployment.
+    def primary_address
+      determine_cluster_config
+      @primary_address
+    end
+
+    def primary_address_str
+      determine_cluster_config
+      @primary_address.seed
+    end
+
+    def primary_address_host
+      both = primary_address_str
+      both.split(':').first
+    end
+
+    def primary_address_port
+      both = primary_address_str
+      both.split(':')[1] || 27017
+    end
+
+    def primary_description
+      determine_cluster_config
+      @primary_description
+    end
+
+    # Try running a command on the admin database to see if the mongod was
+    # started with auth.
+    def auth_enabled?
+      if @auth_enabled.nil?
+        @auth_enabled = begin
+          basic_client.use(:admin).command(getCmdLineOpts: 1).first["argv"].include?("--auth")
+        rescue => e
+          e.message =~ /(not authorized)|(unauthorized)|(no users authenticated)|(requires authentication)/
+        end
+      end
+      @auth_enabled
+    end
+
+    def topology
+      determine_cluster_config
+      @topology
+    end
+
+    def storage_engine
+      @storage_engine ||= begin
+        # 2.6 does not have wired tiger
+        if short_server_version == '2.6'
+          :mmapv1
+        else
+          client = ClientRegistry.instance.global_client('root_authorized')
+          if topology == :sharded
+            shards = client.use(:admin).command(listShards: 1).first
+            if shards['shards'].empty?
+              raise 'Shards are empty'
+            end
+            shard = shards['shards'].first
+            address_str = shard['host'].sub(/^.*\//, '').sub(/,.*/, '')
+            client = ClusterTools.instance.direct_client(address_str,
+              SpecConfig.instance.test_options.merge(SpecConfig.instance.auth_options).merge(connect: :direct))
+          end
+          rv = client.use(:admin).command(serverStatus: 1).first
+          rv = rv['storageEngine']['name']
+          rv_map = {
+            'wiredTiger' => :wired_tiger,
+            'mmapv1' => :mmapv1,
+          }
+          rv_map[rv] || rv
+        end
+      end
+    end
+
+    # This method returns an alternate address for connecting to the configured
+    # deployment. For example, if the replica set is configured with nodes at
+    # of localhost:27017 and so on, this method will return 127.0.0.:27017.
+    #
+    # Note that the "alternate" refers to replica set configuration, not the
+    # addresses specified in test suite configuration. If the deployment topology
+    # is not a replica set, "alternate" refers to test suite configuration as
+    # this is the only configuration available.
+    def alternate_address
+      @alternate_address ||= begin
+        address = primary_address_host
+        str = case address
+        when '127.0.0.1'
+          'localhost'
+        when /^(\d+\.){3}\d+$/
+          skip 'This test requires a hostname or 127.0.0.1 as address'
+        else
+          # We don't know if mongod is listening on ipv4 or ipv6, in principle.
+          # Our tests use ipv4, so hardcode that for now.
+          # To support both we need to try both addresses which will make this
+          # test more complicated.
+          #
+          # JRuby chokes on primary_address_port as the port (e.g. 27017).
+          # Since the port does not actually matter, use a common port like 80.
+          resolved_address = Addrinfo.getaddrinfo(address, 80, Socket::PF_INET).first.ip_address
+          if resolved_address.include?(':')
+            "[#{resolved_address}]"
+          else
+            resolved_address
+          end
+        end + ":#{primary_address_port}"
+        Mongo::Address.new(str)
+      end
+    end
+
+    private
+
+    def determine_cluster_config
+      return if @primary_address
+
+      # Run all commands to figure out the cluster configuration from the same
+      # client. This is somewhat wasteful when running a single test, but reduces
+      # test runtime for the suite overall because all commands are sent on the
+      # same connection rather than each command connecting to the cluster by
+      # itself.
+      client = ClientRegistry.instance.global_client('root_authorized')
+
+      primary = client.cluster.next_primary
+      @primary_address = primary.address
+      @primary_description = primary.description
+      @replica_set_name = client.cluster.topology.replica_set_name
+
+      @topology ||= begin
+        topology = client.cluster.topology.class.name.sub(/.*::/, '')
+        topology = topology.gsub(/([A-Z])/) { |match| '_' + match.downcase }.sub(/^_/, '')
+        if topology =~ /^replica_set/
+          topology = 'replica_set'
+        end
+        topology.to_sym
+      end
+
+      @single_server = client.cluster.servers_list.length == 1
+
+      build_info = client.database.command(buildInfo: 1).first
+
+      @server_version = build_info['version']
+      @enterprise = build_info['modules'] && build_info['modules'].include?('enterprise')
+
+      if @topology != :sharded && short_server_version >= '3.4'
+        rv = client.use(:admin).command(getParameter: 1, featureCompatibilityVersion: 1).first['featureCompatibilityVersion']
+        @fcv = rv['version'] || rv
+      end
+    end
+
+    def basic_client
+      # Do not cache the result here so that if the client gets closed,
+      # client registry reconnects it in subsequent tests
+      ClientRegistry.instance.global_client('basic')
+    end
+  end
+end