dm-constraints 1.1.0 → 1.2.0.rc1

data/spec/integration/constraints_spec.rb

@@ -78,10 +78,12 @@ describe 'DataMapper::Constraints', "(with #{DataMapper::Spec.adapter_name})" do
 
       supported_by :postgres, :mysql do
         it 'should not be able to create related objects with a failing foreign key constraint' do
-          jruby = Object.const_defined?('RUBY_ENGINE') ? RUBY_ENGINE == 'jruby' : false
+          jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
           pending_if 'JRuby throws a DataObjects::SQLError for integrity errors, which is wrong', jruby do
             article = Article.create(:title => 'Man on the Moon')
-            lambda { Comment.create(:body => 'So true!', :article_id => article.id + 1) }.should raise_error(DataObjects::IntegrityError)
+            lambda {
+              Comment.create(:body => 'So true!', :article_id => article.id + 1)
+            }.should raise_error(DataObjects::IntegrityError)
           end
         end
       end

data/spec/isolated/require_spec.rb

@@ -1,11 +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)
+  it "extends Model descendants with the constraint API" do
+    DataMapper::Model.descendants.should_not be_empty
+    DataMapper::Model.descendants.all? do |model|
+      model.respond_to?(:auto_migrate_constraints_down, true).should be(true)
+      model.respond_to?(:auto_migrate_constraints_up,   true).should be(true)
+    end
   end
 
-  it "should include the constraint api into the adapter" do
+  it "includes 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)

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-constraints
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  hash: 15424023
+  prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 0
+  - rc
+  - 1
+  version: 1.2.0.rc1
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -10,53 +17,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
-default_executable: 
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id001
+  requirement: *id001
+  name: dm-core
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   prerelease: false
-  version_requirements: *id002
+  requirement: *id002
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
-  type: :development
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   prerelease: false
-  version_requirements: *id003
+  requirement: *id003
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   prerelease: false
-  version_requirements: *id004
+  requirement: *id004
+  name: rspec
 description: DataMapper plugin constraining relationships
 email: d.bussink [a] gmail [d] com
 executables: []
@@ -73,17 +101,21 @@ files:
 - Rakefile
 - VERSION
 - dm-constraints.gemspec
+- lib/data_mapper/constraints/adapters/abstract_adapter.rb
+- lib/data_mapper/constraints/adapters/do_adapter.rb
+- lib/data_mapper/constraints/adapters/extension.rb
+- lib/data_mapper/constraints/adapters/mysql_adapter.rb
+- lib/data_mapper/constraints/adapters/oracle_adapter.rb
+- lib/data_mapper/constraints/adapters/postgres_adapter.rb
+- lib/data_mapper/constraints/adapters/sqlite_adapter.rb
+- lib/data_mapper/constraints/adapters/sqlserver_adapter.rb
+- lib/data_mapper/constraints/migrations/model.rb
+- lib/data_mapper/constraints/migrations/relationship.rb
+- lib/data_mapper/constraints/migrations/singleton_methods.rb
+- lib/data_mapper/constraints/relationship/many_to_many.rb
+- lib/data_mapper/constraints/relationship/one_to_many.rb
+- lib/data_mapper/constraints/resource.rb
 - lib/dm-constraints.rb
-- lib/dm-constraints/adapters/dm-abstract-adapter.rb
-- lib/dm-constraints/adapters/dm-do-adapter.rb
-- lib/dm-constraints/adapters/dm-mysql-adapter.rb
-- lib/dm-constraints/adapters/dm-oracle-adapter.rb
-- lib/dm-constraints/adapters/dm-postgres-adapter.rb
-- lib/dm-constraints/adapters/dm-sqlite-adapter.rb
-- lib/dm-constraints/adapters/dm-sqlserver-adapter.rb
-- lib/dm-constraints/delete_constraint.rb
-- lib/dm-constraints/migrations.rb
-- lib/dm-constraints/relationships.rb
 - spec/integration/constraints_spec.rb
 - spec/isolated/require_after_setup_spec.rb
 - spec/isolated/require_before_setup_spec.rb
@@ -94,7 +126,6 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: true
 homepage: http://github.com/datamapper/dm-constraints
 licenses: []
 
@@ -108,23 +139,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin constraining relationships
-test_files: 
-- spec/integration/constraints_spec.rb
-- spec/isolated/require_after_setup_spec.rb
-- spec/isolated/require_before_setup_spec.rb
-- spec/isolated/require_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/lib/dm-constraints/adapters/dm-abstract-adapter.rb

@@ -1,22 +0,0 @@
-module DataMapper
-  module Constraints
-    module Adapters
-
-      module AbstractAdapter
-
-        def constraint_exists?(*)
-          false
-        end
-
-        def create_relationship_constraint(*)
-          false
-        end
-
-        def destroy_relationship_constraint(*)
-          false
-        end
-      end
-
-    end
-  end
-end

data/lib/dm-constraints/delete_constraint.rb

