snusnu-dm-accepts_nested_attributes 0.0.1 → 0.0.2

data/Manifest.txt

@@ -10,13 +10,17 @@ lib/dm-accepts_nested_attributes/associations.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/README.textile

@@ -8,6 +8,32 @@ For more information on the progress, have a look at this README and also at
 "this article":http://sick.snusnu.info/2009/04/08/dm-accepts_nested_attributes/ on my blog, where I will try to comment on the
 development (problems).
 
+h2. Current limitations
+
+Interaction with @dm-validations@ is actually possible but not very well specced atm. I added @not null@
+constraints to all spec fixtures for now, but no other custom validations. All specs still pass. However,
+as long as I'm not decided on where to put the specs for interaction with @dm-validations@ (most probably
+inside @dm-validations@ would be the right place for these), I won't write many more specs for these scenarios,
+since it's very hard to decide where to stop, once I start writing some.
+
+Currently, the creation of the record together with all its join models, is not handled inside a transaction.
+This must definitely change! As soon as I find out why my initial experiments with transactions consistently
+yielded _no such table errors_ while migrating the specsuite (see "this pastie":http://pastie.org/446060), I
+will do my best to add this feature.
+
+h2. TODO
+
+* use transactions
+* update README to include more complete usecases
+* specs for custom validations (dm-validations in general)
+* specs for adding errors to the parent objects
+* reorganize specs and fix bugs
+* Adapt to datamapper/next
+
+h2. Implementation details
+
+This section mainly serves as a place for me to take notes during development.
+
 h3. Why isn't this implemented as options on association declarations?
 
 * I somehow like the declarative style of @accepts_nested_attributes_for@ better. it jumps out immediately.
@@ -243,8 +269,3 @@ DataMapper::NestedAttributes Person.has(n, :projects, :through => :project_membe
 - should not allow to delete an existing project via Person#projects_attributes
 </code>
 </pre>
-
-h2. TODO
-
-* add more specs and fix bugs
-* Adapt to datamapper/next

data/lib/dm-accepts_nested_attributes/nested_attributes.rb

@@ -9,9 +9,14 @@ module DataMapper
     
     module ClassMethods
       
-      # Defines an attributes writer for the specified association(s). If you
-      # are using <tt>attr_protected</tt> or <tt>attr_accessible</tt>, then you
-      # will need to add the attribute writer to the allowed list.
+      # Defines an attributes reader and writer for the specified association(s).
+      # If you are using <tt>attr_protected</tt> or <tt>attr_accessible</tt>,
+      # then you will need to add the attribute writer to the allowed list.
+      #
+      # After any params are passed to the attributes writer they are available
+      # via the attributes reader (they are stored in an instance variable of
+      # the same name). The attributes reader returns nil if the attributes
+      # writer has not been called.
       #
       # Supported options:
       # [:allow_destroy]
@@ -26,8 +31,10 @@ module DataMapper
       # do not have a <tt>_delete</tt> that evaluates to true.
       #
       # Examples:
+      # # creates avatar_attributes
       # # creates avatar_attributes=
       # accepts_nested_attributes_for :avatar, :reject_if => proc { |attributes| attributes['name'].blank? }
+      # # creates avatar_attributes  and posts_attributes
       # # creates avatar_attributes= and posts_attributes=
       # accepts_nested_attributes_for :avatar, :posts, :allow_destroy => true
       def accepts_nested_attributes_for(association_name, options = {})
@@ -56,7 +63,12 @@ module DataMapper
         
         class_eval %{
           
+          def #{association_name}_attributes
+            @#{association_name}_attributes
+          end
+          
           def #{association_name}_attributes=(attributes)
+            @#{association_name}_attributes = attributes
             assign_nested_attributes_for_#{type}_association(:#{association_name}, attributes, #{options[:allow_destroy]})
           end
           
@@ -141,6 +153,94 @@ module DataMapper
     
     # instance methods
     
+    
+    if ::DataMapper.const_defined?('Validate')
+      
+      # NOTE: 
+      # overwriting Resource#save like this breaks the before(:save) hook stack
+      # this hopefully is no problem, since the current implementation doesn't rely on
+      # a before(:save) hook, but rather overwrites this hook with a no-op, and adds
+      # the desired behavior via overwriting Resource#save directly. I'd really appreciate
+      # any ideas for doing this differently, though. Anyways, I'm not really sure if this
+      # is the right approach. I don't even know if it works with custom validations,
+      # or maybe breaks other things. It's also really not well specced at all atm.
+      # Use at your own risk :-)
+      
+      def save(context = :default)
+        
+        # -----------------------------------------------------------------
+        #              ORIGINAL CODE from Resource#save
+        # -----------------------------------------------------------------
+        #
+        # associations_saved = false
+        # child_associations.each { |a| associations_saved |= a.save }
+        # 
+        # saved = new_record? ? create : update
+        # 
+        # if saved
+        #   original_values.clear
+        # end
+        # 
+        # parent_associations.each { |a| associations_saved |= a.save }
+        # 
+        # # We should return true if the model (or any of its associations)
+        # # were saved.
+        # (saved | associations_saved) == true
+        #
+        # -----------------------------------------------------------------
+        
+        
+        return super if context.nil? # preserve save! behavior
+        
+        associations_saved = false
+        
+        child_associations.each do |a|
+          
+          if a.respond_to?(:valid?)
+            a.errors.each { |e| self.errors.add(:general, e) } unless a.valid?(context)
+          else
+            self.errors.add(:general, "child association is missing")
+          end
+          
+          associations_saved |= a.save
+          
+        end
+        
+        saved = self.valid? && (new_record? ? create : update)
+        
+        if saved
+          original_values.clear
+        end
+        
+        parent_associations.each do |a|
+          
+          if a.respond_to?(:each) 
+            a.each do |r|
+              r.errors.each { |e| self.errors.add(:general, e) } unless r.valid?(context)
+            end
+          else                  
+            a.errors.each { |e| self.errors.add(:general, e) } unless a.valid?(context)
+          end
+          
+          associations_saved |= a.save
+          
+        end
+        
+        (saved | associations_saved) == true
+        
+      end
+      
+      # everything works the same if this method isn't overwritten with a no-op
+      # however, i suspect that this is the case because the registered before(:save) hook
+      # somehow gets lost when overwriting Resource#save here in this module.
+      # I'll leave it in for now, to make the purpose clear
+      
+      def check_validations(context = :default)
+        true # no-op, validations are checked inside #save
+      end
+      
+    end
+    
     # returns nil if no resource has been associated yet
     def associated_instance_get(association_name, repository = :default)
       send(self.class.association_for_name(association_name, repository).name)
@@ -252,7 +352,7 @@ module DataMapper
       # do what's done in dm-core/specs/integration/association_through_spec.rb
       
       # explicitly build the join entry and assign it to the join association
-      join_entry = Extlib::Inflection.constantize(Extlib::Inflection.classify(association.name)).new
+      join_entry = self.class.associated_model_for_name(association.name).new
       self.send(association.name) << join_entry
       self.save
       # explicitly build the child entry and assign the join entry to its join association

data/lib/dm-accepts_nested_attributes/version.rb

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

data/spec/fixtures/photo.rb

@@ -0,0 +1,9 @@
+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/profile.rb

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

data/spec/fixtures/project_membership.rb

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

data/spec/fixtures/tag.rb

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,10 @@
+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/fixtures/task.rb

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

data/spec/integration/belongs_to_spec.rb

@@ -7,7 +7,6 @@ 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.person_attributes = { :name => 'Martin' }
       @profile.get_person.should_not be_nil
       @profile.get_person.should be_new_record
     end
@@ -33,8 +32,8 @@ describe DataMapper::NestedAttributes do
     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
-      Profile.all.size.should == 1
+      @profile.save # fails because of validations (not null on belongs_to)
+      Profile.all.size.should == 0
       Person.all.size.should == 0
     end
     
@@ -112,7 +111,19 @@ describe DataMapper::NestedAttributes do
       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
@@ -127,6 +138,7 @@ describe DataMapper::NestedAttributes do
       
       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
       
@@ -201,4 +213,4 @@ describe DataMapper::NestedAttributes do
 
   end
   
-end
+end

data/spec/integration/has_1_spec.rb

@@ -101,6 +101,18 @@ describe DataMapper::NestedAttributes do
     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
     
@@ -114,6 +126,7 @@ describe DataMapper::NestedAttributes do
     
       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
         
@@ -190,4 +203,4 @@ describe DataMapper::NestedAttributes do
   
   end
   
-end
+end

data/spec/integration/has_n_spec.rb

@@ -91,6 +91,18 @@ describe DataMapper::NestedAttributes do
     end
     
   end
+
+  describe "every accessible has(n) association with a nested attributes reader", :shared => true do
+
+    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 "Project.has(n, :tasks)" do
   
@@ -104,6 +116,7 @@ describe DataMapper::NestedAttributes do
       
       it_should_behave_like "every accessible has(n) association with no reject_if proc"
       it_should_behave_like "every accessible has(n) association with :allow_destroy => false"
+      it_should_behave_like "every accessible has(n) association with a nested attributes reader"
       
     end
       
@@ -178,4 +191,4 @@ describe DataMapper::NestedAttributes do
     
   end
   
-end
+end

data/spec/integration/has_n_through_renamed_spec.rb

@@ -0,0 +1,214 @@
+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

data/spec/integration/has_n_through_spec.rb

@@ -110,6 +110,18 @@ describe DataMapper::NestedAttributes do
     end
     
   end
+
+  describe "every accessible has(n, :through) association with a nested attributes reader", :shared => true do
+
+    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 "Person.has(n, :projects, :through => :project_memberships)" do
   
@@ -123,6 +135,7 @@ describe DataMapper::NestedAttributes do
       
       it_should_behave_like "every accessible has(n, :through) association with no reject_if proc"
       it_should_behave_like "every accessible has(n, :through) association with :allow_destroy => false"
+      it_should_behave_like "every accessible has(n, :through) association with a nested attributes reader"
       
     end
       
@@ -197,4 +210,5 @@ describe DataMapper::NestedAttributes do
     
   end
   
-end
+end
+

data/spec/shared/rspec_tmbundle_support.rb

@@ -23,7 +23,7 @@ module RSpecTmBundleHelpers
     end
   end
   
-  def puth(html)
+  def puth(html = nil)
     print "#{h(html)}<br />"
   end
   

data/spec/spec_helper.rb

@@ -13,8 +13,8 @@ require 'dm-validations'
 require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-accepts_nested_attributes'
  
 ENV["SQLITE3_SPEC_URI"]  ||= 'sqlite3::memory:'
-ENV["MYSQL_SPEC_URI"]    ||= 'mysql://localhost/dm_core_test'
-ENV["POSTGRES_SPEC_URI"] ||= 'postgres://postgres@localhost/dm_more_test'
+ENV["MYSQL_SPEC_URI"]    ||= 'mysql://localhost/dm-accepts_nested_attributes_test'
+ENV["POSTGRES_SPEC_URI"] ||= 'postgres://postgres@localhost/dm-accepts_nested_attributes_test'
  
  
 def setup_adapter(name, default_uri = nil)
@@ -30,13 +30,6 @@ def setup_adapter(name, default_uri = nil)
     false
   end
 end
- 
-ENV['ADAPTER'] ||= 'sqlite3'
-
- 
-setup_adapter(:default)
-Dir[Pathname(__FILE__).dirname.to_s + "/fixtures/**/*.rb"].each { |rb| require(rb) }
-
 
 # -----------------------------------------------
 # support for nice html output in rspec tmbundle
@@ -50,9 +43,14 @@ if USE_TEXTMATE_RSPEC_BUNDLE
 
   # use the tmbundle logger
   RSpecTmBundleHelpers::TextmateRspecLogger.new(STDOUT, :off)
+  
 
   class Object
     include RSpecTmBundleHelpers
   end
 
-end
+end
+
+ENV['ADAPTER'] ||= 'sqlite3'
+setup_adapter(:default)
+Dir[Pathname(__FILE__).dirname.to_s + "/fixtures/**/*.rb"].each { |rb| require(rb) }

data/spec/unit/accepts_nested_attributes_for_spec.rb

@@ -181,6 +181,14 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
           @model.autosave_associations[@association].should == { :allow_destroy => false }
         end
         
+        it "should create a \#{association_name}_attributes instance reader" do
+          p = @model.new
+          p.respond_to?("#{@association}_attributes").should be_false
+          @model.accepts_nested_attributes_for @association
+          p = @model.new
+          p.respond_to?("#{@association}_attributes").should be_true
+        end
+        
         it "should create a \#{association_name}_attributes instance writer" do
           p = @model.new
           p.respond_to?("#{@association}_attributes=").should be_false
@@ -209,6 +217,14 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
           @model.autosave_associations[@association].should == { :allow_destroy => false }
         end
         
+        it "should create a \#{association_name}_attributes instance reader" do
+          p = @model.new
+          p.respond_to?("#{@association}_attributes").should be_false
+          @model.accepts_nested_attributes_for @association, {}
+          p = @model.new
+          p.respond_to?("#{@association}_attributes").should be_true
+        end
+        
         it "should create a \#{association_name}_attributes instance writer" do
           p = @model.new
           p.respond_to?("#{@association}_attributes=").should be_false
@@ -231,6 +247,14 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
           @model.autosave_associations[@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
+          p = @model.new
+          p.respond_to?("#{@association}_attributes").should be_false
+        end
+        
         it "should not create a \#{association_name}_attributes instance writer" do
           p = @model.new
           p.respond_to?("#{@association}_attributes=").should be_false
@@ -277,9 +301,17 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
           @model.reject_new_nested_attributes_proc_for(@association).should be_kind_of(Proc)
         end
         
+        it "should create a \#{association_name}_attributes instance reader" do
+          p = @model.new
+          p.respond_to?("#{@association}_attributes").should be_false
+          @model.accepts_nested_attributes_for @association, :allow_destroy => true
+          p = @model.new
+          p.respond_to?("#{@association}_attributes=").should be_true
+        end
+        
         it "should create a \#{association_name}_attributes instance writer" do
           p = @model.new
-          p.respond_to?("#{@association}_attributes=").should be_false
+          p.respond_to?("#{@association}_attributes").should be_false
           @model.accepts_nested_attributes_for @association, :allow_destroy => true
           p = @model.new
           p.respond_to?("#{@association}_attributes=").should be_true
@@ -451,4 +483,4 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
     
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: snusnu-dm-accepts_nested_attributes
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - "Martin Gamsj\xC3\xA4ger"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,13 +55,17 @@ files:
 - 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