mongoid 8.0.10 → 8.1.0

data/spec/mongoid/traversable_spec.rb

@@ -531,9 +531,9 @@ describe Mongoid::Traversable do
         end
 
         context "before class creation" do
-          before do
-            Mongoid.discriminator_key = "test"
+          config_override :discriminator_key, "test"
 
+          before do
             class PreGlobalDiscriminatorParent
               include Mongoid::Document
             end
@@ -542,10 +542,6 @@ describe Mongoid::Traversable do
             end
           end
 
-          after do
-            Mongoid.discriminator_key = "_type"
-          end
-
           it "creates a field with new discriminator key in the parent" do
             expect(PreGlobalDiscriminatorParent.fields.keys).to include("test")
           end
@@ -677,9 +673,9 @@ describe Mongoid::Traversable do
         end
 
         context "before class creation" do
-          before do
-            Mongoid.discriminator_key = :test
+          config_override :discriminator_key, :test
 
+          before do
             class PreGlobalSymDiscriminatorParent
               include Mongoid::Document
             end
@@ -688,10 +684,6 @@ describe Mongoid::Traversable do
             end
           end
 
-          after do
-            Mongoid.discriminator_key = "_type"
-          end
-
           it "creates a field with new discriminator key as a string in the parent" do
             expect(PreGlobalSymDiscriminatorParent.fields.keys).to include("test")
           end
@@ -829,8 +821,9 @@ describe Mongoid::Traversable do
     end
 
     context "when setting a field equal to discriminator key and duplicate_fields_exception is true" do
+      config_override :duplicate_fields_exception, true
+
       before do
-        Mongoid.duplicate_fields_exception = true
 
         class DuplicateDiscriminatorKeyParent
           include Mongoid::Document
@@ -841,10 +834,6 @@ describe Mongoid::Traversable do
         end
       end
 
-      after do
-        Mongoid.duplicate_fields_exception = false
-      end
-
       it "does not raise an error" do
         expect do
           DuplicateDiscriminatorKeyParent.discriminator_key = "dkey"
@@ -871,9 +860,10 @@ describe Mongoid::Traversable do
     end
 
     context "when setting a field equal to global discriminator key and duplicate_fields_exception is true" do
+      config_override :duplicate_fields_exception, true
+      config_override :discriminator_key, "dkey"
+
       before do
-        Mongoid.duplicate_fields_exception = true
-        Mongoid.discriminator_key = "dkey"
 
         class GlobalDuplicateDiscriminatorKeyParent
           include Mongoid::Document
@@ -883,11 +873,6 @@ describe Mongoid::Traversable do
         end
       end
 
-      after do
-        Mongoid.duplicate_fields_exception = false
-        Mongoid.discriminator_key = "_type"
-      end
-
       it "raises an error" do
         expect do
           GlobalDuplicateDiscriminatorKeyParent.class_eval do

data/spec/mongoid/validatable/associated_spec.rb

@@ -37,18 +37,12 @@ describe Mongoid::Validatable::AssociatedValidator do
           User.new(name: "test")
         end
 
-        let(:description1) do
-          Description.new
-        end
-
-        let(:description2) do
+        let(:description) do
           Description.new
         end
 
         before do
-          user.descriptions << description1
-          user.descriptions << description2
-          user.valid?
+          user.descriptions << description
         end
 
         it "only validates the parent once" do
@@ -56,16 +50,12 @@ describe Mongoid::Validatable::AssociatedValidator do
         end
 
         it "adds the errors from the relation" do
+          user.valid?
           expect(user.errors[:descriptions]).to_not be_nil
         end
 
-        it 'reports all failed validations' do
-          errors = user.descriptions.flat_map { |d| d.errors[:details] }
-          expect(errors.length).to be == 2
-        end
-
         it "only validates the child once" do
-          expect(description1).to_not be_valid
+          expect(description).to_not be_valid
         end
       end
 
@@ -85,6 +75,7 @@ describe Mongoid::Validatable::AssociatedValidator do
         end
 
         it "does not run validation on them" do
+          expect(description).to receive(:valid?).never
           expect(user).to be_valid
         end
 
@@ -93,14 +84,14 @@ describe Mongoid::Validatable::AssociatedValidator do
     end
   end
 
-  describe "#validate" do
+  describe "#validate_each" do
 
     let(:person) do
       Person.new
     end
 
     let(:validator) do
-      described_class.new(attributes: person.relations.keys)
+      described_class.new(attributes: person.attributes)
     end
 
     context "when the association is a one to one" do
@@ -108,7 +99,7 @@ describe Mongoid::Validatable::AssociatedValidator do
       context "when the association is nil" do
 
         before do
-          validator.validate(person)
+          validator.validate_each(person, :name, nil)
         end
 
         it "adds no errors" do
@@ -117,9 +108,14 @@ describe Mongoid::Validatable::AssociatedValidator do
       end
 
       context "when the association is valid" do
+
+        let(:associated) do
+          double(valid?: true, flagged_for_destroy?: false)
+        end
+
         before do
-          person.name = Name.new(first_name: 'A', last_name: 'B')
-          validator.validate(person)
+          expect(associated).to receive(:validated?).and_return(false)
+          validator.validate_each(person, :name, associated)
         end
 
         it "adds no errors" do
@@ -129,9 +125,13 @@ describe Mongoid::Validatable::AssociatedValidator do
 
       context "when the association is invalid" do
 
+        let(:associated) do
+          double(valid?: false, flagged_for_destroy?: false)
+        end
+
         before do
-          person.name = Name.new(first_name: 'Jamis', last_name: 'Buck')
-          validator.validate(person)
+          expect(associated).to receive(:validated?).and_return(false)
+          validator.validate_each(person, :name, associated)
         end
 
         it "adds errors to the parent document" do
@@ -149,7 +149,7 @@ describe Mongoid::Validatable::AssociatedValidator do
       context "when the association is empty" do
 
         before do
-          validator.validate(person)
+          validator.validate_each(person, :addresses, [])
         end
 
         it "adds no errors" do
@@ -159,9 +159,13 @@ describe Mongoid::Validatable::AssociatedValidator do
 
       context "when the association has invalid documents" do
 
+        let(:associated) do
+          double(valid?: false, flagged_for_destroy?: false)
+        end
+
         before do
-          person.addresses << Address.new(street: '123')
-          validator.validate(person)
+          expect(associated).to receive(:validated?).and_return(false)
+          validator.validate_each(person, :addresses, [ associated ])
         end
 
         it "adds errors to the parent document" do
@@ -171,10 +175,13 @@ describe Mongoid::Validatable::AssociatedValidator do
 
       context "when the association has all valid documents" do
 
+        let(:associated) do
+          double(valid?: true, flagged_for_destroy?: false)
+        end
+
         before do
-          person.addresses << Address.new(street: '123 First St')
-          person.addresses << Address.new(street: '456 Second St')
-          validator.validate(person)
+          expect(associated).to receive(:validated?).and_return(false)
+          validator.validate_each(person, :addresses, [ associated ])
         end
 
         it "adds no errors" do

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -2476,11 +2476,10 @@ describe Mongoid::Validatable::UniquenessValidator do
   describe "i18n" do
 
     context 'when using a different locale' do
-      around do |example|
-        I18n.with_locale(:fr) { example.run }
-      end
+      with_default_i18n_configs
 
       before do
+        I18n.locale = :fr
         # Translation key location is as per rails-i18n gem.
         # See: https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/en.yml
         I18n.backend.store_translations(:fr, { errors: { messages: { taken: 'est déjà utilisé(e)' } } })

data/spec/mongoid_spec.rb

@@ -13,22 +13,46 @@ describe Mongoid do
       end
     end
 
-    context "when a block is supplied" do
+    context "when a block is given" do
+      config_override :preload_models, false
 
-      before do
-        Mongoid.configure do |config|
-          config.preload_models = true
+      context "with arity 0" do
+
+        before do
+          Mongoid.configure do
+            config.preload_models = true
+          end
+        end
+
+        it "sets the values on the config instance" do
+          expect(Mongoid.preload_models).to be true
         end
       end
 
-      after do
-        Mongoid.configure do |config|
-          config.preload_models = false
+      context "with arity 1" do
+
+        before do
+          Mongoid.configure do |config|
+            config.preload_models = true
+          end
+        end
+
+        it "sets the values on the config instance" do
+          expect(Mongoid.preload_models).to be true
         end
       end
 
-      it "sets the values on the config instance" do
-        expect(Mongoid.preload_models).to be true
+      context "with arity 2" do
+
+        before do
+          Mongoid.configure do |config, _other|
+            config.preload_models = true
+          end
+        end
+
+        it "sets the values on the config instance" do
+          expect(Mongoid.preload_models).to be true
+        end
       end
     end
   end
@@ -51,8 +75,10 @@ describe Mongoid do
     end
 
     it "disconnects from all active clients" do
+      pending 'https://jira.mongodb.org/browse/MONGOID-5621'
+
       clients.each do |client|
-        expect(client).to receive(:close).and_call_original
+        expect(client.cluster).to receive(:disconnect!).and_call_original
       end
       Mongoid.disconnect_clients
     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