mongoid 7.2.0.rc1 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da086175f8b41ffc6991262225460da5577f7ea47d3c355f34e072ff5c78d5f1
-  data.tar.gz: 7797a83ed15fd55f0ec8aba1a43569393f99f037a7f1013aeb0770f0aa4c3000
+  metadata.gz: 6a81d403f49ffcc37e06200c91ab90a6205604730f7169ceb4a07d057ae61193
+  data.tar.gz: 045ce8ed60ab931f1406e52f25f9e486d670ec1c76dff86ee3b299cbeca0adfe
 SHA512:
-  metadata.gz: f18e6f9ca45ce9cc406a32983d031388c5f6a76100de18fcdf036163bf08c74f4f15a1e77a02c6445e37f2824ec6ecf549514bf78447f7876b8d52d2c2fb4947
-  data.tar.gz: ca7b9fe36e273d4e2dab3680dbaa973450eb2b87ae58a9d462bba6ec95d27de1479255175a9d7971b32e61b5a43726d7b7855134c5ec733b75e126e6e51fb408
+  metadata.gz: bebd7b18d65049cd7d0793319a65bf1868f3c9addf09c21c7b4dbf315deb2fda27cf1a8f27be5288245ab2b1c830d21752de9042d01fb9b31579cab7536ccdcf
+  data.tar.gz: 4a4b231ce42eb8b5bf07eca5131ff4b9e5c838a0965996adcf9a529ad6c398f11e0c9e4e5d7cc005fe969e4851a50a2d6aab7c436af433a809c6090ff1927b9c

data/Rakefile

@@ -4,8 +4,13 @@ require "bundler"
 require "bundler/gem_tasks"
 Bundler.setup
 
+ROOT = File.expand_path(File.join(File.dirname(__FILE__)))
+
+$: << File.join(ROOT, 'spec/shared/lib')
+
 require "rake"
 require "rspec/core/rake_task"
+require 'mrss/spec_organizer'
 
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "mongoid/version"
@@ -22,11 +27,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|
@@ -38,11 +40,30 @@ RSpec::Core::RakeTask.new('spec:progress') do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-task :ci do
-  $LOAD_PATH.push File.expand_path("../spec", __FILE__)
-  require 'support/spec_organizer'
+CLASSIFIERS = [
+  [%r,^mongoid/attribute,, :attributes],
+  [%r,^mongoid/association/[or],, :associations_referenced],
+  [%r,^mongoid/association,, :associations],
+  [%r,^mongoid,, :unit],
+  [%r,^integration,, :integration],
+  [%r,^rails,, :rails],
+]
+
+RUN_PRIORITY = %i(
+  unit attributes associations_referenced associations
+  integration rails
+)
+
+def spec_organizer
+  Mrss::SpecOrganizer.new(
+    root: ROOT,
+    classifiers: CLASSIFIERS,
+    priority_order: RUN_PRIORITY,
+  )
+end
 
-  SpecOrganizer.new.run
+task :ci do
+  spec_organizer.run
 end
 
 task :default => :spec
@@ -66,5 +87,3 @@ namespace :release do
     end
   end
 end
-
-task :release => ['release:check_private_key', 'release:do']

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

@@ -35,6 +35,14 @@ module Mongoid
           private
 
           def clear_associated(object)
+            unless inverse
+              raise Errors::InverseNotFound.new(
+                  @owner_class,
+                  name,
+                  object.class,
+                  foreign_key,
+              )
+            end
             if object && (associated = object.send(inverse))
               associated.substitute(nil)
             end

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/copyable.rb

@@ -23,8 +23,12 @@ module Mongoid
       # elsewhere.
       attrs = clone_document.except("_id", "id")
       dynamic_attrs = {}
+      _attribute_names = self.attribute_names
       attrs.reject! do |attr_name, value|
-        dynamic_attrs.merge!(attr_name => value) unless self.attribute_names.include?(attr_name)
+        unless _attribute_names.include?(attr_name)
+          dynamic_attrs[attr_name] = value
+          true
+        end
       end
       self.class.new(attrs).tap do |object|
         dynamic_attrs.each do |attr_name, value|

data/lib/mongoid/extensions.rb

@@ -38,6 +38,7 @@ require "mongoid/extensions/range"
 require "mongoid/extensions/regexp"
 require "mongoid/extensions/set"
 require "mongoid/extensions/string"
