mongo_mapper-unstable 2010.1.19 → 2010.1.20

data/VERSION

@@ -1 +1 @@
-2010.01.19
+2010.01.20

data/lib/mongo_mapper/document.rb

@@ -22,7 +22,6 @@ module MongoMapper
         plugin Plugins::Serialization
         plugin Plugins::Validations
         plugin Plugins::Callbacks # for now callbacks needs to be after validations
-        plugin Plugins::IdentityMap
         
         extend Plugins::Validations::DocumentMacros
       end
@@ -277,6 +276,7 @@ module MongoMapper
           end
         end
 
+        # All query methods that load documents pass through find_one or find_many
         def find_one(options={})
           criteria, options = to_finder_options(options)
           if doc = collection.find_one(criteria, options)
@@ -284,6 +284,7 @@ module MongoMapper
           end
         end
 
+        # All query methods that load documents pass through find_one or find_many
         def find_many(options)
           criteria, options = to_finder_options(options)
           collection.find(criteria, options).to_a.map do |doc|

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -23,15 +23,27 @@ module MongoMapper
         end
 
         def find_one(options={})
-          criteria, finder_options = to_finder_options(options)
-          key = identity_map_key(criteria[:_id])
-          if criteria.keys == [:_id] && document = identity_map[key]
-            document
+          criteria, finder_options   = to_finder_options(options)
+          document_in_map            = identity_map[identity_map_key(criteria[:_id])]
+          find_by_single_id          = criteria.keys == [:_id]
+          find_by_single_id_with_sci = criteria.keys.to_set == [:_id, :_type].to_set
+          
+          if find_by_single_id && document_in_map
+            document_in_map
+          elsif find_by_single_id_with_sci && document_in_map
+            document_in_map
           else
-            document = super
+            super.tap do |document|
+              remove_documents_from_map(document) unless finder_options[:fields].nil?
+            end
           end
+        end
 
-          document
+        def find_many(options)
+          criteria, finder_options = to_finder_options(options)
+          super.tap do |documents|
+            remove_documents_from_map(documents) unless finder_options[:fields].nil?
+          end
         end
 
         def load(attrs)
@@ -43,6 +55,13 @@ module MongoMapper
 
           document
         end
+        
+        private
+          def remove_documents_from_map(*documents)
+            documents.flatten.compact.each do |document|
+              identity_map.delete(identity_map_key(document._id))
+            end
+          end
       end
 
       module InstanceMethods

data/test/functional/test_identity_map.rb

@@ -11,15 +11,28 @@ class IdentityMapTest < Test::Unit::TestCase
     resource.identity_map.keys.should_not include(resource.identity_map_key)
   end
   
+  def expect_no_queries
+    Mongo::Collection.any_instance.expects(:find_one).never
+    Mongo::Collection.any_instance.expects(:find).never
+  end
+  
+  def expects_one_query
+    Mongo::Collection.any_instance.expects(:find_one).once.returns({})
+  end
+  
   context "Document" do
     setup do
       @person_class = Doc('Person') do
         set_collection_name 'people'
+        plugin MongoMapper::Plugins::IdentityMap
+        
         key :name, String
       end
       
       @post_class = Doc('Post') do
         set_collection_name 'posts'
+        plugin MongoMapper::Plugins::IdentityMap
+        
         key :title, String
         key :person_id, ObjectId
       end
@@ -82,7 +95,7 @@ class IdentityMapTest < Test::Unit::TestCase
 
       should "remove object from identity and re-query" do
         assert_in_map(@person)
-        Mongo::Collection.any_instance.expects(:find_one).once.returns({})
+        expects_one_query
         @person.reload
       end
       
@@ -120,7 +133,7 @@ class IdentityMapTest < Test::Unit::TestCase
         end
 
         should "query the database" do
-          Mongo::Collection.any_instance.expects(:find_one).once
+          expects_one_query
           @person_class.find(@person.id)
         end
 
