mongoid 7.2.1 → 9.0.0

data/spec/mongoid/validatable_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -37,7 +37,7 @@ describe Mongoid::Validatable do
       end
 
       let(:documents) do
-        Mongoid::Association::Referenced::HasMany::Targets::Enumerable.new([ address ])
+        Mongoid::Association::Referenced::HasMany::Enumerable.new([ address ])
       end
 
       before do
@@ -103,7 +103,7 @@ describe Mongoid::Validatable do
 
         before do
           account.name = "Testing"
-          account.save
+          account.save!
           account.name = "Testing a really long name."
         end
 
@@ -121,7 +121,7 @@ describe Mongoid::Validatable do
 
       before do
         pizza.build_topping(name: "cheese")
-        pizza.save
+        pizza.save!
       end
 
       let(:from_db) do

data/spec/mongoid/warnings_spec.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+# rubocop:todo all
+
+require "spec_helper"
+
+describe Mongoid::Warnings do
+
+  describe ".warn_*" do
+
+    context "when calling a warn_* method" do
+
+      let(:id) { :geo_haystack_deprecated }
+      let(:message) do
+        'The geoHaystack type is deprecated.'
+      end
+
+      before do
+        warn_id = id
+        Mongoid::Warnings.class_eval do
+          instance_variable_set("@#{warn_id}", false)
+        end
+      end
+
+      it "logs the warning" do
+        expect_any_instance_of(Logger).to receive(:warn).once.with(message)
+        Mongoid::Warnings.send("warn_#{id}")
+      end
+
+      it "logs the warning only once" do
+        expect_any_instance_of(Logger).to receive(:warn).once.with(message)
+        Mongoid::Warnings.send("warn_#{id}")
+        Mongoid::Warnings.send("warn_#{id}")
+      end
+    end
+  end
+end

data/spec/mongoid_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -14,22 +14,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
@@ -53,10 +77,36 @@ describe Mongoid do
 
     it "disconnects from all active clients" do
       clients.each do |client|
-        expect(client.cluster).to receive(:disconnect!).and_call_original
+        expect(client).to receive(:close).and_call_original
       end
       Mongoid.disconnect_clients
     end
+
+    it "returns true" do
+      expect(Mongoid.disconnect_clients).to eq(true)
+    end
+  end
+
+  describe ".reconnect_clients" do
+
+    let(:clients) do
+      Mongoid::Clients.clients.values
+    end
+
+    before do
+      Band.all.entries
+    end
+
+    it "reconnects all active clients" do
+      clients.each do |client|
+        expect(client).to receive(:reconnect).and_call_original
+      end
+      Mongoid.reconnect_clients
+    end
+
+    it "returns true" do
+      expect(Mongoid.reconnect_clients).to eq(true)
+    end
   end
 
   describe ".client" do

data/spec/rails/controller_extension/controller_runtime_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 require "mongoid/railties/controller_runtime"
@@ -31,11 +31,11 @@ describe "Mongoid::Railties::ControllerRuntime" do
 
       clear_metric!
       instance.succeeded event_payload
-      expect(collector.runtime).to eq(42)
+      expect(collector.runtime).to eq(42000)
 
       clear_metric!
       instance.failed event_payload
-      expect(collector.runtime).to eq(42)
+      expect(collector.runtime).to eq(42000)
     end
 
     it "resets the metric and returns the value" do

data/spec/rails/mongoid_spec.rb

@@ -1,158 +1,54 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
+require "support/feature_sandbox"
 
 describe "Rails::Mongoid" do
+  let(:model_root) do
+    File.absolute_path(
+      File.join(
+        File.dirname(__FILE__),
+        "../support/models/sandbox"
+      ))
+  end
 
-  before(:all) do
-    require "rails/mongoid"
-    ::Mongoid.models.delete_if do |model|
-      ![ User, Account, Address, AddressNumber ].include?(model)
+  around :each do |example|
+    FeatureSandbox.quarantine do
+      require "rails/mongoid"
+      $LOAD_PATH.push(model_root)
+      example.run
     end
   end
 
   describe ".preload_models" do
+    let(:app) { double(config: config) }
+    let(:config) { double(paths: paths) }
+    let(:paths) { { "app/models" => path } }
+    let(:path) { double(expanded: [ model_root ]) }
 
-    let(:app) do
-      double(config: config)
-    end
-
-    let(:config) do
-      double(paths: paths)
-    end
-
-    let(:paths) do
-      double('[]' => path)
-    end
-
-    let(:path) do
-      double(expanded: [ "/rails/root/app/models" ])
-    end
+    before { Rails::Mongoid.preload_models(app) }
 
     context "when preload models config is false" do
-
-      let(:files) do
-        [
-          "/rails/root/app/models/user.rb",
-          "/rails/root/app/models/address.rb"
-        ]
-      end
-
-      before(:all) do
-        Mongoid.preload_models = false
-      end
+      config_override :preload_models, false
 
       it "does not load any models" do
-        allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        expect(Rails::Mongoid).to receive(:load_model).never
-        Rails::Mongoid.preload_models(app)
+        expect(defined?(SandboxMessage)).to be_nil
+        expect(defined?(SandboxUser)).to be_nil
+        expect(defined?(SandboxComment)).to be_nil
       end
     end
 
     context "when preload models config is true" do
-
-      before(:all) do
-        Mongoid.preload_models = true
-      end
+      config_override :preload_models, true
 
       context "when all models are in the models directory" do
-
-        let(:files) do
-          [
-            "/rails/root/app/models/user.rb",
-            "/rails/root/app/models/address.rb"
-          ]
-        end
-
-        before do
-          expect(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        end
-
-        it "requires the models by basename" do
-          expect(Rails::Mongoid).to receive(:load_model).with("address")
-          expect(Rails::Mongoid).to receive(:load_model).with("user")
-          Rails::Mongoid.preload_models(app)
-        end
-      end
-
-      context "when models exist in subdirectories" do
-
-        let(:files) do
-          [ "/rails/root/app/models/mongoid/behavior.rb" ]
-        end
-
-        before do
-          expect(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        end
-
-        it "requires the models by subdirectory and basename" do
-          expect(Rails::Mongoid).to receive(:load_model).with("mongoid/behavior")
-          Rails::Mongoid.preload_models(app)
+        it "requires the models" do
+          expect(SandboxMessage.ancestors).to include(Mongoid::Document)
+          expect(SandboxUser.ancestors).to include(Mongoid::Document)
+          expect(SandboxComment.ancestors).to include(Mongoid::Document)
         end
       end
     end
   end
-
-  describe ".load_models" do
-
-    let(:app) do
-      double(config: config)
-    end
-
-    let(:config) do
-      double(paths: paths)
-    end
-
-    let(:paths) do
-      double('[]' => path)
-    end
-
-    let(:path) do
-      double(expanded: [ "/rails/root/app/models" ])
-    end
-
-    context "even when preload models config is false" do
-
-      let(:files) do
-        [
-          "/rails/root/app/models/user.rb",
-          "/rails/root/app/models/address.rb"
-        ]
-      end
-
-      before(:all) do
-        Mongoid.preload_models = false
-      end
-
-      it "loads all models" do
-        allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        expect(Rails::Mongoid).to receive(:load_model).with("address")
-        expect(Rails::Mongoid).to receive(:load_model).with("user")
-        Rails::Mongoid.load_models(app)
-      end
-    end
-
-    context "when list of models to load was configured" do
-
-      let(:files) do
-        [
-          "/rails/root/app/models/user.rb",
-          "/rails/root/app/models/address.rb"
-        ]
-      end
-
-      before(:all) do
-        Mongoid.preload_models = ["user", "AddressNumber"]
-      end
-
-      it "loads selected models only" do
-        allow(Dir).to receive(:glob).with("/rails/root/app/models/**/*.rb").and_return(files)
-        expect(Rails::Mongoid).to receive(:load_model).with("user")
-        expect(Rails::Mongoid).to receive(:load_model).with("address_number")
-        expect(Rails::Mongoid).to receive(:load_model).with("address").never
-        Rails::Mongoid.load_models(app)
-      end
-    end
-  end
 end

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 # ClusterConfig requires ClientRegistry class provided by the host project.
 
 require 'singleton'
@@ -12,6 +15,11 @@ module Mrss
       @single_server
     end
 
+    def sharded_ish?
+      determine_cluster_config
+      @topology == :sharded || @topology == :load_balanced
+    end
+
     def replica_set_name
       determine_cluster_config
       @replica_set_name
@@ -45,7 +53,7 @@ module Mrss
         raise "Deployment server version not known - check that connection to deployment succeeded"
       end
 
-      if server_version >= '3.4' && topology != :sharded
+      if server_version >= '3.4' && !sharded_ish?
         fcv
       else
         if short_server_version == '4.1'
@@ -82,6 +90,11 @@ module Mrss
       @primary_description
     end
 
+    def server_parameters
+      determine_cluster_config
+      @server_parameters
+    end
+
     # Try running a command on the admin database to see if the mongod was
     # started with auth.
     def auth_enabled?
@@ -107,7 +120,7 @@ module Mrss
           :mmapv1
         else
           client = ClientRegistry.instance.global_client('root_authorized')
-          if topology == :sharded
+          if sharded_ish?
             shards = client.use(:admin).command(listShards: 1).first
             if shards['shards'].empty?
               raise 'Shards are empty'
@@ -196,8 +209,15 @@ module Mrss
       @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']
+      @server_parameters = begin
+        client.use(:admin).command(getParameter: '*').first
+      rescue => e
+        STDERR.puts("WARNING: Failed to obtain server parameters: #{e.class}: #{e.message}")
+        {}
+      end
+
+      if !sharded_ish? && short_server_version >= '3.4'
+        rv = @server_parameters['featureCompatibilityVersion']
         @fcv = rv['version'] || rv
       end
     end