dm-core 0.10.1 → 0.10.2

data/spec/public/shared/resource_shared_spec.rb

@@ -25,10 +25,10 @@ share_examples_for 'A public Resource' do
     it { @user.should respond_to(method) }
 
     describe "##{method}" do
-      describe 'when comparing to the same object' do
+      describe 'when comparing to the same resource' do
         before :all do
           @other  = @user
-          @return = @user.send(method, @other)
+          @return = @user.__send__(method, @other)
         end
 
         it 'should return true' do
@@ -36,10 +36,10 @@ share_examples_for 'A public Resource' do
         end
       end
 
-      describe 'when comparing to an object that does not respond to model' do
+      describe 'when comparing to an resource that does not respond to resource methods' do
         before :all do
           @other  = Object.new
-          @return = @user.send(method, @other)
+          @return = @user.__send__(method, @other)
         end
 
         it 'should return false' do
@@ -49,9 +49,9 @@ share_examples_for 'A public Resource' do
 
       describe 'when comparing to a resource with the same properties, but the model is a subclass' do
         before :all do
-          rescue_if 'TODO', @skip do
+          rescue_if @skip do
             @other  = @author_model.new(@user.attributes)
-            @return = @user.send(method, @other)
+            @return = @user.__send__(method, @other)
           end
         end
 
@@ -62,9 +62,9 @@ share_examples_for 'A public Resource' do
 
       describe 'when comparing to a resource with the same repository, key and neither self or the other resource is dirty' do
         before :all do
-          rescue_if 'TODO', @skip do
+          rescue_if @skip do
             @other  = @user_model.get(*@user.key)
-            @return = @user.send(method, @other)
+            @return = @user.__send__(method, @other)
           end
         end
 
@@ -75,10 +75,10 @@ share_examples_for 'A public Resource' do
 
       describe 'when comparing to a resource with the same repository, key but either self or the other resource is dirty' do
         before :all do
-          rescue_if 'TODO', @skip do
+          rescue_if @skip do
             @user.age = 20
             @other  = @user_model.get(*@user.key)
-            @return = @user.send(method, @other)
+            @return = @user.__send__(method, @other)
           end
         end
 
@@ -89,9 +89,9 @@ share_examples_for 'A public Resource' do
 
       describe 'when comparing to a resource with the same properties' do
         before :all do
-          rescue_if 'TODO', @skip do
+          rescue_if @skip do
             @other  = @user_model.new(@user.attributes)
-            @return = @user.send(method, @other)
+            @return = @user.__send__(method, @other)
           end
         end
 
@@ -103,9 +103,9 @@ share_examples_for 'A public Resource' do
       with_alternate_adapter do
         describe 'when comparing to a resource with a different repository, but the same properties' do
           before :all do
-            rescue_if 'TODO', @skip do
+            rescue_if @skip do
               @other = @alternate_repository.scope { @user_model.create(@user.attributes) }
-              @return = @user.send(method, @other)
+              @return = @user.__send__(method, @other)
             end
           end
 
@@ -122,7 +122,7 @@ share_examples_for 'A public Resource' do
   describe '#<=>' do
     describe 'when the default order properties are equal with another resource' do
       before :all do
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @other = @user_model.new(:name => 'dbussink')
           @return = @user <=> @other
         end
@@ -135,7 +135,7 @@ share_examples_for 'A public Resource' do
 
     describe 'when the default order property values are sorted before another resource' do
       before :all do
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @other = @user_model.new(:name => 'c')
           @return = @user <=> @other
         end
@@ -148,7 +148,7 @@ share_examples_for 'A public Resource' do
 
     describe 'when the default order property values are sorted after another resource' do
       before :all do
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @other = @user_model.new(:name => 'e')
           @return = @user <=> @other
         end
@@ -187,11 +187,23 @@ share_examples_for 'A public Resource' do
   it { @user.should respond_to(:attributes) }
 
   describe '#attributes' do
+    describe 'with a new resource' do
+      before :all do
+        rescue_if @skip do
+          @user = @user.model.new
+        end
+      end
 
-    it 'should return the expected values' do
-      @user.attributes.only(:name, :description, :age).should == { :name => 'dbussink', :description => 'Test', :age => 25 }
+      it 'should return the expected values' do
+        @user.attributes.should == {}
+      end
     end
 
+    describe 'with a saved resource' do
+      it 'should return the expected values' do
+        @user.attributes.only(:name, :description, :age).should == { :name => 'dbussink', :description => 'Test', :age => 25 }
+      end
+    end
   end
 
   it { @user.should respond_to(:attributes=) }
@@ -199,7 +211,7 @@ share_examples_for 'A public Resource' do
   describe '#attributes=' do
     describe 'when a public mutator is specified' do
       before :all do
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @user.attributes = { :name => 'dkubb' }
         end
       end
@@ -222,26 +234,26 @@ share_examples_for 'A public Resource' do
     it { @user.should respond_to(:destroy) }
 
     describe "##{method}" do
-      describe 'on a single object' do
+      describe 'on a single resource' do
         before :all do
           @resource = @user_model.create(:name => 'hacker', :age => 20, :comment => @comment)
 
-          @return = @resource.send(method)
+          @return = @resource.__send__(method)
         end
 
         it 'should successfully remove a resource' do
           @return.should be_true
         end
 
-        it 'should freeze the destroyed resource' do
-          @resource.should be_frozen
+        it 'should mark the destroyed resource as readonly' do
+          @resource.should be_readonly
         end
 
         it "should return true when calling #{method} on a destroyed resource" do
-          @resource.send(method).should be_true
+          @resource.__send__(method).should be_true
         end
 
-        it 'should remove object from persistent storage' do
+        it 'should remove resource from persistent storage' do
           @user_model.get(*@resource.key).should be_nil
         end
       end
@@ -252,10 +264,131 @@ share_examples_for 'A public Resource' do
     end
   end
 
+  it { @user.should respond_to(:dirty?) }
+
+  describe '#dirty?' do
+    describe 'on a record, with dirty attributes' do
+      before { @user.age = 100 }
+
+      it { @user.should be_dirty }
+    end
+
+    describe 'on a record, with no dirty attributes, and dirty parents' do
+      before :all do
+        rescue_if @skip do
+          @user.should_not be_dirty
+
+          parent = @user.parent = @user_model.new(:name => 'Parent')
+          parent.should be_dirty
+        end
+      end
+
+      it { @user.should be_dirty }
+    end
+
+    describe 'on a record, with no dirty attributes, and dirty children' do
+      before :all do
+        rescue_if @skip do
+          @user.should_not be_dirty
+
+          child = @user.children.new(:name => 'Child')
+          child.should be_dirty
+        end
+      end
+
+      it { @user.should be_dirty }
+    end
+
+    describe 'on a record, with no dirty attributes, and dirty siblings' do
+      before :all do
+        rescue_if @skip do
+          @user.should_not be_dirty
+
+          parent = @user_model.create(:name => 'Parent', :comment => @comment)
+          parent.should_not be_dirty
+
+          @user.update(:parent => parent)
+          @user.should_not be_dirty
+
+          sibling = parent.children.new(:name => 'Sibling')
+          sibling.should be_dirty
+          parent.should be_dirty
+        end
+      end
+
+      it { @user.should_not be_dirty }
+    end
+
+    describe 'on a saved record, with no dirty attributes' do
+      it { @user.should_not be_dirty }
+    end
+
+    describe 'on a new record, with no dirty attributes, no default attributes, and no identity field' do
+      before { @user = @user_model.new }
+
+      it { @user.should_not be_dirty }
+    end
+
+    describe 'on a new record, with no dirty attributes, no default attributes, and an identity field' do
+      before { @comment = @comment_model.new }
+
+      it { @comment.should be_dirty }
+    end
+
+    describe 'on a new record, with no dirty attributes, default attributes, and no identity field' do
+      before { @default = Default.new }
+
+      it { @default.should be_dirty }
+    end
+
+    describe 'on a record with itself as a parent (circular dependency)' do
+      before :all do
+        rescue_if @skip do
+          @user.parent = @user
+        end
+      end
+
+      it 'should not raise an exception' do
+        lambda {
+          @user.dirty?.should be_true
+        }.should_not raise_error(SystemStackError)
+      end
+    end
+
+    describe 'on a record with itself as a child (circular dependency)' do
+      before :all do
+        rescue_if @skip do
+          @user.children = [ @user ]
+        end
+      end
+
+      it 'should not raise an exception' do
+        lambda {
+          @user.dirty?.should be_true
+        }.should_not raise_error(SystemStackError)
+      end
+    end
+
+    describe 'on a record with a parent as a child (circular dependency)' do
+      before :all do
+        rescue_if @skip do
+          @user.children = [ @user.parent = @user_model.new(:name => 'Parent', :comment => @comment) ]
+          @user.save.should be_true
+        end
+      end
+
+      it 'should not raise an exception' do
+        lambda {
+          @user.dirty?.should be_true
+        }.should_not raise_error(SystemStackError)
+      end
+    end
+  end
+
   it { @user.should respond_to(:eql?) }
 
   describe '#eql?' do
-    describe 'when comparing to the same object' do
+    describe 'when comparing to the same resource' do
       before :all do
         @other  = @user
         @return = @user.eql?(@other)
@@ -266,7 +399,7 @@ share_examples_for 'A public Resource' do
       end
     end
 
-    describe 'when comparing to an object that does not respond to model' do
+    describe 'when comparing to an resource that does not respond to model' do
       before :all do
         @other  = Object.new
         @return = @user.eql?(@other)
@@ -279,7 +412,7 @@ share_examples_for 'A public Resource' do
 
     describe 'when comparing to a resource with the same properties, but the model is a subclass' do
       before :all do
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @other  = @author_model.new(@user.attributes)
           @return = @user.eql?(@other)
         end
@@ -292,8 +425,8 @@ share_examples_for 'A public Resource' do
 
     describe 'when comparing to a resource with a different key' do
       before :all do
-        @other     = @user_model.create(:name => 'dkubb', :age => 33, :comment => @comment)
-        @return    = @user.eql?(@other)
+        @other  = @user_model.create(:name => 'dkubb', :age => 33, :comment => @comment)
+        @return = @user.eql?(@other)
       end
 
       it 'should return false' do
@@ -303,7 +436,7 @@ share_examples_for 'A public Resource' do
 
     describe 'when comparing to a resource with the same repository, key and neither self or the other resource is dirty' do
       before :all do
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @other  = @user_model.get(*@user.key)
           @return = @user.eql?(@other)
         end
@@ -316,7 +449,7 @@ share_examples_for 'A public Resource' do
 
     describe 'when comparing to a resource with the same repository, key but either self or the other resource is dirty' do
       before :all do
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @user.age = 20
           @other  = @user_model.get(*@user.key)
           @return = @user.eql?(@other)
@@ -330,7 +463,7 @@ share_examples_for 'A public Resource' do
 
     describe 'when comparing to a resource with the same properties' do
       before :all do
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @other  = @user_model.new(@user.attributes)
           @return = @user.eql?(@other)
         end
@@ -344,7 +477,7 @@ share_examples_for 'A public Resource' do
     with_alternate_adapter do
       describe 'when comparing to a resource with a different repository, but the same properties' do
         before :all do
-          rescue_if 'TODO', @skip do
+          rescue_if @skip do
             @other = @alternate_repository.scope { @user_model.create(@user.attributes) }
             @return = @user.eql?(@other)
           end
@@ -362,7 +495,7 @@ share_examples_for 'A public Resource' do
   describe '#inspect' do
 
     before :all do
-      rescue_if 'TODO', @skip do
+      rescue_if @skip do
         @user = @user_model.get(*@user.key)
         @inspected = @user.inspect
       end
@@ -383,7 +516,7 @@ share_examples_for 'A public Resource' do
   describe '#key' do
 
     before :all do
-      rescue_if 'TODO', @skip do
+      rescue_if @skip do
         @key = @user.key
         @user.name = 'dkubb'
       end
@@ -422,328 +555,471 @@ share_examples_for 'A public Resource' do
   it { @user.should respond_to(:reload) }
 
   describe '#reload' do
+    before do
+      # reset the user for each spec
+      rescue_if(@skip) do
+        @user.update(:name => 'dbussink', :age => 25, :description => 'Test')
+      end
+    end
 
-    describe 'for a single object' do
+    subject { rescue_if(@skip) { @user.reload } }
 
-      before :all do
-        rescue_if 'TODO', @skip do
-          @user.name = 'dkubb'
-          @user.description = 'test'
-          @user.reload
-        end
+    describe 'on a resource not persisted' do
+      before do
+        @user.attributes = { :description => 'Changed' }
       end
 
-      it { @user.name.should eql('dbussink') }
+      it { should be_kind_of(DataMapper::Resource) }
 
-      it 'should also reload previously loaded attributes' do
-        @user.attribute_loaded?(:description).should be_true
-      end
-    end
+      it { should equal(@user) }
 
-    describe 'for when the object is changed outside another object' do
+      it { should be_clean }
 
-      before :all do
-        rescue_if 'TODO', @skip do
-          @user2 = @user.dup
-          @user2.description = 'Changed'
-          @user2.save
-          @user.reload
-        end
+      it 'reset the changed attributes' do
+        method(:subject).should change(@user, :description).from('Changed').to('Test')
       end
+    end
 
-      it 'should reload the object from the data store' do
-        @user.description.should eql('Changed')
+    describe 'on a resource where the key is changed, but not persisted' do
+      before do
+        @user.attributes = { :name => 'dkubb' }
       end
 
+      it { should be_kind_of(DataMapper::Resource) }
+
+      it { should equal(@user) }
+
+      it { should be_clean }
+
+      it 'reset the changed attributes' do
+        method(:subject).should change(@user, :name).from('dkubb').to('dbussink')
+      end
     end
 
-  end
+    describe 'on a resource that is changed outside another resource' do
+      before do
+        rescue_if @skip do
+          @user.dup.update(:description => 'Changed')
+        end
+      end
 
-  it { @user.should respond_to(:save) }
+      it { should be_kind_of(DataMapper::Resource) }
 
-  describe '#save' do
+      it { should equal(@user) }
 
-    describe 'on a new, not dirty object' do
+      it { should be_clean }
 
-      before :all do
-        @user = @user_model.new
-        @return = @user.save
+      it 'should reload the resource from the data store' do
+        method(:subject).should change(@user, :description).from('Test').to('Changed')
       end
+    end
 
-      it 'should return false' do
-        @return.should be_false
+    describe 'on an anonymous resource' do
+      before do
+        rescue_if @skip do
+          @user = @user.class.first(:fields => [ :description ])
+          @user.description.should == 'Test'
+        end
       end
 
-    end
+      it { should be_kind_of(DataMapper::Resource) }
 
-    describe 'on a not new, not dirty object' do
+      it { should equal(@user) }
 
-      it 'should return true even when resource is not dirty' do
-        @user.save.should be_true
-      end
+      it { should be_clean }
 
+      it 'should not reload any attributes' do
+        method(:subject).should_not change(@user, :attributes)
+      end
     end
+  end
 
-    describe 'on a not new, dirty object' do
+  it { @user.should respond_to(:readonly?) }
 
+  describe '#readonly?' do
+    describe 'on a new resource' do
       before :all do
-        rescue_if 'TODO', @skip do
-          @user.age = 26
-          @return = @user.save
+        rescue_if @skip do
+          @user = @user.model.new
         end
       end
 
-      it 'should save a resource succesfully when dirty' do
-        @return.should be_true
+      it 'should return false' do
+        @user.readonly?.should be_false
+      end
+    end
+
+    describe 'on a saved resource' do
+      before :all do
+        rescue_if @skip do
+          @user.should be_saved
+        end
       end
 
-      it 'should actually store the changes to persistent storage' do
-        @user.attributes.should == @user.reload.attributes
+      it 'should return false' do
+        @user.readonly?.should be_false
       end
     end
 
-    describe 'on a dirty invalid object' do
+    describe 'on a destroyed resource' do
       before :all do
-        rescue_if 'TODO', @skip do
-          @user.name = nil
+        rescue_if @skip do
+          @user.destroy.should be_true
         end
       end
 
-      it 'should not save an invalid resource' do
-        @user.save.should be_false
+      it 'should return true' do
+        @user.readonly?.should be_true
       end
     end
 
-    describe 'with new resources in a has relationship' do
-      before do
-        rescue_if 'TODO: fix for one to one association', !@user.respond_to?(:comments) do
-          @initial_comments = @user.comments.size
-          @first_comment    = @user.comments.new(:body => "DM is great!")
-          @second_comment   = @comment_model.new(:user => @user, :body => "is it really?")
-          @return           = @user.save
+    describe 'on an anonymous resource' do
+      before :all do
+        rescue_if @skip do
+          # load the user without a key
+          @user = @user.model.first(:fields => @user_model.properties - @user_model.key)
         end
       end
 
-      it 'should save resource' do
-        pending_if 'TODO', !@user.respond_to?(:comments) do
-          @return.should be_true
-        end
+      it 'should return true' do
+        @user.readonly?.should be_true
       end
+    end
+  end
+
+  [ :save, :save! ].each do |method|
+    it { @user.should respond_to(method) }
 
-      it 'should save the first resource created through new' do
-        pending_if 'TODO', !@user.respond_to?(:comments) do
-          @first_comment.new?.should be_false
+    describe "##{method}" do
+      describe 'on a new, not dirty resource' do
+        before :all do
+          @user = @user_model.new
+          @return = @user.__send__(method)
         end
-      end
 
-      it 'should save the correct foreign key for the first resource' do
-        pending_if 'TODO', !@user.respond_to?(:comments) do
-          @first_comment.user.should eql(@user)
+        it 'should return false' do
+          @return.should be_false
         end
       end
 
-      it 'should save the second resource created through the constructor' do
-        pending "Changing a belongs_to parent should add the object to the correct association" do
-          @second_comment.new?.should be_false
+      describe 'on a not new, not dirty resource' do
+        it 'should return true even when resource is not dirty' do
+          @user.__send__(method).should be_true
         end
       end
 
-      it 'should save the correct foreign key for the second resource' do
-        pending_if 'TODO', !@user.respond_to?(:comments) do
-          @second_comment.user.should eql(@user)
+      describe 'on a not new, dirty resource' do
+        before :all do
+          rescue_if @skip do
+            @user.age = 26
+            @return = @user.__send__(method)
+          end
+        end
+
+        it 'should save a resource succesfully when dirty' do
+          @return.should be_true
+        end
+
+        it 'should actually store the changes to persistent storage' do
+          @user.attributes.should == @user.reload.attributes
         end
       end
 
-      it 'should create 2 extra resources in persistent storage' do
-        pending "Changing a belongs_to parent should add the object to the correct association" do
-          @user.comments.size.should == @initial_comments + 2
+      describe 'on a dirty invalid resource' do
+        before :all do
+          rescue_if @skip do
+            @user.name = nil
+          end
+        end
+
+        it 'should not save an invalid resource' do
+          @user.__send__(method).should be_false
         end
       end
 
-    end
+      describe 'with new resources in a has relationship' do
+        before do
+          rescue_if 'TODO: fix for one to one association', !@user.respond_to?(:comments) do
+            @initial_comments = @user.comments.size
+            @first_comment    = @user.comments.new(:body => "DM is great!")
+            @second_comment   = @comment_model.new(:user => @user, :body => "is it really?")
+            @return           = @user.__send__(method)
+          end
+        end
 
-    describe 'with dirty resources in a has relationship' do
-      before :all do
-        rescue_if 'TODO: fix for one to one association', !@user.respond_to?(:comments) do
-          @initial_comments = @user.comments.size
-          @first_comment    = @user.comments.create(:body => "DM is great!")
-          @second_comment   = @comment_model.create(:user => @user, :body => "is it really?")
+        it 'should save resource' do
+          pending_if !@user.respond_to?(:comments) do
+            @return.should be_true
+          end
+        end
 
-          @first_comment.body  = "It still has rough edges"
-          @second_comment.body = "But these cool specs help fixing that"
-          @second_comment.user = @user_model.create(:name => 'dkubb')
-          @return              = @user.save
+        it 'should save the first resource created through new' do
+          pending_if !@user.respond_to?(:comments) do
+            @first_comment.new?.should be_false
+          end
         end
-      end
 
-      it 'should save the dirty resources' do
-        pending_if 'TODO', !@user.respond_to?(:comments) do
-          @return.should be_true
+        it 'should save the correct foreign key for the first resource' do
+          pending_if !@user.respond_to?(:comments) do
+            @first_comment.user.should eql(@user)
+          end
+        end
+
+        it 'should save the second resource created through the constructor' do
+          pending "Changing a belongs_to parent should add the resource to the correct association" do
+            @second_comment.new?.should be_false
+          end
         end
-      end
 
-      it 'should have saved the first child resource' do
-        pending_if 'TODO', !@user.respond_to?(:comments) do
-          @first_comment.should_not be_dirty
+        it 'should save the correct foreign key for the second resource' do
+          pending_if !@user.respond_to?(:comments) do
+            @second_comment.user.should eql(@user)
+          end
         end
-      end
 
-      it 'should not have saved the second child resource' do
-        pending_if 'TODO', !@user.respond_to?(:comments) do
-          @second_comment.should be_dirty
+        it 'should create 2 extra resources in persistent storage' do
+          pending "Changing a belongs_to parent should add the resource to the correct association" do
+            @user.comments.size.should == @initial_comments + 2
+          end
         end
       end
 
-    end
+      describe 'with dirty resources in a has relationship' do
+        before :all do
+          rescue_if 'TODO: fix for one to one association', !@user.respond_to?(:comments) do
+            @first_comment  = @user.comments.create(:body => 'DM is great!')
+            @second_comment = @comment_model.create(:user => @user, :body => 'is it really?')
 
-    describe 'with a new dependency' do
+            @first_comment.body  = 'It still has rough edges'
+            @second_comment.body = 'But these cool specs help fixing that'
+            @second_comment.user = @user_model.create(:name => 'dkubb')
 
-      before :all do
-        @first_comment      = @comment_model.new(:body => "DM is great!")
-        @first_comment.user = @user_model.new(:name => 'dkubb')
+            @return = @user.__send__(method)
+          end
+        end
+
+        it 'should return true' do
+          pending_if !@user.respond_to?(:comments) do
+            @return.should be_true
+          end
+        end
+
+        it 'should not be dirty' do
+          @user.should_not be_dirty
+        end
+
+        it 'should have saved the first child resource' do
+          pending_if !@user.respond_to?(:comments) do
+            @first_comment.model.get(*@first_comment.key).body.should == 'It still has rough edges'
+          end
+        end
+
+        it 'should not have saved the second child resource' do
+          pending_if !@user.respond_to?(:comments) do
+            @second_comment.model.get(*@second_comment.key).body.should == 'is it really?'
+          end
+        end
       end
 
-      it 'should not raise an exception when saving the resource' do
-        pending do
-          lambda { @first_comment.save.should be_false }.should_not raise_error
+      describe 'with a new dependency' do
+        before :all do
+          @first_comment      = @comment_model.new(:body => "DM is great!")
+          @first_comment.user = @user_model.new(:name => 'dkubb')
+        end
+
+        it 'should not raise an exception when saving the resource' do
+          pending do
+            lambda { @first_comment.send(method).should be_false }.should_not raise_error
+          end
         end
       end
 
-    end
+      describe 'with a dirty dependency' do
+        before :all do
+          rescue_if @skip do
+            @user.name = 'dbussink-the-second'
 
-    describe 'with a dirty dependency' do
-      before :all do
-        rescue_if 'TODO', @skip do
-          @user.name = 'dbussink-the-second'
+            @first_comment = @comment_model.new(:body => 'DM is great!')
+            @first_comment.user = @user
 
-          @first_comment = @comment_model.new(:body => 'DM is great!')
-          @first_comment.user = @user
+            @return = @first_comment.__send__(method)
+          end
+        end
 
-          @return = @first_comment.save
+        it 'should succesfully save the resource' do
+          @return.should be_true
         end
-      end
 
-      it 'should succesfully save the object' do
-        @return.should be_true
-      end
+        it 'should not have a dirty dependency' do
+          @user.should_not be_dirty
+        end
 
-      it 'should not have a dirty dependency' do
-        @user.should_not be_dirty
+        it 'should succesfully save the dependency' do
+          @user.attributes.should == @user_model.get(*@user.key).attributes
+        end
       end
 
-      it 'should succesfully save the dependency' do
-        @user.attributes.should == @user_model.get(*@user.key).attributes
-      end
+      describe 'with a new resource and new relations' do
+        before :all do
+          @article = @article_model.new(:body => "Main")
+          rescue_if 'TODO: fix for one to one association', (!@article.respond_to?(:paragraphs)) do
+            @paragraph = @article.paragraphs.new(:text => 'Content')
 
-    end
+            @article.__send__(method)
+          end
+        end
 
-    describe 'with a new object and new relations' do
-      before :all do
-        @article = @article_model.new(:body => "Main")
-        rescue_if 'TODO: fix for one to one association', (!@article.respond_to?(:paragraphs)) do
-          @paragraph = @article.paragraphs.new(:text => 'Content')
+        it 'should not be dirty' do
+          pending_if !@article.respond_to?(:paragraphs) do
+            @article.should_not be_dirty
+          end
+        end
 
-          @article.save
+        it 'should not be dirty' do
+          pending_if !@article.respond_to?(:paragraphs) do
+            @paragraph.should_not be_dirty
+          end
         end
-      end
 
-      it 'should not be dirty' do
-        pending_if 'TODO', !@article.respond_to?(:paragraphs) do
-          @article.should_not be_dirty
+        it 'should set the related resource' do
+          pending_if !@article.respond_to?(:paragraphs) do
+            @paragraph.article.should == @article
+          end
         end
-      end
 
-      it 'should not be dirty' do
-        pending_if 'TODO', !@article.respond_to?(:paragraphs) do
-          @paragraph.should_not be_dirty
+        it 'should set the foreign key properly' do
+          pending_if !@article.respond_to?(:paragraphs) do
+            @paragraph.article_id.should == @article.id
+          end
         end
       end
 
-      it 'should set the related object' do
-        pending_if 'TODO', !@article.respond_to?(:paragraphs) do
-          @paragraph.article.should == @article
+      describe 'with a dirty resource with a changed key' do
+        before :all do
+          rescue_if @skip do
+            @original_key = @user.key
+            @user.name = 'dkubb'
+            @return = @user.__send__(method)
+          end
         end
-      end
 
-      it 'should set the foreign key properly' do
-        pending_if 'TODO', !@article.respond_to?(:paragraphs) do
-          @paragraph.article_id.should == @article.id
+        it 'should save a resource succesfully when dirty' do
+          @return.should be_true
         end
-      end
-    end
 
-    describe 'with a dirty object with a changed key' do
+        it 'should actually store the changes to persistent storage' do
+          @user.name.should == @user.reload.name
+        end
 
-      before :all do
-        rescue_if 'TODO', @skip do
-          @original_key = @user.key
-          @user.name = 'dkubb'
-          @return = @user.save
+        it 'should update the identity map' do
+          @user.repository.identity_map(@user_model).should have_key(%w[ dkubb ])
         end
-      end
 
-      it 'should save a resource succesfully when dirty' do
-        @return.should be_true
+        it 'should remove the old entry from the identity map' do
+          @user.repository.identity_map(@user_model).should_not have_key(@original_key)
+        end
       end
 
-      it 'should actually store the changes to persistent storage' do
-        @user.name.should == @user.reload.name
-      end
+      describe 'on a new resource with unsaved parent and grandparent' do
+        before :all do
+          @grandparent = @user_model.new(:name => 'dkubb',       :comment => @comment)
+          @parent      = @user_model.new(:name => 'ashleymoran', :comment => @comment, :referrer => @grandparent)
+          @child       = @user_model.new(:name => 'mrship',      :comment => @comment, :referrer => @parent)
 
-      it 'should update the identity map' do
-        @user.repository.identity_map(@user_model).should have_key(%w[ dkubb ])
-      end
+          @response = @child.__send__(method)
+        end
 
-      it 'should remove the old entry from the identity map' do
-        @user.repository.identity_map(@user_model).should_not have_key(@original_key)
-      end
+        it 'should return true' do
+          @response.should be_true
+        end
 
-    end
+        it 'should save the child' do
+          @child.should be_saved
+        end
 
-    describe 'on a new object with unsaved parent and grandparent' do
-      before :all do
-        @grandparent = @user_model.new(:name => 'dkubb',       :comment => @comment)
-        @parent      = @user_model.new(:name => 'ashleymoran', :comment => @comment, :referrer => @grandparent)
-        @child       = @user_model.new(:name => 'mrship',      :comment => @comment, :referrer => @parent)
+        it 'should save the parent' do
+          @parent.should be_saved
+        end
 
-        @response = @child.save
-      end
+        it 'should save the grandparent' do
+          @grandparent.should be_saved
+        end
 
-      it 'should return true' do
-        @response.should be_true
-      end
+        it 'should relate the child to the parent' do
+          pending_if @one_to_one_through do
+            @child.model.get(*@child.key).referrer.should == @parent
+          end
+        end
 
-      it 'should save the child' do
-        @child.should be_saved
-      end
+        it 'should relate the parent to the grandparent' do
+          pending_if @one_to_one_through do
+            @parent.model.get(*@parent.key).referrer.should == @grandparent
+          end
+        end
 
-      it 'should save the parent' do
-        @parent.should be_saved
+        it 'should relate the grandparent to nothing' do
+          pending_if @one_to_one_through do
+            @grandparent.model.get(*@grandparent.key).referrer.should be_nil
+          end
+        end
       end
 
-      it 'should save the grandparent' do
-        @grandparent.should be_saved
+      describe 'on a destroyed resource' do
+        before :all do
+          rescue_if @skip do
+            @user.destroy
+          end
+        end
+
+        it 'should raise an exception' do
+          lambda {
+            @user.__send__(method)
+          }.should raise_error(DataMapper::PersistenceError, "#{@user.model}##{method} cannot be called on a destroyed resource")
+        end
       end
 
-      it 'should relate the child to the parent' do
-        pending_if 'TODO', @one_to_one_through do
-          @child.model.get(*@child.key).referrer.should == @parent
+      describe 'on a record with itself as a parent (circular dependency)' do
+        before :all do
+          rescue_if @skip do
+            @user.parent = @user
+          end
+        end
+
+        it 'should not raise an exception' do
+          lambda {
+            @user.__send__(method).should be_true
+          }.should_not raise_error(SystemStackError)
         end
       end
 
-      it 'should relate the parent to the grandparent' do
-        pending_if 'TODO', @one_to_one_through do
-          @parent.model.get(*@parent.key).referrer.should == @grandparent
+      describe 'on a record with itself as a child (circular dependency)' do
+        before :all do
+          rescue_if @skip do
+            @user.children = [ @user ]
+          end
+        end
+
+        it 'should not raise an exception' do
+          lambda {
+            @user.__send__(method).should be_true
+          }.should_not raise_error(SystemStackError)
         end
       end
 
-      it 'should relate the grandparent to nothing' do
-        pending_if 'TODO', @one_to_one_through do
-          @grandparent.model.get(*@grandparent.key).referrer.should be_nil
+      describe 'on a record with a parent as a child (circular dependency)' do
+        before :all do
+          rescue_if @skip do
+            @user.children = [ @user.parent = @user_model.new(:name => 'Parent', :comment => @comment) ]
+          end
+        end
+
+        it 'should not raise an exception' do
+          lambda {
+            @user.__send__(method).should be_true
+          }.should_not raise_error(SystemStackError)
         end
       end
     end
-
   end
 
   it { @user.should respond_to(:saved?) }
@@ -772,8 +1048,8 @@ share_examples_for 'A public Resource' do
     describe "##{method}" do
       describe 'with no arguments' do
         before :all do
-          rescue_if 'TODO', @skip do
-            @return = @user.send(method)
+          rescue_if @skip do
+            @return = @user.__send__(method)
           end
         end
 
@@ -784,9 +1060,9 @@ share_examples_for 'A public Resource' do
 
       describe 'with attributes' do
         before :all do
-          rescue_if 'TODO', @skip do
+          rescue_if @skip do
             @attributes = { :description => 'Changed' }
-            @return = @user.send(method, @attributes)
+            @return = @user.__send__(method, @attributes)
           end
         end
 
@@ -795,12 +1071,12 @@ share_examples_for 'A public Resource' do
         end
 
         it 'should update attributes of Resource' do
-          @attributes.each { |key, value| @user.send(key).should == value }
+          @attributes.each { |key, value| @user.__send__(key).should == value }
         end
 
         it 'should persist the changes' do
           resource = @user_model.get(*@user.key)
-          @attributes.each { |key, value| resource.send(key).should == value }
+          @attributes.each { |key, value| resource.__send__(key).should == value }
         end
       end
 
@@ -808,34 +1084,34 @@ share_examples_for 'A public Resource' do
         before :all do
           rescue_if 'Use table aliases to avoid ambiguous named in query', @one_to_one_through do
             @attributes = { :referrer => @user_model.create(:name => 'dkubb', :age => 33, :comment => @comment) }
-            @return = @user.send(method, @attributes)
+            @return = @user.__send__(method, @attributes)
           end
         end
 
         it 'should return true' do
-          pending_if 'TODO', @one_to_one_through do
+          pending_if @one_to_one_through do
             @return.should be_true
           end
         end
 
         it 'should update attributes of Resource' do
-          pending_if 'TODO', @one_to_one_through do
-            @attributes.each { |key, value| @user.send(key).should == value }
+          pending_if @one_to_one_through do
+            @attributes.each { |key, value| @user.__send__(key).should == value }
           end
         end
 
         it 'should persist the changes' do
-          pending_if 'TODO', @one_to_one_through do
+          pending_if @one_to_one_through do
             resource = @user_model.get(*@user.key)
-            @attributes.each { |key, value| resource.send(key).should == value }
+            @attributes.each { |key, value| resource.__send__(key).should == value }
           end
         end
       end
 
       describe 'with attributes where a value is nil for a property that does not allow nil' do
         before :all do
-          rescue_if 'TODO', @skip do
-            @return = @user.send(method, :name => nil)
+          rescue_if @skip do
+            @return = @user.__send__(method, :name => nil)
           end
         end
 
@@ -850,14 +1126,14 @@ share_examples_for 'A public Resource' do
 
       describe 'on a dirty resource' do
         before :all do
-          rescue_if 'TODO', @skip do
+          rescue_if @skip do
             @user.age = 99
           end
         end
 
         it 'should raise an exception' do
           lambda {
-            @user.send(method, :admin => true)
+            @user.__send__(method, :admin => true)
           }.should raise_error(DataMapper::UpdateConflictError, "#{@user.model}##{method} cannot be called on a dirty resource")
         end
       end
@@ -897,7 +1173,7 @@ share_examples_for 'A public Resource' do
 
   describe 'lazy loading' do
     before :all do
-      rescue_if 'TODO', @skip do
+      rescue_if @skip do
         @user.name    = 'dkubb'
         @user.age     = 33
         @user.summary = 'Programmer'