Fix bug with nested includes when the related document is .

Author: ElMassimo

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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.

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid_includes (1.1.0)
+    mongoid_includes (1.1.1)
       mongoid (>= 4.0.0, < 6.0.0)
 
 GEM
@@ -87,3 +87,6 @@ DEPENDENCIES
   rspec-given (~> 3.5)
   yard
   yard-tomdoc
+
+BUNDLED WITH
+   1.11.2

lib/mongoid/includes/eager_load.rb

@@ -42,7 +42,7 @@ def preload_polymorphic(inclusion, docs)
       # includes by that property are processed as usual.
       def preload_nested(nested_inclusions, docs)
         nested_inclusions.group_by(&:from).each do |from, inclusions|
-          preload(inclusions, docs.map(&from).flatten)
+          preload(inclusions, docs.flat_map(&from).compact)
         end
       end
     end

lib/mongoid/includes/version.rb

@@ -5,6 +5,6 @@ module Mongoid
   module Includes
 
     # Public: This library will attempt to follow semantic versioning (whatever that's supposed to be).
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end