mongoid 6.4.0 → 6.4.7

data/spec/spec_helper.rb

@@ -34,6 +34,10 @@ end
 
 require 'support/authorization'
 require 'support/expectations'
+require 'support/macros'
+require 'support/spec_config'
+require 'support/cluster_config'
+require 'support/constraints'
 
 # Give MongoDB time to start up on the travis ci environment.
 if (ENV['CI'] == 'travis' || ENV['CI'] == 'evergreen')
@@ -127,8 +131,13 @@ end
 I18n.config.enforce_available_locales = false
 
 RSpec.configure do |config|
+  config.expect_with(:rspec) do |c|
+    c.syntax = [:should, :expect]
+  end
+
   config.raise_errors_for_deprecations!
   config.include(Mongoid::Expectations)
+  config.extend(Constraints)
 
   config.before(:suite) do
     client = Mongo::Client.new(["#{HOST}:#{PORT}"])

data/spec/support/cluster_config.rb

@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'singleton'
+
+class ClusterConfig
+  include Singleton
+
+  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 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 >= '3.4' && topology != :sharded
+      fcv
+    else
+      if short_server_version == '4.1'
+        '4.2'
+      else
+        short_server_version
+      end
+    end
+  end
+
+  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
+          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
+
+  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 = Mongoid::Clients.default
+
+    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.send(:servers_list).length == 1
+
+    @server_version = client.database.command(buildInfo: 1).first['version']
+
+    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

data/spec/support/constraints.rb

@@ -0,0 +1,101 @@
+module Constraints
+  RAILS_VERSION = ActiveSupport.version.to_s.split('.')[0..1].join('.').freeze
+
+  def min_rails_version(version)
+    unless version =~ /^\d+\.\d+$/
+      raise ArgumentError, "Version can only be major.minor: #{version}"
+    end
+
+    before do
+      if version > RAILS_VERSION
+        skip "Rails version #{version} or higher required, we have #{RAILS_VERSION}"
+      end
+    end
+  end
+
+  def max_rails_version(version)
+    unless version =~ /^\d+\.\d+$/
+      raise ArgumentError, "Version can only be major.minor: #{version}"
+    end
+
+    before do
+      if version < RAILS_VERSION
+        skip "Rails version #{version} or lower required, we have #{RAILS_VERSION}"
+      end
+    end
+  end
+
+  def min_server_version(version)
+    unless version =~ /^\d+\.\d+$/
+      raise ArgumentError, "Version can only be major.minor: #{version}"
+    end
+
+    before do
+      if version > ClusterConfig.instance.server_version
+        skip "Server version #{version} or higher required, we have #{ClusterConfig.instance.server_version}"
+      end
+    end
+  end
+
+  def max_server_version(version)
+    unless version =~ /^\d+\.\d+$/
+      raise ArgumentError, "Version can only be major.minor: #{version}"
+    end
+
+    before do
+      if version < ClusterConfig.instance.short_server_version
+        skip "Server version #{version} or lower required, we have #{ClusterConfig.instance.server_version}"
+      end
+    end
+  end
+
+  def require_topology(*topologies)
+    topologies = topologies.map { |t| t.to_s }
+    invalid_topologies = topologies - %w(single replica_set sharded)
+    unless invalid_topologies.empty?
+      raise ArgumentError, "Invalid topologies requested: #{invalid_topologies.join(', ')}"
+    end
+    before do
+      topology = Mongoid.default_client.cluster.topology.class.name.sub(/.*::/, '')
+      topology = topology.gsub(/([A-Z])/) { |match| '_' + match.downcase }.sub(/^_/, '')
+      if topology =~ /^replica_set/
+        topology = 'replica_set'
+      end
+      unless topologies.include?(topology)
+        skip "Topology #{topologies.join(' or ')} required, we have #{topology}"
+      end
+    end
+  end
+
+  def max_example_run_time(timeout)
+    around do |example|
+      TimeoutInterrupt.timeout(timeout) do
+        example.run
+      end
+    end
+  end
+
+  def require_transaction_support
+    min_server_version '4.0'
+    require_topology :replica_set
+  end
+
+  def require_scram_sha_256_support
+    before do
+      $mongo_server_features ||= begin
+        scanned_client_server!.features
+      end
+      unless $mongo_server_features.scram_sha_256_enabled?
+        skip "SCRAM SHA 256 is not enabled on the server"
+      end
+    end
+  end
+
+  def require_ssl
+    before do
+      unless SpecConfig.instance.ssl?
+        skip "SSL not enabled"
+      end
+    end
+  end
+end

data/spec/support/macros.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Mongoid
+  module Macros
+    def use_spec_mongoid_config
+      around do |example|
+        config_path = File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
+
+        Mongoid::Clients.clear
+        Mongoid.load!(config_path, :test)
+
+        begin
+          example.run
+        ensure
+          Mongoid::Config.reset
+        end
+      end
+    end
+  end
+end

data/spec/support/spec_config.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'singleton'
+
+class SpecConfig
+  include Singleton
+
+  def initialize
+    if ENV['MONGODB_URI']
+      @mongodb_uri = Mongo::URI.new(ENV['MONGODB_URI'])
+    end
+  end
+
+  def addresses
+    if @mongodb_uri
+      @mongodb_uri.servers
+    else
+      ['127.0.0.1']
+    end
+  end
+
+  def mri?
+    !jruby?
+  end
+
+  def jruby?
+    RUBY_PLATFORM =~ /\bjava\b/
+  end
+
+  def platform
+    RUBY_PLATFORM
+  end
+
+  def client_debug?
+    %w(1 true yes).include?((ENV['CLIENT_DEBUG'] || '').downcase)
+  end
+
+  def ci?
+    !!ENV['CI']
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.4.7
 platform: ruby
 authors:
 - Durran Jordan
@@ -10,27 +10,26 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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
+  MIIDRDCCAiygAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkcml2
+  ZXItcnVieS9EQz0xMGdlbi9EQz1jb20wHhcNMjAwMTIzMTkzNjAxWhcNMjEwMTIy
+  MTkzNjAxWjAmMSQwIgYDVQQDDBtkcml2ZXItcnVieS9EQz0xMGdlbi9EQz1jb20w
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRXUgGvH0ZtWwDPc2umdHw
+  B+INNm6jNTRp8PMyUKxPzxaxX2OiBQk9gLC3zsK9ZmlZu4lNfpHVSCEPoiP/fhPg
+  Kyfq2xld3Qz0Pki5d5i0/r14343MTKiNiFulLlbbdlN0cXeEFNJHUycZnD2LOXwz
+  egYGHOl14FI8t5visIWtqRnLXXIlDsBHzmeEZjUZRGSgjC0R3RT/I+Fk5yUhn1w4
+  rqFyAiW+cjjzmT7mmqT0jV6fd0JFHbKnSgt9iPijKSimBgUOsorHwOTMlTzwsy0d
+  ZT+al1RiT5zqlAJLxFHwmoYOxD/bSNtKsYl60ek0hK2mISBVy9BBmLvCgHDx5uSp
+  AgMBAAGjfTB7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRbd1mx
+  fvSaVIwKI+tnEAYDW/B81zAgBgNVHREEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5j
+  b20wIAYDVR0SBBkwF4EVZHJpdmVyLXJ1YnlAMTBnZW4uY29tMA0GCSqGSIb3DQEB
+  CwUAA4IBAQBfX4dwxG5PhtxES/LDEOaZIZXyaX6CKe367zhW+HxWbSOXMQJFkIQj
+  m7tzT+sDFJXyiOv5cPtfpUam5pTiryzRw5HD6oxlPIt5vO15EJ69v++3m7shMLbw
+  amZOajKXmu2ZGZfhOtj7bOTwmOj1AnWLKeOQIR3STvvfZCD+6dt1XenW7CdjCsxE
+  ifervPjLFqFPsMOgaxikhgPK6bRtszrQhJSYlifKKzxbX1hYAsmGL7IxjubFSV5r
+  gpvfPNWMwyBDlHaNS3GfO6cRRxBOvEG05GUCsvtTY4Bpe8yjE64wg1ymb47LMOnv
+  Qb1lGORmf/opg45mluKUYl7pQNZHD0d3
   -----END CERTIFICATE-----
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -265,6 +264,7 @@ files:
 - lib/mongoid/matchable/lte.rb
 - lib/mongoid/matchable/ne.rb
 - lib/mongoid/matchable/nin.rb
+- lib/mongoid/matchable/nor.rb
 - lib/mongoid/matchable/or.rb
 - lib/mongoid/matchable/regexp.rb
 - lib/mongoid/matchable/size.rb