@@ -1,115 +0,0 @@
-module DataMapper
-  module Constraints
-    module DeleteConstraint
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        CONSTRAINT_OPTIONS = [ :protect, :destroy, :destroy!, :set_nil, :skip ].to_set.freeze
-
-        ##
-        # Checks that the constraint type is appropriate to the relationship
-        #
-        # @param cardinality [Fixnum] cardinality of relationship
-        #
-        # @param name [Symbol] name of relationship to evaluate constraint of
-        #
-        # @param options [Hash] options hash
-        #
-        # @raise ArgumentError
-        #
-        # @return [nil]
-        #
-        # @api semi-public
-        def check_delete_constraint_type(cardinality, name, *args)
-          options = extract_options(args)
-
-          return unless options.key?(:constraint)
-
-          constraint = options[:constraint]
-
-          unless CONSTRAINT_OPTIONS.include?(constraint)
-            raise ArgumentError, ":constraint option must be one of #{CONSTRAINT_OPTIONS.to_a.join(', ')}"
-          end
-
-          # XXX: is any constraint valid with a :through relationship?
-          if constraint == :set_nil && options.key?(:through)
-            raise ArgumentError, 'Constraint type :set_nil is not valid for relationships using :through'
-          end
-        end
-
-        private
-
-        ##
-        # Temporarily changes the visibility of a method so a block can be evaluated against it
-        #
-        # @param method [Symobl] method to change visibility of
-        #
-        # @param from_visibility [Symbol] original visibility
-        #
-        # @param to_visibility [Symbol] temporary visibility
-        #
-        # @param block [Proc] proc to run
-        #
-        # @note  TODO: this should be moved to a 'util-like' module
-        #
-        # @return [nil]
-        #
-        # @api semi-public
-        def with_changed_method_visibility(method, from_visibility, to_visibility, &block)
-          send(to_visibility, method)
-          yield
-        ensure
-          send(from_visibility, method)
-        end
-      end
-
-      ##
-      # Adds the delete constraint options to a relationship
-      #
-      # @param params [*ARGS] Arguments passed to Relationship#initialize
-      #
-      # @return [nil]
-      #
-      # @api semi-public
-      def add_constraint_option(name, child_model, parent_model, options = {})
-        @constraint = options.fetch(:constraint, :protect) || :skip
-      end
-
-      private
-
-      ##
-      # Checks delete constraints prior to destroying a dm resource or collection
-      #
-      # @note
-      #   - It only considers a relationship's constraints if this is the parent model (ie a child shouldn't delete a parent)
-      #   - Many to Many Relationships are skipped, as they are evaluated by their underlying 1:M relationships
-      #
-      # @return [nil]
-      #
-      # @api semi-public
-      def check_delete_constraints
-        relationships.each do |relationship|
-          next unless relationship.respond_to?(:constraint)
-          next unless association = relationship.get(self)
-
-          delete_allowed = case constraint = relationship.constraint
-            when :protect
-              Array(association).empty?
-            when :destroy, :destroy!
-              association.__send__(constraint)
-            when :set_nil
-              Array(association).all? do |resource|
-                resource.update(relationship.inverse => nil)
-              end
-            when :skip
-              true  # do nothing
-          end
-
-          throw(:halt, false) unless delete_allowed
-        end
-      end
-    end # DeleteConstraint
-  end # Constraints
-end # DataMapper

data/lib/dm-constraints/migrations.rb

@@ -1,60 +0,0 @@
-require 'dm-migrations/auto_migration'
-
-module DataMapper
-  module Constraints
-    module Migrations
-
-      module SingletonMethods
-
-        def auto_migrate!(repository_name = nil)
-          repository_execute(:auto_migrate_down_constraints!, repository_name)
-          descendants = super
-          repository_execute(:auto_migrate_up_constraints!, repository_name)
-          descendants
-        end
-
-      private
-
-        def auto_migrate_down!(repository_name = nil)
-          repository_execute(:auto_migrate_down_constraints!, repository_name)
-          super
-        end
-
-        def auto_migrate_up!(repository_name = nil)
-          descendants = super
-          repository_execute(:auto_migrate_up_constraints!, repository_name)
-          descendants
-        end
-
-      end
-
-      module Model
-
-      private
-
-        def auto_migrate_down_constraints!(repository_name = self.repository_name)
-          return unless storage_exists?(repository_name)
-          return if self.respond_to?(:is_remixable?) && self.is_remixable?
-          execute_each_relationship(:destroy_relationship_constraint, repository_name)
-        end
-
-        def auto_migrate_up_constraints!(repository_name = self.repository_name)
-          return if self.respond_to?(:is_remixable?) && self.is_remixable?
-          execute_each_relationship(:create_relationship_constraint, repository_name)
-        end
-
-        def execute_each_relationship(method, repository_name)
-          adapter = DataMapper.repository(repository_name).adapter
-          return unless adapter.respond_to?(method)
-
-          relationships(repository_name).each do |relationship|
-            adapter.send(method, relationship)
-          end
-        end
-
-      end
-
-    end # module Migrations
-
-  end # module Constraints
-end # module DataMapper

data/lib/dm-constraints/relationships.rb

@@ -1,41 +0,0 @@
-require 'dm-core'
-require 'dm-constraints/delete_constraint'
-
-module DataMapper
-  module Associations
-
-    class OneToMany::Relationship
-
-      include DataMapper::Hook
-      include Constraints::DeleteConstraint
-
-      OPTIONS << :constraint
-
-      attr_reader :constraint
-
-      # initialize is a private method in Relationship
-      # and private methods can not be "advised" (hooked into)
-      # in extlib.
-      with_changed_method_visibility(:initialize, :private, :public) do
-        before :initialize, :add_constraint_option
-      end
-
-    end
-
-    class ManyToMany::Relationship
-
-      OPTIONS << :constraint
-
-      private
-
-      # TODO: document
-      # @api semipublic
-      chainable do
-        def one_to_many_options
-          super.merge(:constraint => @constraint)
-        end
-      end
-    end
-
-  end
-end