dm-migrations 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 Paul Sadauskas
+Copyright (c) 2010 Paul Sadauskas
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -10,12 +10,12 @@ begin
     gem.summary     = 'DataMapper plugin for writing and speccing migrations'
     gem.description = gem.summary
     gem.email       = 'psadauskas [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     = [ 'Paul Sadauskas' ]
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core', '~> 1.0.0.rc2'
+    gem.add_dependency 'dm-core', '~> 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-migrations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-migrations}
-  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 = ["Paul Sadauskas"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-27}
   s.description = %q{DataMapper plugin for writing and speccing migrations}
   s.email = %q{psadauskas [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-migrations}
+  s.homepage = %q{http://github.com/datamapper/dm-migrations}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
@@ -107,14 +107,14 @@ 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-core>, ["~> 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-core>, ["~> 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-core>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

data/lib/dm-migrations/adapters/dm-do-adapter.rb

@@ -154,6 +154,7 @@ module DataMapper
         def create_index_statements(model)
           name       = self.name
           table_name = model.storage_name(name)
+
           indexes(model).map do |index_name, fields|
             <<-SQL.compress_lines
               CREATE INDEX #{quote_name("index_#{table_name}_#{index_name}")} ON
@@ -164,9 +165,12 @@ module DataMapper
 
         # @api private
         def create_unique_index_statements(model)
-          name       = self.name
-          table_name = model.storage_name(name)
-          unique_indexes(model).map do |index_name, fields|
+          name           = self.name
+          table_name     = model.storage_name(name)
+          key            = model.key(name).map { |property| property.field }
+          unique_indexes = unique_indexes(model).reject { |index_name, fields| fields == key }
+
+          unique_indexes.map do |index_name, fields|
             <<-SQL.compress_lines
               CREATE UNIQUE INDEX #{quote_name("unique_#{table_name}_#{index_name}")} ON
               #{quote_name(table_name)} (#{fields.map { |field| quote_name(field) }.join(', ')})

data/lib/dm-migrations/auto_migration.rb

@@ -181,12 +181,13 @@ module DataMapper
     end # module Model
 
     def self.include_migration_api
-      DataMapper.extend(Migrations::SingletonMethods)
-      DataMapper::Model.send(:include, Migrations::Model)
-      DataMapper::Repository.send(:include, Migrations::Repository)
-      DataMapper::Model.append_extensions(Migrations::Model)
-      DataMapper::Repository.adapters.values.each do |adapter|
-        Adapters.include_migration_api(ActiveSupport::Inflector.demodulize(adapter.class.name))
+      DataMapper.extend(SingletonMethods)
+      [ :Repository, :Model ].each do |name|
+        DataMapper.const_get(name).send(:include, const_get(name))
+      end
+      DataMapper::Model.append_extensions(Model)
+      Adapters::AbstractAdapter.descendants.each do |adapter_class|
+        Adapters.include_migration_api(ActiveSupport::Inflector.demodulize(adapter_class.name))
       end
     end
 
@@ -194,24 +195,22 @@ module DataMapper
 
   module Adapters
 
-    extend Chainable
-
-    class << self
-
-      def include_migration_api(const_name)
-        require auto_migration_extensions(const_name)
+    def self.include_migration_api(const_name)
+      require auto_migration_extensions(const_name)
+      if Migrations.const_defined?(const_name)
         adapter = const_get(const_name)
-        if DataMapper::Migrations.const_defined?(const_name)
-          adapter.send(:include, migration_module(const_name))
-        end
-      rescue LoadError
-        # do nothing
+        adapter.send(:include, migration_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 migrations
+    end
 
-      def migration_module(const_name)
-        DataMapper::Migrations.const_get(const_name)
-      end
+    def self.migration_module(const_name)
+      Migrations.const_get(const_name)
+    end
 
+    class << self
     private
 
       # @api private

data/spec/integration/auto_migration_spec.rb

@@ -188,7 +188,7 @@ describe DataMapper::Migrations do
             end
 
             it 'should return true' do
-              @response.should be_true
+              @response.should be(true)
             end
 
             it "should create a #{statement} column" do
@@ -236,7 +236,7 @@ describe DataMapper::Migrations do
             end
 
             it 'should return true' do
-              @response.should be_true
+              @response.should be(true)
             end
 
             it "should create a #{statement} column" do
@@ -268,7 +268,7 @@ describe DataMapper::Migrations do
             end
 
             it 'should return true' do
-              @response.should be_true
+              @response.should be(true)
             end
 
             it "should create a #{statement} column" do
@@ -331,7 +331,7 @@ describe DataMapper::Migrations do
             end
 
             it 'should return true' do
-              @response.should be_true
+              @response.should be(true)
             end
 
             it "should create a #{statement} column" do
@@ -370,7 +370,7 @@ describe DataMapper::Migrations do
             end
 
             it 'should return true' do
-              @response.should be_true
+              @response.should be(true)
             end
 
             it "should create a #{statement} column" do
@@ -411,7 +411,7 @@ describe DataMapper::Migrations do
             end
 
             it 'should return true' do
-              @response.should be_true
+              @response.should be(true)
             end
 
             it "should create a #{statement} column" do
@@ -478,7 +478,7 @@ describe DataMapper::Migrations do
             end
 
             it 'should return true' do
-              @response.should be_true
+              @response.should be(true)
             end
 
             it "should create a #{statement} column" do

data/spec/integration/sql_spec.rb

@@ -120,12 +120,12 @@ describe "SQL generation" do
       end
 
       it "should know if the migration_info table exists" do
-        @migration.send(:migration_info_table_exists?).should be_true
+        @migration.send(:migration_info_table_exists?).should be(true)
       end
 
       it "should know if the migration_info table does not exist" do
         DataMapper::Spec.adapter.execute("DROP TABLE migration_info") rescue nil
-        @migration.send(:migration_info_table_exists?).should be_false
+        @migration.send(:migration_info_table_exists?).should be(false)
       end
 
       it "should be able to find the migration_info record for itself" do
@@ -134,15 +134,15 @@ describe "SQL generation" do
       end
 
       it "should know if a migration needs_up?" do
-        @migration.send(:needs_up?).should be_true
+        @migration.send(:needs_up?).should be(true)
         insert_migration_record
-        @migration.send(:needs_up?).should be_false
+        @migration.send(:needs_up?).should be(false)
       end
 
       it "should know if a migration needs_down?" do
-        @migration.send(:needs_down?).should be_false
+        @migration.send(:needs_down?).should be(false)
         insert_migration_record
-        @migration.send(:needs_down?).should be_true
+        @migration.send(:needs_down?).should be(true)
       end
 
       it "should properly quote the migration_info table via the adapter for use in queries" do
@@ -158,9 +158,9 @@ describe "SQL generation" do
 
       it "should create the migration_info table if it doesn't exist" do
         DataMapper::Spec.adapter.execute("DROP TABLE migration_info")
-        @migration.send(:migration_info_table_exists?).should be_false
+        @migration.send(:migration_info_table_exists?).should be(false)
         @migration.send(:create_migration_info_table_if_needed)
-        @migration.send(:migration_info_table_exists?).should be_true
+        @migration.send(:migration_info_table_exists?).should be(true)
       end
 
       it "should insert a record into the migration_info table on up" do

data/spec/isolated/require_after_setup_spec.rb

@@ -1,30 +1,30 @@
 require 'spec'
 require 'isolated/require_spec'
 require 'dm-core/spec/setup'
-require 'dm-core/spec/lib/adapter_helpers'
 
 # To really test this behavior, this spec needs to be run in isolation and not
 # as part of the typical rake spec run, which requires dm-transactions upfront
 
-describe "require 'dm-migrations' after calling DataMapper.setup" do
-  extend DataMapper::Spec::Adapters::Helpers
+if %w[ postgres mysql sqlite oracle sqlserver ].include?(ENV['ADAPTER'])
 
-  before(:all) do
+  describe "require 'dm-migrations' after calling DataMapper.setup" do
 
-    @adapter = DataMapper::Spec.adapter
-    require 'dm-migrations'
+    before(:all) do
 
-    class ::Person
-      include DataMapper::Resource
-      property :id, Serial
-    end
+      @adapter = DataMapper::Spec.adapter
+      require 'dm-migrations'
 
-    @model   = Person
+      class ::Person
+        include DataMapper::Resource
+        property :id, Serial
+      end
 
-  end
+      @model   = Person
+
+    end
 
-  supported_by :postgres, :mysql, :sqlite, :oracle, :sqlserver do
     it_should_behave_like "require 'dm-migrations'"
+
   end
 
 end

data/spec/isolated/require_before_setup_spec.rb

@@ -1,30 +1,30 @@
 require 'spec'
 require 'isolated/require_spec'
 require 'dm-core/spec/setup'
-require 'dm-core/spec/lib/adapter_helpers'
 
 # To really test this behavior, this spec needs to be run in isolation and not
 # as part of the typical rake spec run, which requires dm-transactions upfront
 
-describe "require 'dm-migrations' before calling DataMapper.setup" do
-  extend DataMapper::Spec::Adapters::Helpers
+if %w[ postgres mysql sqlite oracle sqlserver ].include?(ENV['ADAPTER'])
 
-  before(:all) do
+  describe "require 'dm-migrations' before calling DataMapper.setup" do
 
-    require 'dm-migrations'
-    @adapter = DataMapper::Spec.adapter
+    before(:all) do
 
-    class ::Person
-      include DataMapper::Resource
-      property :id, Serial
-    end
+      require 'dm-migrations'
+      @adapter = DataMapper::Spec.adapter
 
-    @model   = Person
+      class ::Person
+        include DataMapper::Resource
+        property :id, Serial
+      end
 
-  end
+      @model   = Person
+
+    end
 
-  supported_by :postgres, :mysql, :sqlite, :oracle, :sqlserver do
     it_should_behave_like "require 'dm-migrations'"
+
   end
 
 end

data/spec/isolated/require_spec.rb

@@ -1,25 +1,25 @@
 shared_examples_for "require 'dm-migrations'" do
 
   it "should include the migration api in the DataMapper namespace" do
-    DataMapper.respond_to?(:migrate!                ).should be_true
-    DataMapper.respond_to?(:auto_migrate!           ).should be_true
-    DataMapper.respond_to?(:auto_upgrade!           ).should be_true
-    DataMapper.respond_to?(:auto_migrate_up!,   true).should be_true
-    DataMapper.respond_to?(:auto_migrate_down!, true).should be_true
+    DataMapper.respond_to?(:migrate!                ).should be(true)
+    DataMapper.respond_to?(:auto_migrate!           ).should be(true)
+    DataMapper.respond_to?(:auto_upgrade!           ).should be(true)
+    DataMapper.respond_to?(:auto_migrate_up!,   true).should be(true)
+    DataMapper.respond_to?(:auto_migrate_down!, true).should be(true)
   end
 
-  %w[Repository Model].each do |name|
+  %w[ Repository Model ].each do |name|
     it "should include the migration api in DataMapper::#{name}" do
-      (DataMapper.const_get(name) < DataMapper::Migrations.const_get(name)).should be_true
+      (DataMapper.const_get(name) < DataMapper::Migrations.const_get(name)).should be(true)
     end
   end
 
   it "should include the migration api into the adapter" do
-    @adapter.respond_to?(:storage_exists?      ).should be_true
-    @adapter.respond_to?(:field_exists?        ).should be_true
-    @adapter.respond_to?(:upgrade_model_storage).should be_true
-    @adapter.respond_to?(:create_model_storage ).should be_true
-    @adapter.respond_to?(:destroy_model_storage).should be_true
+    @adapter.respond_to?(:storage_exists?      ).should be(true)
+    @adapter.respond_to?(:field_exists?        ).should be(true)
+    @adapter.respond_to?(:upgrade_model_storage).should be(true)
+    @adapter.respond_to?(:create_model_storage ).should be(true)
+    @adapter.respond_to?(:destroy_model_storage).should be(true)
   end
 
 end

data/spec/rcov.opts

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

data/spec/unit/migration_spec.rb

@@ -58,11 +58,11 @@ describe 'Migration' do
 
       it 'should set @verbose from the options hash' do
         m = DataMapper::Migration.new(1, :do_nothing, :verbose => false) {}
-        m.instance_variable_get(:@verbose).should be_false
+        m.instance_variable_get(:@verbose).should be(false)
       end
 
       it 'should set @verbose to true by default' do
-        @m.instance_variable_get(:@verbose).should be_true
+        @m.instance_variable_get(:@verbose).should be(true)
       end
 
       it 'should set the @up_action to an empty block' do

data/spec/unit/sql/postgres_spec.rb

@@ -11,11 +11,11 @@ describe "Postgres Extensions" do
   end
 
   it 'should support schema-level transactions' do
-    @pe.supports_schema_transactions?.should be_true
+    @pe.supports_schema_transactions?.should be(true)
   end
 
   it 'should support the serial column attribute' do
-    @pe.supports_serial?.should be_true
+    @pe.supports_serial?.should be(true)
   end
 
   it 'should create a table object from the name' do

data/spec/unit/sql/sqlite_extensions_spec.rb

@@ -11,11 +11,11 @@ describe "SQLite3 Extensions" do
   end
 
   it 'should support schema-level transactions' do
-    @se.supports_schema_transactions?.should be_true
+    @se.supports_schema_transactions?.should be(true)
   end
 
   it 'should support the serial column attribute' do
-    @se.supports_serial?.should be_true
+    @se.supports_serial?.should be(true)
   end
 
   it 'should create a table object from the name' do

data/spec/unit/sql/table_creator_spec.rb

@@ -26,7 +26,7 @@ describe 'SQL module' do
       end
 
       it 'should evaluate the given block' do
-        block = lambda { column :foo, :bar }
+        block = proc { column :foo, :bar }
         col = mock('column')
         SQL::TableCreator::Column.should_receive(:new).with(@adapter, :foo, :bar, {}).and_return(col)
         tc = SQL::TableCreator.new(@adapter, 'users', {}, &block)

data/spec/unit/sql/table_modifier_spec.rb

@@ -26,7 +26,7 @@ describe 'SQL module' do
       end
 
       it 'should evaluate the given block' do
-        block = lambda { column :foo, :bar }
+        block = proc { column :foo, :bar }
         col = mock('column')
         SQL::TableCreator::Column.should_receive(:new).with(@adapter, :foo, :bar, {}).and_return(col)
         tc = SQL::TableCreator.new(@adapter, 'users', {}, &block)

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-migrations
 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: 
 - Paul Sadauskas
@@ -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 
@@ -119,7 +119,7 @@ files:
 - tasks/yard.rake
 - tasks/yardstick.rake
 has_rdoc: true
-homepage: http://github.com/datamapper/dm-more/tree/master/dm-migrations
+homepage: http://github.com/datamapper/dm-migrations
 licenses: []
 
 post_install_message: