mongo_mapper-unstable 2010.1.18 → 2010.1.19

data/VERSION

@@ -1 +1 @@
-2010.01.18
+2010.01.19

data/lib/mongo_mapper/document.rb

@@ -22,6 +22,7 @@ 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
@@ -45,29 +46,28 @@ module MongoMapper
         MongoMapper.ensure_index(self, keys_to_index, options)
       end
 
-      def find!(*args)
+      def find(*args)
+        find_all_first_last_error(args)
         options = args.extract_options!
-        case args.first
-          when :first then first(options)
-          when :last  then last(options)
-          when :all   then find_every(options)
-          when Array  then find_some(args, options)
-          else
-            case args.size
-              when 0
-                raise DocumentNotFound, "Couldn't find without an ID"
-              when 1
-                find_one!(options.merge({:_id => args[0]}))
-              else
-                find_some(args, options)
-            end
+        return nil if args.size == 0
+
+        if args.first.is_a?(Array) || args.size > 1
+          find_some(args, options)
+        else
+          find_one(options.merge({:_id => args[0]}))
         end
       end
-      
-      def find(*args)
-        find!(*args)
-      rescue DocumentNotFound
-        nil
+
+      def find!(*args)
+        find_all_first_last_error(args)
+        options = args.extract_options!
+        raise DocumentNotFound, "Couldn't find without an ID" if args.size == 0
+
+        if args.first.is_a?(Array) || args.size > 1
+          find_some!(args, options)
+        else
+          find_one(options.merge({:_id => args[0]})) || raise(DocumentNotFound, "Document match #{options.inspect} does not exist in #{collection.name} collection")
+        end
       end
 
       def first(options={})
@@ -80,7 +80,7 @@ module MongoMapper
       end
 
       def all(options={})
-        find_every(options)
+        find_many(options)
       end
 
       def find_by_id(id)
@@ -121,7 +121,7 @@ module MongoMapper
       end
 
       def destroy(*ids)
-        find_some(ids.flatten).each(&:destroy)
+        find_some!(ids.flatten).each(&:destroy)
       end
 
       def destroy_all(options={})
@@ -168,20 +168,6 @@ module MongoMapper
       def pop(*args)
         modifier_update('$pop', args)
       end
-      
-      def modifier_update(modifier, args)
-        criteria, keys = criteria_and_keys_from_args(args)
-        modifiers = {modifier => keys}
-        collection.update(criteria, modifiers, :multi => true)
-      end
-      private :modifier_update
-      
-      def criteria_and_keys_from_args(args)
-        keys     = args.pop
-        criteria = args[0].is_a?(Hash) ? args[0] : {:id => args}
-        [to_criteria(criteria), keys]
-      end
-      private :criteria_and_keys_from_args
 
       def embeddable?
         false
@@ -257,17 +243,33 @@ module MongoMapper
           instances.size == 1 ? instances[0] : instances
         end
 
-        def find_every(options)
-          criteria, options = to_finder_options(options)
-          collection.find(criteria, options).to_a.map do |doc|
-            load(doc)
+        def modifier_update(modifier, args)
+          criteria, keys = criteria_and_keys_from_args(args)
+          modifiers = {modifier => keys}
+          collection.update(criteria, modifiers, :multi => true)
+        end
+
+        def criteria_and_keys_from_args(args)
+          keys     = args.pop
+          criteria = args[0].is_a?(Hash) ? args[0] : {:id => args}
+          [to_criteria(criteria), keys]
+        end
+
+        def find_all_first_last_error(args)
+          if args[0] == :first || args[0] == :last || args[0] == :all
+            raise ArgumentError, "#{self}.find(:#{args}) is no longer supported, use #{self}.#{args} instead."
           end
         end
 
         def find_some(ids, options={})
-          ids       = ids.flatten.compact.uniq
-          documents = find_every(options.merge(:_id => ids))
-
+          ids = ids.flatten.compact.uniq
+          find_many(options.merge(:_id => ids)).compact
+        end
+        
+        def find_some!(ids, options={})
+          ids = ids.flatten.compact.uniq
+          documents = find_some(ids, options)
+          
           if ids.size == documents.size
             documents
           else
@@ -282,8 +284,11 @@ module MongoMapper
           end
         end
 
-        def find_one!(options={})
-          find_one(options) || raise(DocumentNotFound, "Document match #{options.inspect} does not exist in #{collection.name} collection")
+        def find_many(options)
+          criteria, options = to_finder_options(options)
+          collection.find(criteria, options).to_a.map do |doc|
+            load(doc)
+          end
         end
 
         def invert_order_clause(order)
@@ -365,10 +370,13 @@ module MongoMapper
       end
 
       def reload
-        doc = self.class.find(_id)
-        self.class.associations.each { |name, assoc| send(name).reset if respond_to?(name) }
-        self.attributes = doc.attributes
-        self
+        if attrs = collection.find_one({:_id => _id})
+          self.class.associations.each { |name, assoc| send(name).reset if respond_to?(name) }
+          self.attributes = attrs
+          self
+        else
+          raise DocumentNotFound, "Document match #{_id.inspect} does not exist in #{collection.name} collection"
+        end
       end
 
     private

data/lib/mongo_mapper/dynamic_finder.rb

@@ -9,7 +9,7 @@ module MongoMapper
       
       options = args.extract_options!.merge(attributes)
       
-      if result = find(finder.finder, options)
+      if result = send(finder.finder, options)
         result
       else
         if finder.raise?

data/lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb

@@ -2,6 +2,8 @@ module MongoMapper
   module Plugins
     module Associations
       class BelongsToPolymorphicProxy < Proxy
+        undef_method :object_id
+        
         def replace(doc)
           if doc
             doc.save if doc.new?
@@ -16,7 +18,7 @@ module MongoMapper
         protected
           def find_target
             return nil if association_class.nil? || owner[reflection.foreign_key].nil?
-            association_class.first(:id => owner[reflection.foreign_key])
+            association_class.find_by_id(owner[reflection.foreign_key])
           end
 
           def association_class

data/lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb

@@ -2,6 +2,8 @@ module MongoMapper
   module Plugins
     module Associations
       class BelongsToProxy < Proxy
+        undef_method :object_id
+        
         def replace(doc)
           if doc
             doc.save if doc.new?
@@ -15,7 +17,7 @@ module MongoMapper
         protected
           def find_target
             return nil if owner[reflection.foreign_key].nil?
-            klass.first(:id => owner[reflection.foreign_key])
+            klass.find_by_id(owner[reflection.foreign_key])
           end
       end
     end

data/lib/mongo_mapper/plugins/associations/one_proxy.rb

@@ -2,6 +2,8 @@ module MongoMapper
   module Plugins
     module Associations
       class OneProxy < Proxy
+        undef_method :object_id
+        
         def build(attrs={})
           instantiate_target(:new, attrs)
         end

data/lib/mongo_mapper/plugins/dirty.rb

@@ -38,9 +38,9 @@ module MongoMapper
           changed.inject({}) { |h, key| h[key] = key_change(key); h }
         end
 
-        def initialize(attrs={})
+        def initialize(*args)
           super
-          changed_keys.clear if attrs.blank?
+          changed_keys.clear if args.first.blank? || !new?
         end
 
         def save(*args)

data/lib/mongo_mapper/plugins/identity_map.rb

@@ -1,36 +1,41 @@
 module MongoMapper
   module Plugins
     module IdentityMap
+      def self.identity_map
+        Thread.current[:mongo_mapper_identity_map] ||= {}
+      end
+      
+      def self.identity_map=(v)
+        Thread.current[:mongo_mapper_identity_map] = v
+      end
+      
       module ClassMethods
         def identity_map
-          Thread.current[:mongo_mapper_identity_map] ||= {}
+          IdentityMap.identity_map
         end
 
         def identity_map=(v)
-          Thread.current[:mongo_mapper_identity_map] = v
+          IdentityMap.identity_map = v
         end
 
         def identity_map_key(id)
-          "#{self}:#{id}"
+          "#{collection.name}:#{id}"
         end
 
         def find_one(options={})
-          criteria, options = to_finder_options(options)
+          criteria, finder_options = to_finder_options(options)
           key = identity_map_key(criteria[:_id])
-
-          if document = identity_map[key]
+          if criteria.keys == [:_id] && document = identity_map[key]
             document
           else
             document = super
           end
-          
+
           document
         end
 
         def load(attrs)
