snusnu-dm-accepts_nested_attributes 0.0.2 → 0.0.3

data/lib/dm-accepts_nested_attributes/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module NestedAttributes
     
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   
   end
 end

data/spec/fixtures/person.rb

@@ -1,7 +1,7 @@
 class Person
   include DataMapper::Resource
   property :id,   Serial
-  property :name, String
+  property :name, String, :nullable => false
   has 1, :profile
   has n, :project_memberships
   has n, :projects, :through => :project_memberships

data/spec/fixtures/profile.rb

@@ -2,6 +2,6 @@ class Profile
   include DataMapper::Resource
   property :id,        Serial
   property :person_id, Integer, :nullable => false
-  property :nick,      String
+  property :nick,      String,  :nullable => false
   belongs_to :person
 end

data/spec/fixtures/project.rb

@@ -1,7 +1,7 @@
 class Project
   include DataMapper::Resource
   property :id,   Serial
-  property :name, String
+  property :name, String, :nullable => false
   has n, :tasks
   has n, :project_memberships
   has n, :people, :through => :project_memberships

data/spec/fixtures/task.rb

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

data/spec/integration/belongs_to_spec.rb

@@ -2,37 +2,12 @@ require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe DataMapper::NestedAttributes do
-
-  
-  describe "every accessible belongs_to association with no associated parent model", :shared => true do
-    
-    it "should return a new_record from get_\#{association_name}" do
-      @profile.get_person.should_not be_nil
-      @profile.get_person.should be_new_record
-    end
-    
-  end
-  
-  describe "every accessible belongs_to association with an associated parent model", :shared => true do
-
-    it "should return an already existing record from get_\#{association_name}" do
-      @profile.person_attributes = { :name => 'Martin' }
-      @profile.save
-      @profile.get_person.should_not be_nil
-      @profile.get_person.should_not be_new_record
-      @profile.get_person.should be_kind_of(Person)
-    end
-  
-  end
     
   describe "every accessible belongs_to association with a valid reject_if proc", :shared => true do
     
-    it_should_behave_like "every accessible belongs_to association with no associated parent model"
-  
     it "should not allow to create a new person via Profile#person_attributes" do
       @profile.person_attributes = { :name => 'Martin' }
-      @profile.person.should be_nil
-      @profile.save # fails because of validations (not null on belongs_to)
+      @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
@@ -40,9 +15,6 @@ describe DataMapper::NestedAttributes do
   end
     
   describe "every accessible belongs_to association with no reject_if proc", :shared => true do
-    
-    it_should_behave_like "every accessible belongs_to association with no associated parent model"
-    it_should_behave_like "every accessible belongs_to association with an associated parent model"
   
     it "should allow to create a new person via Profile#person_attributes" do
       @profile.person_attributes = { :name => 'Martin' }
@@ -74,6 +46,26 @@ describe DataMapper::NestedAttributes do
       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
@@ -127,11 +119,17 @@ describe DataMapper::NestedAttributes do
   end
 
   describe "Profile.belongs_to(:person)" do
+    
+    include XToOneHelpers
+    
+    before(:all) do
+      DataMapper.auto_migrate!
+    end
   
     describe "accepts_nested_attributes_for(:person)" do
     
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Profile.accepts_nested_attributes_for :person
         @profile = Profile.new :nick => 'snusnu'
       end
@@ -145,7 +143,7 @@ describe DataMapper::NestedAttributes do
     describe "accepts_nested_attributes_for(:person, :allow_destroy => false)" do
     
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Profile.accepts_nested_attributes_for :person, :allow_destroy => false
         @profile = Profile.new :nick => 'snusnu'
       end
@@ -158,7 +156,7 @@ describe DataMapper::NestedAttributes do
     describe "accepts_nested_attributes_for(:person, :allow_destroy = true)" do
     
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Profile.accepts_nested_attributes_for :person, :allow_destroy => true
         @profile = Profile.new :nick => 'snusnu'
       end
@@ -173,7 +171,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => :foo" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Profile.accepts_nested_attributes_for :person, :reject_if => :foo
           @profile = Profile.new :nick => 'snusnu'
         end
@@ -186,7 +184,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => lambda { |attrs| true }" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Profile.accepts_nested_attributes_for :person, :reject_if => lambda { |attrs| true }
           @profile = Profile.new :nick => 'snusnu'
         end
