mongoid_includes 1.2.0 → 1.3.0

data/spec/mongoid/includes/polymorphic_includes_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Mongoid::Includes::Criteria do
+
+  describe '#includes' do
+    Given(:inclusions) { criteria.inclusions }
+
+    context 'multiple inclusions through polymorphic associations' do
+      Given(:pink_floyd) { Band.create!(name: 'Pink Floyd') }
+      Given(:jethro) { Band.create!(name: 'Jethro Tull') }
+      Given {
+        Artist.create!(name: 'David Gilmour', associated_act: pink_floyd)
+        wywh = Album.create!(name: 'Wish You Were Here', release: Date.new(1975), owner: pink_floyd)
+        Album.create!(name: 'The Dark Side of the Moon', release: Date.new(1973), owner: pink_floyd)
+
+        Artist.create!(name: 'Ian Anderson', associated_act: jethro)
+        standup = Album.create!(name: 'Stand Up', release: Date.new(1969), owner: jethro)
+        Album.create!(name: 'Aqualung', release: Date.new(1971), owner: jethro)
+
+        Song.create!(name: 'Shine On', album: wywh)
+        Song.create!(name: 'We Used to Know', album: standup)
+      }
+      Given(:criteria) {
+        Artist
+          .includes(:musicians, from: :associated_act, from_class: Band)
+          .includes(:associated_act, with: ->(bands) {
+            bands
+              .includes(:albums, with: ->(albums) { albums.gt(release: 1970) })
+              .includes(:songs, from: :albums, with: ->(songs) { songs })
+          })
+      }
+
+      describe ':with inclusions should not be overriden' do
+        When(:artists) { expect_query(5) { criteria.entries } }
+        Given(:albums) { artists.map(&:associated_act).flat_map(&:albums) }
+        Then { artists.size == 2 }
+        And {
+          expect_no_queries { albums.size == 3 } # gt(release: 1970)
+        }
+        And {
+          expect_no_queries { albums.flat_map(&:songs).size == 1 } # Only "Shine On"
+        }
+      end
+
+      describe 'should not replace an includes with an specified modifier with a generic one' do
+        Given(:inclusions) { new_criteria.inclusions.to_a }
+        When(:new_criteria) { criteria.includes(:musicians, from: :associated_act, from_class: Band) }
+        Then { inclusions.size == 2 }
+        And  { inclusions.first.nested? }
+        And  { inclusions.last.polymorphic? && inclusions.last.modifier }
+      end
+    end
+  end
+end

data/spec/support/models/artist.rb

@@ -5,4 +5,6 @@ class Artist
 
   has_many :albums
   has_one :musician
+
+  belongs_to :associated_act, polymorphic: true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_includes
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -54,11 +54,13 @@ files:
 - lib/mongoid/includes/relations/eager.rb
 - lib/mongoid/includes/version.rb
 - lib/mongoid_includes.rb
+- spec/mongo.log
 - spec/mongoid/includes/criteria_spec.rb
 - spec/mongoid/includes/errors/invalid_includes_spec.rb
 - spec/mongoid/includes/errors/invalid_polymorphic_includes_spec.rb
 - spec/mongoid/includes/inclusions_spec.rb
 - spec/mongoid/includes/nested_inclusions_spec.rb
+- spec/mongoid/includes/polymorphic_includes_spec.rb
 - spec/mongoid/includes/simple_inclusions_spec.rb
 - spec/spec_helper.rb
 - spec/support/config/mongoid.yml
@@ -101,11 +103,13 @@ signing_key:
 specification_version: 4
 summary: Improved eager loading support for Mongoid.
 test_files:
+- spec/mongo.log
 - spec/mongoid/includes/criteria_spec.rb
 - spec/mongoid/includes/errors/invalid_includes_spec.rb
 - spec/mongoid/includes/errors/invalid_polymorphic_includes_spec.rb
 - spec/mongoid/includes/inclusions_spec.rb
 - spec/mongoid/includes/nested_inclusions_spec.rb
+- spec/mongoid/includes/polymorphic_includes_spec.rb
 - spec/mongoid/includes/simple_inclusions_spec.rb
 - spec/spec_helper.rb
 - spec/support/config/mongoid.yml