-          id = attrs[:_id] || attrs[:id] || attrs['_id'] || attrs['id']
-          key = identity_map_key(id)
-
+          key = identity_map_key(attrs['_id'])
           unless document = identity_map[key]
             document = super
             identity_map[document.identity_map_key] = document
@@ -49,7 +54,7 @@ module MongoMapper
           self.class.identity_map
         end
 
-        def save
+        def save(*args)
           if result = super
             identity_map[identity_map_key] = self
           end

data/lib/mongo_mapper/plugins/keys.rb

@@ -42,16 +42,13 @@ module MongoMapper
           value.is_a?(self) ? value : load(value)
         end
 
+        # load is overridden in identity map to ensure same objects are loaded
         def load(attrs)
           begin
             klass = attrs['_type'].present? ? attrs['_type'].constantize : self
-            doc = klass.new(attrs)
-            doc.instance_variable_set("@new", false)
-            doc
+            klass.new(attrs, true)
           rescue NameError
-            doc = new(attrs)
-            doc.instance_variable_set("@new", false)
-            doc
+            new(attrs, true)
           end
         end
 
@@ -140,7 +137,7 @@ module MongoMapper
           model.key :_id, ObjectId
         end
         
-        def initialize(attrs={})
+        def initialize(attrs={}, from_db=false)
           unless attrs.nil?
             provided_keys = attrs.keys.map { |k| k.to_s }
             unless provided_keys.include?('_id') || provided_keys.include?('id')
@@ -148,7 +145,7 @@ module MongoMapper
             end
           end
           
-          @new = true
+          @new = from_db ? false : true
           self._type = self.class.name if respond_to?(:_type=)
           self.attributes = attrs
         end

data/lib/mongo_mapper/plugins/pagination.rb

@@ -13,7 +13,7 @@ module MongoMapper
           pagination    = Pagination::PaginationProxy.new(total_entries, page, per_page)
 
           options.merge!(:limit => pagination.limit, :skip => pagination.skip)
-          pagination.subject = find_every(options)
+          pagination.subject = find_many(options)
           pagination
         end
       end

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -131,23 +131,6 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
       @post2.save
     end
 
-    context "with :all" do
-      should "work" do
-        @post.comments.find(:all).should include(@comment1)
-        @post.comments.find(:all).should include(@comment2)
-      end
-
-      should "work with conditions" do
-        comments = @post.comments.find(:all, :body => 'comment1')
-        comments.should == [@comment1]
-      end
-
-      should "work with order" do
-        comments = @post.comments.find(:all, :order => 'body desc')
-        comments.should == [@comment2, @comment1]
-      end
-    end
-
     context "with #all" do
       should "work" do
         @post.comments.all.should include(@comment1)
@@ -171,9 +154,9 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
       end
 
       should "not work for id not in association" do
-        lambda {
+        assert_raises(MongoMapper::DocumentNotFound) do
           @post.comments.find!(@comment5._id)
-        }.should raise_error(MongoMapper::DocumentNotFound)
+        end
       end
     end
 
@@ -184,9 +167,9 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
       end
 
       should "not work for ids not in association" do
-        lambda {
+        assert_raises(MongoMapper::DocumentNotFound) do
           @post.comments.find!(@comment1._id, @comment2._id, @comment4._id)
-        }.should raise_error(MongoMapper::DocumentNotFound)
+        end
       end
     end
     

data/test/functional/associations/test_many_documents_proxy.rb

@@ -242,36 +242,30 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     
     context "all" do
       should "work" do
-        @project1.statuses.find(:all, :order => "position asc").should == [@brand_new, @complete]
         @project1.statuses.all(:order => "position asc").should == [@brand_new, @complete]
       end
       
       should "work with conditions" do
-        @project1.statuses.find(:all, :name => 'Complete').should == [@complete]
         @project1.statuses.all(:name => 'Complete').should == [@complete]
       end
     end
     
     context "first" do
       should "work" do
-        @project1.statuses.find(:first, :order => 'name').should == @complete
         @project1.statuses.first(:order => 'name').should == @complete
       end
       
       should "work with conditions" do
-        @project1.statuses.find(:first, :name => 'Complete').should == @complete
         @project1.statuses.first(:name => 'Complete').should == @complete
       end
     end
     
     context "last" do
       should "work" do
