snusnu-dm-accepts_nested_attributes 0.10.0 → 0.11.0

data/lib/dm-accepts_nested_attributes/transactional_save.rb

@@ -3,7 +3,18 @@ module DataMapper
     
     module TransactionalSave
       
-      def save(*args)
+      ##
+      # Overrides @see DataMapper::Resource#save to perform inside a transaction.
+      # The current implementation simply wraps the saving of the complete object tree
+      # inside a transaction and rolls back in case any exceptions are raised,
+      # or any of the calls to
+      #
+      # @see DataMapper::Resource#save
+      #
+      # @return [true, false]
+      #   true if all related resources were saved properly
+      #
+      def save(*)
         saved = false
         transaction { |t| t.rollback unless saved = super }
         saved

data/lib/dm-accepts_nested_attributes/version.rb

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

data/spec/fixtures/person.rb

@@ -1,6 +1,7 @@
 class Person
   
   include DataMapper::Resource
+  extend ConstraintSupport
   
   # properties
   
@@ -9,8 +10,19 @@ class Person
   
   # associations
   
-  has 1, :profile
-  has n, :project_memberships
-  has n, :projects, :through => :project_memberships
+  has 1, :profile,
+    constraint_options(:destroy)
+
+  # has 1, :address,
+  #   :through => :profile
+
+  has n, :project_memberships,
+    constraint_options(:destroy)
+
+  has n, :projects,
+    :through => :project_memberships
+
+  # has n, :tasks,
+  #   :through => :projects
   
 end

data/spec/fixtures/profile.rb

@@ -13,4 +13,6 @@ class Profile
   
   belongs_to :person
   
+  has 1, :address
+
 end

data/spec/fixtures/project.rb

@@ -1,6 +1,7 @@
 class Project
   
   include DataMapper::Resource
+  extend ConstraintSupport
   
   # properties
   
@@ -9,8 +10,13 @@ class Project
   
   # associations
   
-  has n, :tasks
-  has n, :project_memberships
-  has n, :people, :through => :project_memberships
-  
+  has n, :tasks,
+    constraint_options(:destroy)
+
+  has n, :project_memberships,
+    constraint_options(:destroy)
+
+  has n, :people,
+    :through => :project_memberships
+
 end

data/spec/lib/constraint_support.rb

@@ -0,0 +1,11 @@
+module ConstraintSupport
+
+  def constraint_options(type)
+    if DataMapper.const_defined?('Constraints')
+      { :constraint => type }
+    else
+      {}
+    end
+  end
+
+end

data/spec/shared/belongs_to_spec.rb

@@ -55,6 +55,10 @@ describe "every accessible belongs_to association with a valid reject_if proc",
     Person.all.size.should  == 0
 
     @profile.person_attributes = { :name => 'Martin' }
+
+    Profile.all.size.should == 0
+    Person.all.size.should  == 0
+
     @profile.save.should be_false
 
     Profile.all.size.should == 0
@@ -70,6 +74,10 @@ describe "every accessible belongs_to association with no reject_if proc", :shar
     Person.all.size.should  == 0
 
     @profile.person_attributes = { :name => 'Martin' }
+
+    Profile.all.size.should == 0
+    Person.all.size.should  == 0
+
     @profile.save.should be_true
 
     Profile.all.size.should  == 1
@@ -87,12 +95,16 @@ describe "every accessible belongs_to association with :allow_destroy => false",
     
     person = Person.create(:name => 'Martin')
     @profile.person = person
-    @profile.save.should be_true
+    @profile.save
     
     Profile.all.size.should == 1
     Person.all.size.should  == 1
   
     @profile.person_attributes = { :id => person.id, :_delete => true }
+
+    Profile.all.size.should == 1
+    Person.all.size.should  == 1
+
     @profile.save
     
     Profile.all.size.should == 1
@@ -115,10 +127,13 @@ describe "every accessible belongs_to association with :allow_destroy => true",
     Person.all.size.should  == 1
   
     @profile.person_attributes = { :id => person.id, :_delete => true }
+
+    Profile.all.size.should == 1
+    Person.all.size.should  == 1
+
     @profile.save
     
-    Profile.all.size.should == 1 # project.person_id must not be nil
-    Person.all.size.should  == 1
+    Person.all.size.should  == 0
     
     # TODO also test this behavior in situations where setting the FK to nil is allowed
     

data/spec/shared/has_1_spec.rb

@@ -5,6 +5,9 @@ describe "every accessible has(1) association", :shared => true do
     profile = Profile.create(:person_id => @person.id, :nick => 'snusnu')
     @person.reload
 
+    Person.all.size.should    == 1
+    Profile.all.size.should   == 1
+
     @person.profile_attributes = { :id => profile.id, :nick => 'still snusnu somehow' }
     @person.save.should be_true
 
@@ -13,24 +16,6 @@ describe "every accessible has(1) association", :shared => true do
     Profile.first.nick.should == 'still snusnu somehow'
   end
 
-  it "should perform atomic commits" do
-
-    # related resource is invalid
-    @person.profile_attributes = { :nick => nil } # will fail because of validations
-    @person.save.should be_false
-
-    Person.all.size.should == 0
-    Profile.all.size.should == 0
-
-    # self is invalid
-    @person.name = nil # will fail because of validations
-    @person.profile_attributes = { :nick => 'snusnu' }
-    @person.save.should be_false
-
-    Person.all.size.should  == 0
-    Profile.all.size.should == 0
-  end
-
   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' }
@@ -61,6 +46,10 @@ describe "every accessible has(1) association with no reject_if proc", :shared =
     Profile.all.size.should   == 0
 
     @person.profile_attributes = { :nick => 'snusnu' }
+
+    Person.all.size.should    == 0
+    Profile.all.size.should   == 0
+
     @person.save.should be_true
 
     Person.all.size.should    == 1
@@ -68,6 +57,24 @@ describe "every accessible has(1) association with no reject_if proc", :shared =
     Profile.first.nick.should == 'snusnu'
   end
 
+  it "should perform atomic commits" do
+
+    # related resource is invalid
+    @person.profile_attributes = { :nick => nil } # will fail because of validations
+    @person.save.should be_false
+
+    Person.all.size.should == 0
+    Profile.all.size.should == 0
+
+    # self is invalid
+    @person.name = nil # will fail because of validations
+    @person.profile_attributes = { :nick => 'snusnu' }
+    @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
@@ -76,9 +83,17 @@ describe "every accessible has(1) association with :allow_destroy => false", :sh
     @person.save
     profile = Profile.create(:person_id => @person.id, :nick => 'snusnu')
     @person.reload
-  
+
+    Person.all.size.should  == 1
+    Profile.all.size.should == 1
+
     @person.profile_attributes = { :id => profile.id, :_delete => true }
+
+    Person.all.size.should  == 1
+    Profile.all.size.should == 1
+
     @person.save
+
     Person.all.size.should  == 1
     Profile.all.size.should == 1
   end
@@ -90,10 +105,16 @@ describe "every accessible has(1) association with :allow_destroy => true", :sha
   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.profile = profile
+
+    Person.all.size.should  == 1
+    Profile.all.size.should == 1
+
     @person.profile_attributes = { :id => profile.id, :_delete => true }
 
+    Person.all.size.should  == 1
+    Profile.all.size.should == 1
+
     @person.save
 
     Person.all.size.should  == 1

data/spec/shared/has_n_spec.rb

@@ -14,27 +14,6 @@ describe "every accessible has(n) association", :shared => true do
     Task.first.name.should  == 'write more specs'
   end
 
-  it "should perform atomic commits" do
-    Project.all.size.should == 0
-    Task.all.size.should    == 0
-
-    # self is invalid
-    @project.name = nil # will fail because of validations
-    @project.tasks_attributes = { 'new_1' => { :name => 'write specs' } }
-    @project.save
-
-    Project.all.size.should == 0
-    Task.all.size.should    == 0
-
-    # related resource is invalid
-    @project.name = 'dm-accepts_nested_attributes'
-    @project.tasks_attributes = { 'new_1' => { :name => nil } } # will fail because of validations
-    @project.save
-
-    Project.all.size.should == 0
-    Task.all.size.should    == 0
-  end
-
   it "should return the attributes written to Project#task_attributes from the Project#task_attributes reader" do
     @project.tasks_attributes.should be_nil
     @project.tasks_attributes = { 'new_1' => { :name => 'write specs' } }
@@ -67,6 +46,10 @@ describe "every accessible has(n) association with no reject_if proc", :shared =
     Task.all.size.should    == 0
 
     @project.tasks_attributes = { 'new_1' => { :name => 'write specs' } }
+
+    Project.all.size.should == 1
+    Task.all.size.should    == 0
+
     @project.save.should be_true
 
     Project.all.size.should == 1
@@ -74,6 +57,27 @@ describe "every accessible has(n) association with no reject_if proc", :shared =
     Task.first.name.should  == 'write specs'
   end
 
+  it "should perform atomic commits" do
+    Project.all.size.should == 0
+    Task.all.size.should    == 0
+
+    # self is invalid
+    @project.name = nil # will fail because of validations
+    @project.tasks_attributes = { 'new_1' => { :name => 'write specs' } }
+    @project.save
+
+    Project.all.size.should == 0
+    Task.all.size.should    == 0
+
+    # related resource is invalid
+    @project.name = 'dm-accepts_nested_attributes'
+    @project.tasks_attributes = { 'new_1' => { :name => nil } } # will fail because of validations
+    @project.save
+
+    Project.all.size.should == 0
+    Task.all.size.should    == 0
+  end
+
 end
 
 describe "every accessible has(n) association with :allow_destroy => false", :shared => true do
