dm-constraints 0.9.7 → 0.9.8

data/History.txt

@@ -1 +1,5 @@
+=== 0.9.8 / 2008-12-07
 
+* 1 bug fix:
+
+  * Only extend defined adapter classes [#610 state:resolved]

data/Manifest.txt

@@ -12,9 +12,5 @@ lib/dm-constraints/version.rb
 spec/integration/constraints_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
-tasks/ci.rb
-tasks/dm.rb
-tasks/doc.rb
-tasks/gemspec.rb
-tasks/hoe.rb
 tasks/install.rb
+tasks/spec.rb

data/Rakefile

@@ -1,26 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
+
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-ROOT = Pathname(__FILE__).dirname.expand_path
 require ROOT + 'lib/dm-constraints/version'
 
-AUTHOR = "Dirkjan Bussink"
-EMAIL  = "d.bussink@gmail.com"
-GEM_NAME = "dm-constraints"
+AUTHOR = 'Dirkjan Bussink'
+EMAIL  = 'd.bussink [a] gmail [d] com'
+GEM_NAME = 'dm-constraints'
 GEM_VERSION = DataMapper::Constraints::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
-GEM_CLEAN = ["log", "pkg", "coverage"]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
+GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"]]
+GEM_CLEAN = %w[ log pkg coverage ]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 
-PROJECT_NAME = "datamapper"
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-constraints"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin for performing validations on data models"
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin constraining relationships'
 
-require ROOT + 'tasks/hoe'
-require ROOT + 'tasks/gemspec'
-require ROOT + 'tasks/install'
-require ROOT + 'tasks/dm'
-require ROOT + 'tasks/doc'
-require ROOT + 'tasks/ci'
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
+end

data/TODO

@@ -1,3 +0,0 @@
-TODO
-====
-Everything :)

data/lib/dm-constraints/data_objects_adapter.rb

@@ -69,6 +69,7 @@ module DataMapper
             descendants.each do |model|
               if model.storage_exists?(repository_name)
                 adapter = model.repository(repository_name).adapter
+                next unless adapter.respond_to?(:destroy_constraints_statements)
                 statements = adapter.destroy_constraints_statements(repository_name, model)
                 statements.each {|stmt| adapter.execute(stmt) }
               end
@@ -79,6 +80,7 @@ module DataMapper
             descendants = DataMapper::Resource.descendants.to_a if descendants.empty?
             descendants.each do |model|
               adapter = model.repository(repository_name).adapter
+              next unless adapter.respond_to?(:create_constraints_statements)
               statements = adapter.create_constraints_statements(repository_name, model)
               statements.each {|stmt| adapter.execute(stmt) }
             end

data/lib/dm-constraints/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Constraints
-    VERSION = "0.9.7"
+    VERSION = '0.9.8'
   end
 end

data/lib/dm-constraints.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'pathname'
 
 # Add all external dependencies for the plugin here
-gem 'dm-core', '~>0.9.7'
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
 
 # Require plugin-files
@@ -18,12 +18,12 @@ module DataMapper
   end
 
   module Adapters
-    class MysqlAdapter
-      include DataMapper::Constraints::MysqlAdapter::SQL
+    if defined?(MysqlAdapter)
+      MysqlAdapter.send :include, DataMapper::Constraints::MysqlAdapter::SQL
     end
 
-    class PostgresAdapter
-      include DataMapper::Constraints::PostgresAdapter::SQL
+    if defined?(PostgresAdapter)
+      PostgresAdapter.send :include, DataMapper::Constraints::PostgresAdapter::SQL
     end
   end
 end

data/spec/integration/constraints_spec.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
-[HAS_MYSQL, HAS_POSTGRES].each do |adapter|
+ADAPTERS.each do |adapter|
 
   describe 'DataMapper::Constraints' do
 
@@ -57,7 +57,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
     end
 
     it "should not be able to create related objects with a failing foreign key constraint" do
-      s = Stable.first(:order => [:id.desc])
+      s = Stable.create
       lambda { @c1 = Cow.create(:name => "Bea", :stable_id => s.id + 1) }.should raise_error
     end
 

data/spec/spec.opts

@@ -1,2 +1 @@
---format specdoc
 --colour

data/spec/spec_helper.rb

@@ -1,27 +1,25 @@
+require 'pathname'
 require 'rubygems'
-gem 'rspec', '>=1.1.3'
+
+gem 'rspec', '~>1.1.11'
 require 'spec'
-require 'pathname'
 
-gem 'dm-core', '~>0.9.7'
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
 
+ADAPTERS = []
 def load_driver(name, default_uri)
-
-  lib = "do_#{name}"
   begin
-    gem lib, '~>0.9.7'
-    require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
-    DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
-    name
-  rescue Gem::LoadError => e
-    warn "Could not load #{lib}: #{e}"
+    DataMapper::Repository.adapters[:default] = DataMapper::Repository.adapters[name]
+    ADAPTERS << name
+  rescue LoadError => e
+    warn "Could not load do_#{name}: #{e}"
     false
   end
 end
 