@@ -129,6 +142,10 @@ class IdentityMapTest < Test::Unit::TestCase
           found_person = @person_class.find(@person.id)
           assert_in_map(found_person)
         end
+        
+        should "return nil if not found " do
+          @person_class.find(1234).should be_nil
+        end
       end
 
       context "for object in map" do
@@ -137,8 +154,7 @@ class IdentityMapTest < Test::Unit::TestCase
         end
 
         should "not query database" do
-          Mongo::Collection.any_instance.expects(:find).never
-          Mongo::Collection.any_instance.expects(:find_one).never
+          expect_no_queries
           @person_class.find(@person.id)
         end
         
@@ -147,7 +163,7 @@ class IdentityMapTest < Test::Unit::TestCase
           found_person = @person_class.find(@person.id)
           found_person.object_id.should == @person.object_id
         end
-      end      
+      end
     end
     
     context "#find (with one id and options)" do
@@ -165,7 +181,7 @@ class IdentityMapTest < Test::Unit::TestCase
       # way to check if document matches criteria without querying.
       should "query the database" do
         assert_in_map(@post1)
-        Mongo::Collection.any_instance.expects(:find_one)
+        expects_one_query
         @person.posts.find(@post1.id)
       end
       
@@ -174,6 +190,10 @@ class IdentityMapTest < Test::Unit::TestCase
         @person.posts.find(@post1.id)
         assert_in_map(@post1)
       end
+      
+      should "return nil if not found " do
+        @person.posts.find(1234).should be_nil
+      end
     end
     
     context "#find (with multiple ids)" do
@@ -212,7 +232,7 @@ class IdentityMapTest < Test::Unit::TestCase
         end
 
         should "query the database" do
-          Mongo::Collection.any_instance.expects(:find_one).once
+          expects_one_query
           @person_class.first(:_id => @person.id)
         end
 
@@ -221,6 +241,10 @@ class IdentityMapTest < Test::Unit::TestCase
           found_person = @person_class.first(:_id => @person.id)
           assert_in_map(found_person)
         end
+        
+        should "return nil if not found" do
+          @person_class.first(:name => 'Bill').should be_nil
+        end
       end
 
       context "for object in map" do
@@ -229,8 +253,7 @@ class IdentityMapTest < Test::Unit::TestCase
         end
 
         should "not query database" do
-          Mongo::Collection.any_instance.expects(:find).never
-          Mongo::Collection.any_instance.expects(:find_one).never
+          expect_no_queries
           @person_class.first(:_id => @person.id)
         end
         
@@ -281,57 +304,101 @@ class IdentityMapTest < Test::Unit::TestCase
       end
     end
     
+    context "querying and selecting certain fields" do
+      setup do
+        @person = @person_class.create(:name => 'Bill')
+        @person_class.identity_map.clear
+      end
+
+      should "not add to map" do
+        assert_not_in_map(@person)
+        @person_class.first(:_id => @person.id, :select => 'name').should == @person
+        @person_class.first(:_id => @person.id, 'fields' => ['name']).should == @person
+        @person_class.last(:_id => @person.id, :select => 'name', :order => 'name').should == @person
+        @person_class.find(@person.id, :select => 'name').should == @person
+        @person_class.all(:_id => @person.id, :select => 'name').should == [@person]
+        assert_not_in_map(@person)
+      end
+      
+      should "return nil if not found" do
+        @person_class.find(1234, :select => 'name').should be_nil
+      end
+    end
+    
     context "single collection inheritance" do
       setup do
-        class ::DocParent
+        class ::Item
           include MongoMapper::Document
+          plugin MongoMapper::Plugins::IdentityMap
+          
           key :_type, String
-          key :name, String
+          key :title, String
           key :parent_id, ObjectId
           
-          belongs_to :parent, :class_name => 'DocParent'
-          one :child, :class_name => 'DocDaughter'
+          belongs_to :parent, :class_name => 'Item'
+          one :child, :class_name => 'Blog'
         end
-        DocParent.collection.remove
-        DocParent.identity_map.clear
+        Item.collection.remove
+        Item.identity_map.clear
 
-        class ::DocDaughter < ::DocParent; end
+        class ::Blog < ::Item; end
+        
+        class ::BlogPost < ::Item
+          key :blog_id, ObjectId
+          belongs_to :blog
+        end
       end
 
       teardown do
-        Object.send :remove_const, 'DocParent'   if defined?(::DocParent)
-        Object.send :remove_const, 'DocDaughter' if defined?(::DocDaughter)
+        Object.send :remove_const, 'Item'   if defined?(::Item)
+        Object.send :remove_const, 'Blog' if defined?(::Blog)
+        Object.send :remove_const, 'BlogPost' if defined?(::BlogPost)
       end
 
       should "share the same identity map 4eva" do
-        @daughter = DocDaughter.create(:name => 'Jill')
-        assert_in_map(@daughter)
-        DocParent.identity_map_key(@daughter).should == DocDaughter.identity_map_key(@daughter)
-        DocParent.identity_map.object_id.should == DocDaughter.identity_map.object_id
+        blog = Blog.create(:title => 'Jill')
+        assert_in_map(blog)
+        Item.identity_map_key(blog).should == Blog.identity_map_key(blog)
+        Item.identity_map.object_id.should == Blog.identity_map.object_id
+      end
+      
+      should "not query when finding by _id and _type" do
+        blog = Blog.create(:title => 'Blog')
+        post = BlogPost.create(:title => 'Mongo Rocks', :blog => blog)
+        Item.identity_map.clear
+        
+        blog = Item.find(blog.id)
+        post = Item.find(post.id)
+        assert_in_map(blog)
+        assert_in_map(post)
+        
+        expect_no_queries
+        post.blog
+        Blog.find(blog.id)
       end
       
       should "load from map when using parent collection inherited class" do
-        @daughter = DocDaughter.create(:name => 'Jill')
-        DocParent.find(@daughter.id).object_id.should == @daughter.object_id
+        blog = Blog.create(:title => 'Jill')
+        Item.find(blog.id).object_id.should == blog.object_id
       end
       
       should "work correctly with belongs to proxy" do
-        @parent = DocParent.create(:name => 'Dad')
-        assert_in_map(@parent)
+        root = Item.create(:title => 'Root')
+        assert_in_map(root)
         
-        @daughter = DocDaughter.create(:name => 'Jill', :parent => @parent)
-        assert_in_map(@daughter)
-        @parent.object_id.should == @daughter.parent.object_id
+        blog = Blog.create(:title => 'Jill', :parent => root)
+        assert_in_map(blog)
+        root.object_id.should == blog.parent.object_id
       end
       
       should "work correctly with one proxy" do
-        @daughter = DocDaughter.create(:name => 'Jill')
-        assert_in_map(@daughter)
+        blog = Blog.create(:title => 'Jill')
+        assert_in_map(blog)
 
-        @parent = DocParent.create(:name => 'Dad', :child => @daughter)
-        assert_in_map(@parent)
+        root = Item.create(:title => 'Root', :child => blog)
+        assert_in_map(root)
         
-        @parent.child.object_id.should == @daughter.object_id
+        root.child.object_id.should == blog.object_id
       end
     end
   end

data/test/unit/test_finder_options.rb

@@ -242,6 +242,10 @@ class FinderOptionsTest < Test::Unit::TestCase
     should "also work as select" do
       FinderOptions.new(Room, :select => %w(a b)).options[:fields].should == %w(a b)
     end
+    
+    should "also work with select as array of symbols" do
+      FinderOptions.new(Room, :select => [:a, :b]).options[:fields].should == [:a, :b]
+    end
   end
   
   context "Condition auto-detection" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper-unstable
 version: !ruby/object:Gem::Version 
-  version: 2010.1.19
+  version: 2010.1.20
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -05:00
+date: 2010-01-20 00:00:00 -05:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency