mongoid-eager-loading 0.2.0 → 0.3.0

data/spec/models/user_account.rb

@@ -1,9 +1,10 @@
 class UserAccount
   include Mongoid::Document
   field :username
+  field :name
   field :email
   validates_uniqueness_of :username, :message => "is not unique"
   validates_uniqueness_of :email, :message => "is not unique", :case_sensitive => false
-
-  referenced_in :person, :inverse_of => :user_accounts
+  validates_length_of :name, :minimum => 2, :allow_nil => true
+  references_and_referenced_in_many :people
 end

data/spec/models/vet_visit.rb

@@ -1,5 +1,5 @@
 class VetVisit
   include Mongoid::Document
   field :date, :type => Date
-  embedded_in :pet, :inverse_of => :vet_visits
+  embedded_in :pet
 end

data/spec/models/video.rb

@@ -1,5 +1,5 @@
 class Video
   include Mongoid::Document
   field :title
-  embedded_in :person, :inverse_of => :videos
+  embedded_in :person
 end

data/spec/models/wiki_page.rb

@@ -0,0 +1,6 @@
+class WikiPage
+  include Mongoid::Document
+  include Mongoid::Versioning
+  field :title, :type => String
+  max_versions 5
+end

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

@@ -26,19 +26,23 @@ describe Mongoid::Criterion::EagerLoading do
 
       @person1 = Person.create(:title => "Sir", :age => 100, :aliases => ["D", "Durran"], :ssn => "666666666")
       @person2 = Person.create(:title => "Madam", :age => 1, :ssn => "098-76-5434")
+      @person3 = Person.create(:title => "Sir", :age => 10, :aliases => ["R", "Richard"], :ssn => "111111111")
 
       @game1 = @person1.create_game(:score => 10)
       @game2 = @person2.create_game(:score => 20)
+      @game3 = Game.create(:score => 30)
 
       @post1 = @person1.posts.create(:title => "post1")
       @post2 = @person1.posts.create(:title => "post2")
       @post3 = @person2.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")
       @preference4 = @person2.preferences.create(:name => "preference4")
+      @preference5 = Preference.create(:name => "preference5")
     end
 
     it "preload references_one association" do
@@ -52,13 +56,16 @@ describe Mongoid::Criterion::EagerLoading do
       id_documents_map = criteria.send(:id_documents_map)
       id_documents_map[@person1.id].should == [@person1]
       id_documents_map[@person2.id].should == [@person2]
+      id_documents_map[@person3.id].should == [@person3]
 
       id_associations_map = criteria.send(:id_associations_map)
       id_associations_map[@person1.id].should == [@game1]
       id_associations_map[@person2.id].should == [@game2]
+      id_associations_map[@person3.id].should == nil
 
       @person1.game.should == @game1
       @person2.game.should == @game2
+      @person3.game.should == nil
     end
 
     it "preload references_many association" do
@@ -72,13 +79,16 @@ describe Mongoid::Criterion::EagerLoading do
       id_documents_map = criteria.send(:id_documents_map)
       id_documents_map[@person1.id].should == [@person1]
       id_documents_map[@person2.id].should == [@person2]
+      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[@person3.id].should == nil
 
       @person1.posts.should == [@post1, @post2]
       @person2.posts.should == [@post3, @post4]
+      @person3.posts.should == []
     end
 
     it "preload references_many_as_array association" do
@@ -94,15 +104,18 @@ describe Mongoid::Criterion::EagerLoading do
       id_documents_map[@preference2.id].should == [@person1]
       id_documents_map[@preference3.id].should == [@person2]
       id_documents_map[@preference4.id].should == [@person2]
+      id_documents_map[@preference5.id].should == nil
 
       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]
+      id_associations_map[@preference5.id].should == nil
 
       @person1.preferences.should == [@preference1, @preference2]
       @person2.preferences.should == [@preference3, @preference4]
+      @person3.preferences.should == []
     end
 
     context "referenced_in" do
@@ -117,13 +130,16 @@ describe Mongoid::Criterion::EagerLoading do
         id_documents_map = criteria.send(:id_documents_map)
         id_documents_map[@person1.id].should == [@game1]
         id_documents_map[@person2.id].should == [@game2]
+        id_documents_map[@person3.id].should == nil
 
         id_associations_map = criteria.send(:id_associations_map)
         id_associations_map[@person1.id].should == [@person1]
         id_associations_map[@person2.id].should == [@person2]
+        id_associations_map[@person3.id].should == nil
 
         @game1.person.should == @person1
         @game2.person.should == @person2
+        @game3.person.should == nil
       end
 
       it "preload referenced_in association to references_many" do
@@ -137,15 +153,18 @@ describe Mongoid::Criterion::EagerLoading do
         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[@person3.id].should == nil
 
         id_associations_map = criteria.send(:id_associations_map)
         id_associations_map[@person1.id].should == [@person1]
         id_associations_map[@person2.id].should == [@person2]
+        id_associations_map[@person3.id].should == nil
 
         @post1.person.should == @person1
         @post2.person.should == @person1
         @post3.person.should == @person2
         @post4.person.should == @person2
+        @post5.person.should == nil
       end
     end
   end

data/spec/spec_helper.rb

@@ -12,8 +12,8 @@ require "rspec"
 Mongoid.configure do |config|
   name = "mongoid_test"
   host = "localhost"
+  #config.master = Mongo::Connection.new(host, 27018, :logger => Logger.new($stdout)).db(name)
   config.master = Mongo::Connection.new.db(name)
-  config.logger = nil
   # config.slaves = [
     # Mongo::Connection.new(host, 27018, :slave_ok => true).db(name)
   # ]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid-eager-loading
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Richard Huang
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 +08:00
+date: 2011-01-20 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,104 +31,119 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  prerelease: false
   type: :development
-  version_requirements: *id001
+  name: bundler
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196427
+        hash: 31
         segments: 
+        - 1
         - 2
         - 0
-        - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
-  name: mongoid
-  prerelease: false
+        version: 1.2.0
   type: :development
-  version_requirements: *id002
+  name: mongo
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 31
         segments: 
+        - 1
         - 2
         - 0
-        - 0
-        version: 2.0.0
-  name: rspec
-  prerelease: false
+        version: 1.2.0
   type: :development
-  version_requirements: *id003
+  name: bson
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
+        - 1
+        - 2
         - 0
-        version: "0"
-  name: mocha
-  prerelease: false
+        version: 1.2.0
   type: :development
-  version_requirements: *id004
+  name: bson_ext
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15424089
         segments: 
+        - 2
         - 0
-        version: "0"
-  name: watchr
-  prerelease: false
+        - 0
+        - rc
+        - 6
+        version: 2.0.0.rc.6
   type: :development
-  version_requirements: *id005
+  name: mongoid
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
-        - 1
-        - 1
-        - 1
-        version: 1.1.1
-  name: bson_ext
-  prerelease: false
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
   type: :development
-  version_requirements: *id006
+  name: rspec
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 3
         segments: 
-        - 1
-        - 1
-        - 1
-        version: 1.1.1
-  name: mongo
+        - 0
+        version: "0"
+  type: :development
+  name: mocha
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirements: *id007
+  name: watchr
+  requirement: *id008
 description: eager loading for mongoid
 email: 
 - flyerhzm@gmail.com
@@ -156,23 +172,34 @@ files:
 - spec/config/mongoid.yml
 - spec/models/account.rb
 - spec/models/address.rb
+- spec/models/address_component.rb
 - spec/models/agent.rb
 - spec/models/animal.rb
 - spec/models/answer.rb
+- spec/models/bar.rb
+- spec/models/book.rb
+- spec/models/business.rb
 - spec/models/callbacks.rb
 - spec/models/category.rb
 - spec/models/comment.rb
 - spec/models/country_code.rb
 - spec/models/description.rb
+- spec/models/drug.rb
 - spec/models/employer.rb
 - spec/models/favorite.rb
+- spec/models/fruits.rb
 - spec/models/game.rb
+- spec/models/house.rb
 - spec/models/inheritance.rb
 - spec/models/location.rb
 - spec/models/login.rb
+- spec/models/membership.rb
 - spec/models/mixed_drink.rb
+- spec/models/movie.rb
 - spec/models/name.rb
 - spec/models/namespacing.rb
+- spec/models/page.rb
+- spec/models/page_question.rb
 - spec/models/paranoid_post.rb
 - spec/models/parents.rb
 - spec/models/patient.rb
@@ -183,12 +210,19 @@ files:
 - spec/models/post.rb
 - spec/models/preference.rb
 - spec/models/question.rb
+- spec/models/quiz.rb
+- spec/models/rating.rb
+- spec/models/role.rb
+- spec/models/shelf.rb
+- spec/models/slave_address_numbers.rb
 - spec/models/survey.rb
+- spec/models/tracking_id_validation_history.rb
 - spec/models/translation.rb
 - spec/models/user.rb
 - spec/models/user_account.rb
 - spec/models/vet_visit.rb
 - spec/models/video.rb
+- spec/models/wiki_page.rb
 - spec/mongoid-eager-loading/mongoid/criteria_spec.rb
 - spec/mongoid-eager-loading/mongoid/criterion/eager_loading_spec.rb
 - spec/spec_helper.rb
@@ -224,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongoid-eager-loading
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: eager loading for mongoid