mongoid_includes 3.0.2 → 4.0.0

data/spec/mongoid/includes/polymorphic_includes_spec.rb

@@ -56,5 +56,117 @@ describe Mongoid::Includes::Criteria do
         }.to raise_error(Mongoid::Includes::Errors::InvalidPolymorphicIncludes)
       end
     end
+
+    context 'eager loading polymorphic belongs_to associations with multiple concrete types' do
+      before(:context) do
+        class Main
+          include Mongoid::Document
+          belongs_to :related, polymorphic: true, optional: true
+        end
+
+        class Related
+          include Mongoid::Document
+          has_one :parent, as: :related
+        end
+
+        class Two < Related; end
+        class Three < Related; end
+      end
+
+      after(:context) do
+        %i[Main Related Two Three].each do |const|
+          Object.send(:remove_const, const) if Object.const_defined?(const, false)
+        end
+      end
+
+      it 'loads the related documents for each concrete type without raising' do
+        Main.create!(related: Two.create!)
+        Main.create!(related: Three.create!)
+
+        loaded = nil
+        expect { loaded = Main.includes(:related).entries }.not_to raise_error
+        expect(loaded.map { |doc| doc.related.class }).to match_array([Two, Three])
+        expect { Main.last.related.id }.not_to raise_error
+      end
+    end
+
+    context 'polymorphic eager loading in a fresh Ruby process' do
+      let(:project_root) { File.expand_path('../../..', __dir__) }
+
+      it 'does not error when includes is evaluated from the CLI' do
+        require 'open3'
+
+        database_name = "mongoid_includes_spec_#{SecureRandom.hex(6)}"
+        base_script = <<~RUBY
+          require 'bundler/setup'
+          require 'mongoid'
+          require 'mongoid_includes'
+
+          Mongoid.load_configuration(
+            clients: {
+              default: {
+                database: '#{database_name}',
+                hosts: %w[localhost:27017]
+              }
+            }
+          )
+
+          class Main
+            include Mongoid::Document
+            belongs_to :related, polymorphic: true, optional: true
+          end
+
+          class Related
+            include Mongoid::Document
+            has_one :parent, as: :related
+          end
+
+          class Two < Related; end
+          class Three < Related; end
+        RUBY
+
+        init_script = base_script + <<~RUBY
+          client = Mongoid::Clients.default
+          begin
+            client.database.drop
+          rescue Mongo::Error::OperationFailure
+          end
+
+          Main.destroy_all
+          Related.destroy_all
+
+          Main.create!(related: Two.create!)
+          Main.create!(related: Three.create!)
+        RUBY
+
+        bad_script = base_script + <<~RUBY
+          Main.includes(:related).entries
+          Main.last.related.id
+
+          Mongoid::Clients.default.database.drop
+        RUBY
+
+        bundle_gemfile = ENV.fetch(
+          'BUNDLE_GEMFILE',
+          File.join(project_root, 'Gemfile')
+        )
+
+        run_script = lambda do |script|
+          Open3.capture2e(
+            { 'BUNDLE_GEMFILE' => bundle_gemfile },
+            RbConfig.ruby,
+            '-',
+            chdir: project_root,
+            stdin_data: script
+          )
+        end
+
+        init_out, init_status = run_script.call(init_script)
+        expect(init_status).to be_success, "failed to prepare polymorphic data: #{init_out}"
+
+        bad_out, bad_status = run_script.call(bad_script)
+        expect(bad_status).to be_success, "expected CLI reproduction to succeed, got #{bad_status.exitstatus}: #{bad_out}"
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -54,3 +54,5 @@ RSpec.configure do |config|
     Mongoid.purge!
   end
 end
+
+Time.zone = 'UTC'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_includes
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Máximo Mussini
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,20 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.10
+        version: 8.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.10
+        version: 8.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: 10.0.0
 description: Mongoid::Includes improves eager loading in Mongoid, supporting polymorphic
   associations, and up to two-levels of eager loading.
 email:
@@ -38,7 +37,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -77,11 +75,10 @@ files:
 - spec/support/models/preference.rb
 - spec/support/models/record.rb
 - spec/support/models/song.rb
-homepage: https://github.com/ElMassimo/mongoid_includes
+homepage: https://github.com/cacheventures/mongoid_includes
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -97,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Improved eager loading support for Mongoid.
 test_files:

data/CHANGELOG.md

@@ -1,54 +0,0 @@
-## Mongoid::Includes 3.0.2 (2022-11-03) ##
-
-*  [perf: avoid queries when foreign keys are empty](https://github.com/ElMassimo/mongoid_includes/commit/9f4c0c8bf1560a319c663fae77015c638caec56b)
-
-## Mongoid::Includes 3.0.1 (2022-11-03) ##
-
-*  Allow installing this library with Mongoid `8.0`.
-
-## 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!
-
-## Mongoid::Includes 2.0.0 (2017-01-10) ##
-
-*   Support Mongoid 6.0.1, fixes related to [changes in Mongoid internals](https://github.com/mongodb/mongoid/pull/4326). Thanks @mityakoval and @forumd for the bug reports!
-
-## Mongoid::Includes 1.1.3 (2016-10-17) ##
-
-*   Fix eager loading for [self-referencing associations](https://github.com/ElMassimo/mongoid_includes/pull/6). Thanks @rmachielse!
-
-## Mongoid::Includes 1.1.2 (2016-05-26) ##
-
-*   Change gem dependencies to [support Mongoid 6](https://github.com/ElMassimo/mongoid_includes/pull/3). Thanks @joostverdoorn!
-
-## Mongoid::Includes 1.1.1 (2016-01-12) ##
-
-*   Fix bug with nested includes when the related document is `nil`.
-
-## Mongoid::Includes 1.1.0 (2015-11-04) ##
-
-*   Fix bug with optional polymorphic `belongs_to` relations where the name of the relation does not match an actual class name.
-
-## Mongoid::Includes 1.0.3 (2015-10-10) ##
-
-*   Add support for Mongoid 5.
-
-## Mongoid::Includes 1.0.2 (2015-10-08) ##
-
-*   Fix error when using `merge` or `merge!` with a criteria and `includes`.
-*   Replace the internal structure with a Set to be more robust when avoiding duplicate relations.
-
-## Mongoid::Includes 1.0.1 (August 5, 2015) ##
-
-*   Fix error messages for polymorphic includes.
-*   Add :with option that receives the criteria that will be used to include documents.
-
-## Mongoid::Includes 1.0.0 (July 30, 2015) ##
-
-*   Initial Version.