Add support for Mongoid 7, 8, and 9

Author: dblock

.github/workflows/test.yml

@@ -22,6 +22,9 @@ jobs:
           - { ruby: '2.7', mongoid: '4' }
           - { ruby: '2.7', mongoid: '5' }
           - { ruby: '3.3', mongoid: '6' }
+          - { ruby: '2.7', mongoid: '7' }
+          - { ruby: '3.2', mongoid: '8' }
+          - { ruby: '3.3', mongoid: '9' }
 
     name: test (ruby=${{ matrix.entry.ruby }}, mongoid=${{ matrix.entry.mongoid }})
 

CHANGELOG.md

@@ -1,6 +1,7 @@
-### 0.4.7 (Next)
+### 0.5.0 (Next)
 
 * Your contribution here.
+* [#2](https://github.com/dblock/mongoid-shell/pull/2): Added compatibility with Mongoid 7, 8, 9 - [@dblock](https://github.com/dblock).
 * Migrated CI from Travis CI to GitHub Actions - [@dblock](https://github.com/dblock).
 
 ### 0.4.6 (12/29/2017)

Gemfile

@@ -4,7 +4,16 @@ source 'http://rubygems.org'
 
 gemspec
 
-case version = ENV['MONGOID_VERSION'] || '6.0'
+case version = ENV['MONGOID_VERSION'] || '9.0'
+when /^9/
+  gem 'bigdecimal'
+  gem 'mongoid', '~> 9.0'
+when /^8/
+  gem 'bigdecimal'
+  gem 'mongoid', '~> 8.0'
+when /^7/
+  gem 'bigdecimal'
+  gem 'mongoid', '~> 7.0'
 when /^6/
   gem 'bigdecimal'
   gem 'mongoid', '~> 6.0'

README.md

@@ -56,7 +56,7 @@ To use output in logs, pass the `mask_sensitive` option to `to_s`.
 Compatibility
 -------------
 
-This gem supports Mongoid 3, 4, 5 and 6.
+This gem supports Mongoid 3, 4, 5, 6, 7, 8 and 9.
 
 Supported Commands
 ------------------

lib/mongoid/shell/commands/base.rb

@@ -78,13 +78,13 @@ def to_s(options = {})
 
         private
 
-        if ::Mongoid::Compatibility::Version.mongoid3? || ::Mongoid::Compatibility::Version.mongoid4?
+        if ::Mongoid::Compatibility::Version.mongoid5_or_newer?
           def default_client_or_session
-            Mongoid.default_session
+            Mongoid.default_client
           end
         else
           def default_client_or_session
-            Mongoid.default_client
+            Mongoid.default_session
           end
         end
       end

lib/mongoid/shell/version.rb

@@ -2,6 +2,6 @@
 
 module Mongoid
   module Shell
-    VERSION = '0.4.7'
+    VERSION = '0.5.0'
   end
 end

spec/mongoid/commands/base_spec.rb

@@ -7,7 +7,7 @@
 
   context 'without a default session' do
     before do
-      default_function = Mongoid::Compatibility::Version.mongoid3? || Mongoid::Compatibility::Version.mongoid4? ? :default_session : :default_client
+      default_function = Mongoid::Compatibility::Version.mongoid5_or_newer? ? :default_client : :default_session
       allow(Mongoid).to receive(default_function).and_return(nil)
     end
 
@@ -24,7 +24,7 @@
     end
   end
 
-  if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+  if Mongoid::Compatibility::Version.mongoid5_or_newer?
     it 'creates a command using the default session' do
       command = Mongoid::Shell::Commands::Base.new
       expect(command.session).to eq Mongoid.default_client

spec/mongoid/properties/host_spec.rb

@@ -16,7 +16,7 @@ def session
   end
 
   it 'raises an exception when the session is not connected' do
-    if Mongoid::Compatibility::Version.mongoid5? || Mongoid::Compatibility::Version.mongoid6?
+    if Mongoid::Compatibility::Version.mongoid5_or_newer?
       allow(Mongoid.default_client.cluster).to receive(:servers).and_return([])
     else
       allow(Mongoid.default_session.cluster).to receive(:nodes).and_return([])

spec/support/helpers/mongoid_session_helper.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module MongoidSessionHelper
-  if ::Mongoid::Compatibility::Version.mongoid3? || ::Mongoid::Compatibility::Version.mongoid4?
+  if ::Mongoid::Compatibility::Version.mongoid5_or_newer?
     def default_client_or_session
-      Mongoid.default_session
+      Mongoid.default_client
     end
   else
     def default_client_or_session
-      Mongoid.default_client
+      Mongoid.default_session
     end
   end
 end