snusnu-dm-accepts_nested_attributes 0.0.6 → 0.10.0

data/spec/shared/has_1_spec.rb

@@ -0,0 +1,103 @@
+describe "every accessible has(1) association", :shared => true do
+
+  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_attributes = { :id => profile.id, :nick => 'still snusnu somehow' }
+    @person.save.should be_true
+
+    Person.all.size.should    == 1
+    Profile.all.size.should   == 1
+    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' }
+    @person.profile_attributes.should == { :nick => 'snusnu' }
+  end
+
+end
+
+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.all.size.should  == 0
+    Profile.all.size.should == 0
+
+    @person.profile_attributes = { :nick => 'snusnu' }
+    @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.all.size.should    == 0
+    Profile.all.size.should   == 0
+
+    @person.profile_attributes = { :nick => 'snusnu' }
+    @person.save.should be_true
+
+    Person.all.size.should    == 1
+    Profile.all.size.should   == 1
+    Profile.first.nick.should == 'snusnu'
+  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.profile = profile
+    @person.profile_attributes = { :id => profile.id, :_delete => true }
+
+    @person.save
+
+    Person.all.size.should  == 1
+    Profile.all.size.should == 0
+  end
+  
+end

data/spec/shared/has_n_spec.rb

@@ -0,0 +1,114 @@
+describe "every accessible has(n) association", :shared => true do
+
+  it "should allow to update an existing task via Project#tasks_attributes" do
+    @project.save
+    task = Task.create(:project => @project, :name => 'write specs')
+    Project.all.size.should == 1
+    Task.all.size.should    == 1
+
+    @project.tasks_attributes = { task.id.to_s => { :id => task.id, :name => 'write more specs' } }
+    @project.save.should be_true
+
+    Project.all.size.should == 1
+    Task.all.size.should    == 1
+    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' } }
+    @project.tasks_attributes.should == { 'new_1' => { :name => 'write specs' } }
+  end
+
+end
+
+describe "every accessible has(n) association with a valid reject_if proc", :shared => true do
+
+  it "should not allow to create a new task via Project#tasks_attributes" do
+    @project.save
+    Project.all.size.should == 1
+    Task.all.size.should    == 0
+
+    @project.tasks_attributes = { 'new_1' => { :name => 'write specs' } }
+    @project.save.should be_true
+
+    Project.all.size.should == 1
+    Task.all.size.should    == 0
+  end
+
+end
+
+describe "every accessible has(n) association with no reject_if proc", :shared => true do
+
+  it "should allow to create a new task via Project#tasks_attributes" do
+    @project.save
+    Project.all.size.should == 1
+    Task.all.size.should    == 0
+
+    @project.tasks_attributes = { 'new_1' => { :name => 'write specs' } }
+    @project.save.should be_true
+
+    Project.all.size.should == 1
+    Task.all.size.should    == 1
+    Task.first.name.should  == 'write specs'
+  end
+
+end
+
+describe "every accessible has(n) association with :allow_destroy => false", :shared => true do
+  
+  it "should not allow to delete an existing task via Profile#tasks_attributes" do
+    @project.save
+    task = Task.create(:project => @project, :name => 'write specs')
+    
+    Project.all.size.should == 1
+    Task.all.size.should    == 1
+  
+    @project.tasks_attributes = { '1' => { :id => task.id, :_delete => true } }
+    @project.save
+    
+    Project.all.size.should == 1
+    Task.all.size.should    == 1
+  end
+  
+end
+
+describe "every accessible has(n) association with :allow_destroy => true", :shared => true do
+  
+  it "should allow to delete an existing task via Profile#tasks_attributes" do
+    @project.save
+    task = Task.create(:project => @project, :name => 'write specs')
+    
+    Project.all.size.should == 1
+    Task.all.size.should    == 1
+  
+    @project.tasks << task
+    @project.tasks_attributes = { '1' => { :id => task.id, :_delete => true } }
+    @project.save
+    
+    Project.all.size.should == 1
+    Task.all.size.should    == 0
+  end
+  
+end

data/spec/shared/has_n_through_spec.rb

@@ -0,0 +1,139 @@
+describe "every accessible has(n, :through) association", :shared => true do
+
+  it "should allow to update an existing project via Person#projects_attributes" do
+    Person.all.size.should            == 0
+    Project.all.size.should           == 0
+    ProjectMembership.all.size.should == 0
+
+    @person.save
+    project = Project.create(:name => 'dm-accepts_nested_attributes')
+    project_membership = ProjectMembership.create(:person => @person, :project => project)
+
+    Person.all.size.should            == 1
+    Project.all.size.should           == 1
+    ProjectMembership.all.size.should == 1
+
+    @person.projects_attributes = { project.id.to_s => { :id => project.id, :name => 'still dm-accepts_nested_attributes' } }
+    @person.save
+
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 1
+    Project.all.size.should           == 1
+
+    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' } }
+    @person.projects_attributes.should == { 'new_1' => { :name => 'write specs' } }
+  end
+
+end
+
+describe "every accessible has(n, :through) association with a valid reject_if proc", :shared => true do
+
+  it "should not allow to create a new project via Person#projects_attributes" do
+    Person.all.size.should            == 0
+    Project.all.size.should           == 0
+    ProjectMembership.all.size.should == 0
+
+    @person.save
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 0
+    Project.all.size.should           == 0
+
+    @person.projects_attributes = { 'new_1' => { :name => 'dm-accepts_nested_attributes' } }
+    @person.save
+
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 0
+    Project.all.size.should           == 0
+  end
+
+end
+
+describe "every accessible has(n, :through) association with no reject_if proc", :shared => true do
+
+  it "should allow to create a new project via Person#projects_attributes" do
+    Person.all.size.should            == 0
+    Project.all.size.should           == 0
+    ProjectMembership.all.size.should == 0
+
+    @person.save
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 0
+    Project.all.size.should           == 0
+
+    @person.projects_attributes = { 'new_1' => { :name => 'dm-accepts_nested_attributes' } }
+    @person.save
+
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 1
+    Project.all.size.should           == 1
+
+    Project.first.name.should == 'dm-accepts_nested_attributes'
+  end
+
+end
+
+describe "every accessible has(n, :through) association with :allow_destroy => false", :shared => true do
+  
+  it "should not 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)
+    
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 1
+    Project.all.size.should           == 1
+  
+    @person.projects_attributes = { '1' => { :id => project.id, :_delete => true } }
+    @person.save
+    
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 1
+    Project.all.size.should           == 1
+  end
+  
+end
+
+describe "every accessible has(n, :through) association with :allow_destroy => true", :shared => true do
+  
+  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)
+    
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 1
+    Project.all.size.should           == 1
+  
+    @person.projects_attributes = { '1' => { :id => project.id, :_delete => true } }
+    @person.save
+    
+    Person.all.size.should            == 1
+    ProjectMembership.all.size.should == 0
+    Project.all.size.should           == 0
+  end
+  
+end

data/spec/spec_helper.rb

@@ -1,14 +1,14 @@
 require 'pathname'
-require 'rubygems'
- 
-gem 'rspec', '>=1.1.12'
 require 'spec'
 
-gem 'dm-association_validator', '>=0.0.1'
-require 'dm-association_validator'
- 
+# require the plugin
 require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-accepts_nested_attributes'
- 
+
+# allow testing with dm-validations enabled
+# must be required after the plugin, since
+# dm-validations seems to need dm-core
+require 'dm-validations'
+
 ENV["SQLITE3_SPEC_URI"]  ||= 'sqlite3::memory:'
 ENV["MYSQL_SPEC_URI"]    ||= 'mysql://localhost/dm-accepts_nested_attributes_test'
 ENV["POSTGRES_SPEC_URI"] ||= 'postgres://postgres@localhost/dm-accepts_nested_attributes_test'
@@ -36,7 +36,7 @@ USE_TEXTMATE_RSPEC_BUNDLE = true # set to false if not using textmate
 
 if USE_TEXTMATE_RSPEC_BUNDLE
 
-  require Pathname(__FILE__).dirname.expand_path + 'shared/rspec_tmbundle_support'
+  require Pathname(__FILE__).dirname.expand_path + 'lib/rspec_tmbundle_support'
 
   # use the tmbundle logger
   RSpecTmBundleHelpers::TextmateRspecLogger.new(STDOUT, :off)
@@ -50,7 +50,10 @@ end
 
 ENV['ADAPTER'] ||= 'sqlite3'
 setup_adapter(:default)
-Dir[Pathname(__FILE__).dirname.to_s + "/fixtures/**/*.rb"].each { |rb| require(rb) }
+
+spec_dir = Pathname(__FILE__).dirname.to_s
+Dir[ spec_dir + "/fixtures/**/*.rb" ].each { |rb| require(rb) }
+Dir[ spec_dir + "/shared/**/*.rb"   ].each { |rb| require(rb) }
 
 
 module XToOneHelpers

data/spec/unit/accepts_nested_attributes_for_spec.rb

@@ -58,36 +58,8 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
     
     describe "no association_name" do
       
-      describe "and no options" do
-      
-        it "should raise" do
-          lambda { Branch.accepts_nested_attributes_for }.should raise_error(ArgumentError)
-        end
-      
-      end
-            
-      describe "and empty options" do
-      
-        it "should raise" do
-          lambda { Branch.accepts_nested_attributes_for({}) }.should raise_error(ArgumentError)
-        end
-      
-      end
-                  
-      describe "and invalid options" do
-      
-        it "should raise" do
-          lambda { Branch.accepts_nested_attributes_for({ :foo => :bar}) }.should raise_error(ArgumentError)
-        end
-      
-      end
-                        
-      describe "and valid options" do
-      
-        it "should raise" do
-          lambda { Branch.accepts_nested_attributes_for({ :allow_destroy => true}) }.should raise_error(ArgumentError)
-        end
-      
+      it "should raise" do
+        lambda { Branch.accepts_nested_attributes_for }.should raise_error(ArgumentError)
       end
       
     end
@@ -174,16 +146,18 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
           lambda { @model.accepts_nested_attributes_for @association }.should_not raise_error
         end
         
-        it "should store the accessible association in .autosave_associations" do
-          @model.autosave_associations[@association].should be_nil
+        it "should store the accessible association in .options_for_nested_attributes" do
+          @model.options_for_nested_attributes[@association].should be_nil
           @model.accepts_nested_attributes_for @association
-          @model.autosave_associations[@association].should_not be_nil
+          relationship = @model.relationships[@association]
+          @model.options_for_nested_attributes[relationship].should_not be_nil
         end
 
-        it "should store the default options under the association_name in .autosave_associations" do
-          @model.autosave_associations[@association].should be_nil
+        it "should store the default options under the association_name in .options_for_nested_attributes" do
+          @model.options_for_nested_attributes[@association].should be_nil
           @model.accepts_nested_attributes_for @association
-          @model.autosave_associations[@association].should == { :allow_destroy => false }
+          relationship = @model.relationships[@association]
+          @model.options_for_nested_attributes[relationship].should == { :allow_destroy => false }
         end
         
         it "should create a \#{association_name}_attributes instance reader" do
@@ -211,15 +185,17 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
         end
         
         it "should store the accessible association in .autosave_associations" do
-          @model.autosave_associations[@association].should be_nil
+          @model.options_for_nested_attributes[@association].should be_nil
           @model.accepts_nested_attributes_for @association, {}
-          @model.autosave_associations[@association].should_not be_nil
+          relationship = @model.relationships[@association]
+          @model.options_for_nested_attributes[relationship].should_not be_nil
         end
 
         it "should store the default options under the association_name in .autosave_associations" do
-          @model.autosave_associations[@association].should be_nil
+          @model.options_for_nested_attributes[@association].should be_nil
           @model.accepts_nested_attributes_for @association, {}
-          @model.autosave_associations[@association].should == { :allow_destroy => false }
+          relationship = @model.relationships[@association]
+          @model.options_for_nested_attributes[relationship].should == { :allow_destroy => false }
         end
         
         it "should create a \#{association_name}_attributes instance reader" do
@@ -243,19 +219,19 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
       describe "and invalid options" do
       
         it "should raise" do
-          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error
+          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error(DataMapper::NestedAttributes::InvalidOptions)
         end
         
         it "should not store the accessible association in .autosave_associations" do
-          @model.autosave_associations[@association].should be_nil
-          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error
-          @model.autosave_associations[@association].should be_nil
+          @model.options_for_nested_attributes[@association].should be_nil
+          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error(DataMapper::NestedAttributes::InvalidOptions)
+          @model.options_for_nested_attributes[@association].should be_nil
         end
         
         it "should not create a \#{association_name}_attributes instance reader" do
           p = @model.new
           p.respond_to?("#{@association}_attributes").should be_false
-          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error
+          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error(DataMapper::NestedAttributes::InvalidOptions)
           p = @model.new
           p.respond_to?("#{@association}_attributes").should be_false
         end
@@ -263,7 +239,7 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
         it "should not create a \#{association_name}_attributes instance writer" do
           p = @model.new
           p.respond_to?("#{@association}_attributes=").should be_false
-          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error
+          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error(DataMapper::NestedAttributes::InvalidOptions)
           p = @model.new
           p.respond_to?("#{@association}_attributes=").should be_false
         end
@@ -277,33 +253,35 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
         end
         
         it "should store the accessible association in .autosave_associations" do
-          @model.autosave_associations[@association].should be_nil
+          @model.options_for_nested_attributes[@association].should be_nil
           @model.accepts_nested_attributes_for @association, :allow_destroy => true
-          @model.autosave_associations[@association].should_not be_nil
+          relationship = @model.relationships[@association]
+          @model.options_for_nested_attributes[relationship].should_not be_nil
         end
                 
         it "should accept :allow_destroy as the only option (and thus overwrite the default option)" do
-          @model.autosave_associations[@association].should be_nil
+          @model.options_for_nested_attributes[@association].should be_nil
           @model.accepts_nested_attributes_for @association, :allow_destroy => true
-          @model.autosave_associations[@association].should == { :allow_destroy => true }
+          relationship = @model.relationships[@association]
+          @model.options_for_nested_attributes[relationship].should == { :allow_destroy => true }
         end
                         
         it "should accept :reject_if as the only option (and add :allow_destroy => false)" do
-          @model.autosave_associations[@association].should be_nil
+          @model.options_for_nested_attributes[@association].should be_nil
           @model.accepts_nested_attributes_for @association, :reject_if => lambda { |attributes| nil }
-          @model.autosave_associations[@association].should_not be_nil
-          @model.autosave_associations[@association][:allow_destroy].should be_false
-          @model.autosave_associations[@association][:reject_if].should be_kind_of(Proc)
-          @model.reject_new_nested_attributes_proc_for(@association).should be_kind_of(Proc)
+          relationship = @model.relationships[@association]
+          @model.options_for_nested_attributes[relationship].should_not be_nil
+          @model.options_for_nested_attributes[relationship][:allow_destroy].should be_false
+          @model.options_for_nested_attributes[relationship][:reject_if].should be_kind_of(Proc)
         end
                                 
         it "should accept both :allow_destroy and :reject_if as options" do
-          @model.autosave_associations[@association].should be_nil
+          @model.options_for_nested_attributes[@association].should be_nil
           @model.accepts_nested_attributes_for @association, :allow_destroy => true, :reject_if => lambda { |attributes| nil }
-          @model.autosave_associations[@association].should_not be_nil
-          @model.autosave_associations[@association][:allow_destroy].should be_true
-          @model.autosave_associations[@association][:reject_if].should be_kind_of(Proc)
-          @model.reject_new_nested_attributes_proc_for(@association).should be_kind_of(Proc)
+          relationship = @model.relationships[@association]
+          @model.options_for_nested_attributes[relationship].should_not be_nil
+          @model.options_for_nested_attributes[relationship][:allow_destroy].should be_true
+          @model.options_for_nested_attributes[relationship][:reject_if].should be_kind_of(Proc)
         end
         
         it "should create a \#{association_name}_attributes instance reader" do
@@ -326,61 +304,6 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
     
     end
     
-    describe "a valid association_name pointing to a single resource", :shared => true do
-      
-      describe "and no options" do
-      
-        it "should create a get_\#{association_name} instance reader" do
-          p = @model.new
-          p.respond_to?("get_#{@association}").should be_false
-          @model.accepts_nested_attributes_for @association
-          p = @model.new
-          p.respond_to?("get_#{@association}").should be_true
-          p.send("get_#{@association}").should_not be_nil
-        end
-        
-      end
-      
-      describe "and empty options" do
-        
-        it "should create a get_\#{association_name} instance reader" do
-          p = @model.new
-          p.respond_to?("get_#{@association}").should be_false
-          @model.accepts_nested_attributes_for @association, {}
-          p = @model.new
-          p.respond_to?("get_#{@association}").should be_true
-          p.send("get_#{@association}").should_not be_nil
-        end
-        
-      end
-            
-      describe "and invalid options" do
-        
-        it "should not create a get_\#{association_name} instance reader" do
-          p = @model.new
-          p.respond_to?("get_#{@association}").should be_false
-          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error
-          p = @model.new
-          p.respond_to?("get_#{@association}").should be_false
-        end
-        
-      end
-                  
-      describe "and valid options" do
-        
-        it "should create a get_\#{association_name} instance reader" do
-          p = @model.new
-          p.respond_to?("get_#{@association}").should be_false
-          @model.accepts_nested_attributes_for @association, :allow_destroy => true
-          p = @model.new
-          p.respond_to?("get_#{@association}").should be_true
-          p.send("get_#{@association}").should_not be_nil
-        end
-        
-      end
-      
-    end
-    
     describe "a valid association_name pointing to multiple resources", :shared => true do
       
       describe "and no options" do
@@ -412,7 +335,7 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
         it "should not create a get_\#{association_name} instance reader" do
           p = @model.new
           p.respond_to?("get_#{@association}").should be_false
-          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error
+          lambda { @model.accepts_nested_attributes_for @association, { :foo => :bar } }.should raise_error(DataMapper::NestedAttributes::InvalidOptions)
           p = @model.new
           p.respond_to?("get_#{@association}").should be_false
         end
@@ -446,7 +369,6 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
       end
       
       it_should_behave_like "a valid association_name"
-      it_should_behave_like "a valid association_name pointing to a single resource"
       
     end
         
@@ -458,7 +380,6 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
       end
       
       it_should_behave_like "a valid association_name"
-      it_should_behave_like "a valid association_name pointing to a single resource"
       
     end