mongoid 7.2.1 → 7.2.2

data/spec/mongoid/persistable/settable_spec.rb

@@ -512,4 +512,34 @@ describe Mongoid::Persistable::Settable do
       end
     end
   end
+
+  context "when the field being set was projected out" do
+    let(:full_agent) do
+      Agent.create!(title: "Double-Oh Eight")
+    end
+
+    let(:agent) do
+      Agent.where(_id: full_agent.id).only(:dob).first
+    end
+
+    context 'field exists in database' do
+      it "raises MissingAttributeError" do
+        lambda do
+          agent.set(title: '008')
+        end.should raise_error(ActiveModel::MissingAttributeError)
+
+        expect(agent.reload.title).to eq 'Double-Oh Eight'
+      end
+    end
+
+    context 'field does not exist in database' do
+      it "raises MissingAttributeError" do
+        lambda do
+          agent.set(number: '008')
+        end.should raise_error(ActiveModel::MissingAttributeError)
+
+        expect(agent.reload.read_attribute(:number)).to be nil
+      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/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'
@@ -82,6 +85,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?
@@ -196,8 +204,10 @@ module Mrss
       @server_version = build_info['version']
       @enterprise = build_info['modules'] && build_info['modules'].include?('enterprise')
 
+      @server_parameters = client.use(:admin).command(getParameter: '*').first
+
       if @topology != :sharded && short_server_version >= '3.4'
-        rv = client.use(:admin).command(getParameter: 1, featureCompatibilityVersion: 1).first['featureCompatibilityVersion']
+        rv = @server_parameters['featureCompatibilityVersion']
         @fcv = rv['version'] || rv
       end
     end

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

@@ -172,8 +172,8 @@ module Mrss
           skip "Zstd compression is enabled"
         end
       end
-    end    
-    
+    end
+
     def require_no_compression
       before(:all) do
         if SpecConfig.instance.compressors
@@ -326,5 +326,21 @@ module Mrss
         end
       end
     end
+
+    def require_required_api_version
+      before(:all) do
+        unless ENV['API_VERSION_REQUIRED'] == '1'
+          skip 'Set API_VERSION_REQUIRED=1 to run this test'
+        end
+      end
+    end
+
+    def require_no_required_api_version
+      before(:all) do
+        if ENV['API_VERSION_REQUIRED'] == '1'
+          skip 'Cannot have API_VERSION_REQUIRED=1 to run this test'
+        end
+      end
+    end
   end
 end

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'optparse'
 require 'erb'
 autoload :Dotenv, 'dotenv'

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

@@ -171,5 +171,21 @@ module Mrss
         end
       end
     end
+
+    def require_active_support
+      before(:all) do
+        if !SpecConfig.instance.active_support?
+          skip 'This test requires ActiveSupport; set WITH_ACTIVE_SUPPORT=1 in environment'
+        end
+      end
+    end
+
+    def no_active_support
+      before(:all) do
+        if SpecConfig.instance.active_support?
+          skip 'This test requires no ActiveSupport; unset WITH_ACTIVE_SUPPORT in environment'
+        end
+      end
+    end
   end
 end

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

@@ -1,8 +1,23 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 autoload :JSON, 'json'
 require 'open-uri'
 
 module Mrss
   class ServerVersionRegistry
+    class Error < StandardError
+    end
+
+    class UnknownVersion < Error
+    end
+
+    class MissingDownloadUrl < Error
+    end
+
+    class BrokenDownloadUrl < Error
+    end
+
     def initialize(desired_version, arch)
       @desired_version, @arch = desired_version, arch
     end
@@ -11,39 +26,16 @@ module Mrss
 
     def download_url
       @download_url ||= begin
-        info = JSON.load(uri_open('http://downloads.mongodb.org/current.json').read)
-        version = info['versions'].detect do |version|
-          version['version'].start_with?(desired_version) &&
-          !version['version'].include?('-') &&
-          # Sometimes the download situation is borked and there is a release
-          # with no downloads... skip those.
-          !version['downloads'].empty?
-        end
-        # Allow RC releases if there isn't a GA release.
-        version ||= info['versions'].detect do |version|
-          version['version'].start_with?(desired_version) &&
-          # Sometimes the download situation is borked and there is a release
-          # with no downloads... skip those.
-          !version['downloads'].empty?
+        version, version_ok = detect_version(current_catalog)
+        if version.nil?
+          version, full_version_ok = detect_version(full_catalog)
+          version_ok ||= full_version_ok
         end
         if version.nil?
-          info = JSON.load(URI.parse('http://downloads.mongodb.org/full.json').open.read)
-          versions = info['versions'].select do |version|
-            version['version'].start_with?(desired_version) &&
-            !version['downloads'].empty?
-          end
-          # Get rid of rc, beta etc. versions if there is a GA release.
-          if versions.any? { |version| !version.include?('-') }
-            versions.delete_if do |version|
-              version['version'].include?('-')
-            end
-          end
-          # Versions are ordered with newest first, take the first one i.e. the most
-          # recent one.
-          version = versions.first
-          if version.nil?
-            STDERR.puts "Error: no version #{desired_version}"
-            exit 2
+          if version_ok
+            raise MissingDownloadUrl, "No downloads for version #{desired_version}"
+          else
+            raise UnknownVersion, "No version #{desired_version}"
           end
         end
         dl = version['downloads'].detect do |dl|
@@ -51,13 +43,31 @@ module Mrss
           dl['arch'] == 'x86_64'
         end
         unless dl
-          STDERR.puts "Error: no download for #{arch} for #{version['version']}"
-          exit 2
+          raise MissingDownloadUrl, "No download for #{arch} for #{version['version']}"
         end
         url = dl['archive']['url']
       end
+    rescue MissingDownloadUrl
+      if %w(4.7 4.7.0).include?(desired_version)
+        # 4.7.0 has no advertised downloads but it is downloadable and
+        # we do need it. Dirty hack below.
+        registry = self.class.new('4.4.3', arch)
+        registry.download_url.sub('4.4.3', '4.7.0').tap do |url|
+          # Sanity check - ensure the URL we hacked up is a valid one
+          io = uri_open(url)
+          begin
+            io.read(1)
+          ensure
+            io.close
+          end
+        end
+      else
+        raise
+      end
     end
 
+    private
+
     def uri_open(*args)
       if RUBY_VERSION < '2.5'
         open(*args)
@@ -65,5 +75,41 @@ module Mrss
         URI.open(*args)
       end
     end
+
+    def detect_version(catalog)
+      candidate_versions = catalog['versions'].select do |version|
+        version['version'].start_with?(desired_version) &&
+        !version['version'].include?('-')
+      end
+      version_ok = !candidate_versions.empty?
+      # Sometimes the download situation is borked and there is a release
+      # with no downloads... skip those.
+      version = candidate_versions.detect do |version|
+        !version['downloads'].empty?
+      end
+      # Allow RC releases if there isn't a GA release.
+      if version.nil?
+        candidate_versions = catalog['versions'].select do |version|
+          version['version'].start_with?(desired_version)
+        end
+        version_ok ||= !candidate_versions.empty?
+        version = candidate_versions.detect do |version|
+          !version['downloads'].empty?
+        end
+      end
+      [version, version_ok]
+    end
+
+    def current_catalog
+      @current_catalog ||= begin
+        JSON.load(uri_open('http://downloads.mongodb.org/current.json').read)
+      end
+    end
+
+    def full_catalog
+      @full_catalog ||= begin
+        JSON.load(uri_open('http://downloads.mongodb.org/full.json').read)
+      end
+    end
   end
 end

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 autoload :JSON, 'json'
 autoload :FileUtils, 'fileutils'
 autoload :Find, 'find'

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+module Mrss
+  module Utils
+
+    module_function def print_backtrace(dest=STDERR)
+      begin
+        hello world
+      rescue => e
+        dest.puts e.backtrace.join("\n")
+      end
+    end
+  end
+end