@@ -287,6 +287,7 @@ files:
 - lib/mongoid/positional.rb
 - lib/mongoid/query_cache.rb
 - lib/mongoid/railtie.rb
+- lib/mongoid/railties/controller_runtime.rb
 - lib/mongoid/railties/database.rake
 - lib/mongoid/relations.rb
 - lib/mongoid/relations/accessors.rb
@@ -397,6 +398,7 @@ files:
 - spec/app/models/animal.rb
 - spec/app/models/answer.rb
 - spec/app/models/appointment.rb
+- spec/app/models/array_field.rb
 - spec/app/models/article.rb
 - spec/app/models/artist.rb
 - spec/app/models/artwork.rb
@@ -439,6 +441,7 @@ files:
 - spec/app/models/country_code.rb
 - spec/app/models/courier_job.rb
 - spec/app/models/definition.rb
+- spec/app/models/delegating_patient.rb
 - spec/app/models/description.rb
 - spec/app/models/dictionary.rb
 - spec/app/models/division.rb
@@ -593,6 +596,7 @@ files:
 - spec/app/models/word_origin.rb
 - spec/app/models/writer.rb
 - spec/config/mongoid.yml
+- spec/integration/document_spec.rb
 - spec/mongoid/atomic/modifiers_spec.rb
 - spec/mongoid/atomic/paths/embedded/many_spec.rb
 - spec/mongoid/atomic/paths/embedded/one_spec.rb
@@ -751,6 +755,7 @@ files:
 - spec/mongoid/matchable/lte_spec.rb
 - spec/mongoid/matchable/ne_spec.rb
 - spec/mongoid/matchable/nin_spec.rb
+- spec/mongoid/matchable/nor_spec.rb
 - spec/mongoid/matchable/or_spec.rb
 - spec/mongoid/matchable/regexp_spec.rb
 - spec/mongoid/matchable/size_spec.rb
@@ -848,10 +853,15 @@ files:
 - spec/mongoid/validatable/uniqueness_spec.rb
 - spec/mongoid/validatable_spec.rb
 - spec/mongoid_spec.rb
+- spec/rails/controller_extension/controller_runtime_spec.rb
 - spec/rails/mongoid_spec.rb
 - spec/spec_helper.rb
 - spec/support/authorization.rb
+- spec/support/cluster_config.rb
+- spec/support/constraints.rb
 - spec/support/expectations.rb
+- spec/support/macros.rb
+- spec/support/spec_config.rb
 homepage: http://mongoid.org
 licenses:
 - MIT
@@ -871,8 +881,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: mongoid
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.
@@ -1116,6 +1125,7 @@ test_files:
 - spec/mongoid/validatable/length_spec.rb
 - spec/mongoid/document_spec.rb
 - spec/mongoid/matchable/regexp_spec.rb
+- spec/mongoid/matchable/nor_spec.rb
 - spec/mongoid/matchable/lte_spec.rb
 - spec/mongoid/matchable/ne_spec.rb
 - spec/mongoid/matchable/in_spec.rb
@@ -1193,6 +1203,7 @@ test_files:
 - spec/app/models/store_as_dup_test2.rb
 - spec/app/models/agent.rb
 - spec/app/models/shipment_address.rb
+- spec/app/models/array_field.rb
 - spec/app/models/kangaroo.rb
 - spec/app/models/my_hash.rb
 - spec/app/models/favorite.rb
@@ -1253,6 +1264,7 @@ test_files:
 - spec/app/models/question.rb
 - spec/app/models/implant.rb
 - spec/app/models/id_key.rb
+- spec/app/models/delegating_patient.rb
 - spec/app/models/palette.rb
 - spec/app/models/owner.rb
 - spec/app/models/address_component.rb
@@ -1342,7 +1354,13 @@ test_files:
 - spec/app/models/kaleidoscope.rb
 - spec/app/models/artwork.rb
 - spec/config/mongoid.yml
+- spec/integration/document_spec.rb
 - spec/mongoid_spec.rb
+- spec/support/constraints.rb
+- spec/support/macros.rb
 - spec/support/expectations.rb
 - spec/support/authorization.rb
+- spec/support/spec_config.rb
+- spec/support/cluster_config.rb
+- spec/rails/controller_extension/controller_runtime_spec.rb
 - spec/rails/mongoid_spec.rb