dm-constraints 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc2'
+DM_VERSION = '~> 1.0.0.rc3'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Dirkjan Bussink
+Copyright (c) 2010 Dirkjan Bussink
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -10,13 +10,13 @@ begin
     gem.summary     = 'DataMapper plugin constraining relationships'
     gem.description = gem.summary
     gem.email       = 'd.bussink [a] gmail [d] com'
-    gem.homepage    = 'http://github.com/datamapper/dm-more/tree/master/%s' % gem.name
+    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Dirkjan Bussink' ]
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core',       '~> 1.0.0.rc2'
-    gem.add_dependency 'dm-migrations', '~> 1.0.0.rc2'
+    gem.add_dependency 'dm-core',       '~> 1.0.0.rc3'
+    gem.add_dependency 'dm-migrations', '~> 1.0.0.rc3'
 
     gem.add_development_dependency 'rspec', '~> 1.3'
   end

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/dm-constraints.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-constraints}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirkjan Bussink"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-27}
   s.description = %q{DataMapper plugin constraining relationships}
   s.email = %q{d.bussink [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-constraints}
+  s.homepage = %q{http://github.com/datamapper/dm-constraints}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
@@ -68,17 +68,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-      s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.0.rc3"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-      s.add_dependency(%q<dm-migrations>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
-    s.add_dependency(%q<dm-migrations>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

data/lib/dm-constraints.rb

@@ -38,8 +38,8 @@ module DataMapper
     end
 
     def self.include_constraint_api
-      DataMapper::Repository.adapters.values.each do |adapter|
-        DataMapper::Adapters.include_constraint_api(ActiveSupport::Inflector.demodulize(adapter.class.name))
+      DataMapper::Adapters::AbstractAdapter.descendants.each do |adapter_class|
+        DataMapper::Adapters.include_constraint_api(ActiveSupport::Inflector.demodulize(adapter_class.name))
       end
     end
 
@@ -53,24 +53,22 @@ module DataMapper
       include DataMapper::Constraints::Adapters::AbstractAdapter
     end
 
-    extend Chainable
-
-    class << self
-
-      def include_constraint_api(const_name)
-        require constraint_extensions(const_name)
-        if Constraints::Adapters.const_defined?(const_name)
-          adapter = const_get(const_name)
-          adapter.send(:include, constraint_module(const_name))
-        end
-      rescue LoadError
-        # do nothing
+    def self.include_constraint_api(const_name)
+      require constraint_extensions(const_name)
+      if Constraints::Adapters.const_defined?(const_name)
+        adapter = const_get(const_name)
+        adapter.send(:include, constraint_module(const_name))
       end
+    rescue LoadError
+      # Silently ignore the fact that no adapter extensions could be required
+      # This means that the adapter in use doesn't support constraints
+    end
 
-      def constraint_module(const_name)
-        Constraints::Adapters.const_get(const_name)
-      end
+    def self.constraint_module(const_name)
+      Constraints::Adapters.const_get(const_name)
+    end
 
+    class << self
     private
 
       # @api private

data/spec/integration/constraints_spec.rb

@@ -92,12 +92,12 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
       end
 
       it 'should destroy the parent if there are no children in the association' do
-        @article.destroy.should be_true
+        @article.destroy.should be(true)
         @article.model.get(*@article.key).should be_nil
       end
 
       it 'the child should be destroyable' do
-        @revision.destroy.should be_true
+        @revision.destroy.should be(true)
         @revision.model.get(*@revision.key).should be_nil
       end
     end
@@ -112,12 +112,12 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
         end
 
         it 'should destroy the parent if there are no children in the association' do
-          @author.destroy.should be_true
+          @author.destroy.should be(true)
           @author.model.get(*@author.key).should be_nil
         end
 
         it 'should not destroy the parent if there are children in the association' do
-          @other_author.destroy.should be_false
+          @other_author.destroy.should be(false)
           @other_author.model.get(*@other_author.key).should_not be_nil
         end
       end
@@ -152,12 +152,12 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should not destroy the parent if there are children in the association' do
-            @article.destroy.should be_false
+            @article.destroy.should be(false)
             @article.model.get(*@article.key).should_not be_nil
           end
 
           it 'the child should be destroyable' do
-            @revision.destroy.should be_true
+            @revision.destroy.should be(true)
             @revision.model.get(*@revision.key).should be_nil
           end
         end
@@ -171,16 +171,16 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should destroy the parent if there are no children in the association' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @author.model.get(*@author.key).should be_nil
           end
 
           it 'should not destroy the parent if there are children in the association' do
-            @another_author.destroy.should be_false
+            @another_author.destroy.should be(false)
           end
 
           it 'the child should be destroyable' do
-            @comment.destroy.should be_true
+            @comment.destroy.should be(true)
             @comment.model.get(*@comment.key).should be_nil
           end
         end
@@ -197,18 +197,18 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should destroy the parent if there are no children in the association' do
-            @another_author.destroy.should be_true
+            @another_author.destroy.should be(true)
             @another_author.model.get(*@another_author.key).should be_nil
           end
 
           it 'should not destroy the parent if there are children in the association' do
             @author.articles.should_not == []
-            @author.destroy.should be_false
+            @author.destroy.should be(false)
           end
 
           it 'the child should be destroyable' do
             @article.authors.clear
-            @article.save.should be_true
+            @article.save.should be(true)
             @article.authors.should be_empty
           end
         end
@@ -244,18 +244,18 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should let the parent to be destroyed' do
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             @article.model.get(*@article.key).should be_nil
           end
 
           it 'should destroy the children' do
             revision = @article.revision
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             revision.model.get(*revision.key).should be_nil
           end
 
           it 'the child should be destroyable' do
-            @revision.destroy.should be_true
+            @revision.destroy.should be(true)
             @revision.model.get(*@revision.key).should be_nil
           end
         end
@@ -269,17 +269,17 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should let the parent to be destroyed' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @author.model.get(*@author.key).should be_nil
           end
 
           it 'should destroy the children' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @author.comments.all? { |comment| comment.should be_new }
           end
 
           it 'the child should be destroyable' do
-            @comment.destroy.should be_true
+            @comment.destroy.should be(true)
             @comment.model.get(*@comment.key).should be_nil
           end
         end
@@ -296,18 +296,18 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should let the parent to be destroyed' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @author.model.get(*@author.key).should be_nil
           end
 
           it 'should destroy the children' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @article.model.get(*@article.key).should be_nil
             @other_article.model.get(*@other_article.key).should be_nil
           end
 
           it 'the child should be destroyable' do
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             @article.model.get(*@article.key).should be_nil
           end
         end
@@ -343,18 +343,18 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should let the parent to be destroyed' do
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             @article.model.get(*@article.key).should be_nil
           end
 
           it 'should destroy the children' do
             revision = @article.revision
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             revision.model.get(*revision.key).should be_nil
           end
 
           it 'the child should be destroyable' do
-            @revision.destroy.should be_true
+            @revision.destroy.should be(true)
             @revision.model.get(*@revision.key).should be_nil
           end
         end
@@ -368,17 +368,17 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should let the parent to be destroyed' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @author.model.get(*@author.key).should be_nil
           end
 
           it 'should destroy the children' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @author.comments.all? { |comment| comment.should be_new }
           end
 
           it 'the child should be destroyable' do
-            @comment.destroy.should be_true
+            @comment.destroy.should be(true)
             @comment.model.get(*@comment.key).should be_nil
           end
         end
@@ -395,7 +395,7 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should destroy the parent and the children, too' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @author.model.get(*@author.key).should be_nil
 
             @article.model.get(*@article.key).should be_nil
@@ -403,7 +403,7 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'the child should be destroyable' do
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             @article.model.get(*@article.key).should be_nil
           end
         end
@@ -440,19 +440,19 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should let the parent to be destroyed' do
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             @article.model.get(*@article.key).should be_nil
           end
 
           it "should set the child's foreign_key id to nil" do
             revision = @article.revision
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             revision.article.should be_nil
             revision.model.get(*revision.key).article.should be_nil
           end
 
           it 'the child should be destroyable' do
-            @revision.destroy.should be_true
+            @revision.destroy.should be(true)
             @revision.model.get(*@revision.key).should be_nil
           end
         end
@@ -465,20 +465,20 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should let the parent to be destroyed' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @author.model.get(*@author.key).should be_nil
           end
 
           it 'should set the foreign_key ids of children to nil' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @author.comments.all? { |comment| comment.author.should be_nil }
           end
 
           it 'the children should be destroyable' do
-            @comment.destroy.should be_true
+            @comment.destroy.should be(true)
             @comment.model.get(*@comment.key).should be_nil
 
-            @other_comment.destroy.should be_true
+            @other_comment.destroy.should be(true)
             @other_comment.model.get(*@other_comment.key).should be_nil
           end
         end
@@ -514,17 +514,17 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should let the parent be destroyed' do
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             @article.model.get(*@article.key).should be_nil
           end
 
           it 'should let the children become orphan records' do
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             @revision.model.get(*@revision.key).article.should be_nil
           end
 
           it 'the child should be destroyable' do
-            @revision.destroy.should be_true
+            @revision.destroy.should be(true)
             @revision.model.get(*@revision.key).should be_nil
           end
         end
@@ -538,19 +538,19 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'should let the parent to be destroyed' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @author.model.get(*@author.key).should be_nil
           end
 
           it 'should let the children become orphan records' do
-            @author.destroy.should be_true
+            @author.destroy.should be(true)
             @comment.model.get(*@comment.key).author.should be_nil
             @other_comment.model.get(*@other_comment.key).author.should be_nil
           end
 
           it 'the children should be destroyable' do
-            @comment.destroy.should be_true
-            @other_comment.destroy.should be_true
+            @comment.destroy.should be(true)
+            @other_comment.destroy.should be(true)
             @other_comment.model.get(*@other_comment.key).should be_nil
           end
         end
@@ -567,7 +567,7 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
           end
 
           it 'the children should be destroyable' do
-            @article.destroy.should be_true
+            @article.destroy.should be(true)
             @article.model.get(*@article.key).should be_nil
           end
         end

data/spec/isolated/require_spec.rb

@@ -1,14 +1,14 @@
 shared_examples_for "require 'dm-constraints'" do
 
   it "should include the constraint api in the DataMapper namespace" do
-    DataMapper::Model.respond_to?(:auto_migrate_down_constraints!, true).should be_true
-    DataMapper::Model.respond_to?(:auto_migrate_up_constraints!,   true).should be_true
+    DataMapper::Model.respond_to?(:auto_migrate_down_constraints!, true).should be(true)
+    DataMapper::Model.respond_to?(:auto_migrate_up_constraints!,   true).should be(true)
   end
 
   it "should include the constraint api into the adapter" do
-    @adapter.respond_to?(:constraint_exists?             ).should be_true
-    @adapter.respond_to?(:create_relationship_constraint ).should be_true
-    @adapter.respond_to?(:destroy_relationship_constraint).should be_true
+    @adapter.respond_to?(:constraint_exists?             ).should be(true)
+    @adapter.respond_to?(:create_relationship_constraint ).should be(true)
+    @adapter.respond_to?(:destroy_relationship_constraint).should be(true)
   end
 
 end

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ Spec::Runner.configure do |config|
   config.extend(DataMapper::Spec::Helpers)
 
   config.before(:each) do
+    DataMapper.finalize
     DataMapper.auto_migrate!
   end
 

data/tasks/spec.rake

@@ -35,4 +35,7 @@ rescue LoadError
   end
 end
 
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
 task :default => :spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-constraints
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,13 +44,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -110,7 +110,7 @@ files:
 - tasks/yard.rake
 - tasks/yardstick.rake
 has_rdoc: true
-homepage: http://github.com/datamapper/dm-more/tree/master/dm-constraints
+homepage: http://github.com/datamapper/dm-constraints
 licenses: []
 
 post_install_message: