jmonteiro-mongo_mapper 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/mongo_mapper/document.rb

@@ -366,10 +366,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/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/keys.rb

@@ -45,13 +45,9 @@ module MongoMapper
         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 +136,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 +144,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/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

@@ -393,7 +393,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
 
@@ -1104,6 +1104,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

@@ -64,6 +64,25 @@ class IdentityMapTest < Test::Unit::TestCase
       assert_not_in_map(person)
     end
     
+    context "reload" do
+      setup do
+        @person = @person_class.create(:name => 'Fred')
+      end
+
+      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 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
+    end
+
     context "#load" do
       setup do
         @id = Mongo::ObjectID.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jmonteiro-mongo_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - John Nunemaker
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 -02:00
+date: 2010-01-19 00:00:00 -02:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency