mongoid-eager-loading 0.1.2 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-eager-loading (0.1.2)
+    mongoid-eager-loading (0.2.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/mongoid-eager-loading/mongoid/criterion/eager_loading.rb

@@ -10,7 +10,7 @@ module Mongoid
       # <tt>criteria.includes(:user, :post)</tt>
       #
       # Returns: <tt>self</tt>
-      attr_accessor :eager_loadings, :id_document_map, :id_associations_map
+      attr_accessor :eager_loadings, :id_documents_map, :id_associations_map
 
       def includes(*options)
         @eager_loadings = options
@@ -18,12 +18,13 @@ module Mongoid
       end
 
       def preload(documents)
+        return if documents.blank?
         document_class = documents.first.class
         @eager_loadings.each do |eager_loading|
           setup_associations(documents, association_reflection(document_class, eager_loading))
         end
       end
-      
+
       private
         def ignore_includes
           @eager_loadings = nil
@@ -48,19 +49,21 @@ module Mongoid
         def setup_associations_with_ids(documents, reflection, one=true)
           ids = []
           documents.each do |document|
-            id_document_map[document.id] = document
+            add_id_document(document.id, document)
             ids << document.id if document.id
           end
 
           association_class = reflection.name.singularize.camelize.constantize
           ignore_includes
-          eager_associations = association_class.where(reflection.foreign_key.to_sym.in => ids).to_a
+          eager_associations = association_class.where(reflection.foreign_key.to_sym.in => ids.uniq).to_a
           eager_associations.each do |eager_association|
             add_id_association(eager_association.send(reflection.foreign_key), eager_association)
           end
 
-          id_document_map.each do |id, document|
-            document.send("#{reflection.name}=", one ? id_associations_map[id].first : id_associations_map[id])
+          id_documents_map.each do |id, documents|
+            documents.each do |document|
+              document.instance_variable_set("@#{reflection.name}", one ? id_associations_map[id].first : id_associations_map[id])
+            end
           end
         end
 
@@ -70,11 +73,11 @@ module Mongoid
           documents.each do |document|
             foreign_key_value = document.send(foreign_key_name)
             if one
-              id_document_map[foreign_key_value] = document
+              add_id_document(foreign_key_value, document)
               ids << foreign_key_value if foreign_key_value
             elsif foreign_key_value
               foreign_key_value.each do |fkv|
-                id_document_map[fkv] = document
+                add_id_document(fkv, document)
                 ids << fkv if fkv
               end
             end
@@ -82,31 +85,38 @@ module Mongoid
 
           association_class = reflection.name.singularize.camelize.constantize
           ignore_includes
-          eager_associations = association_class.find(ids).to_a
+          eager_associations = association_class.find(ids.uniq).to_a
           eager_associations.each do |eager_association|
             add_id_association(eager_association.id, eager_association)
           end
 
-          id_document_map.each do |id, document|
-            foreign_key_value = document.send(foreign_key_name)
-            associations = \
-              if one
-                id_associations_map[foreign_key_value].first
-              else
-                foreign_key_value.collect { |fkv| id_associations_map[fkv] }.flatten.uniq
-              end
-            document.send("#{reflection.name}=", associations)
+          id_documents_map.each do |id, documents|
+            documents.each do |document|
+              foreign_key_value = document.send(foreign_key_name)
+              associations = \
+                if one
+                  id_associations_map[foreign_key_value].first
+                else
+                  foreign_key_value.collect { |fkv| id_associations_map[fkv] }.flatten.uniq
+                end
+              document.instance_variable_set("@#{reflection.name}", associations)
+            end
           end
         end
 
-        def id_document_map
-          @id_doccument_map ||= {}
+        def id_documents_map
+          @id_documents_map ||= {}
         end
 
         def id_associations_map
           @id_associations_map ||= {}
         end
 
+        def add_id_document(id, document)
+          id_documents_map[id] ||= []
+          id_documents_map[id] << document
+        end
+
         def add_id_association(id, association)
           id_associations_map[id] ||= []
           id_associations_map[id] << association

data/lib/mongoid-eager-loading/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module EagerLoading
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/spec/mongoid-eager-loading/mongoid/criteria_spec.rb

@@ -23,5 +23,12 @@ describe Mongoid::Criteria do
       criteria.collect(&:title).should == ["Sir", "Madam"]
       criteria.collect(&:game).should == [@person1.game, @person2.game]
     end
+
+    it "empty parent objects with include" do
+      Game.destroy_all
+      Person.destroy_all
+      criteria = Person.includes(:game)
+      criteria.collect(&:game).should == []
+    end
   end
 end

data/spec/mongoid-eager-loading/mongoid/criterion/eager_loading_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Criterion::EagerLoading do
 
   describe "#includes" do
-    
+
     it "should return self" do
       criteria = Mongoid::Criteria.new(Person)
       criteria.includes(:game, :posts).should == criteria
@@ -23,86 +23,130 @@ describe Mongoid::Criterion::EagerLoading do
       Post.destroy_all
       Game.destroy_all
       Person.destroy_all
-      
-      person1 = Person.create(:title => "Sir", :age => 100, :aliases => ["D", "Durran"], :ssn => "666666666")
-      person2 = Person.create(:title => "Madam", :age => 1, :ssn => "098-76-5434")
-
-      person1.create_game(:score => 10)
-      person2.create_game(:score => 20)
-      
-      person1.posts.create(:title => "post1")
-      person1.posts.create(:title => "post2")
-      person2.posts.create(:title => "post3")
-      person2.posts.create(:title => "post4")
-      
-      person1.preferences.create(:name => "preference1")
-      person1.preferences.create(:name => "preference2")
-      person2.preferences.create(:name => "preference3")
-      person2.preferences.create(:name => "preference4")
+
+      @person1 = Person.create(:title => "Sir", :age => 100, :aliases => ["D", "Durran"], :ssn => "666666666")
+      @person2 = Person.create(:title => "Madam", :age => 1, :ssn => "098-76-5434")
+
+      @game1 = @person1.create_game(:score => 10)
+      @game2 = @person2.create_game(:score => 20)
+
+      @post1 = @person1.posts.create(:title => "post1")
+      @post2 = @person1.posts.create(:title => "post2")
+      @post3 = @person2.posts.create(:title => "post3")
+      @post4 = @person2.posts.create(:title => "post4")
+
+      @preference1 = @person1.preferences.create(:name => "preference1")
+      @preference2 = @person1.preferences.create(:name => "preference2")
+      @preference3 = @person2.preferences.create(:name => "preference3")
+      @preference4 = @person2.preferences.create(:name => "preference4")
     end
 
     it "preload references_one association" do
       people = Person.all.to_a
       games = Game.all.to_a
 
-      complex = stub(:key => :person_id, :operator => "in")
-      Mongoid::Criterion::Complex.expects(:new).with(:key => :person_id, :operator => "in").returns(complex)
-      Game.expects(:where).with(complex => people.collect(&:id)).returns(games)
-      
       criteria = Mongoid::Criteria.new(Person)
       criteria.includes(:game)
       criteria.preload(people)
 
-      people.first.game.should == games.first
-      people.last.game.should == games.last
+      id_documents_map = criteria.send(:id_documents_map)
+      id_documents_map[@person1.id].should == [@person1]
+      id_documents_map[@person2.id].should == [@person2]
+
+      id_associations_map = criteria.send(:id_associations_map)
+      id_associations_map[@person1.id].should == [@game1]
+      id_associations_map[@person2.id].should == [@game2]
+
+      @person1.game.should == @game1
+      @person2.game.should == @game2
     end
 
     it "preload references_many association" do
       people = Person.all.to_a
       posts = Post.all.to_a
-      person1_posts = Post.where(:person_id => people.first.id).to_a
-      person2_posts = Post.where(:person_id => people.last.id).to_a
 
-      complex = stub(:key => :person_id, :operator => "in")
-      Mongoid::Criterion::Complex.expects(:new).with(:key => :person_id, :operator => "in").returns(complex)
-      Post.expects(:where).with(complex => people.collect(&:id)).returns(posts)
-      
       criteria = Mongoid::Criteria.new(Person)
       criteria.includes(:posts)
       criteria.preload(people)
 
-      people.first.posts.should == person1_posts
-      people.last.posts.should == person2_posts
+      id_documents_map = criteria.send(:id_documents_map)
+      id_documents_map[@person1.id].should == [@person1]
+      id_documents_map[@person2.id].should == [@person2]
+
+      id_associations_map = criteria.send(:id_associations_map)
+      id_associations_map[@person1.id].should == [@post1, @post2]
+      id_associations_map[@person2.id].should == [@post3, @post4]
+
+      @person1.posts.should == [@post1, @post2]
+      @person2.posts.should == [@post3, @post4]
     end
 
     it "preload references_many_as_array association" do
       people = Person.all.to_a
       preferences = Preference.all.to_a
-      person1_preferences = Preference.find(people.first.preference_ids).to_a
-      person2_preferences = Preference.find(people.last.preference_ids).to_a
-
-      Preference.expects(:find).with(preferences.collect(&:id)).returns(preferences)
 
       criteria = Mongoid::Criteria.new(Person)
       criteria.includes(:preferences)
       criteria.preload(people)
 
-      people.first.preferences.should == person1_preferences
-      people.last.preferences.should == person2_preferences
+      id_documents_map = criteria.send(:id_documents_map)
+      id_documents_map[@preference1.id].should == [@person1]
+      id_documents_map[@preference2.id].should == [@person1]
+      id_documents_map[@preference3.id].should == [@person2]
+      id_documents_map[@preference4.id].should == [@person2]
+
+      id_associations_map = criteria.send(:id_associations_map)
+      id_associations_map[@preference1.id].should == [@preference1]
+      id_associations_map[@preference2.id].should == [@preference2]
+      id_associations_map[@preference3.id].should == [@preference3]
+      id_associations_map[@preference4.id].should == [@preference4]
+
+      @person1.preferences.should == [@preference1, @preference2]
+      @person2.preferences.should == [@preference3, @preference4]
     end
 
-    it "preload referenced_in association" do
-      people = Person.all.to_a
-      games = Game.all.to_a
+    context "referenced_in" do
+      it "preload referenced_in association to references_one" do
+        people = Person.all.to_a
+        games = Game.all.to_a
+
+        criteria = Mongoid::Criteria.new(Game)
+        criteria.includes(:person)
+        criteria.preload(games)
+
+        id_documents_map = criteria.send(:id_documents_map)
+        id_documents_map[@person1.id].should == [@game1]
+        id_documents_map[@person2.id].should == [@game2]
+
+        id_associations_map = criteria.send(:id_associations_map)
+        id_associations_map[@person1.id].should == [@person1]
+        id_associations_map[@person2.id].should == [@person2]
+
+        @game1.person.should == @person1
+        @game2.person.should == @person2
+      end
+
+      it "preload referenced_in association to references_many" do
+        people = Person.all.to_a
+        posts = Post.all.to_a
+
+        criteria = Mongoid::Criteria.new(Game)
+        criteria.includes(:person)
+        criteria.preload(posts)
+
+        id_documents_map = criteria.send(:id_documents_map)
+        id_documents_map[@person1.id].should == [@post1, @post2]
+        id_documents_map[@person2.id].should == [@post3, @post4]
 
-      Person.expects(:find).with(people.collect(&:id)).returns(people)
-      
-      criteria = Mongoid::Criteria.new(Game)
-      criteria.includes(:person)
-      criteria.preload(games)
+        id_associations_map = criteria.send(:id_associations_map)
+        id_associations_map[@person1.id].should == [@person1]
+        id_associations_map[@person2.id].should == [@person2]
 
-      people.first.game.should == games.first
-      people.last.game.should == games.last
+        @post1.person.should == @person1
+        @post2.person.should == @person1
+        @post3.person.should == @person2
+        @post4.person.should == @person2
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid-eager-loading
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Richard Huang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +08:00
+date: 2011-01-19 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency