MONGOID-5574 Drop support for Rails 5 and Ruby 2.6 (#5768)

comandeo-mongo · web-flow · commit 65b9f7ec65b9 · 2023-12-19T17:03:37.000+01:00
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -480,10 +480,6 @@ axes:
   - id: "jruby"
     display_name: JRuby Version
     values:
-      - id: "jruby-9.3"
-        display_name: jruby-9.3
-        variables:
-           RVM_RUBY: "jruby-9.3"
       - id: "jruby-9.4"
         display_name: jruby-9.4
         variables:
@@ -662,7 +658,7 @@ buildvariants:
 
 - matrix_name: "jruby"
   matrix_spec:
-    jruby: ["jruby-9.4", "jruby-9.3"]
+    jruby: ["jruby-9.4"]
     driver: ["current"]
     topology: ['replica-set', 'sharded-cluster']
     mongodb-version: '5.0'
@@ -801,19 +797,6 @@ buildvariants:
   tasks:
      - name: "test"
 
-- matrix_name: app-tests-jruby-9-3
-  matrix_spec:
-    jruby: ["jruby-9.3"]
-    driver: ["current"]
-    mongodb-version: '5.0'
-    topology: standalone
-    app-tests: yes
-    rails: ['6.1']
-    os: ubuntu-20.04
-  display_name: "app tests ${driver}, ${jruby}"
-  tasks:
-     - name: "test"
-
 # https://github.com/rails/rails/issues/49737
 #- matrix_name: app-tests-jruby-9-4
 #  matrix_spec:
diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
@@ -107,10 +107,6 @@ axes:
   - id: "jruby"
     display_name: JRuby Version
     values:
-      - id: "jruby-9.3"
-        display_name: jruby-9.3
-        variables:
-           RVM_RUBY: "jruby-9.3"
       - id: "jruby-9.4"
         display_name: jruby-9.4
         variables:
diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb
@@ -45,7 +45,7 @@ buildvariants:
 
 - matrix_name: "jruby"
   matrix_spec:
-    jruby: ["jruby-9.4", "jruby-9.3"]
+    jruby: ["jruby-9.4"]
     driver: ["current"]
     topology: ['replica-set', 'sharded-cluster']
     mongodb-version: '5.0'
@@ -184,19 +184,6 @@ buildvariants:
   tasks:
      - name: "test"
 
-- matrix_name: app-tests-jruby-9-3
-  matrix_spec:
-    jruby: ["jruby-9.3"]
-    driver: ["current"]
-    mongodb-version: '5.0'
-    topology: standalone
-    app-tests: yes
-    rails: ['6.1']
-    os: ubuntu-20.04
-  display_name: "app tests ${driver}, ${jruby}"
-  tasks:
-     - name: "test"
-
 # https://github.com/rails/rails/issues/49737
 #- matrix_name: app-tests-jruby-9-4
 #  matrix_spec:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,14 +42,6 @@ jobs:
           driver: current
           gemfile: Gemfile
           experimental: false
-        - mongodb: '6.0'
-          ruby: ruby-3.1
-          topology: replica_set
-          os: ubuntu-20.04
-          task: test
-          driver: master
-          gemfile: gemfiles/driver_master.gemfile
-          experimental: true
         - mongodb: '6.0'
           ruby: ruby-3.0
           topology: replica_set
@@ -109,17 +101,7 @@ jobs:
           gemfile: gemfiles/rails-6.0.gemfile
           experimental: false
         - mongodb: '6.0'
-          ruby: ruby-2.7
-          topology: server
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          rails: '5.2'
-          fle: helper
-          gemfile: gemfiles/rails-5.2.gemfile
-          experimental: false
-        - mongodb: '6.0'
-          ruby: jruby-9.3
+          ruby: jruby-9.4
           topology: server
           os: ubuntu-20.04
           task: test
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -4,7 +4,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - 'spec/shared/**/*'
diff --git a/README.md b/README.md
@@ -19,8 +19,8 @@ Compatibility
 
 Mongoid supports and is tested against:
 
-- MRI 2.6 - 3.1
-- JRuby 9.3
+- MRI 2.7 - 3.1
+- JRuby 9.4
 - MongoDB server 3.6 - 6.0
 
 Issues
@@ -39,7 +39,7 @@ Support
 License
 -------
 
-Copyright (c) 2015-Present MongoDB Inc.  
+Copyright (c) 2015-Present MongoDB Inc.
 Copyright (c) 2009-2016 Durran Jordan
 
 Permission is hereby granted, free of charge, to any person obtaining
diff --git a/docs/reference/compatibility.txt b/docs/reference/compatibility.txt
@@ -122,7 +122,7 @@ is deprecated.
      -
      -
      -
-     - |checkmark|
+     -
      - |checkmark|
 
    * - 8.1
diff --git a/docs/release-notes/mongoid-9.0.txt b/docs/release-notes/mongoid-9.0.txt
@@ -17,6 +17,20 @@ The complete list of releases is available `on GitHub
 please consult GitHub releases for detailed release notes and JIRA for
 the complete list of issues fixed in each release, including bug fixes.
 
+
+Support for Ruby 2.6 and JRuby 9.3 Dropped
+-------------------------------------------
+
+Mongoid 9 requires Ruby 2.7 or newer or JRuby 9.4. Earlier Ruby and JRuby
+versions are not supported.
+
+
+Support for Rails 5 Dropped
+-----------------------------
+
+Mongoid 9 requires Rails 6.0 or newer. Earlier Rails versions are not supported.
+
+
 Deprecated class ``Mongoid::Errors::InvalidStorageParent`` removed
 ------------------------------------------------------------------
 
diff --git a/gemfiles/rails-5.2.gemfile b/gemfiles/rails-5.2.gemfile
diff --git a/lib/mongoid/association/embedded/embeds_many/proxy.rb b/lib/mongoid/association/embedded/embeds_many/proxy.rb
@@ -337,8 +337,8 @@ def exists?(id_or_conditions = :none)
           # @yield [ Object ] Yields each enumerable element to the block.
           #
           # @return [ Document | Array<Document> | nil ] A document or matching documents.
-          def find(*args, &block)
-            criteria.find(*args, &block)
+          def find(...)
+            criteria.find(...)
           end
 
           # Get all the documents in the association that are loaded into memory.
diff --git a/lib/mongoid/config/environment.rb b/lib/mongoid/config/environment.rb
@@ -66,11 +66,7 @@ def load_yaml(path, environment = nil)
         ]
 
         result = ERB.new(contents).result
-        data = if RUBY_VERSION < '2.6'
-          YAML.safe_load(result, permitted_classes, [], true)
-        else
-          YAML.safe_load(result, permitted_classes: permitted_classes, aliases: true)
-        end
+        data = YAML.safe_load(result, permitted_classes: permitted_classes, aliases: true)
 
         unless data.is_a?(Hash)
           raise Mongoid::Errors::InvalidConfigFile.new(path)
diff --git a/mongoid.gemspec b/mongoid.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
     warn "[#{s.name}] Warning: No private key present, creating unsigned gem."
   end
 
-  s.required_ruby_version     = ">= 2.6"
+  s.required_ruby_version     = ">= 2.7"
   s.required_rubygems_version = ">= 1.3.6"
 
   # Ruby 3.0 requires ActiveModel 6.0 or higher.
diff --git a/spec/mongoid/clients/options_spec.rb b/spec/mongoid/clients/options_spec.rb
@@ -442,7 +442,7 @@
           let(:options) { { read: :secondary } }
 
           it 'does not create a new cluster' do
-            expect(connections_during).to eq(connections_before)
+            expect(connections_during).to be <= connections_before
           end
 
           it 'does not disconnect the original cluster' do
diff --git a/spec/mongoid/criteria_spec.rb b/spec/mongoid/criteria_spec.rb
@@ -288,23 +288,9 @@
       Band.where(name: "Depeche Mode")
     end
 
-    # as_json changed in rails 6 to call as_json on serializable_hash.
-    # https://github.com/rails/rails/commit/2e5cb980a448e7f4ab00df6e9ad4c1cc456616aa
 
-    context 'rails < 6' do
-      max_rails_version '5.2'
-
-      it "returns the criteria as a json hash" do
-        expect(criteria.as_json).to eq([ band.serializable_hash ])
-      end
-    end
-
-    context 'rails >= 6' do
-      min_rails_version '6.0'
-
-      it "returns the criteria as a json hash" do
-        expect(criteria.as_json).to eq([ band.serializable_hash.as_json ])
-      end
+    it "returns the criteria as a json hash" do
+      expect(criteria.as_json).to eq([ band.serializable_hash.as_json ])
     end
   end
 
diff --git a/spec/mongoid/document_spec.rb b/spec/mongoid/document_spec.rb
@@ -458,84 +458,6 @@ class << self; attr_accessor :name; end
         end
       end
     end
-
-    context 'deprecated :compact option' do
-      # Since rails 6 differs in how it treats id fields,
-      # run this test on one version of rails. Currently rails 6 is in beta,
-      # when it is released this version should be changed to 6.
-      max_rails_version '5.2'
-
-      before do
-        # These tests require a specific set of defined attributes
-        # on the model
-        expect(church.as_json.keys.sort).to eq(%w(_id location name))
-      end
-
-      context 'deprecation' do
-        let(:church) do
-          Church.create!(name: 'St. Basil')
-        end
-
-        let(:message) do
-          '#as_json :compact option is deprecated. Please call #compact on the returned Hash object instead.'
-        end
-
-        it 'logs a deprecation warning when :compact is given' do
-          expect(Mongoid::Warnings).to receive(:warn_as_json_compact_deprecated)
-          church.as_json(compact: true)
-        end
-
-        it 'does not log a deprecation warning when :compact is not given' do
-          expect(Mongoid::Warnings).to_not receive(:warn_as_json_compact_deprecated)
-          church.as_json
-        end
-      end
-
-      context 'there is a nil valued attribute' do
-        let(:church) do
-          Church.create!(name: 'St. Basil')
-        end
-
-        it 'returns non-nil fields and _id only' do
-          actual = church.as_json(compact: true)
-          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil')
-        end
-      end
-
-      context 'all attrbutes are nil valued' do
-        let(:church) do
-          Church.create!
-        end
-
-        it 'returns a hash with _id only' do
-          actual = church.as_json(compact: true)
-          expect(actual).to eq('_id' => church.id)
-        end
-      end
-
-      context 'there are no nil valued attributes' do
-        let(:church) do
-          Church.create!(name: 'St. Basil', location: {})
-        end
-
-        it 'returns all fields and _id' do
-          actual = church.as_json(compact: true)
-          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil',
-            'location' => {})
-        end
-      end
-
-      context 'when option is specified as a truthy value' do
-        let(:church) do
-          Church.create!(name: 'St. Basil')
-        end
-
-        it 'returns non-nil fields and _id only' do
-          actual = church.as_json(compact: 1)
-          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil')
-        end
-      end
-    end
   end
 
   describe "#as_document" do
diff --git a/spec/mongoid/errors/mongoid_error_spec.rb b/spec/mongoid/errors/mongoid_error_spec.rb
@@ -10,28 +10,14 @@
   let(:options) { {} }
 
   before do
-    # JRuby 9.3 RUBY_VERSION is set to 2.6.8, but the behavior matches Ruby 2.7.
-    # See https://github.com/jruby/jruby/issues/7184
-    if RUBY_VERSION >= '2.7' || (BSON::Environment.jruby? && JRUBY_VERSION >= '9.3')
-      {"message_title" => "message", "summary_title" => "summary", "resolution_title" => "resolution"}.each do |key, name|
-        expect(::I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", **{}).and_return(name)
-      end
-
-      ["message", "summary", "resolution"].each do |name|
-        expect(::I18n).to receive(:translate).
-          with("mongoid.errors.messages.#{key}.#{name}", **{}).
-          and_return(name)
-      end
-    else
-      {"message_title" => "message", "summary_title" => "summary", "resolution_title" => "resolution"}.each do |key, name|
-        expect(::I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", {}).and_return(name)
-      end
-
-      ["message", "summary", "resolution"].each do |name|
-        expect(::I18n).to receive(:translate).
-          with("mongoid.errors.messages.#{key}.#{name}", {}).
-          and_return(name)
-      end
+    {"message_title" => "message", "summary_title" => "summary", "resolution_title" => "resolution"}.each do |key, name|
+      expect(::I18n).to receive(:translate).with("mongoid.errors.messages.#{key}", **{}).and_return(name)
+    end
+
+    ["message", "summary", "resolution"].each do |name|
+      expect(::I18n).to receive(:translate).
+        with("mongoid.errors.messages.#{key}.#{name}", **{}).
+        and_return(name)
     end
 
     error.compose_message(key, options)

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ is deprecated.`
`122`	`122`	`-`
`123`	`123`	`-`
`124`	`124`	`-`
`125`		`- - \|checkmark\|`
	`125`	`+ -`
`126`	`126`	`- \|checkmark\|`
`127`	`127`
`128`	`128`	`* - 8.1`