-        @project1.statuses.find(:last, :order => "position asc").should == @complete
         @project1.statuses.last(:order => "position asc").should == @complete
       end
       
       should "work with conditions" do
-        @project1.statuses.find(:last, :order => 'position', :name => 'New').should == @brand_new
         @project1.statuses.last(:order => 'position', :name => 'New').should == @brand_new
       end
     end
@@ -295,9 +289,9 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       end
       
       should "not work for ids not in association" do
-        lambda {
+        assert_raises(MongoMapper::DocumentNotFound) do
           @project1.statuses.find!(@brand_new.id, @complete.id, @archived.id)
-        }.should raise_error(MongoMapper::DocumentNotFound)
+        end
       end
     end
     

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -176,22 +176,6 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
     end
     
-    context "with :all" do
-      should "work" do
-        @lounge.messages.find(:all, :order => "position").should == [@lm1, @lm2]
-      end
-      
-      should "work with conditions" do
-        messages = @lounge.messages.find(:all, :body => 'Loungin!', :order => "position")
-        messages.should == [@lm1]
-      end
-      
-      should "work with order" do
-        messages = @lounge.messages.find(:all, :order => 'position desc')
-        messages.should == [@lm2, @lm1]
-      end
-    end
-    
     context "with #all" do
       should "work" do
         @lounge.messages.all(:order => "position").should == [@lm1, @lm2]
@@ -208,17 +192,6 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
     end
     
-    context "with :first" do
-      should "work" do
-        @lounge.messages.find(:first, :order => "position asc").should == @lm1
-      end
-      
-      should "work with conditions" do
-        message = @lounge.messages.find(:first, :body => 'I love loungin!', :order => "position asc")
-        message.should == @lm2
-      end
-    end
-    
     context "with #first" do
       should "work" do
         @lounge.messages.first(:order => "position asc").should == @lm1
@@ -230,17 +203,6 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
     end
     
-    context "with :last" do
-      should "work" do
-        @lounge.messages.find(:last, :order => "position asc").should == @lm2
-      end
-      
-      should "work with conditions" do
-        message = @lounge.messages.find(:last, :body => 'Loungin!', :order => "position asc")
-        message.should == @lm1
-      end
-    end
-    
     context "with #last" do
       should "work" do
         @lounge.messages.last(:order => "position asc").should == @lm2
@@ -285,9 +247,9 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "not work for ids not in association" do
-        lambda {
+        assert_raises(MongoMapper::DocumentNotFound) do
           @lounge.messages.find!(@lm1._id, @lm2._id, @hm2._id)
-        }.should raise_error(MongoMapper::DocumentNotFound)
+        end
       end
     end
     

data/test/functional/test_dirty.rb

@@ -1,23 +1,17 @@
 require 'test_helper'
-require 'models'
 
 class DirtyTest < Test::Unit::TestCase
   def setup
-    @document = Doc do
-      key :phrase, String
-    end
-    
-    Status.collection.remove
-    Project.collection.remove
+    @document = Doc { key :phrase, String }
   end
-  
+
   context "marking changes" do
     should "not happen if there are none" do
       doc = @document.new
       doc.phrase_changed?.should be_false
       doc.phrase_change.should be_nil
     end
-    
+
     should "happen when change happens" do
       doc = @document.new
       doc.phrase = 'Golly Gee Willikers Batman'
@@ -25,12 +19,12 @@ class DirtyTest < Test::Unit::TestCase
       doc.phrase_was.should be_nil
       doc.phrase_change.should == [nil, 'Golly Gee Willikers Batman']
     end
-    
+
     should "happen when initializing" do
       doc = @document.new(:phrase => 'Foo')
       doc.changed?.should be_true
     end
-    
+
     should "clear changes on save" do
       doc = @document.new
       doc.phrase = 'Golly Gee Willikers Batman'
@@ -39,7 +33,7 @@ class DirtyTest < Test::Unit::TestCase
       doc.phrase_changed?.should_not be_true
       doc.phrase_change.should be_nil
     end
-    
+
     should "clear changes on save!" do
       doc = @document.new
       doc.phrase = 'Golly Gee Willikers Batman'
@@ -48,15 +42,18 @@ class DirtyTest < Test::Unit::TestCase
       doc.phrase_changed?.should_not be_true
       doc.phrase_change.should be_nil
     end
-    
+
     should "not happen when loading from database" do
       doc = @document.create(:phrase => 'Foo')
+      doc = @document.find(doc.id)
+      
+      doc.changed?.should be_false
       doc.phrase = 'Fart'
       doc.changed?.should be_true
       doc.reload
       doc.changed?.should be_false
     end
-    
+
     should "happen if changed after loading from database" do
       doc = @document.create(:phrase => 'Foo')
       doc.reload
@@ -65,7 +62,7 @@ class DirtyTest < Test::Unit::TestCase
       doc.changed?.should be_true
     end
   end
-  
+
   context "blank new value and type integer" do
     should "not mark changes" do
       @document.key :age, Integer
@@ -147,10 +144,20 @@ class DirtyTest < Test::Unit::TestCase
   
   context "changing a foreign key through association" do
     should "mark changes" do
-      status = Status.create(:name => 'Foo')
-      status.project = Project.create(:name => 'Bar')
-      status.changed?.should be_true
-      status.changed.should == %w(project_id)
+      project_class = Doc do
+        key :name, String
+      end
+      
+      milestone_class = Doc do
+        key :project_id, ObjectId
+        key :name, String
+      end
+      milestone_class.belongs_to :project, :class => project_class
+      
+      milestone = milestone_class.create(:name => 'Launch')
+      milestone.project = project_class.create(:name => 'Harmony')
+      milestone.changed?.should be_true
+      milestone.changed.should == %w(project_id)
     end
   end
 end

data/test/functional/test_document.rb

@@ -239,7 +239,19 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "raise document not found if nothing provided for find!" do
-      lambda { @document.find! }.should raise_error(MongoMapper::DocumentNotFound)
+      assert_raises(MongoMapper::DocumentNotFound) do
+        @document.find!
+      end
+    end
+    
+    should "raise error if trying to find with :all, :first, or :last" do
+      [:all, :first, :last].each do |m|
+        assert_raises(ArgumentError) { @document.find(m) }
+      end
+
+      [:all, :first, :last].each do |m|
+        assert_raises(ArgumentError) { @document.find!(m) }
+      end
     end
 
     context "(with a single id)" do
@@ -252,9 +264,7 @@ class DocumentTest < Test::Unit::TestCase
       end
 
       should "raise error if document not found with find!" do
-        lambda {
-          @document.find!(123)
-        }.should raise_error(MongoMapper::DocumentNotFound)
+        assert_raises(MongoMapper::DocumentNotFound) { @document.find!(123) }
       end
     end
 
@@ -267,7 +277,17 @@ class DocumentTest < Test::Unit::TestCase
         @document.find([@doc1._id, @doc2._id]).should == [@doc1, @doc2]
       end
 
-      should "return array if array only has one element" do
+      should "compact not found when using find" do
+        @document.find(@doc1._id, 1234).should == [@doc1]
+      end
+
+      should "raise error if not all found when using find!" do
+        assert_raises(MongoMapper::DocumentNotFound) do
+          @document.find!(@doc1._id, 1234)
+        end
+      end
+
+      should "return array if array with one element" do
         @document.find([@doc1._id]).should == [@doc1]
       end
     end
@@ -277,43 +297,21 @@ class DocumentTest < Test::Unit::TestCase
       @document.all(:last_name => 'Nunemaker', :order => 'age desc').should == [@doc1, @doc3]
     end
 
-    context "(with :all)" do
-      should "find all documents" do
-        @document.find(:all, :order => 'first_name').should == [@doc1, @doc3, @doc2]
-      end
-
-      should "be able to add conditions" do
-        @document.find(:all, :first_name => 'John').should == [@doc1]
-      end
-    end
-
-    context "(with #all)" do
+    context "#all" do
       should "find all documents based on criteria" do
         @document.all(:order => 'first_name').should == [@doc1, @doc3, @doc2]
         @document.all(:last_name => 'Nunemaker', :order => 'age desc').should == [@doc1, @doc3]
       end
     end
 
-    context "(with :first)" do
-      should "find first document" do
-        @document.find(:first, :order => 'first_name').should == @doc1
-      end
-    end
-
-    context "(with #first)" do
+    context "#first" do
       should "find first document based on criteria" do
         @document.first(:order => 'first_name').should == @doc1
         @document.first(:age => 28).should == @doc2
       end
     end
 
-    context "(with :last)" do
-      should "find last document" do
-        @document.find(:last, :order => 'age').should == @doc2
-      end
-    end
-
-    context "(with #last)" do
+    context "#last" do
       should "find last document based on criteria" do
         @document.last(:order => 'age').should == @doc2
         @document.last(:order => 'age', :age => 28).should == @doc2
@@ -324,7 +322,7 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
 
-    context "(with :find_by)" do
+    context "#find_by..." do
       should "find document based on argument" do
         @document.find_by_first_name('John').should == @doc1
         @document.find_by_last_name('Nunemaker', :order => 'age desc').should == @doc1
@@ -340,7 +338,7 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
 
-    context "(with dynamic finders)" do
+    context "dynamic finders" do
       should "find document based on all arguments" do
         @document.find_by_first_name_and_last_name_and_age('John', 'Nunemaker', 27).should == @doc1
       end
@@ -393,7 +391,7 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "return nil if document not found" do
-      @document.find_by_id(1234).should be(nil)
+      @document.find_by_id(1234).should be_nil
     end
   end
 
@@ -835,7 +833,7 @@ class DocumentTest < Test::Unit::TestCase
       @parent.save
       @daughter.save
 
-      collection = DocParent.find(:all)
+      collection = DocParent.all
       collection.size.should == 2
       collection.first.should be_kind_of(DocParent)
       collection.first.name.should == "Daddy Warbucks"
@@ -1104,6 +1102,11 @@ class DocumentTest < Test::Unit::TestCase
     should "return self" do
       @instance.reload.object_id.should == @instance.object_id
     end
+    
+    should "raise DocumentNotFound if not found" do
+      @instance.destroy
+      assert_raises(MongoMapper::DocumentNotFound) { @instance.reload }
+    end
   end
 
   context "Loading a document from the database with keys that are not defined" do

data/test/functional/test_identity_map.rb

@@ -14,17 +14,21 @@ class IdentityMapTest < Test::Unit::TestCase
   context "Document" do
     setup do
       @person_class = Doc('Person') do
+        set_collection_name 'people'
         key :name, String
-        plugin MongoMapper::Plugins::IdentityMap
       end
       
       @post_class = Doc('Post') do
+        set_collection_name 'posts'
         key :title, String
-        plugin MongoMapper::Plugins::IdentityMap
+        key :person_id, ObjectId
       end
       
-      @person_class.identity_map = {}
-      @post_class.identity_map   = {}
+      @post_class.belongs_to :person, :class => @person_class
+      @person_class.many :posts, :class => @post_class
+      
+      @person_class.identity_map.clear
+      @post_class.identity_map.clear
     end
 
     should "default identity map to hash" do
@@ -40,11 +44,11 @@ class IdentityMapTest < Test::Unit::TestCase
 
     should "have identity map key that is always unique per document and class" do
       person = @person_class.new
-      person.identity_map_key.should == "Person:#{person.id}"
+      person.identity_map_key.should == "people:#{person.id}"
       @person_class.identity_map_key(person.id).should == person.identity_map_key
 
       post = @post_class.new
-      post.identity_map_key.should == "Post:#{post.id}"
+      post.identity_map_key.should == "posts:#{post.id}"
       @post_class.identity_map_key(post.id).should == post.identity_map_key
 
       person.identity_map_key.should_not == post.identity_map_key
@@ -56,6 +60,13 @@ class IdentityMapTest < Test::Unit::TestCase
       person.save.should be_true
       assert_in_map(person)
     end
+    
+    should "allow saving with options" do
+      person = @person_class.new
+      assert_nothing_raised do
+        person.save(:validate => false).should be_true
+      end
+    end
 
     should "remove key from map when deleted" do
       person = @person_class.create(:name => 'Fred')
@@ -64,35 +75,39 @@ class IdentityMapTest < Test::Unit::TestCase
       assert_not_in_map(person)
     end
     
-    context "#load" do
+    context "reload" do
       setup do
-        @id = Mongo::ObjectID.new
+        @person = @person_class.create(:name => 'Fred')
       end
-      
-      should "add document to map with _id key as symbol" do
-        loaded = @person_class.load({:_id => @id, :name => 'Frank'})
-        assert_in_map(loaded)
+
+      should "remove object from identity and re-query" do
+        assert_in_map(@person)
+        Mongo::Collection.any_instance.expects(:find_one).once.returns({})
+        @person.reload
       end
       
