dm-accepts_nested_attributes 0.12.0 → 1.0.0.rc1

data/.gitignore

@@ -23,4 +23,7 @@ _Yardoc
 */ri
 measurements
 tmp
+.bundle
+Gemfile.local
+Gemfile.lock
 

data/Gemfile

@@ -0,0 +1,145 @@
+# If you're working on more than one datamapper gem at a time, then it's
+# recommended to create a local Gemfile and use this instead of the git
+# sources. This will make sure that you are  developing against your
+# other local datamapper sources that you currently work on. Gemfile.local
+# will behave identically to the standard Gemfile apart from the fact that
+# it fetches the datamapper gems from local paths. This means that you can use
+# the same environment variables, like ADAPTER(S) or PLUGIN(S) when running
+# bundle commands. Gemfile.local is added to .gitignore, so you don't need to
+# worry about accidentally checking local development paths into git.
+# In order to create a local Gemfile, all you need to do is run:
+#
+#   bundle exec rake local_gemfile
+#
+# This will give you a Gemfile.local file that points to your local clones of
+# the various datamapper gems. It's assumed that all datamapper repo clones
+# reside in the same directory. You can use the Gemfile.local like so for
+# running any bundle command:
+#
+#   BUNDLE_GEMFILE=Gemfile.local bundle foo
+#
+# You can also specify which adapter(s) should be part of the bundle by setting
+# an environment variable. This of course also works when using the Gemfile.local
+#
+#   bundle foo                        # dm-sqlite-adapter
+#   ADAPTER=mysql bundle foo          # dm-mysql-adapter
+#   ADAPTERS=sqlite,mysql bundle foo  # dm-sqlite-adapter and dm-mysql-adapter
+#
+# Of course you can also use the ADAPTER(S) variable when using the Gemfile.local
+# and running specs against selected adapters.
+#
+# For easily working with adapters supported on your machine, it's recommended
+# that you first install all adapters that you are planning to use or work on
+# by doing something like
+#
+#   ADAPTERS=sqlite,mysql,postgres bundle install
+#
+# This will clone the various repositories and make them available to bundler.
+# Once you have them installed you can easily switch between adapters for the
+# various development tasks. Running something like
+#
+#   ADAPTER=mysql bundle exec rake spec
+#
+# will make sure that the dm-mysql-adapter is part of the bundle, and will be used
+# when running the specs.
+#
+# You can also specify which plugin(s) should be part of the bundle by setting
+# an environment variable. This also works when using the Gemfile.local
+#
+#   bundle foo                                 # dm-migrations
+#   PLUGINS=dm-validations bundle foo          # dm-migrations and dm-validations
+#   PLUGINS=dm-validations,dm-types bundle foo # dm-migrations, dm-validations and dm-types
+#
+# Of course you can combine the PLUGIN(S) and ADAPTER(S) env vars to run specs
+# for certain adapter/plugin combinations.
+#
+# Finally, to speed up running specs and other tasks, it's recommended to run
+#
+#   bundle lock
+#
+# after running 'bundle install' for the first time. This will make 'bundle exec' run
+# a lot faster compared to the unlocked version. With an unlocked bundle you would
+# typically just run 'bundle install' from time to time to fetch the latest sources from
+# upstream. When you locked your bundle, you need to run
+#
+#   bundle install --relock
+#
+# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
+# is added to the .gitignore file, so you don't need to worry about accidentally checking
+# it into version control.
+
+source 'http://rubygems.org'
+
+DATAMAPPER = 'git://github.com/datamapper'
+DM_VERSION = '~> 1.0.0.rc1'
+
+
+group :runtime do # Runtime dependencies (as in the gemspec)
+
+  if ENV['EXTLIB']
+    gem 'extlib',        '~> 0.9.15',      :git => "#{DATAMAPPER}/extlib.git"
+  else
+    gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+  end
+
+  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+
+end
+
+group(:development) do # Development dependencies (as in the gemspec)
+
+  gem 'dm-validations',  DM_VERSION, :git => "#{DATAMAPPER}/dm-validations.git"
+  gem 'dm-constraints',  DM_VERSION, :git => "#{DATAMAPPER}/dm-constraints.git"
+
+  gem 'rake',            '~> 0.8.7'
+  gem 'rspec',           '~> 1.3'
+  gem 'yard',            '~> 0.5'
+  gem 'rcov',            '~> 0.9.7'
+  gem 'jeweler',         '~> 1.4'
+
+end
+
+group :quality do # These gems contain rake tasks that check the quality of the source code
+
+  gem 'yardstick',       '~> 0.1'
+  gem 'metric_fu',       '~> 1.3'
+  gem 'reek',            '~> 1.2.7'
+  gem 'roodi',           '~> 2.1'
+
+end
+
+group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+
+  adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
+  adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
+
+  unless adapters.empty?
+
+    DO_VERSION     = '~> 0.10.2'
+    DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+
+    gem 'data_objects',  DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+
+    adapters.each do |adapter|
+      if DM_DO_ADAPTERS.any? { |dm_do_adapter| dm_do_adapter =~ /#{adapter}/  }
+        adapter = 'sqlite3' if adapter == 'sqlite'
+        gem "do_#{adapter}", DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+      end
+    end
+
+    gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+
+    adapters.each do |adapter|
+      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
+    end
+
+  end
+
+  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+  plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
+
+  plugins.each do |plugin|
+    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+  end
+
+end

data/Rakefile

@@ -1,35 +1,30 @@
 require 'rubygems'
 require 'rake'
 
-require File.expand_path('../lib/dm-accepts_nested_attributes/version', __FILE__)
-
-FileList['tasks/**/*.rake'].each { |task| load task }
-
 begin
 
-  gem 'jeweler', '~> 1.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
 
-    gem.version     = DataMapper::NestedAttributes::VERSION
-
     gem.name        = 'dm-accepts_nested_attributes'
     gem.summary     = 'Nested model assignment for datamapper'
     gem.description = 'A datamapper plugin that allows nested model assignment like activerecord.'
     gem.email       = 'gamsnjaga [a] gmail [d] com'
     gem.homepage    = 'http://github.com/snusnu/dm-accepts_nested_attributes'
-    gem.authors     = [ 'Martin Gamsjaeger' ]
+    gem.authors     = [ 'Martin Gamsjaeger (snusnu)' ]
 
-    gem.add_dependency 'dm-core', '~> 0.10.2'
+    gem.add_dependency             'dm-core', '~> 1.0.0.rc1'
 
-    gem.add_development_dependency 'rspec', '~> 1.2.9'
-    gem.add_development_dependency 'yard',  '~> 0.4.0'
+    gem.add_development_dependency 'rspec',   '~> 1.3'
+    gem.add_development_dependency 'yard',    '~> 0.5'
 
   end
 
   Jeweler::GemcutterTasks.new
 
+  FileList['tasks/**/*.rake'].each { |task| import task }
+
 rescue LoadError
   puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end

data/VERSION

@@ -0,0 +1 @@
+1.0.0.rc1

data/dm-accepts_nested_attributes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-accepts_nested_attributes}
-  s.version = "0.12.0"
+  s.version = "1.0.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Martin Gamsjaeger"]
-  s.date = %q{2010-01-23}
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Martin Gamsjaeger (snusnu)"]
+  s.date = %q{2010-05-20}
   s.description = %q{A datamapper plugin that allows nested model assignment like activerecord.}
   s.email = %q{gamsnjaga [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -20,16 +20,16 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "CHANGELOG",
+     "Gemfile",
      "LICENSE",
      "README.textile",
      "Rakefile",
      "TODO",
+     "VERSION",
      "dm-accepts_nested_attributes.gemspec",
      "lib/dm-accepts_nested_attributes.rb",
-     "lib/dm-accepts_nested_attributes/error_collecting.rb",
      "lib/dm-accepts_nested_attributes/model.rb",
      "lib/dm-accepts_nested_attributes/resource.rb",
-     "lib/dm-accepts_nested_attributes/transactional_save.rb",
      "lib/dm-accepts_nested_attributes/version.rb",
      "spec/accepts_nested_attributes_for_spec.rb",
      "spec/many_to_many_spec.rb",
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb",
      "tasks/changelog.rake",
      "tasks/ci.rake",
+     "tasks/local_gemfile.rake",
      "tasks/metrics.rake",
      "tasks/spec.rake",
      "tasks/yard.rake",
@@ -53,7 +54,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/snusnu/dm-accepts_nested_attributes}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Nested model assignment for datamapper}
   s.test_files = [
     "spec/accepts_nested_attributes_for_spec.rb",
@@ -72,19 +73,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<yard>, ["~> 0.5"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<yard>, ["~> 0.5"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc1"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<yard>, ["~> 0.5"])
   end
 end
 

data/lib/dm-accepts_nested_attributes/model.rb

@@ -56,16 +56,6 @@ module DataMapper
 
         include ::DataMapper::NestedAttributes::Resource
 
-        # TODO i wonder if this is the best place here?
-        # the transactional save behavior is definitely not needed for all resources,
-        # but it's necessary for resources that accept nested attributes
-        # FIXME this leads to weird "no such table" errors when specs are run
-        add_transactional_save_behavior # TODO if repository.adapter.supports_transactions?
-
-        # TODO make this do something
-        # it's only here now to remind me that this is probably the best place to put it
-        add_error_collection_behavior if DataMapper.const_defined?('Validate')
-
         type = relationship.max > 1 ? :collection : :resource
 
         define_method "#{association_name}_attributes" do
@@ -87,34 +77,6 @@ module DataMapper
 
       private
 
-      ##
-      # Provides a hook to include or disable customized transactional save behavior.
-      # Override this method to customize the implementation or disable it altogether.
-      # The current implementation in @see DataMapper::NestedAttributes::TransactionalSave
-      # 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 returned false
-      #
-      # @return Not specified
-      #
-      def add_transactional_save_behavior
-        require 'dm-accepts_nested_attributes/transactional_save'
-        include ::DataMapper::NestedAttributes::TransactionalSave
-      end
-
-      ##
-      # Provides a hook to include or disable customized error collecting behavior.
-      # Overwrite this method to customize the implementation or disable it altogether.
-      # The current implementation in @see DataMapper::NestedAttributes::ValidationErrorCollecting
-      # simply attaches all errors of related resources to the object that was initially saved.
-      #
-      # @return Not specified
-      #
-      def add_error_collection_behavior
-        require 'dm-accepts_nested_attributes/error_collecting'
-        include ::DataMapper::NestedAttributes::ValidationErrorCollecting
-      end
-
       ##
       # Checks options passed to @see accepts_nested_attributes_for
       # If any of the given options is invalid, this method will raise

data/spec/accepts_nested_attributes_for_spec.rb

@@ -4,7 +4,7 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
 
   FIXTURES = <<-RUBY
 
-    class Branch
+    class ::Branch
       include DataMapper::Resource
       property :id, Serial
       has 1, :shop
@@ -12,20 +12,20 @@ describe "DataMapper::Model.accepts_nested_attributes_for" do
       has n, :bookings, :through => :items
     end
 
-    class Shop
+    class ::Shop
       include DataMapper::Resource
       property :id,        Serial
       belongs_to :branch
     end
 
-    class Item
+    class ::Item
       include DataMapper::Resource
       property :id,        Serial
       belongs_to :branch
       has n, :bookings
     end
 
-    class Booking
+    class ::Booking
       include DataMapper::Resource
       property :id,      Serial
       belongs_to :item

data/spec/many_to_many_spec.rb

@@ -4,7 +4,7 @@ describe "Person.has(n, :projects, :through => :project_memberships);" do
 
   before(:all) do
 
-    class Person
+    class ::Person
 
       include DataMapper::Resource
       extend ConstraintSupport
@@ -18,7 +18,7 @@ describe "Person.has(n, :projects, :through => :project_memberships);" do
 
     end
 
-    class Project
+    class ::Project
 
       include DataMapper::Resource
       extend ConstraintSupport
@@ -32,7 +32,7 @@ describe "Person.has(n, :projects, :through => :project_memberships);" do
 
     end
 
-    class ProjectMembership
+    class ::ProjectMembership
 
       include DataMapper::Resource
 
@@ -43,7 +43,7 @@ describe "Person.has(n, :projects, :through => :project_memberships);" do
 
     end
 
-    class Task
+    class ::Task
 
       include DataMapper::Resource
 
@@ -54,7 +54,7 @@ describe "Person.has(n, :projects, :through => :project_memberships);" do
 
     end
 
-    DataMapper.auto_upgrade!
+    DataMapper.auto_migrate!
 
   end
 

data/spec/many_to_one_spec.rb

@@ -4,7 +4,7 @@ describe "Profile.belongs_to(:person);" do
 
   before(:all) do
 
-    class Person
+    class ::Person
 
       include DataMapper::Resource
       extend ConstraintSupport
@@ -16,7 +16,7 @@ describe "Profile.belongs_to(:person);" do
 
     end
 
-    class Profile
+    class ::Profile
 
       include DataMapper::Resource
 
@@ -28,7 +28,7 @@ describe "Profile.belongs_to(:person);" do
 
     end
 
-    DataMapper.auto_upgrade!
+    DataMapper.auto_migrate!
 
   end
 

data/spec/one_to_many_spec.rb

@@ -4,7 +4,7 @@ describe "Project.has(n, :tasks);" do
 
   before(:all) do
 
-    class Project
+    class ::Project
 
       include DataMapper::Resource
       extend ConstraintSupport
@@ -16,7 +16,7 @@ describe "Project.has(n, :tasks);" do
 
     end
 
-    class Task
+    class ::Task
 
       include DataMapper::Resource
 
@@ -27,7 +27,7 @@ describe "Project.has(n, :tasks);" do
 
     end
 
-    DataMapper.auto_upgrade!
+    DataMapper.auto_migrate!
 
   end
 

data/spec/one_to_one_spec.rb

@@ -4,7 +4,7 @@ describe "Person.has(1, :profile);" do
 
   before(:all) do
 
-    class Person
+    class ::Person
 
       include DataMapper::Resource
       extend ConstraintSupport
@@ -17,7 +17,7 @@ describe "Person.has(1, :profile);" do
 
     end
 
-    class Profile
+    class ::Profile
 
       include DataMapper::Resource
 
@@ -29,7 +29,7 @@ describe "Person.has(1, :profile);" do
 
     end
 
-    class Address
+    class ::Address
 
       include DataMapper::Resource
 
@@ -41,7 +41,7 @@ describe "Person.has(1, :profile);" do
 
     end
 
-    DataMapper.auto_upgrade!
+    DataMapper.auto_migrate!
 
   end
 

data/spec/shared/many_to_many_spec.rb

@@ -1,26 +1,28 @@
 describe "every accessible many_to_many 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
+    pending_if "#{DataMapper::Spec.adapter_name} doesn't support M2M", !HAS_M2M_SUPPORT do
+      Person.all.size.should            == 0
+      Project.all.size.should           == 0
+      ProjectMembership.all.size.should == 0
 
-    person = Person.create :name => 'snusnu'
-    project = Project.create(:name => 'dm-accepts_nested_attributes')
-    project_membership = ProjectMembership.create(:person => person, :project => project)
+      person = Person.create :name => 'snusnu'
+      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.all.size.should            == 1
+      Project.all.size.should           == 1
+      ProjectMembership.all.size.should == 1
 
-    person.projects_attributes = [{ :id => project.id, :name => 'still dm-accepts_nested_attributes' }]
-    person.save
+      person.projects_attributes = [{ :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
+      Person.all.size.should            == 1
+      ProjectMembership.all.size.should == 1
+      Project.all.size.should           == 1
 
-    Project.first.name.should == 'still dm-accepts_nested_attributes'
+      Project.first.name.should == 'still dm-accepts_nested_attributes'
+    end
   end
 
   it "should return the attributes written to Person#projects_attributes from the Person#projects_attributes reader" do
@@ -83,26 +85,6 @@ describe "every accessible many_to_many association with no reject_if proc", :sh
     Project.first.name.should == 'dm-accepts_nested_attributes'
   end
 
-  it "should perform atomic commits" do
-
-    person = Person.new :name => 'snusnu'
-    person.projects_attributes = [{ :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 = [{ :name => nil }]
-    person.save
-
-    Person.all.size.should            == 0
-    ProjectMembership.all.size.should == 0
-    Project.all.size.should           == 0
-
-  end
-
 end
 
 describe "every accessible many_to_many association with :allow_destroy => false", :shared => true do
@@ -135,28 +117,30 @@ end
 describe "every accessible many_to_many association with :allow_destroy => true", :shared => true do
 
   it "should allow to delete an existing project via Person#projects_attributes" do
-    person = Person.create :name => 'snusnu'
+    pending_if "#{DataMapper::Spec.adapter_name} doesn't support M2M", !HAS_M2M_SUPPORT do
+      person = Person.create :name => 'snusnu'
 
-    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)
+      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 == 2
-    Project.all.size.should           == 2
+      Person.all.size.should            == 1
+      ProjectMembership.all.size.should == 2
+      Project.all.size.should           == 2
 
-    person.projects_attributes = [{ :id => project_1.id, :_delete => true }]
+      person.projects_attributes = [{ :id => project_1.id, :_delete => true }]
 
-    Person.all.size.should            == 1
-    ProjectMembership.all.size.should == 2
-    Project.all.size.should           == 2
+      Person.all.size.should            == 1
+      ProjectMembership.all.size.should == 2
+      Project.all.size.should           == 2
 
-    person.save
+      person.save
 
-    Person.all.size.should            == 1
-    ProjectMembership.all.size.should == 1
-    Project.all.size.should           == 1
+      Person.all.size.should            == 1
+      ProjectMembership.all.size.should == 1
+      Project.all.size.should           == 1
+    end
   end
 
 end

data/spec/shared/many_to_one_spec.rb

@@ -21,27 +21,6 @@ describe "every accessible many_to_one association", :shared => true do
     Person.first.name.should == 'Martin Gamsjaeger'
   end
 
-  it "should perform atomic commits" do
-    Profile.all.size.should == 0
-    Person.all.size.should  == 0
-
-    # related resource is invalid
-    profile = Profile.new :nick => 'snusnu'
-    profile.person_attributes = { :name => nil }
-    profile.save.should be_false
-
-    Profile.all.size.should == 0
-    Person.all.size.should  == 0
-
-    # self is invalid
-    profile.nick = nil
-    profile.person_attributes = { :name => 'Martin' }
-    profile.save.should be_false
-
-    Profile.all.size.should == 0
-    Person.all.size.should  == 0
-  end
-
   it "should return the attributes written to Profile#person_attributes from the Profile#person_attributes reader" do
     profile = Profile.new :nick => 'snusnu'
     profile.person_attributes.should be_nil
@@ -63,10 +42,11 @@ describe "every accessible many_to_one association with a valid reject_if proc",
     Profile.all.size.should == 0
     Person.all.size.should  == 0
 
-    profile.save.should be_false
-
-    Profile.all.size.should == 0
-    Person.all.size.should  == 0
+    begin
+      profile.save.should be(false)
+    rescue
+      # swallow native FK errors which is basically like expecting save to be false
+    end
   end
 
 end

data/spec/shared/one_to_many_spec.rb

@@ -61,27 +61,6 @@ describe "every accessible one_to_many association with no reject_if proc", :sha
     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 = Project.new :name => nil
-    project.tasks_attributes = [{ :name => 'write specs' }]
-    project.save.should be_false
-
-    Project.all.size.should == 0
-    Task.all.size.should    == 0
-
-    # related resource is invalid
-    project.name = 'dm-accepts_nested_attributes'
-    project.tasks_attributes = [{ :name => nil }] # will fail because of validations
-    project.save
-
-    Project.all.size.should == 0
-    Task.all.size.should    == 0
-  end
-
 end
 
 describe "every accessible one_to_many association with :allow_destroy => false", :shared => true do

data/spec/shared/one_to_one_spec.rb

@@ -60,25 +60,6 @@ describe "every accessible one_to_one association with no reject_if proc", :shar
     Profile.first.nick.should == 'snusnu'
   end
 
-  it "should perform atomic commits" do
-
-    # related resource is invalid
-    person = Person.new :name => 'Martin'
-    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 one_to_one association with :allow_destroy => false", :shared => true do

data/spec/spec_helper.rb

@@ -1,44 +1,16 @@
-require 'rubygems'
-require 'pathname'
-require 'spec'
+require 'dm-core/spec/setup'
+require 'dm-core/spec/lib/pending_helpers'
 
-# require the plugin
 require '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'
-require 'dm-constraints'
-
-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'
-
-
-def setup_adapter(name, default_uri = nil)
-  begin
-    DataMapper.setup(name, ENV["#{ENV['ADAPTER'].to_s.upcase}_SPEC_URI"] || default_uri)
-    Object.const_set('ADAPTER', ENV['ADAPTER'].to_sym) if name.to_s == ENV['ADAPTER']
-    true
-  rescue Exception => e
-    if name.to_s == ENV['ADAPTER']
-      Object.const_set('ADAPTER', nil)
-      warn "Could not load do_#{name}: #{e}"
-    end
-    false
-  end
-end
-
-ENV['ADAPTER'] ||= 'mysql'
-setup_adapter(:default)
-
-
 require 'shared/many_to_many_spec'
 require 'shared/many_to_one_spec'
 require 'shared/one_to_many_spec'
 require 'shared/one_to_one_spec'
 
+DataMapper::Spec.setup
+
+HAS_M2M_SUPPORT = !%w[in_memory yaml].include?(DataMapper::Spec.adapter_name)
 
 module ConstraintSupport
 
@@ -51,3 +23,15 @@ module ConstraintSupport
   end
 
 end
+
+Spec::Runner.configure do |config|
+
+  config.include(DataMapper::Spec::PendingHelpers)
+
+  config.after(:suite) do
+    if DataMapper.respond_to?(:auto_migrate_down!, true)
+      DataMapper.send(:auto_migrate_down!, DataMapper::Spec.adapter.name)
+    end
+  end
+
+end

data/tasks/local_gemfile.rake

@@ -0,0 +1,18 @@
+desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
+task :local_gemfile do |t|
+
+  root              = Pathname(__FILE__).dirname.parent
+  datamapper        = root.parent
+
+  source_regex     = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
+  gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
+
+  root.join('Gemfile.local').open('w') do |f|
+    root.join('Gemfile').open.each do |line|
+      line.sub!(source_regex,     "DATAMAPPER = '#{datamapper}'")
+      line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
+      f.puts line
+    end
+  end
+
+end

data/tasks/spec.rake

@@ -19,7 +19,4 @@ RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
   rcov.threshold = 100
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,47 +1,71 @@
 --- !ruby/object:Gem::Specification 
 name: dm-accepts_nested_attributes
 version: !ruby/object:Gem::Version 
-  version: 0.12.0
+  hash: 144173629
+  prerelease: true
+  segments: 
+  - 1
+  - 0
+  - 0
+  - rc1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
-- Martin Gamsjaeger
+- Martin Gamsjaeger (snusnu)
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +01:00
+date: 2010-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
+        hash: 144173629
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc1
+        version: 1.0.0.rc1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
+  type: :development
+  version_requirements: *id003
 description: A datamapper plugin that allows nested model assignment like activerecord.
 email: gamsnjaga [a] gmail [d] com
 executables: []
@@ -55,16 +79,16 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README.textile
 - Rakefile
 - TODO
+- VERSION
 - dm-accepts_nested_attributes.gemspec
 - lib/dm-accepts_nested_attributes.rb
-- lib/dm-accepts_nested_attributes/error_collecting.rb
 - lib/dm-accepts_nested_attributes/model.rb
 - lib/dm-accepts_nested_attributes/resource.rb
-- lib/dm-accepts_nested_attributes/transactional_save.rb
 - lib/dm-accepts_nested_attributes/version.rb
 - spec/accepts_nested_attributes_for_spec.rb
 - spec/many_to_many_spec.rb
@@ -80,6 +104,7 @@ files:
 - spec/spec_helper.rb
 - tasks/changelog.rake
 - tasks/ci.rake
+- tasks/local_gemfile.rake
 - tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
@@ -94,21 +119,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Nested model assignment for datamapper

data/lib/dm-accepts_nested_attributes/error_collecting.rb

@@ -1,35 +0,0 @@
-module DataMapper
-  module NestedAttributes
-
-    module ValidationErrorCollecting
-
-      # collect errors on parent associations
-      def before_save_parent_association(association, context)
-        if association.respond_to?(:each)
-          association.each do |r|
-            unless r.valid?(context)
-              r.errors.each { |e| self.errors.add(:general, e) }
-            end
-          end
-        else
-          unless association.valid?(context)
-            association.errors.each { |e| self.errors.add(:general, e) }
-          end
-        end
-      end
-
-      # collect errors on child associations
-      def before_save_child_association(association, context)
-        if association.respond_to?(:valid?)
-          unless association.valid?(context)
-            association.errors.each { |e| self.errors.add(:general, e) }
-          end
-        else
-          self.errors.add(:general, "child association is missing")
-        end
-      end
-
-    end
-
-  end
-end

data/lib/dm-accepts_nested_attributes/transactional_save.rb

@@ -1,24 +0,0 @@
-module DataMapper
-  module NestedAttributes
-
-    module TransactionalSave
-
-      ##
-      # 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 [Boolean]
-      #   true if all related resources were saved properly
-      #
-      def save
-        transaction { |t| super || t.rollback && false }
-      end
-
-    end
-
-  end
-end