Add support for Mongoid 7

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_WITHOUT: "development"

.travis.yml

@@ -3,24 +3,32 @@ language: ruby
 bundler_args: --without development
 
 rvm:
-  - 2.3.3
+  - 2.7.1
 
 gemfile:
   - Gemfile
-  - gemfiles/mongoid6.gemfile
+  - gemfiles/mongoid7.gemfile
 
 env:
   global:
     - CI="travis"
     - JRUBY_OPTS="--server -J-Xms512m -J-Xmx1024m"
+    - CC_TEST_REPORTER_ID=fd17c835d3e49ec85fddd67f8834b7652021efd7653d8d00f8be67d6229bdc2e
   matrix:
-    - MONGODB=2.6.10
+    - MONGODB=4.0.3
 
 before_script:
   - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz -O /tmp/mongodb.tgz
   - tar -xvf /tmp/mongodb.tgz
   - mkdir /tmp/data
   - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath /tmp/data --bind_ip 127.0.0.1 --auth &> /dev/null &
 
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+
 notifications:
   email: false

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Mongoid::Includes 3.0.0 (2020-10-29) ##
+
+*  Add support for Mongoid `7.1`.
+*  Avoid making a query when the foreign keys are empty.
+
 ## Mongoid::Includes 2.1.0 (2017-07-03) ##
 
 *   Fix bug where `includes` ignores the `:with` option if the association is polymorphic. Thanks @nickcherry for the bug report!

Gemfile

@@ -4,15 +4,10 @@ gemspec
 
 gem 'bundler'
 gem 'rake'
-gem 'pry'
-gem 'mongoid', '6.0.1'
+gem 'pry-byebug'
+gem 'mongoid', '~> 7.1.0'
 
 group :test do
   gem 'rspec-given', '~> 3.5'
-  gem 'codeclimate-test-reporter', require: nil
-end
-
-group :doc do
-  gem 'yard'
-  gem 'yard-tomdoc'
+  gem 'simplecov', '~> 0.17.0', require: false
 end

Gemfile.lock

@@ -1,87 +1,83 @@
 PATH
   remote: .
   specs:
-    mongoid_includes (2.0.0)
-      mongoid (>= 6.0.1, < 7.0.0)
+    mongoid_includes (3.0.0)
+      mongoid (>= 7.0.10, < 8.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activesupport (5.0.1)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    bson (4.2.1)
-    codeclimate-test-reporter (0.4.7)
-      simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.0)
-    concurrent-ruby (1.0.4)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    given_core (3.7.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    bson (4.11.0)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    given_core (3.8.1)
       sorcerer (>= 0.3.7)
-    i18n (0.7.0)
-    json (1.8.3)
-    method_source (0.8.2)
-    minitest (5.10.1)
-    mongo (2.4.1)
-      bson (>= 4.2.1, < 5.0.0)
-    mongoid (6.0.1)
-      activemodel (~> 5.0)
-      mongo (~> 2.3)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    json (2.3.1)
+    method_source (1.0.0)
+    minitest (5.14.2)
+    mongo (2.13.1)
+      bson (>= 4.8.2, < 5.0.0)
+    mongoid (7.1.4)
+      activemodel (>= 5.1, < 6.1)
+      mongo (>= 2.7.0, < 3.0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-given (3.7.1)
-      given_core (= 3.7.1)
+      rspec-support (~> 3.9.0)
+    rspec-given (3.8.1)
+      given_core (= 3.8.1)
       rspec (>= 2.14.0)
-    rspec-mocks (3.3.2)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    sorcerer (1.0.2)
-    thread_safe (0.3.5)
-    tomparse (0.4.2)
-    tzinfo (1.2.2)
+    simplecov-html (0.10.2)
+    sorcerer (2.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    yard (0.8.7.6)
-    yard-tomdoc (0.7.1)
-      tomparse (>= 0.4.0)
-      yard
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
-  codeclimate-test-reporter
-  mongoid (= 6.0.1)
+  mongoid (~> 7.1.0)
   mongoid_includes!
-  pry
+  pry-byebug
   rake
   rspec-given (~> 3.5)
-  yard
-  yard-tomdoc
+  simplecov (~> 0.17.0)
 
 BUNDLED WITH
-   1.12.5
+   2.1.4

bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")