-      should "add document to map with _id key as string" do
-        loaded = @person_class.load({'_id' => @id, :name => 'Frank'})
-        assert_in_map(loaded)
+      should "add object back into map" do
+        assert_in_map(@person)
+        object_id = @person.object_id
+        @person.reload.object_id.should == object_id
+        assert_in_map(@person)
       end
-      
-      should "add document to map with id key as symbol" do
-        loaded = @person_class.load({:id => @id, :name => 'Frank'})
-        assert_in_map(loaded)
+    end
+
+    context "#load" do
+      setup do
+        @id = Mongo::ObjectID.new
       end
-      
-      should "add document to map with id key as string" do
-        loaded = @person_class.load({'id' => @id, :name => 'Frank'})
+
+      should "add document to map" do
+        loaded = @person_class.load({'_id' => @id, 'name' => 'Frank'})
         assert_in_map(loaded)
       end
-      
+
       should "return document if already in map" do
-        first_load = @person_class.load({:_id => @id, :name => 'Frank'})
+        first_load = @person_class.load({'_id' => @id, 'name' => 'Frank'})
         @person_class.identity_map.expects(:[]=).never
-        second_load = @person_class.load({:_id => @id, :name => 'Frank'})
+        second_load = @person_class.load({'_id' => @id, 'name' => 'Frank'})
         first_load.object_id.should == second_load.object_id
       end
     end
@@ -132,6 +147,32 @@ class IdentityMapTest < Test::Unit::TestCase
           found_person = @person_class.find(@person.id)
           found_person.object_id.should == @person.object_id
         end
+      end      
+    end
+    
+    context "#find (with one id and options)" do
+      setup do
+        @person = @person_class.create(:name => 'Fred')
+        @post1  = @person.posts.create(:title => 'I Love Mongo')
+        @post2  = @person.posts.create(:title => 'Migrations Suck!')
+      end
+
+      # There are times when even though the id matches, other criteria doesn't
+      # so we need to do the query to ensure that when criteria doesn't match
+      # the document is in fact not found. 
+      #
+      # I'm open to not making this query if someone can figure out reliable
+      # 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)
+        @person.posts.find(@post1.id)
+      end
+      
+      should "return exact object" do
+        assert_in_map(@post1)
+        @person.posts.find(@post1.id)
+        assert_in_map(@post1)
       end
     end
     
@@ -229,5 +270,69 @@ class IdentityMapTest < Test::Unit::TestCase
       end
     end
     
+    context "#find_by_id" do
+      setup do
+        @person = @person_class.create(:name => 'Bill')
+      end
+      
+      should "return nil for document id not found in collection" do
+        assert_in_map(@person)
+        @person_class.find_by_id(1234).should be_nil
+      end
+    end
+    
+    context "single collection inheritance" do
+      setup do
+        class ::DocParent
+          include MongoMapper::Document
+          key :_type, String
+          key :name, String
+          key :parent_id, ObjectId
+          
+          belongs_to :parent, :class_name => 'DocParent'
+          one :child, :class_name => 'DocDaughter'
+        end
+        DocParent.collection.remove
+        DocParent.identity_map.clear
+
+        class ::DocDaughter < ::DocParent; end
+      end
+
+      teardown do
+        Object.send :remove_const, 'DocParent'   if defined?(::DocParent)
+        Object.send :remove_const, 'DocDaughter' if defined?(::DocDaughter)
+      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
+      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
+      end
+      
+      should "work correctly with belongs to proxy" do
+        @parent = DocParent.create(:name => 'Dad')
+        assert_in_map(@parent)
+        
+        @daughter = DocDaughter.create(:name => 'Jill', :parent => @parent)
+        assert_in_map(@daughter)
+        @parent.object_id.should == @daughter.parent.object_id
+      end
+      
+      should "work correctly with one proxy" do
+        @daughter = DocDaughter.create(:name => 'Jill')
+        assert_in_map(@daughter)
+
+        @parent = DocParent.create(:name => 'Dad', :child => @daughter)
+        assert_in_map(@parent)
+        
+        @parent.child.object_id.should == @daughter.object_id
+      end
+    end
   end
 end

metadata

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