+require "mongoid/stringified_symbol"
 require "mongoid/extensions/symbol"
 require "mongoid/extensions/time"
 require "mongoid/extensions/time_with_zone"

data/lib/mongoid/fields.rb

@@ -12,6 +12,8 @@ module Mongoid
   module Fields
     extend ActiveSupport::Concern
 
+    StringifiedSymbol = Mongoid::StringifiedSymbol
+
     # For fields defined with symbols use the correct class.
     #
     # @since 4.0.0
@@ -30,6 +32,7 @@ module Mongoid
       regexp: Regexp,
       set: Set,
       string: String,
+      stringified_symbol: StringifiedSymbol,
       symbol: Symbol,
       time: Time
     }.with_indifferent_access

data/lib/mongoid/stringified_symbol.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+# A class which sends values to the database as Strings but returns them to the user as Symbols.
+module Mongoid
+  class StringifiedSymbol
+
+    class << self
+
+      # Convert the object from its mongo friendly ruby type to this type.
+      #
+      # @example Demongoize the object.
+      #   Symbol.demongoize(object)
+      #
+      # @param [ Object ] object The object to demongoize.
+      #
+      # @return [ Symbol ] The object.
+      #
+      # @api private
+      def demongoize(object)
+        if object.nil?
+          object
+        else
+          object.to_s.to_sym
+        end
+      end
+
+      # Turn the object from the ruby type we deal with to a Mongo friendly
+      # type.
+      #
+      # @example Mongoize the object.
+      #   Symbol.mongoize("123.11")
+      #
+      # @param [ Object ] object The object to mongoize.
+      #
+      # @return [ Symbol ] The object mongoized.
+      #
+      # @api private
+      def mongoize(object)
+         if object.nil?
+           object
+         else
+           object.to_s
+         end
+      end
+
+      # @api private
+      def evolve(object)
+        mongoize(object)
+      end
+    end
+  end
+end

data/lib/mongoid/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 module Mongoid
-  VERSION = "7.2.0.rc1"
+  VERSION = "7.2.0"
 end

data/spec/README.md

@@ -1,8 +1,17 @@
 # Running Mongoid Tests
 
-## Overview
-### Quick Start
-Spin up a MongoDB deployment against which to run the Mongoid specs. Mongoid specs support a variety of MongoDB topologies, but the simplest is a single MongoDB instance:
+## Quick Start
+
+The test suite requires shared tooling that is stored in a separate repository
+and is referenced as a submodule. After checking out the desired driver
+branch, check out the matching submodules:
+
+    git submodule init
+    git submodule update
+
+Spin up a MongoDB deployment against which to run the Mongoid specs.
+Mongoid specs support a variety of MongoDB topologies, but the simplest is
+a single MongoDB instance:
 
     # Launch mongod in one terminal
     mkdir /tmp/mdb
@@ -14,5 +23,11 @@ Run the test suite in a separate terminal:
 
 
 ## Caveats
+
 ### "Too many open files" error
-On MacOS, you may encounter a "Too many open files" error on the MongoDB server when running the tests. If this happens, stop the server, run the command `ulimit -n 10000` in the same terminal session as the server, and restart the server. This will increase the number of files that can be opened. Then, re-run the tests.
+
+On MacOS, you may encounter a "Too many open files" error on the MongoDB server
+when running the tests. If this happens, stop the server, run the command
+`ulimit -n 10000` in the same terminal session as the server, and restart
+the server. This will increase the number of files that can be opened.
+Then, re-run the tests.

data/spec/integration/app_spec.rb

@@ -13,7 +13,7 @@ describe 'Mongoid application tests' do
     end
 
     require 'fileutils'
-    require 'support/child_process_helper'
+    require 'mrss/child_process_helper'
     require 'open-uri'
 
     FileUtils.mkdir_p(TMP_BASE)
@@ -91,19 +91,19 @@ describe 'Mongoid application tests' do
     ['~> 5.1.0', '~> 5.2.0', '~> 6.0.0'].each do |rails_version|
       context "with rails #{rails_version}" do
         it 'creates' do
-          ChildProcessHelper.check_call(%w(gem uni rails -a))
-          ChildProcessHelper.check_call(%w(gem install rails --no-document -v) + [rails_version])
+          Mrss::ChildProcessHelper.check_call(%w(gem uni rails -a))
+          Mrss::ChildProcessHelper.check_call(%w(gem install rails --no-document -v) + [rails_version])
 
           Dir.chdir(TMP_BASE) do
             FileUtils.rm_rf('mongoid-test')