@@ -199,7 +197,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => lambda { |attrs| false }" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Profile.accepts_nested_attributes_for :person, :reject_if => lambda { |attrs| false }
           @profile = Profile.new :nick => 'snusnu'
         end

data/spec/integration/has_1_spec.rb

@@ -3,31 +3,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe DataMapper::NestedAttributes do
   
-  describe "every accessible has(1) association with no associated parent model", :shared => true do
-    
-    it "should return a new_record from get_\#{association_name}" do
-      @person.profile_attributes = { :nick => 'snusnu' }
-      @person.get_profile.should_not be_nil
-      @person.get_profile.should be_new_record
-    end
-    
-  end
-  
-  describe "every accessible has(1) association with an associated parent model", :shared => true do
-
-    it "should return an already existing record from get_\#{association_name}" do
-      @person.profile_attributes = { :nick => 'snusnu' }
-      @person.save
-      @person.get_profile.should_not be_nil
-      @person.get_profile.should_not be_new_record
-      @person.get_profile.should be_kind_of(Profile)
-    end
-  
-  end
-  
   describe "every accessible has(1) association with a valid reject_if proc", :shared => true do
-    
-    it_should_behave_like "every accessible has(1) association with no associated parent model"
   
     it "should not allow to create a new profile via Person#profile_attributes" do
       @person.profile_attributes = { :nick => 'snusnu' }
@@ -41,35 +17,51 @@ describe DataMapper::NestedAttributes do
   
   describe "every accessible has(1) association with no reject_if proc", :shared => true do
     
-    it_should_behave_like "every accessible has(1) association with no associated parent model"
-    it_should_behave_like "every accessible has(1) association with an associated parent model"
-    
     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
-      @person.profile.should == Profile.first
+      @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
+      @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
+      @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
@@ -116,14 +108,20 @@ describe DataMapper::NestedAttributes do
   
   describe "Person.has(1, :profile)" do
     
+    include XToOneHelpers
+    
+    before(:all) do
+      DataMapper.auto_migrate!
+    end
+    
     describe "accepts_nested_attributes_for(:profile)" do
     
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Person.accepts_nested_attributes_for :profile
         @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"
       it_should_behave_like "every accessible has(1) association with a nested attributes reader"
@@ -133,7 +131,7 @@ describe DataMapper::NestedAttributes do
     describe "accepts_nested_attributes_for(:profile, :allow_destroy => false)" do
     
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Person.accepts_nested_attributes_for :profile, :allow_destroy => false
         @person = Person.new :name => 'Martin'
       end
@@ -146,7 +144,7 @@ describe DataMapper::NestedAttributes do
     describe "accepts_nested_attributes_for(:profile, :allow_destroy => true)" do
       
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Person.accepts_nested_attributes_for :profile, :allow_destroy => true
         @person = Person.new :name => 'Martin'
       end
@@ -162,7 +160,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => :foo" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Person.accepts_nested_attributes_for :profile, :reject_if => :foo
           @person = Person.new :name => 'Martin'
         end
@@ -175,7 +173,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => lambda { |attrs| true }" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Person.accepts_nested_attributes_for :profile, :reject_if => lambda { |attrs| true }
           @person = Person.new :name => 'Martin'
         end
@@ -184,11 +182,11 @@ describe DataMapper::NestedAttributes do
         it_should_behave_like "every accessible has(1) association with :allow_destroy => false"
       
       end
-                  
+      
       describe ":reject_if => lambda { |attrs| false }" do
-    
+        
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Person.accepts_nested_attributes_for :profile, :reject_if => lambda { |attrs| false }
           @person = Person.new :name => 'Martin'
         end

data/spec/integration/has_n_spec.rb

@@ -52,6 +52,35 @@ describe DataMapper::NestedAttributes 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
+      
+      @project.name = nil # will fail because of validations
+      @project.tasks_attributes = { 'new_1' => { :name => 'write specs' } }
+      @project.tasks.should_not be_empty
+      @project.tasks.first.name.should == 'write specs'
+      @project.save
+      @project.should be_new_record
+      @project.tasks.all? { |t| t.should be_new_record }
+      Project.all.size.should == 0
+      Task.all.size.should == 0
+      
+      # TODO write specs for xxx_attributes= method that test
+      # if same hash keys properly get overwritten and not end up being multiple records
+      # (which obviously is the case right now)
+      
+      @project.name = 'dm-accepts_nested_attributes'
+      @project.tasks_attributes = { 'new_1' => { :name => nil } } # will fail because of validations
+      @project.tasks.should_not be_empty
+      @project.tasks.first.name.should be_nil
+      @project.save
+      @project.should be_new_record
+      @project.tasks.all? { |t| t.should be_new_record }
+      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
@@ -105,11 +134,17 @@ describe DataMapper::NestedAttributes do
   end
   
   describe "Project.has(n, :tasks)" do
+    
+    include OneToManyHelpers
+    
+    before(:all) do
+      DataMapper.auto_migrate!
+    end
   
     describe "accepts_nested_attributes_for(:tasks)" do
       
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Project.accepts_nested_attributes_for :tasks
         @project = Project.new :name => 'trippings'
       end
@@ -123,7 +158,7 @@ describe DataMapper::NestedAttributes do
     describe "accepts_nested_attributes_for(:tasks, :allow_destroy => false)" do
       
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Project.accepts_nested_attributes_for :tasks, :allow_destroy => false
         @project = Project.new :name => 'trippings'
       end
@@ -136,7 +171,7 @@ describe DataMapper::NestedAttributes do
     describe "accepts_nested_attributes_for(:tasks, :allow_destroy => true)" do
       
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Project.accepts_nested_attributes_for :tasks, :allow_destroy => true
         @project = Project.new :name => 'trippings'
       end
@@ -151,7 +186,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => :foo" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Project.accepts_nested_attributes_for :tasks, :reject_if => :foo
           @project = Project.new :name => 'trippings'
         end
@@ -164,7 +199,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => lambda { |attrs| true }" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Project.accepts_nested_attributes_for :tasks, :reject_if => lambda { |attrs| true }
           @project = Project.new :name => 'trippings'
         end
@@ -177,7 +212,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => lambda { |attrs| false }" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Project.accepts_nested_attributes_for :tasks, :reject_if => lambda { |attrs| false }
           @project = Project.new :name => 'trippings'
         end

data/spec/integration/has_n_through_spec.rb

@@ -65,6 +65,29 @@ describe DataMapper::NestedAttributes 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.projects.should be_empty
+      @person.save
+      @person.projects.should be_empty
+      
+      Person.all.size.should            == 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.projects.should be_empty
+      @person.save
+      @person.projects.should be_empty
+      
+      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
@@ -124,11 +147,17 @@ describe DataMapper::NestedAttributes do
   end
   
   describe "Person.has(n, :projects, :through => :project_memberships)" do
+    
+    include ManyToManyHelpers
+    
+    before(:all) do
+      DataMapper.auto_migrate!
+    end
   
     describe "accepts_nested_attributes_for(:projects)" do
       
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Person.accepts_nested_attributes_for :projects
         @person = Person.new :name => 'snusnu'
       end
@@ -142,7 +171,7 @@ describe DataMapper::NestedAttributes do
     describe "accepts_nested_attributes_for(:projects, :allow_destroy => false)" do
       
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Person.accepts_nested_attributes_for :projects, :allow_destroy => false
         @person = Person.new :name => 'snusnu'
       end
@@ -155,7 +184,7 @@ describe DataMapper::NestedAttributes do
     describe "accepts_nested_attributes_for(:projects, :allow_destroy = true)" do
       
       before(:each) do
-        DataMapper.auto_migrate!
+        clear_data
         Person.accepts_nested_attributes_for :projects, :allow_destroy => true
         @person = Person.new :name => 'snusnu'
       end
@@ -170,7 +199,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => :foo" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Person.accepts_nested_attributes_for :projects, :reject_if => :foo
           @person = Person.new :name => 'snusnu'
         end
@@ -183,7 +212,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => lambda { |attrs| true }" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Person.accepts_nested_attributes_for :projects, :reject_if => lambda { |attrs| true }
           @person = Person.new :name => 'snusnu'
         end
@@ -196,7 +225,7 @@ describe DataMapper::NestedAttributes do
       describe ":reject_if => lambda { |attrs| false }" do
     
         before(:each) do
-          DataMapper.auto_migrate!
+          clear_data
           Person.accepts_nested_attributes_for :projects, :reject_if => lambda { |attrs| false }
           @person = Person.new :name => 'snusnu'
         end