@@ -99,14 +103,18 @@ describe "every accessible has(n) association with :allow_destroy => true", :sha
   it "should allow to delete an existing task via Profile#tasks_attributes" do
     @project.save
     task = Task.create(:project => @project, :name => 'write specs')
+    @project.tasks.reload
     
     Project.all.size.should == 1
     Task.all.size.should    == 1
-  
-    @project.tasks << task
+
     @project.tasks_attributes = { '1' => { :id => task.id, :_delete => true } }
+
+    Project.all.size.should == 1
+    Task.all.size.should    == 1
+
     @project.save
-    
+
     Project.all.size.should == 1
     Task.all.size.should    == 0
   end

data/spec/shared/has_n_through_spec.rb

@@ -23,25 +23,6 @@ describe "every accessible has(n, :through) association", :shared => true do
     Project.first.name.should == 'still dm-accepts_nested_attributes'
   end
 
-  it "should perform atomic commits" do
-
-    @person.projects_attributes = { 'new_1' => { :name => nil } } # should fail because of validations
-    @person.save
-
-    Person.all.size.should            == 0 # TODO think more if this should be '1'
-    ProjectMembership.all.size.should == 0
-    Project.all.size.should           == 0
-
-    @person.name = nil # should fail because of validations
-    @person.projects_attributes = { 'new_1' => { :name => nil } }
-    @person.save
-
-    Person.all.size.should            == 0
-    ProjectMembership.all.size.should == 0
-    Project.all.size.should           == 0
-
-  end
-
   it "should return the attributes written to Person#projects_attributes from the Person#projects_attributes reader" do
     @person.projects_attributes.should be_nil
     @person.projects_attributes = { 'new_1' => { :name => 'write specs' } }
@@ -85,6 +66,11 @@ describe "every accessible has(n, :through) association with no reject_if proc",
     Project.all.size.should           == 0
 
     @person.projects_attributes = { 'new_1' => { :name => 'dm-accepts_nested_attributes' } }
+
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 0
+    Project.all.size.should           == 0
+
     @person.save
 
     Person.all.size.should            == 1
@@ -94,6 +80,25 @@ describe "every accessible has(n, :through) association with no reject_if proc",
     Project.first.name.should == 'dm-accepts_nested_attributes'
   end
 
+  it "should perform atomic commits" do
+
+    @person.projects_attributes = { 'new_1' => { :name => nil } } # should fail because of validations
+    @person.save
+
+    Person.all.size.should            == 0 # TODO think more if this should be '1'
+    ProjectMembership.all.size.should == 0
+    Project.all.size.should           == 0
+
+    @person.name = nil # should fail because of validations
+    @person.projects_attributes = { 'new_1' => { :name => nil } }
+    @person.save
+
+    Person.all.size.should            == 0
+    ProjectMembership.all.size.should == 0
+    Project.all.size.should           == 0
+
+  end
+
 end
 
 describe "every accessible has(n, :through) association with :allow_destroy => false", :shared => true do
@@ -108,6 +113,11 @@ describe "every accessible has(n, :through) association with :allow_destroy => f
     Project.all.size.should           == 1
   
     @person.projects_attributes = { '1' => { :id => project.id, :_delete => true } }
+
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 1
+    Project.all.size.should           == 1
+
     @person.save
     
     Person.all.size.should            == 1
@@ -121,19 +131,26 @@ describe "every accessible has(n, :through) association with :allow_destroy => t
   
   it "should allow to delete an existing project via Person#projects_attributes" do
     @person.save
-    project = Project.create(:name => 'dm-accepts_nested_attributes')
-    project_membership = ProjectMembership.create(:person => @person, :project => project)
+    project_1 = Project.create(:name => 'dm-accepts_nested_attributes')
+    project_2 = Project.create(:name => 'dm-is-localizable')
+    project_membership_1 = ProjectMembership.create(:person => @person, :project => project_1)
+    project_membership_2 = ProjectMembership.create(:person => @person, :project => project_2)
     
     Person.all.size.should            == 1
-    ProjectMembership.all.size.should == 1
-    Project.all.size.should           == 1
-  
-    @person.projects_attributes = { '1' => { :id => project.id, :_delete => true } }
+    ProjectMembership.all.size.should == 2
+    Project.all.size.should           == 2
+
+    @person.projects_attributes = { '1' => { :id => project_1.id, :_delete => true } }
+
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 2
+    Project.all.size.should           == 2
+
     @person.save
-    
+
     Person.all.size.should            == 1
-    ProjectMembership.all.size.should == 0
-    Project.all.size.should           == 0
+    ProjectMembership.all.size.should == 1
+    Project.all.size.should           == 1
   end
   
 end