-            ChildProcessHelper.check_call(%w(rails new mongoid-test --skip-spring --skip-active-record), env: clean_env)
+            Mrss::ChildProcessHelper.check_call(%w(rails new mongoid-test --skip-spring --skip-active-record), env: clean_env)
 
             Dir.chdir('mongoid-test') do
               adjust_app_gemfile
-              ChildProcessHelper.check_call(%w(bundle install), env: clean_env)
+              Mrss::ChildProcessHelper.check_call(%w(bundle install), env: clean_env)
 
-              ChildProcessHelper.check_call(%w(rails g model post), env: clean_env)
-              ChildProcessHelper.check_call(%w(rails g model comment post:belongs_to), env: clean_env)
+              Mrss::ChildProcessHelper.check_call(%w(rails g model post), env: clean_env)
+              Mrss::ChildProcessHelper.check_call(%w(rails g model comment post:belongs_to), env: clean_env)
 
               # https://jira.mongodb.org/browse/MONGOID-4885
               comment_text = File.read('app/models/comment.rb')
@@ -136,7 +136,7 @@ describe 'Mongoid application tests' do
               before do
                 Dir.chdir(APP_PATH) do
                   remove_bundler_req
-                  ChildProcessHelper.check_call(%w(bundle install), env: env)
+                  Mrss::ChildProcessHelper.check_call(%w(bundle install), env: env)
                   write_mongoid_yml
                 end
 
@@ -150,7 +150,7 @@ describe 'Mongoid application tests' do
                 end
                 index.should be nil
 
-                ChildProcessHelper.check_call(%w(rake db:mongoid:create_indexes),
+                Mrss::ChildProcessHelper.check_call(%w(rake db:mongoid:create_indexes),
                   cwd: APP_PATH, env: env)
 
                 index = client['posts'].indexes.detect do |index|
@@ -168,10 +168,10 @@ describe 'Mongoid application tests' do
   def clone_application(repo_url, subdir: nil, rails_version: nil)
     Dir.chdir(TMP_BASE) do
       FileUtils.rm_rf(File.basename(repo_url))
-      ChildProcessHelper.check_call(%w(git clone) + [repo_url])
+      Mrss::ChildProcessHelper.check_call(%w(git clone) + [repo_url])
       Dir.chdir(File.join(*[File.basename(repo_url), subdir].compact)) do
         adjust_app_gemfile(rails_version: rails_version)
-        ChildProcessHelper.check_call(%w(bundle install), env: clean_env)
+        Mrss::ChildProcessHelper.check_call(%w(bundle install), env: clean_env)
         puts `git diff`
 
         write_mongoid_yml
@@ -230,7 +230,7 @@ describe 'Mongoid application tests' do
     # in `initialize': too long unix socket path (126bytes given but 108bytes max) (ArgumentError)
     # Is it trying to create unix sockets in current directory?
     # https://stackoverflow.com/questions/30302021/rails-runner-without-spring
-    ChildProcessHelper.check_call(%w(bin/spring binstub --remove --all), env: clean_env)
+    Mrss::ChildProcessHelper.check_call(%w(bin/spring binstub --remove --all), env: clean_env)
   end
 
   def clean_env

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

@@ -66,4 +66,64 @@ describe 'has_many associations' do
       end
     end
   end
+
+  context 'when child does not have parent association' do
+    context 'Child.new' do
+      it 'creates a child instance' do
+        HmmBusSeat.new.should be_a(HmmBusSeat)
+      end
+    end
+
+    context 'assignment to child in parent' do
+      let(:parent) { HmmBus.new }
+
+      it 'raises InverseNotFound' do
+        lambda do
+          parent.seats << HmmBusSeat.new
+        end.should raise_error(Mongoid::Errors::InverseNotFound)
+      end
+    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

@@ -66,4 +66,64 @@ describe 'has_one associations' do
       end
     end
   end
+
+  context 'when child does not have parent association' do
+    context 'Child.new' do
+      it 'creates a child instance' do
+        HomBusDriver.new.should be_a(HomBusDriver)
+      end
+    end
+
+    context 'assignment to child in parent' do
+      let(:parent) { HomBus.new }
+
+      it 'raises InverseNotFound' do
+        lambda do
+          parent.driver = HomBusDriver.new
+        end.should raise_error(Mongoid::Errors::InverseNotFound)
+      end
+    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