snusnu-dm-accepts_nested_attributes 0.0.6 → 0.10.0

data/lib/dm-accepts_nested_attributes/save.rb

@@ -0,0 +1,13 @@
+module DataMapper
+  module NestedAttributes
+
+    module Save
+      
+      def save(*)
+        marked_for_destruction? ? destroy : super
+      end
+
+    end
+    
+  end
+end

data/lib/dm-accepts_nested_attributes/transactional_save.rb

@@ -0,0 +1,15 @@
+module DataMapper
+  module NestedAttributes
+    
+    module TransactionalSave
+      
+      def save(*args)
+        saved = false
+        transaction { |t| t.rollback unless saved = super }
+        saved
+      end
+      
+    end
+    
+  end
+end

data/lib/dm-accepts_nested_attributes/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module NestedAttributes
     
-    VERSION = "0.0.6"
+    VERSION = '0.10.0'.freeze
   
   end
 end

data/spec/fixtures/person.rb

@@ -1,8 +1,16 @@
 class Person
+  
   include DataMapper::Resource
+  
+  # properties
+  
   property :id,   Serial
   property :name, String, :nullable => false
+  
+  # associations
+  
   has 1, :profile
   has n, :project_memberships
   has n, :projects, :through => :project_memberships
+  
 end

data/spec/fixtures/profile.rb

@@ -1,7 +1,16 @@
 class Profile
+  
   include DataMapper::Resource
+  
+  # properties
+  
   property :id,        Serial
   property :person_id, Integer, :nullable => false
+  
   property :nick,      String,  :nullable => false
+  
+  # associations
+  
   belongs_to :person
+  
 end

data/spec/fixtures/project.rb

@@ -1,8 +1,16 @@
 class Project
+  
   include DataMapper::Resource
+  
+  # properties
+  
   property :id,   Serial
   property :name, String, :nullable => false
+  
+  # associations
+  
   has n, :tasks
   has n, :project_memberships
   has n, :people, :through => :project_memberships
+  
 end

data/spec/fixtures/project_membership.rb

@@ -1,8 +1,16 @@
 class ProjectMembership
+  
   include DataMapper::Resource
+  
+  # properties
+  
   property :id,         Serial
   property :person_id,  Integer, :nullable => false
   property :project_id, Integer, :nullable => false
+  
+  # associations
+  
   belongs_to :person
   belongs_to :project
+  
 end

data/spec/fixtures/task.rb

@@ -1,7 +1,16 @@
 class Task
+  
   include DataMapper::Resource
+  
+  # properties
+  
   property :id,         Serial
   property :project_id, Integer, :nullable => false
+  
   property :name,       String,  :nullable => false
+  
+  # associations
+  
   belongs_to :project
+  
 end

data/spec/integration/belongs_to_spec.rb