-HAS_POSTGRES = load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')
-HAS_MYSQL    = load_driver(:mysql,    'mysql://localhost/dm_core_test')
+load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')
+load_driver(:mysql,    'mysql://localhost/dm_core_test')
 
 require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-constraints'

data/tasks/install.rb

@@ -1,20 +1,13 @@
-WIN32 = (RUBY_PLATFORM =~ /win32|mingw|bccwin|cygwin/) rescue nil
-SUDO = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
 
-desc "Install #{GEM_NAME}"
-if WIN32
-  task :install => :gem do
-    system %{gem install --no-rdoc --no-ri -l pkg/#{GEM_NAME}-#{GEM_VERSION}.gem}
-  end
-  namespace :dev do
-    desc 'Install for development (for windows)'
-    task :winstall => :gem do
-      warn "You can now call 'rake install' instead of 'rake dev:winstall'."
-      system %{gem install --no-rdoc --no-ri -l pkg/#{GEM_NAME}-#{GEM_VERSION}.gem}
-    end
-  end
-else
-  task :install => :package do
-    sh %{#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION}.gem}
-  end
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
 end

data/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-constraints
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,21 +18,22 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
-description: DataMapper plugin for performing validations on data models
+description: DataMapper plugin constraining relationships
 email: 
-- d.bussink@gmail.com
+- d.bussink [a] gmail [d] com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
 - README.txt
+- LICENSE
+- TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
@@ -48,12 +49,8 @@ files:
 - spec/integration/constraints_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/ci.rb
-- tasks/dm.rb
-- tasks/doc.rb
-- tasks/gemspec.rb
-- tasks/hoe.rb
 - tasks/install.rb
+- tasks/spec.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-constraints
 post_install_message: 
@@ -80,6 +77,6 @@ rubyforge_project: datamapper
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: DataMapper plugin for performing validations on data models
+summary: DataMapper plugin constraining relationships
 test_files: []
 

data/tasks/ci.rb

@@ -1,68 +0,0 @@
-task 'ci:doc' => :doc
-
-namespace :ci do
-
-  task :prepare do
-    rm_rf ROOT + "ci"
-    mkdir_p ROOT + "ci"
-    mkdir_p ROOT + "ci/doc"
-    mkdir_p ROOT + "ci/cyclomatic"
-    mkdir_p ROOT + "ci/token"
-  end
-
-  Spec::Rake::SpecTask.new("spec:unit" => :prepare) do |t|
-    t.spec_opts = ["--format", "specdoc", "--format", "html:#{ROOT}/ci/unit_rspec_report.html", "--diff"]
-    t.spec_files = Pathname.glob((ROOT + 'spec/unit/**/*_spec.rb').to_s)
-    unless ENV['NO_RCOV']
-      t.rcov = true
-      t.rcov_opts << '--exclude' << "spec,gems"
-      t.rcov_opts << '--text-summary'
-      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-      t.rcov_opts << '--only-uncovered'
-    end
-  end
-
-  Spec::Rake::SpecTask.new("spec:integration" => :prepare) do |t|
-    t.spec_opts = ["--format", "specdoc", "--format", "html:#{ROOT}/ci/integration_rspec_report.html", "--diff"]
-    t.spec_files = Pathname.glob((ROOT + 'spec/integration/**/*_spec.rb').to_s)
-    unless ENV['NO_RCOV']
-      t.rcov = true
-      t.rcov_opts << '--exclude' << "spec,gems"
-      t.rcov_opts << '--text-summary'
-      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-      t.rcov_opts << '--only-uncovered'
-    end
-  end
-
-  task :spec do
-    Rake::Task["ci:spec:unit"].invoke
-    mv ROOT + "coverage", ROOT + "ci/unit_coverage"
-
-    Rake::Task["ci:spec:integration"].invoke
-    mv ROOT + "coverage", ROOT + "ci/integration_coverage"
-  end
-
-  task :saikuro => :prepare do
-    system "saikuro -c -i lib -y 0 -w 10 -e 15 -o ci/cyclomatic"
-    mv 'ci/cyclomatic/index_cyclo.html', 'ci/cyclomatic/index.html'
-
-    system "saikuro -t -i lib -y 0 -w 20 -e 30 -o ci/token"
-    mv 'ci/token/index_token.html', 'ci/token/index.html'
-  end
-
-  task :publish do
-    out = ENV['CC_BUILD_ARTIFACTS'] || "out"
-    mkdir_p out unless File.directory? out
-
-    mv "ci/unit_rspec_report.html", "#{out}/unit_rspec_report.html"
-    mv "ci/unit_coverage", "#{out}/unit_coverage"
-    mv "ci/integration_rspec_report.html", "#{out}/integration_rspec_report.html"
-    mv "ci/integration_coverage", "#{out}/integration_coverage"
-    mv "ci/doc", "#{out}/doc"
-    mv "ci/cyclomatic", "#{out}/cyclomatic_complexity"
-    mv "ci/token", "#{out}/token_complexity"
-  end
-end
-
-#task :ci => %w[ ci:spec ci:doc ci:saikuro install ci:publish ]  # yard-related tasks do not work yet
-task :ci => %w[ ci:spec ci:saikuro install ]

data/tasks/dm.rb

@@ -1,63 +0,0 @@
-task :default => 'dm:spec'
-task :spec    => 'dm:spec'
-task :rcov    => 'dm:rcov'
-
-namespace :spec do
-  task :unit        => 'dm:spec:unit'
-  task :integration => 'dm:spec:integration'
-end
-
-namespace :rcov do
-  task :unit        => 'dm:rcov:unit'
-  task :integration => 'dm:rcov:integration'
-end
-
-namespace :dm do
-  def run_spec(name, files, rcov)
-    Spec::Rake::SpecTask.new(name) do |t|
-      t.spec_opts << '--colour' << '--loadby' << 'random'
-      t.spec_files = Pathname.glob(ENV['FILES'] || files.to_s)
-      t.rcov = rcov
-      t.rcov_opts << '--exclude' << 'spec,environment.rb'
-      t.rcov_opts << '--text-summary'
-      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-      t.rcov_opts << '--only-uncovered'
-    end
-  end
-
-  unit_specs        = ROOT + 'spec/unit/**/*_spec.rb'
-  integration_specs = ROOT + 'spec/integration/**/*_spec.rb'
-  all_specs         = ROOT + 'spec/**/*_spec.rb'
-
-  desc "Run all specifications"
-  run_spec('spec', all_specs, false)
-
-  desc "Run all specifications with rcov"
-  run_spec('rcov', all_specs, true)
-
-  namespace :spec do
-    desc "Run unit specifications"
-    run_spec('unit', unit_specs, false)
-
-    desc "Run integration specifications"
-    run_spec('integration', integration_specs, false)
-  end
-
-  namespace :rcov do
-    desc "Run unit specifications with rcov"
-    run_spec('unit', unit_specs, true)
-
-    desc "Run integration specifications with rcov"
-    run_spec('integration', integration_specs, true)
-  end
-
-  desc "Run all comparisons with ActiveRecord"
-  task :perf do
-    sh ROOT + 'script/performance.rb'
-  end
-
-  desc "Profile DataMapper"
-  task :profile do
-    sh ROOT + 'script/profile.rb'
-  end
-end

data/tasks/doc.rb

@@ -1,20 +0,0 @@
-# when yard's ready, it'll have to come back, but for now...
-Rake::RDocTask.new("doc") do |t|
-  t.rdoc_dir = 'doc'
-  t.title    = "DataMapper - Ruby Object Relational Mapper"
-  t.options  = ['--line-numbers', '--inline-source', '--all']
-  t.rdoc_files.include("README.txt", "QUICKLINKS", "FAQ", "lib/**/**/*.rb")
-end
-
-begin
-  gem 'yard', '>=0.2.1'
-  require 'yard'
-
-  YARD::Rake::YardocTask.new("yardoc") do |t|
-    t.options << '--protected'
-    # t.options << '-q'
-    # t.files << '...anyglobshere...'
-  end
-rescue Exception
-  # yard not installed
-end

data/tasks/gemspec.rb

@@ -1,23 +0,0 @@
-desc "Generate gemspec"
-task :gemspec do |x|
-  # Clean up extraneous files before checking manifest
-  %x[rake clean]
-
-  # Check the manifest before generating the gemspec
-  manifest = %x[rake check_manifest]
-  manifest.gsub!("(in /usr/local/projects/dm/dm-core)\n", "")
-
-  unless manifest.empty?
-    print "\n", "#"*68, "\n"
-    print <<-EOS
-  Manifest.txt is not up-to-date. Please review the changes below.
-  If the changes are correct, run 'rake check_manifest | patch'
-  and then run this command again.
-EOS
-    print "#"*68, "\n\n"
-    puts manifest
-  else
-    %x[rake debug_gem > #{GEM_NAME}.gemspec]
-    puts "Successfully created gemspec for #{GEM_NAME}!"
-  end
-end

data/tasks/hoe.rb

@@ -1,46 +0,0 @@
-require 'hoe'
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-# Remove hoe dependency
-class Hoe
-  def extra_dev_deps
-    @extra_dev_deps.reject! { |dep| dep[0] == "hoe" }
-    @extra_dev_deps
-  end
-end
-
-hoe = Hoe.new(GEM_NAME, GEM_VERSION) do |p|
-
-  p.developer(AUTHOR, EMAIL)
-
-  p.description = PROJECT_DESCRIPTION
-  p.summary = PROJECT_SUMMARY
-  p.url = PROJECT_URL
-
-  p.rubyforge_name = PROJECT_NAME if PROJECT_NAME
-
-  p.clean_globs |= ["{coverage,doc,log,tmp}", "**/*.{log,db}", "profile_results.*", "**/.DS_Store"]
-
-  GEM_DEPENDENCIES.each do |dep|
-    p.extra_deps << dep
-  end
-
-end