snusnu-dm-accepts_nested_attributes 0.0.2 → 0.0.3

data/spec/spec_helper.rb

@@ -3,12 +3,9 @@ require 'rubygems'
  
 gem 'rspec', '>=1.1.12'
 require 'spec'
- 
-gem 'dm-core', '0.9.11'
-require 'dm-core'
- 
-gem 'dm-validations', '0.9.11'
-require 'dm-validations'
+
+gem 'dm-association_validator', '>=0.0.1'
+require 'dm-association_validator'
  
 require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-accepts_nested_attributes'
  
@@ -54,3 +51,32 @@ end
 ENV['ADAPTER'] ||= 'sqlite3'
 setup_adapter(:default)
 Dir[Pathname(__FILE__).dirname.to_s + "/fixtures/**/*.rb"].each { |rb| require(rb) }
+
+
+module XToOneHelpers
+  
+  def clear_data
+    Profile.all.destroy!
+    Person.all.destroy!
+  end
+  
+end
+
+module OneToManyHelpers
+  
+  def clear_data
+    Task.all.destroy!
+    Project.all.destroy!
+  end
+  
+end
+
+module ManyToManyHelpers
+  
+  def clear_data
+    ProjectMembership.all.destroy!
+    Project.all.destroy!
+    Person.all.destroy!
+  end
+  
+end

data/spec/unit/accepts_nested_attributes_for_spec.rb

@@ -3,16 +3,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe "DataMapper::Model.accepts_nested_attributes_for" do
   
-  before(:each) do
-    
-    # don't use the originally defined fixtures but provide new ones,
-    # this time without already calling accepts_nested_attributes_for on them.
-    # this helps speccing the exact behavior of this very method call
-  
-    Object.send(:remove_const, 'Branch')  if Object.const_defined?('Branch')
-    Object.send(:remove_const, 'Shop')    if Object.const_defined?('Shop')
-    Object.send(:remove_const, 'Item')    if Object.const_defined?('Item')
-    Object.send(:remove_const, 'Booking') if Object.const_defined?('Booking')
+  FIXTURES = <<-RUBY
   
     class Branch
       include DataMapper::Resource
@@ -21,14 +12,14 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
       has n, :items
       has n, :bookings, :through => :items
     end
-    
+  
     class Shop
       include DataMapper::Resource
       property :id,        Serial
       property :branch_id, Integer
       belongs_to :branch
     end
-  
+
     class Item
       include DataMapper::Resource
       property :id,        Serial
@@ -36,15 +27,29 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
       belongs_to :branch
       has n, :bookings
     end
-    
+  
     class Booking
       include DataMapper::Resource
       property :id,      Serial
       property :item_id, Integer
       belongs_to :item
     end
-    
+  
+  RUBY
+  
+  before(:all) do
+    eval FIXTURES
     DataMapper.auto_migrate!
+  end
+  
+  before(:each) do
+    
+    Object.send(:remove_const, 'Branch')  if Object.const_defined?('Branch')
+    Object.send(:remove_const, 'Shop')    if Object.const_defined?('Shop')
+    Object.send(:remove_const, 'Item')    if Object.const_defined?('Item')
+    Object.send(:remove_const, 'Booking') if Object.const_defined?('Booking')
+  
+    eval FIXTURES # neither class_eval nor instance_eval work here
   
   end
   

data/spec/unit/resource_spec.rb

@@ -143,7 +143,7 @@ describe DataMapper::Resource do
   
   describe "#associated_instance_get(association_name)" do
     
-    before do
+    before(:each) do
       @person = Person.create(:name => 'snusnu')
       @person.profile = Profile.new
       @person.save

data/tasks/gemspec.rb

@@ -1,9 +1,6 @@
 desc "Generate gemspec"
 task :gemspec do |x|
   
-  # # Clean up extraneous files before checking manifest
-  # %x[rake clean]
- 
   %x[rake debug_gem > #{GEM_NAME}.gemspec]
   puts "Successfully created gemspec for #{GEM_NAME}!"
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: snusnu-dm-accepts_nested_attributes
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Martin Gamsj\xC3\xA4ger"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 -07:00
+date: 2009-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,21 +51,18 @@ files:
 - Rakefile
 - TODO
 - lib/dm-accepts_nested_attributes.rb
-- lib/dm-accepts_nested_attributes/associations.rb
+- lib/dm-accepts_nested_attributes/association_proxies.rb
+- lib/dm-accepts_nested_attributes/association_validation.rb
 - lib/dm-accepts_nested_attributes/nested_attributes.rb
 - lib/dm-accepts_nested_attributes/version.rb
 - spec/fixtures/person.rb
-- spec/fixtures/photo.rb
 - spec/fixtures/profile.rb
 - spec/fixtures/project.rb
 - spec/fixtures/project_membership.rb
-- spec/fixtures/tag.rb
-- spec/fixtures/tagging.rb
 - spec/fixtures/task.rb
 - spec/integration/belongs_to_spec.rb
 - spec/integration/has_1_spec.rb
 - spec/integration/has_n_spec.rb
-- spec/integration/has_n_through_renamed_spec.rb
 - spec/integration/has_n_through_spec.rb
 - spec/shared/rspec_tmbundle_support.rb
 - spec/spec.opts

data/spec/fixtures/photo.rb

@@ -1,9 +0,0 @@
-class Photo
-  include DataMapper::Resource
-
-  property :id,   Serial
-  property :name, String
-
-  has n, :tagged_things,    :class_name => "Tagging"
-  has n, :tags,             :through => :tagged_things
-end

data/spec/fixtures/tag.rb

@@ -1,12 +0,0 @@
-class Tag
-  include DataMapper::Resource
-
-  property :id,   Serial
-  property :name, String
-
-  has n, :tagged_things,    :class_name => "Tagging"
-  has n, :pictures,         :through      => :tagged_things,
-                            :class_name   => 'Photo',
-                            :child_key    => [:tag_id],
-                            :remote_name  => :photo
-end

data/spec/fixtures/tagging.rb

@@ -1,10 +0,0 @@
-class Tagging
-  include DataMapper::Resource
-
-  property :id,         Serial
-  property :tag_id,     Integer
-  property :photo_id,   Integer
-
-  belongs_to :tag
-  belongs_to :photo
-end

data/spec/integration/has_n_through_renamed_spec.rb

@@ -1,214 +0,0 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
-
-# TODO: this is overkill - really should use some more focussed unit tests instead
-describe DataMapper::NestedAttributes do
-  
-  describe "every accessible has(n, :through) renamed association with a valid reject_if proc", :shared => true do
-  
-    it "should not allow to create a new picture via Tag#pictures_attributes" do
-      @tag.save
-      Tag.all.size.should == 1
-      Tagging.all.size.should == 0
-      Photo.all.size.should == 0
-      
-      @tag.pictures_attributes = { 'new_1' => { :name => 'dm-accepts_nested_attributes' } }
-      @tag.pictures.should be_empty
-      @tag.save
-      
-      Tag.all.size.should == 1
-      Tagging.all.size.should == 0
-      Photo.all.size.should == 0
-    end
-    
-  end
-  
-  describe "every accessible has(n, :through) renamed association with no reject_if proc", :shared => true do
-    
-    it "should allow to create a new picture via Tag#pictures_attributes" do
-      @tag.save
-      Tag.all.size.should == 1
-      Tagging.all.size.should == 0
-      Photo.all.size.should == 0
-      
-      @tag.pictures_attributes = { 'new_1' => { :name => 'dm-accepts_nested_attributes' } }
-      @tag.pictures.should_not be_empty
-      @tag.pictures.first.name.should == 'dm-accepts_nested_attributes'
-      @tag.save
-      @tag.pictures.first.should == Photo.first
-      
-      Tag.all.size.should == 1
-      Tagging.all.size.should == 1
-      Photo.all.size.should == 1
-      
-      Photo.first.name.should == 'dm-accepts_nested_attributes'
-    end
-        
-    it "should allow to update an existing picture via Tag#pictures_attributes" do
-      @tag.save
-      photo = Photo.create(:name => 'dm-accepts_nested_attributes')
-      tagging = Tagging.create(:tag => @tag, :photo => photo)
-      Tag.all.size.should == 1
-      Photo.all.size.should == 1
-      Tagging.all.size.should == 1
-      
-      @tag.reload
-      
-      @tag.pictures_attributes = { photo.id.to_s => { :id => photo.id, :name => 'still dm-accepts_nested_attributes' } }
-      @tag.pictures.should_not be_empty
-      @tag.pictures.first.name.should == 'still dm-accepts_nested_attributes'
-      @tag.save
-      
-      Tag.all.size.should == 1
-      Tagging.all.size.should == 1
-      Photo.all.size.should == 1
-      
-      Photo.first.name.should == 'still dm-accepts_nested_attributes'
-    end
-    
-  end
-  
-  describe "every accessible has(n, :through) renamed association with :allow_destroy => false", :shared => true do
-    
-    it "should not allow to delete an existing picture via Tag#pictures_attributes" do
-      @tag.save
-      photo = Photo.create(:name => 'dm-accepts_nested_attributes')
-      tagging = Tagging.create(:tag => @tag, :photo => photo)
-      
-      Tag.all.size.should            == 1
-      Tagging.all.size.should == 1
-      Photo.all.size.should           == 1
-    
-      @tag.reload
-      @tag.pictures_attributes = { '1' => { :id => photo.id, :_delete => true } }
-      @tag.save
-      
-      Tag.all.size.should            == 1
-      Tagging.all.size.should == 1
-      Photo.all.size.should           == 1
-    end
-    
-  end
-  
-  describe "every accessible has(n, :through) renamed association with :allow_destroy => true", :shared => true do
-    
-    it "should allow to delete an existing picture via Tag#pictures_attributes" do
-      @tag.save
-      photo = Photo.create(:name => 'dm-accepts_nested_attributes')
-      tagging = Tagging.create(:tag => @tag, :photo => photo)
-      
-      Tag.all.size.should            == 1
-      Tagging.all.size.should == 1
-      Photo.all.size.should           == 1
-    
-      @tag.reload
-      @tag.pictures_attributes = { '1' => { :id => photo.id, :_delete => true } }
-      @tag.save
-      
-      Tag.all.size.should            == 1
-      Tagging.all.size.should == 0
-      Photo.all.size.should           == 0
-    end
-    
-  end
-
-  describe "every accessible has(n, :through) renamed association with a nested attributes reader", :shared => true do
-
-    it "should return the attributes written to Tag#pictures_attributes from the Tag#pictures_attributes reader" do
-      @tag.pictures_attributes.should be_nil
-
-      @tag.pictures_attributes = { 'new_1' => { :name => 'write specs' } }
-
-      @tag.pictures_attributes.should == { 'new_1' => { :name => 'write specs' } }
-    end
-
-  end
-  
-  describe "Tag.has(n, :pictures, :through => :taggings) renamed" do
-  
-    describe "accepts_nested_attributes_for(:pictures)" do
-      
-      before(:each) do
-        DataMapper.auto_migrate!
-        Tag.accepts_nested_attributes_for :pictures
-        @tag = Tag.new :name => 'snusnu'
-      end
-      
-      it_should_behave_like "every accessible has(n, :through) renamed association with no reject_if proc"
-      it_should_behave_like "every accessible has(n, :through) renamed association with :allow_destroy => false"
-      it_should_behave_like "every accessible has(n, :through) renamed association with a nested attributes reader"
-      
-    end
-      
-    describe "accepts_nested_attributes_for(:pictures, :allow_destroy => false)" do
-      
-      before(:each) do
-        DataMapper.auto_migrate!
-        Tag.accepts_nested_attributes_for :pictures, :allow_destroy => false
-        @tag = Tag.new :name => 'snusnu'
-      end
-      
-      it_should_behave_like "every accessible has(n, :through) renamed association with no reject_if proc"
-      it_should_behave_like "every accessible has(n, :through) renamed association with :allow_destroy => false"
-      
-    end
-        
-    describe "accepts_nested_attributes_for(:pictures, :allow_destroy = true)" do
-      
-      before(:each) do
-        DataMapper.auto_migrate!
-        Tag.accepts_nested_attributes_for :pictures, :allow_destroy => true
-        @tag = Tag.new :name => 'snusnu'
-      end
-      
-      it_should_behave_like "every accessible has(n, :through) renamed association with no reject_if proc"
-      it_should_behave_like "every accessible has(n, :through) renamed association with :allow_destroy => true"
-      
-    end
-    
-    describe "accepts_nested_attributes_for :pictures, " do
-      
-      describe ":reject_if => :foo" do
-    
-        before(:each) do
-          DataMapper.auto_migrate!
-          Tag.accepts_nested_attributes_for :pictures, :reject_if => :foo
-          @tag = Tag.new :name => 'snusnu'
-        end
-    
-        it_should_behave_like "every accessible has(n, :through) renamed association with no reject_if proc"
-        it_should_behave_like "every accessible has(n, :through) renamed association with :allow_destroy => false"
-      
-      end
-            
-      describe ":reject_if => lambda { |attrs| true }" do
-    
-        before(:each) do
-          DataMapper.auto_migrate!
-          Tag.accepts_nested_attributes_for :pictures, :reject_if => lambda { |attrs| true }
-          @tag = Tag.new :name => 'snusnu'
-        end
-    
-        it_should_behave_like "every accessible has(n, :through) renamed association with a valid reject_if proc"
-        it_should_behave_like "every accessible has(n, :through) renamed association with :allow_destroy => false"
-      
-      end
-                  
-      describe ":reject_if => lambda { |attrs| false }" do
-    
-        before(:each) do
-          DataMapper.auto_migrate!
-          Tag.accepts_nested_attributes_for :pictures, :reject_if => lambda { |attrs| false }
-          @tag = Tag.new :name => 'snusnu'
-        end
-    
-        it_should_behave_like "every accessible has(n, :through) renamed association with no reject_if proc"
-        it_should_behave_like "every accessible has(n, :through) renamed association with :allow_destroy => false"
-      
-      end
-    
-    end
-    
-  end
-  
-end