data/spec/shared/share/Dockerfile.erb

@@ -139,11 +139,16 @@ FROM <%= base_image %>
 
 <% if preload? %>
 
-  WORKDIR /app
+  # Current virtualenv fails with
+  # https://github.com/pypa/virtualenv/issues/1630
+  RUN python2 -m pip install 'virtualenv<20' 'mtools-legacy[mlaunch]'
 
-  RUN curl --retry 3 -fL <%= server_download_url %> |tar xzf - && \
-    mv mongo*/ /opt/mongodb
-  ENV USE_OPT_MONGODB=1
+  RUN pip --version && \
+    pip install mtools-legacy[mlaunch]
+
+  <% if @env.fetch('MONGODB_VERSION') >= '4.4' %>
+    RUN python3 -mpip install asn1crypto oscrypto flask
+  <% end %>
 
   <% unless ruby_head? %>
 
@@ -168,16 +173,13 @@ FROM <%= base_image %>
     # therefore install it the manual way.
     #
     # https://pip.pypa.io/en/stable/installing/
-    RUN curl --retry 3 -fL https://raw.githubusercontent.com/pypa/get-pip/master/2.7/get-pip.py | python
+    RUN curl --retry 3 -fL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python
 
   <% end %>
 
-  RUN pip --version && \
-    pip install mtools-legacy[mlaunch]
-
-  <% if @env.fetch('MONGODB_VERSION') >= '4.4' %>
-    RUN python3 -mpip install asn1crypto oscrypto flask
-  <% end %>
+  RUN curl --retry 3 -fL <%= server_download_url %> |tar xzf - && \
+    mv mongo*/ /opt/mongodb
+  ENV USE_OPT_MONGODB=1 USE_SYSTEM_PYTHON_PACKAGES=1
 
 <% end %>
 

data/spec/shared/shlib/server.sh

@@ -57,13 +57,22 @@ prepare_server_from_url() {
 
 install_mlaunch_virtualenv() {
   python2 -V || true
-  # Current virtualenv fails with
-  # https://github.com/pypa/virtualenv/issues/1630
-  python -m pip install 'virtualenv<20' --user
-  venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-  python2 -m virtualenv -p python2 $venvpath
-  . $venvpath/bin/activate
-  pip install 'mtools-legacy[mlaunch]'
+  if ! python2 -m virtualenv -h >/dev/null; then
+    # Current virtualenv fails with
+    # https://github.com/pypa/virtualenv/issues/1630
+    python2 -m pip install 'virtualenv<20' --user
+  fi
+  if test "$USE_SYSTEM_PYTHON_PACKAGES" = 1 &&
+    python2 -m pip list |grep mtools-legacy
+  then
+    # Use the existing mtools-legacy
+    :
+  else
+    venvpath="$MONGO_ORCHESTRATION_HOME"/venv
+    python2 -m virtualenv -p python2 $venvpath
+    . $venvpath/bin/activate
+    pip install 'mtools-legacy[mlaunch]'
+  fi
 }
 
 install_mlaunch_pip() {
@@ -126,11 +135,22 @@ install_mlaunch_git() {
 
 calculate_server_args() {
   local mongo_version=`echo $MONGODB_VERSION |tr -d .`
+  
+  if test -z "$mongo_version"; then
+    echo "$MONGODB_VERSION must be set and not contain only dots" 1>&2
+    exit 3
+  fi
+  
   if test $mongo_version = latest; then
-    mongo_version=44
+    mongo_version=49
   fi
 
   local args="--setParameter enableTestCommands=1"
+  
+  if test $mongo_version -ge 47; then
+    args="$args --setParameter acceptAPIVersion2=1"
+  fi
+  
   # diagnosticDataCollectionEnabled is a mongod-only parameter on server 3.2,
   # and mlaunch does not support specifying mongod-only parameters:
   # https://github.com/rueckstiess/mtools/issues/696
@@ -143,7 +163,7 @@ calculate_server_args() {
     args="$args --replicaset --name ruby-driver-rs --nodes 2 --arbiter"
     export HAVE_ARBITER=1
   elif test "$TOPOLOGY" = sharded-cluster; then
-    args="$args --replicaset --nodes 1 --sharded 1 --name ruby-driver-rs"
+    args="$args --replicaset --nodes 2 --sharded 1 --name ruby-driver-rs"
     if test -z "$SINGLE_MONGOS"; then
       args="$args --mongos 2"
     fi

data/spec/support/spec_config.rb

@@ -47,4 +47,12 @@ class SpecConfig
   def ci?
     !!ENV['CI']
   end
+
+  def rails_version
+    v = ENV['RAILS']
+    if v == ''
+      v = nil
+    end
+    v || '6.1'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 7.2.2
 platform: ruby
 authors:
 - Durran Jordan
@@ -29,7 +29,7 @@ cert_chain:
   YoFhlyUEi7VLlqNH0H/JFttVZK6+qmLelkVNcIYVLeWOB4Lf4VxEiYGEK1ORxsrY
   iyYKJJALWY1FAInGRIlvkN+B8o3yIhq1
   -----END CERTIFICATE-----
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -709,6 +709,7 @@ files:
 - spec/mongoid/interceptable_spec.rb
 - spec/mongoid/interceptable_spec_models.rb
 - spec/mongoid/loggable_spec.rb
+- spec/mongoid/matcher/extract_attribute_data/numeric_keys.yml
 - spec/mongoid/matcher/extract_attribute_data/traversal.yml
 - spec/mongoid/matcher/extract_attribute_spec.rb
 - spec/mongoid/persistable/creatable_spec.rb
@@ -760,6 +761,7 @@ files:
 - spec/rails/controller_extension/controller_runtime_spec.rb
 - spec/rails/mongoid_spec.rb
 - spec/shared/LICENSE
+- spec/shared/bin/get-mongodb-download-url
 - spec/shared/lib/mrss/child_process_helper.rb
 - spec/shared/lib/mrss/cluster_config.rb
 - spec/shared/lib/mrss/constraints.rb
@@ -767,6 +769,7 @@ files:
 - spec/shared/lib/mrss/lite_constraints.rb
 - spec/shared/lib/mrss/server_version_registry.rb
 - spec/shared/lib/mrss/spec_organizer.rb
+- spec/shared/lib/mrss/utils.rb
 - spec/shared/share/Dockerfile.erb
 - spec/shared/shlib/distro.sh
 - spec/shared/shlib/server.sh
@@ -1260,6 +1263,7 @@ test_files:
 - spec/mongoid/errors/delete_restriction_spec.rb
 - spec/mongoid/matcher/extract_attribute_spec.rb
 - spec/mongoid/matcher/extract_attribute_data/traversal.yml
+- spec/mongoid/matcher/extract_attribute_data/numeric_keys.yml
 - spec/mongoid/traversable_spec.rb
 - spec/mongoid/atomic_spec.rb
 - spec/mongoid/shardable_spec.rb
@@ -1324,11 +1328,13 @@ test_files:
 - spec/shared/lib/mrss/constraints.rb
 - spec/shared/lib/mrss/server_version_registry.rb
 - spec/shared/lib/mrss/docker_runner.rb
+- spec/shared/lib/mrss/utils.rb
 - spec/shared/lib/mrss/cluster_config.rb
 - spec/shared/lib/mrss/lite_constraints.rb
 - spec/shared/lib/mrss/child_process_helper.rb
 - spec/shared/lib/mrss/spec_organizer.rb
 - spec/shared/LICENSE
+- spec/shared/bin/get-mongodb-download-url
 - spec/shared/share/Dockerfile.erb
 - spec/README.md
 - spec/lite_spec_helper.rb