mongoid-eager-loading 0.3.0 → 0.3.1

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 .rvmrc
+Gemfile.lock

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

@@ -47,7 +47,7 @@ module Mongoid
           end
         end
 
-        def setup_associations_with_ids(documents, reflection, one=true)
+        def setup_associations_with_ids(documents, reflection, one)
           ids = association_ids(documents, reflection)
 
           ignore_includes
@@ -56,7 +56,7 @@ module Mongoid
             add_id_association(eager_association.send(reflection.foreign_key), eager_association)
           end
 
-          assign_associations(documents, reflection)
+          assign_associations(documents, reflection, one)
         end
 
         def setup_associations_with_foreign_keys(documents, reflection, one)
@@ -68,7 +68,7 @@ module Mongoid
             add_id_association(eager_association.id, eager_association)
           end
 
-          assign_associations(documents, reflection)
+          assign_associations(documents, reflection, one)
         end
 
         def association_ids(documents, reflection)
@@ -84,15 +84,15 @@ module Mongoid
           ids
         end
 
-        def assign_associations(documents, reflection)
+        def assign_associations(documents, reflection, one)
           id_documents_map.each do |id, documents|
             documents.each do |document|
               key_value = document.send(reflection.key)
               associations = \
-                if key_value.is_a?(Array)
-                  key_value.collect { |v| id_associations_map[v] }
-                else
+                if one
                   id_associations_map[key_value] ? id_associations_map[key_value].first : nil
+                else
+                  to_array(key_value).collect { |v| id_associations_map[v] }.compact.flatten
                 end
               document.instance_variable_set("@#{reflection.name}", associations)
             end

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

@@ -1,5 +1,5 @@
 module Mongoid
   module EagerLoading
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

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

@@ -34,13 +34,13 @@ describe Mongoid::Criterion::EagerLoading do
 
       @post1 = @person1.posts.create(:title => "post1")
       @post2 = @person1.posts.create(:title => "post2")
-      @post3 = @person2.posts.create(:title => "post3")
+      @post3 = @person1.posts.create(:title => "post3")
       @post4 = @person2.posts.create(:title => "post4")
       @post5 = Post.create(:title => "post5")
 
       @preference1 = @person1.preferences.create(:name => "preference1")
       @preference2 = @person1.preferences.create(:name => "preference2")
-      @preference3 = @person2.preferences.create(:name => "preference3")
+      @preference3 = @person1.preferences.create(:name => "preference3")
       @preference4 = @person2.preferences.create(:name => "preference4")
       @preference5 = Preference.create(:name => "preference5")
     end
@@ -82,12 +82,12 @@ describe Mongoid::Criterion::EagerLoading do
       id_documents_map[@person3.id].should == [@person3]
 
       id_associations_map = criteria.send(:id_associations_map)
-      id_associations_map[@person1.id].should == [@post1, @post2]
-      id_associations_map[@person2.id].should == [@post3, @post4]
+      id_associations_map[@person1.id].should == [@post1, @post2, @post3]
+      id_associations_map[@person2.id].should == [@post4]
       id_associations_map[@person3.id].should == nil
 
-      @person1.posts.should == [@post1, @post2]
-      @person2.posts.should == [@post3, @post4]
+      @person1.posts.should == [@post1, @post2, @post3]
+      @person2.posts.should == [@post4]
       @person3.posts.should == []
     end
 
@@ -102,7 +102,7 @@ describe Mongoid::Criterion::EagerLoading do
       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[@preference3.id].should == [@person1]
       id_documents_map[@preference4.id].should == [@person2]
       id_documents_map[@preference5.id].should == nil
 
@@ -113,8 +113,8 @@ describe Mongoid::Criterion::EagerLoading do
       id_associations_map[@preference4.id].should == [@preference4]
       id_associations_map[@preference5.id].should == nil
 
-      @person1.preferences.should == [@preference1, @preference2]
-      @person2.preferences.should == [@preference3, @preference4]
+      @person1.preferences.should == [@preference1, @preference2, @preference3]
+      @person2.preferences.should == [@preference4]
       @person3.preferences.should == []
     end
 
@@ -151,8 +151,8 @@ describe Mongoid::Criterion::EagerLoading do
         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]
+        id_documents_map[@person1.id].should == [@post1, @post2, @post3]
+        id_documents_map[@person2.id].should == [@post4]
         id_documents_map[@person3.id].should == nil
 
         id_associations_map = criteria.send(:id_associations_map)
@@ -162,10 +162,26 @@ describe Mongoid::Criterion::EagerLoading do
 
         @post1.person.should == @person1
         @post2.person.should == @person1
-        @post3.person.should == @person2
+        @post3.person.should == @person1
         @post4.person.should == @person2
         @post5.person.should == nil
       end
     end
+
+    it "preload references_many association" do
+      people = Person.all.to_a
+      posts = Post.all.to_a
+
+      criteria = Mongoid::Criteria.new(Person)
+
+      criteria.each do |person|
+        person.posts.should be_an_instance_of Array
+        person.posts.each {|p| p.should be_an_instance_of Post}
+      end
+      criteria.includes(:posts).all.each do |person|
+        person.posts.should be_an_instance_of Array
+        person.posts.each {|p| p.should be_an_instance_of Post}
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid-eager-loading
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Richard Huang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +08:00
+date: 2011-01-24 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -158,7 +158,6 @@ files:
 - .rvmrc.example
 - .watchr
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,55 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mongoid-eager-loading (0.3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.3)
-    bson (1.2.0)
-    bson_ext (1.2.0)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    i18n (0.5.0)
-    mocha (0.9.9)
-      rake
-    mongo (1.2.0)
-      bson (>= 1.2.0)
-    mongoid (2.0.0.rc.6)
-      activemodel (~> 3.0)
-      mongo (~> 1.2)
-      tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    rake (0.8.7)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    tzinfo (0.3.24)
-    watchr (0.7)
-    will_paginate (3.0.pre2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bson (= 1.2.0)
-  bson_ext (= 1.2.0)
-  bundler (>= 1.0.0)
-  mocha
-  mongo (= 1.2.0)
-  mongoid (= 2.0.0.rc.6)
-  mongoid-eager-loading!
-  rspec (~> 2.0.0)
-  watchr