@@ -2,121 +2,6 @@ require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe DataMapper::NestedAttributes do
-    
-  describe "every accessible belongs_to association with a valid reject_if proc", :shared => true do
-    
-    it "should not allow to create a new person via Profile#person_attributes" do
-      @profile.person_attributes = { :name => 'Martin' }
-      @profile.save.should be_false # fails because of validations (not null on belongs_to)
-      Profile.all.size.should == 0
-      Person.all.size.should == 0
-    end
-    
-  end
-    
-  describe "every accessible belongs_to association with no reject_if proc", :shared => true do
-  
-    it "should allow to create a new person via Profile#person_attributes" do
-      @profile.person_attributes = { :name => 'Martin' }
-      @profile.person.should_not be_nil
-      @profile.person.name.should == 'Martin'
-      @profile.save
-      @profile.person.should == Person.first
-      Profile.all.size.should == 1
-      Person.all.size.should == 1
-      Person.first.name.should == 'Martin'
-    end
-    
-    it "should allow to update an existing person via Profile#person_attributes" do
-      person = Person.create(:name => 'Martin')
-      @profile.person = person
-      @profile.save
-    
-      Person.all.size.should == 1
-      Person.first.name.should == 'Martin'
-      Profile.all.size.should == 1
-    
-      @profile.person.should == person
-      @profile.person_attributes = { :id => person.id, :name => 'Martin Gamsjaeger' }
-      @profile.person.name.should == 'Martin Gamsjaeger'
-      @profile.save
-    
-      Person.all.size.should == 1
-      Person.first.name.should == 'Martin Gamsjaeger'
-      Profile.all.size.should == 1
-    end
-    
-    it "should perform atomic commits" do
-      @profile.person_attributes = { :name => nil } # will fail because of validations
-      @profile.person.should_not be_nil
-      @profile.person.name.should be_nil
-      @profile.save.should be_false
-      
-      Profile.all.size.should == 0
-      Person.all.size.should == 0
-  
-      @profile.nick = nil # will fail because of validations
-      @profile.should_not be_valid
-      @profile.person_attributes = { :name => 'Martin' }
-      @profile.person.should_not be_nil
-      @profile.person.name.should == 'Martin'
-      @profile.save.should be_false
-      
-      Profile.all.size.should == 0
-      Person.all.size.should == 0
-    end
-    
-  end
-  
-  describe "every accessible belongs_to association with :allow_destroy => false", :shared => true do
-    
-    it "should not allow to delete an existing person via Profile#person_attributes" do
-      person = Person.create(:name => 'Martin')
-      @profile.person = person
-      @profile.save
-      
-      Profile.all.size.should == 1
-      Person.all.size.should == 1
-    
-      @profile.person_attributes = { :id => person.id, :_delete => true }
-      @profile.save
-      
-      Profile.all.size.should == 1
-      Person.all.size.should == 1
-    end
-    
-  end
-    
-  describe "every accessible belongs_to association with :allow_destroy => true", :shared => true do
-    
-    it "should allow to delete an existing person via Profile#person_attributes" do
-      person = Person.create(:name => 'Martin')
-      @profile.person = person
-      @profile.save
-      
-      Profile.all.size.should == 1
-      Person.all.size.should == 1
-    
-      @profile.person_attributes = { :id => person.id, :_delete => true }
-      @profile.save
-      
-      Profile.all.size.should == 1
-      Person.all.size.should == 0
-    end
-
-  end
-    
-  describe "every accessible belongs_to association with a nested attributes reader", :shared => true do
-
-    it "should return the attributes written to Profile#person_attributes from the Profile#person_attributes reader" do
-      @profile.person_attributes.should be_nil
-
-      @profile.person_attributes = { :name => 'Martin' }
-
-      @profile.person_attributes.should == { :name => 'Martin' }
-    end
-
-  end
 
   describe "Profile.belongs_to(:person)" do
     
@@ -133,10 +18,10 @@ describe DataMapper::NestedAttributes do
         Profile.accepts_nested_attributes_for :person
         @profile = Profile.new :nick => 'snusnu'
       end
-      
+
+      it_should_behave_like "every accessible belongs_to association"
       it_should_behave_like "every accessible belongs_to association with no reject_if proc"
       it_should_behave_like "every accessible belongs_to association with :allow_destroy => false"
-      it_should_behave_like "every accessible belongs_to association with a nested attributes reader"
     
     end
       
@@ -147,7 +32,8 @@ describe DataMapper::NestedAttributes do
         Profile.accepts_nested_attributes_for :person, :allow_destroy => false
         @profile = Profile.new :nick => 'snusnu'
       end
-      
+
+      it_should_behave_like "every accessible belongs_to association"
       it_should_behave_like "every accessible belongs_to association with no reject_if proc"
       it_should_behave_like "every accessible belongs_to association with :allow_destroy => false"
     
@@ -160,26 +46,14 @@ describe DataMapper::NestedAttributes do
         Profile.accepts_nested_attributes_for :person, :allow_destroy => true
         @profile = Profile.new :nick => 'snusnu'
       end
-      
+
+      it_should_behave_like "every accessible belongs_to association"
       it_should_behave_like "every accessible belongs_to association with no reject_if proc"
       it_should_behave_like "every accessible belongs_to association with :allow_destroy => true"
     
     end
           
     describe "accepts_nested_attributes_for :person, " do
-      
-      describe ":reject_if => :foo" do
-    
-        before(:each) do
-          clear_data
-          Profile.accepts_nested_attributes_for :person, :reject_if => :foo
-          @profile = Profile.new :nick => 'snusnu'
-        end
-        
-        it_should_behave_like "every accessible belongs_to association with no reject_if proc"
-        it_should_behave_like "every accessible belongs_to association with :allow_destroy => false"
-      
-      end
             
       describe ":reject_if => lambda { |attrs| true }" do
     
@@ -188,7 +62,8 @@ describe DataMapper::NestedAttributes do
           Profile.accepts_nested_attributes_for :person, :reject_if => lambda { |attrs| true }
           @profile = Profile.new :nick => 'snusnu'
         end
-        
+
+        it_should_behave_like "every accessible belongs_to association"
         it_should_behave_like "every accessible belongs_to association with a valid reject_if proc"
         it_should_behave_like "every accessible belongs_to association with :allow_destroy => false"
       
@@ -201,7 +76,8 @@ describe DataMapper::NestedAttributes do
           Profile.accepts_nested_attributes_for :person, :reject_if => lambda { |attrs| false }
           @profile = Profile.new :nick => 'snusnu'
         end
-    
+
+        it_should_behave_like "every accessible belongs_to association"
         it_should_behave_like "every accessible belongs_to association with no reject_if proc"
         it_should_behave_like "every accessible belongs_to association with :allow_destroy => false"
       

data/spec/integration/has_1_spec.rb

@@ -2,110 +2,7 @@ require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe DataMapper::NestedAttributes do
-  
-  describe "every accessible has(1) association with a valid reject_if proc", :shared => true do
-  
-    it "should not allow to create a new profile via Person#profile_attributes" do
-      @person.profile_attributes = { :nick => 'snusnu' }
-      @person.profile.should be_nil
-      @person.save
-      Person.all.size.should == 1
-      Profile.all.size.should == 0
-    end
-    
-  end
-  
-  describe "every accessible has(1) association with no reject_if proc", :shared => true do
-    
-    it "should allow to create a new profile via Person#profile_attributes" do
-      @person.profile_attributes = { :nick => 'snusnu' }
-      @person.profile.should_not be_nil
-      @person.profile.nick.should == 'snusnu'
-      @person.save.should be_true
-      
-      Person.all.size.should == 1
-      Profile.all.size.should == 1
-      Profile.first.nick.should == 'snusnu'
-    end
-        
-    it "should allow to update an existing profile via Person#profile_attributes" do
-      @person.save.should be_true
-      profile = Profile.create(:person_id => @person.id, :nick => 'snusnu')
-      @person.reload
-      
-      @person.profile.should == profile
-      @person.profile_attributes = { :id => profile.id, :nick => 'still snusnu somehow' }
-      @person.profile.nick.should == 'still snusnu somehow'
-      @person.save.should be_true
-      @person.profile.should == Profile.first
-      Person.all.size.should == 1
-      Profile.all.size.should == 1
-      Profile.first.nick.should == 'still snusnu somehow'
-    end
-    
-    it "should perform atomic commits" do
-      @person.profile_attributes = { :nick => nil } # will fail because of validations
-      @person.profile.should_not be_nil
-      @person.profile.nick.should be_nil
-      @person.save.should be_false
-      
-      Person.all.size.should == 0
-      Profile.all.size.should == 0
-      
-      @person.profile_attributes = { :nick => 'snusnu' }
-      @person.profile.should_not be_nil
-      @person.profile.nick.should == 'snusnu'
-      @person.name = nil # will fail because of validations
-      @person.save.should be_false
-      
-      Person.all.size.should == 0
-      Profile.all.size.should == 0
-    end
-    
-  end
-  
-  describe "every accessible has(1) association with :allow_destroy => false", :shared => true do
-    
-    it "should not allow to delete an existing profile via Person#profile_attributes" do
-      @person.save
-      profile = Profile.create(:person_id => @person.id, :nick => 'snusnu')
-      @person.reload
-    
-      @person.profile_attributes = { :id => profile.id, :_delete => true }
-      @person.save
-      Person.all.size.should == 1
-      Profile.all.size.should == 1
-    end
-    
-  end
-  
-  describe "every accessible has(1) association with :allow_destroy => true", :shared => true do
-    
-    it "should allow to delete an existing profile via Person#profile_attributes" do
-      @person.save
-      profile = Profile.create(:person_id => @person.id, :nick => 'snusnu')
-      @person.reload
 
-      @person.profile_attributes = { :id => profile.id, :_delete => true }
-      @person.save
-      Person.all.size.should == 1
-      Profile.all.size.should == 0
-    end
-    
-  end
-
-  describe "every accessible has(1) association with a nested attributes reader", :shared => true do
-
-    it "should return the attributes written to Person#profile_attributes from the Person#profile_attributes reader" do
-      @person.profile_attributes.should be_nil
-
-      @person.profile_attributes = { :nick => 'snusnu' }
-
-      @person.profile_attributes.should == { :nick => 'snusnu' }
-    end
-
-  end
-  
   describe "Person.has(1, :profile)" do
     
     include XToOneHelpers
@@ -121,10 +18,10 @@ describe DataMapper::NestedAttributes do
         Person.accepts_nested_attributes_for :profile
         @person = Person.new :name => 'Martin'
       end
-      
+
+      it_should_behave_like "every accessible has(1) association"
       it_should_behave_like "every accessible has(1) association with no reject_if proc"
       it_should_behave_like "every accessible has(1) association with :allow_destroy => false"
-      it_should_behave_like "every accessible has(1) association with a nested attributes reader"
       
     end
         
@@ -135,7 +32,8 @@ describe DataMapper::NestedAttributes do
         Person.accepts_nested_attributes_for :profile, :allow_destroy => false
         @person = Person.new :name => 'Martin'
       end
-    
+
+      it_should_behave_like "every accessible has(1) association"
       it_should_behave_like "every accessible has(1) association with no reject_if proc"
       it_should_behave_like "every accessible has(1) association with :allow_destroy => false"
       
@@ -149,6 +47,7 @@ describe DataMapper::NestedAttributes do
         @person = Person.new :name => 'Martin'
       end
 
+      it_should_behave_like "every accessible has(1) association"
       it_should_behave_like "every accessible has(1) association with no reject_if proc"
       it_should_behave_like "every accessible has(1) association with :allow_destroy => true"
       
@@ -156,19 +55,6 @@ describe DataMapper::NestedAttributes do
     
     
     describe "accepts_nested_attributes_for :profile, " do
-      
-      describe ":reject_if => :foo" do
-    
-        before(:each) do
-          clear_data
-          Person.accepts_nested_attributes_for :profile, :reject_if => :foo
-          @person = Person.new :name => 'Martin'
-        end
-    
-        it_should_behave_like "every accessible has(1) association with no reject_if proc"
-        it_should_behave_like "every accessible has(1) association with :allow_destroy => false"
-      
-      end
             
       describe ":reject_if => lambda { |attrs| true }" do
     
@@ -177,7 +63,8 @@ describe DataMapper::NestedAttributes do
           Person.accepts_nested_attributes_for :profile, :reject_if => lambda { |attrs| true }
           @person = Person.new :name => 'Martin'
         end
-    
+
+        it_should_behave_like "every accessible has(1) association"
         it_should_behave_like "every accessible has(1) association with a valid reject_if proc"
         it_should_behave_like "every accessible has(1) association with :allow_destroy => false"
       
@@ -190,7 +77,8 @@ describe DataMapper::NestedAttributes do
           Person.accepts_nested_attributes_for :profile, :reject_if => lambda { |attrs| false }
           @person = Person.new :name => 'Martin'
         end
-    
+
+        it_should_behave_like "every accessible has(1) association"
         it_should_behave_like "every accessible has(1) association with no reject_if proc"
         it_should_behave_like "every accessible has(1) association with :allow_destroy => false"