datamapper-dm-core 0.10.0 → 0.10.1

data/History.txt

@@ -1,4 +1,4 @@
-=== 0.10.0 / 2009-10-15
+=== 0.10.0 / 2009-09-15
 
   * Countless enhancements:
 

data/Rakefile

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby -KU
-
 require 'pathname'
 require 'rubygems'
 require 'rake'
@@ -14,7 +12,7 @@ EMAIL            = 'dan.kubb@gmail.com'
 GEM_NAME         = 'dm-core'
 GEM_VERSION      = DataMapper::VERSION
 GEM_DEPENDENCIES = [
-  %w[ extlib      ~>0.9.13 ],
+  %w[ extlib      ~>0.9.14 ],
   %w[ addressable ~>2.1    ],
 ]
 

data/deps.rip

@@ -0,0 +1,2 @@
+git://github.com/datamapper/extlib.git next
+git://github.com/sporkmonger/addressable.git addressable-2.1.0

data/dm-core.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "0.10.0"
+  s.version = "0.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2009-07-30}
+  s.date = %q{2009-09-21}
   s.description = %q{Faster, Better, Simpler.}
   s.email = ["dan.kubb@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = [".autotest", ".gitignore", "CONTRIBUTING", "FAQ", "History.txt", "MIT-LICENSE", "Manifest.txt", "QUICKLINKS", "README.txt", "Rakefile", "SPECS", "TODO", "dm-core.gemspec", "lib/dm-core.rb", "lib/dm-core/adapters.rb", "lib/dm-core/adapters/abstract_adapter.rb", "lib/dm-core/adapters/data_objects_adapter.rb", "lib/dm-core/adapters/in_memory_adapter.rb", "lib/dm-core/adapters/mysql_adapter.rb", "lib/dm-core/adapters/oracle_adapter.rb", "lib/dm-core/adapters/postgres_adapter.rb", "lib/dm-core/adapters/sqlite3_adapter.rb", "lib/dm-core/adapters/yaml_adapter.rb", "lib/dm-core/associations/many_to_many.rb", "lib/dm-core/associations/many_to_one.rb", "lib/dm-core/associations/one_to_many.rb", "lib/dm-core/associations/one_to_one.rb", "lib/dm-core/associations/relationship.rb", "lib/dm-core/collection.rb", "lib/dm-core/core_ext/kernel.rb", "lib/dm-core/core_ext/symbol.rb", "lib/dm-core/identity_map.rb", "lib/dm-core/migrations.rb", "lib/dm-core/model.rb", "lib/dm-core/model/descendant_set.rb", "lib/dm-core/model/hook.rb", "lib/dm-core/model/is.rb", "lib/dm-core/model/property.rb", "lib/dm-core/model/relationship.rb", "lib/dm-core/model/scope.rb", "lib/dm-core/property.rb", "lib/dm-core/property_set.rb", "lib/dm-core/query.rb", "lib/dm-core/query/conditions/comparison.rb", "lib/dm-core/query/conditions/operation.rb", "lib/dm-core/query/direction.rb", "lib/dm-core/query/operator.rb", "lib/dm-core/query/path.rb", "lib/dm-core/query/sort.rb", "lib/dm-core/repository.rb", "lib/dm-core/resource.rb", "lib/dm-core/spec/adapter_shared_spec.rb", "lib/dm-core/spec/data_objects_adapter_shared_spec.rb", "lib/dm-core/support/chainable.rb", "lib/dm-core/support/deprecate.rb", "lib/dm-core/support/equalizer.rb", "lib/dm-core/support/logger.rb", "lib/dm-core/support/naming_conventions.rb", "lib/dm-core/transaction.rb", "lib/dm-core/type.rb", "lib/dm-core/types/boolean.rb", "lib/dm-core/types/discriminator.rb", "lib/dm-core/types/object.rb", "lib/dm-core/types/paranoid_boolean.rb", "lib/dm-core/types/paranoid_datetime.rb", "lib/dm-core/types/serial.rb", "lib/dm-core/types/text.rb", "lib/dm-core/version.rb", "script/performance.rb", "script/profile.rb", "spec/lib/adapter_helpers.rb", "spec/lib/collection_helpers.rb", "spec/lib/counter_adapter.rb", "spec/lib/pending_helpers.rb", "spec/lib/rspec_immediate_feedback_formatter.rb", "spec/public/associations/many_to_many_spec.rb", "spec/public/associations/many_to_one_spec.rb", "spec/public/associations/one_to_many_spec.rb", "spec/public/associations/one_to_one_spec.rb", "spec/public/collection_spec.rb", "spec/public/model/relationship_spec.rb", "spec/public/model_spec.rb", "spec/public/property_spec.rb", "spec/public/resource_spec.rb", "spec/public/sel_spec.rb", "spec/public/setup_spec.rb", "spec/public/shared/association_collection_shared_spec.rb", "spec/public/shared/collection_shared_spec.rb", "spec/public/shared/finder_shared_spec.rb", "spec/public/shared/resource_shared_spec.rb", "spec/public/shared/sel_shared_spec.rb", "spec/public/transaction_spec.rb", "spec/public/types/discriminator_spec.rb", "spec/semipublic/adapters/abstract_adapter_spec.rb", "spec/semipublic/adapters/in_memory_adapter_spec.rb", "spec/semipublic/adapters/mysql_adapter_spec.rb", "spec/semipublic/adapters/oracle_adapter_spec.rb", "spec/semipublic/adapters/postgres_adapter_spec.rb", "spec/semipublic/adapters/sqlite3_adapter_spec.rb", "spec/semipublic/adapters/yaml_adapter_spec.rb", "spec/semipublic/associations/many_to_one_spec.rb", "spec/semipublic/associations/relationship_spec.rb", "spec/semipublic/associations_spec.rb", "spec/semipublic/collection_spec.rb", "spec/semipublic/property_spec.rb", "spec/semipublic/query/conditions_spec.rb", "spec/semipublic/query/path_spec.rb", "spec/semipublic/query_spec.rb", "spec/semipublic/resource_spec.rb", "spec/semipublic/shared/resource_shared_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"]
+  s.files = [".autotest", ".gitignore", "CONTRIBUTING", "FAQ", "History.txt", "MIT-LICENSE", "Manifest.txt", "QUICKLINKS", "README.txt", "Rakefile", "SPECS", "TODO", "deps.rip", "dm-core.gemspec", "lib/dm-core.rb", "lib/dm-core/adapters.rb", "lib/dm-core/adapters/abstract_adapter.rb", "lib/dm-core/adapters/data_objects_adapter.rb", "lib/dm-core/adapters/in_memory_adapter.rb", "lib/dm-core/adapters/mysql_adapter.rb", "lib/dm-core/adapters/oracle_adapter.rb", "lib/dm-core/adapters/postgres_adapter.rb", "lib/dm-core/adapters/sqlite3_adapter.rb", "lib/dm-core/adapters/yaml_adapter.rb", "lib/dm-core/associations/many_to_many.rb", "lib/dm-core/associations/many_to_one.rb", "lib/dm-core/associations/one_to_many.rb", "lib/dm-core/associations/one_to_one.rb", "lib/dm-core/associations/relationship.rb", "lib/dm-core/collection.rb", "lib/dm-core/core_ext/kernel.rb", "lib/dm-core/core_ext/symbol.rb", "lib/dm-core/identity_map.rb", "lib/dm-core/migrations.rb", "lib/dm-core/model.rb", "lib/dm-core/model/descendant_set.rb", "lib/dm-core/model/hook.rb", "lib/dm-core/model/is.rb", "lib/dm-core/model/property.rb", "lib/dm-core/model/relationship.rb", "lib/dm-core/model/scope.rb", "lib/dm-core/property.rb", "lib/dm-core/property_set.rb", "lib/dm-core/query.rb", "lib/dm-core/query/conditions/comparison.rb", "lib/dm-core/query/conditions/operation.rb", "lib/dm-core/query/direction.rb", "lib/dm-core/query/operator.rb", "lib/dm-core/query/path.rb", "lib/dm-core/query/sort.rb", "lib/dm-core/repository.rb", "lib/dm-core/resource.rb", "lib/dm-core/spec/adapter_shared_spec.rb", "lib/dm-core/spec/data_objects_adapter_shared_spec.rb", "lib/dm-core/support/chainable.rb", "lib/dm-core/support/deprecate.rb", "lib/dm-core/support/equalizer.rb", "lib/dm-core/support/logger.rb", "lib/dm-core/support/naming_conventions.rb", "lib/dm-core/transaction.rb", "lib/dm-core/type.rb", "lib/dm-core/types/boolean.rb", "lib/dm-core/types/discriminator.rb", "lib/dm-core/types/object.rb", "lib/dm-core/types/paranoid_boolean.rb", "lib/dm-core/types/paranoid_datetime.rb", "lib/dm-core/types/serial.rb", "lib/dm-core/types/text.rb", "lib/dm-core/version.rb", "script/performance.rb", "script/profile.rb", "spec/lib/adapter_helpers.rb", "spec/lib/collection_helpers.rb", "spec/lib/counter_adapter.rb", "spec/lib/pending_helpers.rb", "spec/lib/rspec_immediate_feedback_formatter.rb", "spec/public/associations/many_to_many_spec.rb", "spec/public/associations/many_to_one_spec.rb", "spec/public/associations/one_to_many_spec.rb", "spec/public/associations/one_to_one_spec.rb", "spec/public/collection_spec.rb", "spec/public/migrations_spec.rb", "spec/public/model/relationship_spec.rb", "spec/public/model_spec.rb", "spec/public/property_spec.rb", "spec/public/resource_spec.rb", "spec/public/sel_spec.rb", "spec/public/setup_spec.rb", "spec/public/shared/association_collection_shared_spec.rb", "spec/public/shared/collection_shared_spec.rb", "spec/public/shared/finder_shared_spec.rb", "spec/public/shared/resource_shared_spec.rb", "spec/public/shared/sel_shared_spec.rb", "spec/public/transaction_spec.rb", "spec/public/types/discriminator_spec.rb", "spec/semipublic/adapters/abstract_adapter_spec.rb", "spec/semipublic/adapters/in_memory_adapter_spec.rb", "spec/semipublic/adapters/mysql_adapter_spec.rb", "spec/semipublic/adapters/oracle_adapter_spec.rb", "spec/semipublic/adapters/postgres_adapter_spec.rb", "spec/semipublic/adapters/sqlite3_adapter_spec.rb", "spec/semipublic/adapters/yaml_adapter_spec.rb", "spec/semipublic/associations/many_to_one_spec.rb", "spec/semipublic/associations/relationship_spec.rb", "spec/semipublic/associations_spec.rb", "spec/semipublic/collection_spec.rb", "spec/semipublic/property_spec.rb", "spec/semipublic/query/conditions_spec.rb", "spec/semipublic/query/path_spec.rb", "spec/semipublic/query_spec.rb", "spec/semipublic/resource_spec.rb", "spec/semipublic/shared/condition_shared_spec.rb", "spec/semipublic/shared/resource_shared_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"]
   s.homepage = %q{http://datamapper.org}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
@@ -23,14 +23,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.13"])
-      s.add_runtime_dependency(%q<addressable>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.14"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.1"])
     else
-      s.add_dependency(%q<extlib>, ["~> 0.9.13"])
-      s.add_dependency(%q<addressable>, ["~> 2.0"])
+      s.add_dependency(%q<extlib>, ["~> 0.9.14"])
+      s.add_dependency(%q<addressable>, ["~> 2.1"])
     end
   else
-    s.add_dependency(%q<extlib>, ["~> 0.9.13"])
-    s.add_dependency(%q<addressable>, ["~> 2.0"])
+    s.add_dependency(%q<extlib>, ["~> 0.9.14"])
+    s.add_dependency(%q<addressable>, ["~> 2.1"])
   end
 end

data/lib/dm-core/associations/many_to_many.rb

@@ -343,6 +343,26 @@ module DataMapper
           super
         end
 
+        # Return the intermediaries between the source and the targets
+        #
+        # @return [Collection]
+        #   the intermediary collection
+        #
+        # @api public
+        def intermediaries
+          return @intermediaries if @intermediaries
+
+          intermediaries = if through.loaded?(source)
+            through.get!(source)
+          else
+            through.set!(source, through.collection_for(source))
+          end
+
+          scoped = intermediaries.all(via => self)
+
+          @intermediaries = scoped.query == intermediaries.query ? intermediaries : scoped
+        end
+
         private
 
         # TODO: document
@@ -363,9 +383,13 @@ module DataMapper
         # TODO: document
         # @api private
         def _save(safe)
-          # delete only intermediaries linked to the removed targets
-          unless @removed.empty? || intermediaries(@removed).send(safe ? :destroy : :destroy!)
-            return false
+          if @removed.any?
+            # delete only intermediaries linked to the removed targets
+            removed_intermediaries = intermediaries.all(via => @removed).each do |resource|
+              intermediaries.delete(resource)
+            end
+
+            return false unless removed_intermediaries.send(safe ? :destroy : :destroy!)
           end
 
           if via.respond_to?(:resource_for)
@@ -374,25 +398,13 @@ module DataMapper
           else
             if intermediary = create_intermediary(safe)
               inverse = via.inverse
-              loaded_entries.map { |resource| inverse.set(resource, intermediary) }
+              loaded_entries.each { |resource| inverse.set(resource, intermediary) }
             end
 
             super
           end
         end
 
-        # TODO: document
-        # @api private
-        def intermediaries(targets = self)
-          intermediaries = if through.loaded?(source)
-            through.get!(source)
-          else
-            through.set!(source, through.collection_for(source))
-          end
-
-          intermediaries.all(via => targets)
-        end
-
         # TODO: document
         # @api private
         def create_intermediary(safe, attributes = {})

data/lib/dm-core/associations/one_to_many.rb

@@ -315,7 +315,7 @@ module DataMapper
           assert_source_saved 'The source must be saved before saving the collection'
 
           # update removed resources to not reference the source
-          @removed.all? { |resource| resource.send(safe ? :save : :save!) } && super
+          @removed.all? { |resource| resource.destroyed? || resource.send(safe ? :save : :save!) } && super
         end
 
         # TODO: document

data/lib/dm-core/resource.rb

@@ -118,6 +118,16 @@ module DataMapper
       @saved == true
     end
 
+    # Checks if this Resource instance is destroyed
+    #
+    # @return [Boolean]
+    #   true if the resource has been destroyed
+    #
+    # @api public
+    def destroyed?
+      @destroyed == true
+    end
+
     # Checks if the resource has no changes to save
     #
     # @return [Boolean]
@@ -364,13 +374,13 @@ module DataMapper
     # @api public
     def destroy!
       if saved? && repository.delete(Collection.new(query, [ self ])) == 1
+        @destroyed = true
         @collection.delete(self) if @collection
         reset
         freeze
-        true
-      else
-        false
       end
+
+      destroyed?
     end
 
     # Compares another Resource for equality

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.10.1'.freeze
 end

data/spec/public/migrations_spec.rb

@@ -0,0 +1,359 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe DataMapper::Migrations do
+  def capture_log(mod)
+    original, mod.logger = mod.logger, DataObjects::Logger.new(@log = StringIO.new, :debug)
+    yield
+  ensure
+    @log.rewind
+    @output = @log.readlines.map do |line|
+      line.chomp.gsub(/\A.+?~ \(\d+\.?\d*\)\s+/, '')
+    end
+
+    mod.logger = original
+  end
+
+  supported_by :mysql do
+    before :all do
+      module ::Blog
+        class Article
+          include DataMapper::Resource
+        end
+      end
+
+      @model = ::Blog::Article
+    end
+
+    describe '#auto_migrate' do
+      describe 'Integer property' do
+        [
+          [                    0,                    1, 'TINYINT(1) UNSIGNED'   ],
+          [                    0,                    9, 'TINYINT(1) UNSIGNED'   ],
+          [                    0,                   10, 'TINYINT(2) UNSIGNED'   ],
+          [                    0,                   99, 'TINYINT(2) UNSIGNED'   ],
+          [                    0,                  100, 'TINYINT(3) UNSIGNED'   ],
+          [                    0,                  255, 'TINYINT(3) UNSIGNED'   ],
+          [                    0,                  256, 'SMALLINT(3) UNSIGNED'  ],
+          [                    0,                  999, 'SMALLINT(3) UNSIGNED'  ],
+          [                    0,                 1000, 'SMALLINT(4) UNSIGNED'  ],
+          [                    0,                 9999, 'SMALLINT(4) UNSIGNED'  ],
+          [                    0,                10000, 'SMALLINT(5) UNSIGNED'  ],
+          [                    0,                65535, 'SMALLINT(5) UNSIGNED'  ],
+          [                    0,                65536, 'MEDIUMINT(5) UNSIGNED' ],
+          [                    0,                99999, 'MEDIUMINT(5) UNSIGNED' ],
+          [                    0,               100000, 'MEDIUMINT(6) UNSIGNED' ],
+          [                    0,               999999, 'MEDIUMINT(6) UNSIGNED' ],
+          [                    0,              1000000, 'MEDIUMINT(7) UNSIGNED' ],
+          [                    0,              9999999, 'MEDIUMINT(7) UNSIGNED' ],
+          [                    0,             10000000, 'MEDIUMINT(8) UNSIGNED' ],
+          [                    0,             16777215, 'MEDIUMINT(8) UNSIGNED' ],
+          [                    0,             16777216, 'INT(8) UNSIGNED'       ],
+          [                    0,             99999999, 'INT(8) UNSIGNED'       ],
+          [                    0,            100000000, 'INT(9) UNSIGNED'       ],
+          [                    0,            999999999, 'INT(9) UNSIGNED'       ],
+          [                    0,           1000000000, 'INT(10) UNSIGNED'      ],
+          [                    0,           4294967295, 'INT(10) UNSIGNED'      ],
+          [                    0,           4294967296, 'BIGINT(10) UNSIGNED'   ],
+          [                    0,           9999999999, 'BIGINT(10) UNSIGNED'   ],
+          [                    0,          10000000000, 'BIGINT(11) UNSIGNED'   ],
+          [                    0,          99999999999, 'BIGINT(11) UNSIGNED'   ],
+          [                    0,         100000000000, 'BIGINT(12) UNSIGNED'   ],
+          [                    0,         999999999999, 'BIGINT(12) UNSIGNED'   ],
+          [                    0,        1000000000000, 'BIGINT(13) UNSIGNED'   ],
+          [                    0,        9999999999999, 'BIGINT(13) UNSIGNED'   ],
+          [                    0,       10000000000000, 'BIGINT(14) UNSIGNED'   ],
+          [                    0,       99999999999999, 'BIGINT(14) UNSIGNED'   ],
+          [                    0,      100000000000000, 'BIGINT(15) UNSIGNED'   ],
+          [                    0,      999999999999999, 'BIGINT(15) UNSIGNED'   ],
+          [                    0,     1000000000000000, 'BIGINT(16) UNSIGNED'   ],
+          [                    0,     9999999999999999, 'BIGINT(16) UNSIGNED'   ],
+          [                    0,    10000000000000000, 'BIGINT(17) UNSIGNED'   ],
+          [                    0,    99999999999999999, 'BIGINT(17) UNSIGNED'   ],
+          [                    0,   100000000000000000, 'BIGINT(18) UNSIGNED'   ],
+          [                    0,   999999999999999999, 'BIGINT(18) UNSIGNED'   ],
+          [                    0,  1000000000000000000, 'BIGINT(19) UNSIGNED'   ],
+          [                    0,  9999999999999999999, 'BIGINT(19) UNSIGNED'   ],
+          [                    0, 10000000000000000000, 'BIGINT(20) UNSIGNED'   ],
+          [                    0, 18446744073709551615, 'BIGINT(20) UNSIGNED'   ],
+
+          [                   -1,                    0, 'TINYINT(2)'            ],
+          [                   -1,                    9, 'TINYINT(2)'            ],
+          [                   -1,                   10, 'TINYINT(2)'            ],
+          [                   -1,                   99, 'TINYINT(2)'            ],
+          [                   -1,                  100, 'TINYINT(3)'            ],
+          [                   -1,                  127, 'TINYINT(3)'            ],
+          [                   -1,                  128, 'SMALLINT(3)'           ],
+          [                   -1,                  999, 'SMALLINT(3)'           ],
+          [                   -1,                 1000, 'SMALLINT(4)'           ],
+          [                   -1,                 9999, 'SMALLINT(4)'           ],
+          [                   -1,                10000, 'SMALLINT(5)'           ],
+          [                   -1,                32767, 'SMALLINT(5)'           ],
+          [                   -1,                32768, 'MEDIUMINT(5)'          ],
+          [                   -1,                99999, 'MEDIUMINT(5)'          ],
+          [                   -1,               100000, 'MEDIUMINT(6)'          ],
+          [                   -1,               999999, 'MEDIUMINT(6)'          ],
+          [                   -1,              1000000, 'MEDIUMINT(7)'          ],
+          [                   -1,              8388607, 'MEDIUMINT(7)'          ],
+          [                   -1,              8388608, 'INT(7)'                ],
+          [                   -1,              9999999, 'INT(7)'                ],
+          [                   -1,             10000000, 'INT(8)'                ],
+          [                   -1,             99999999, 'INT(8)'                ],
+          [                   -1,            100000000, 'INT(9)'                ],
+          [                   -1,            999999999, 'INT(9)'                ],
+          [                   -1,           1000000000, 'INT(10)'               ],
+          [                   -1,           2147483647, 'INT(10)'               ],
+          [                   -1,           2147483648, 'BIGINT(10)'            ],
+          [                   -1,           9999999999, 'BIGINT(10)'            ],
+          [                   -1,          10000000000, 'BIGINT(11)'            ],
+          [                   -1,          99999999999, 'BIGINT(11)'            ],
+          [                   -1,         100000000000, 'BIGINT(12)'            ],
+          [                   -1,         999999999999, 'BIGINT(12)'            ],
+          [                   -1,        1000000000000, 'BIGINT(13)'            ],
+          [                   -1,        9999999999999, 'BIGINT(13)'            ],
+          [                   -1,       10000000000000, 'BIGINT(14)'            ],
+          [                   -1,       99999999999999, 'BIGINT(14)'            ],
+          [                   -1,      100000000000000, 'BIGINT(15)'            ],
+          [                   -1,      999999999999999, 'BIGINT(15)'            ],
+          [                   -1,     1000000000000000, 'BIGINT(16)'            ],
+          [                   -1,     9999999999999999, 'BIGINT(16)'            ],
+          [                   -1,    10000000000000000, 'BIGINT(17)'            ],
+          [                   -1,    99999999999999999, 'BIGINT(17)'            ],
+          [                   -1,   100000000000000000, 'BIGINT(18)'            ],
+          [                   -1,   999999999999999999, 'BIGINT(18)'            ],
+          [                   -1,  1000000000000000000, 'BIGINT(19)'            ],
+          [                   -1,  9223372036854775807, 'BIGINT(19)'            ],
+
+          [                   -1,                    0, 'TINYINT(2)'            ],
+          [                   -9,                    0, 'TINYINT(2)'            ],
+          [                  -10,                    0, 'TINYINT(3)'            ],
+          [                  -99,                    0, 'TINYINT(3)'            ],
+          [                 -100,                    0, 'TINYINT(4)'            ],
+          [                 -128,                    0, 'TINYINT(4)'            ],
+          [                 -129,                    0, 'SMALLINT(4)'           ],
+          [                 -999,                    0, 'SMALLINT(4)'           ],
+          [                -1000,                    0, 'SMALLINT(5)'           ],
+          [                -9999,                    0, 'SMALLINT(5)'           ],
+          [               -10000,                    0, 'SMALLINT(6)'           ],
+          [               -32768,                    0, 'SMALLINT(6)'           ],
+          [               -32769,                    0, 'MEDIUMINT(6)'          ],
+          [               -99999,                    0, 'MEDIUMINT(6)'          ],
+          [              -100000,                    0, 'MEDIUMINT(7)'          ],
+          [              -999999,                    0, 'MEDIUMINT(7)'          ],
+          [             -1000000,                    0, 'MEDIUMINT(8)'          ],
+          [             -8388608,                    0, 'MEDIUMINT(8)'          ],
+          [             -8388609,                    0, 'INT(8)'                ],
+          [             -9999999,                    0, 'INT(8)'                ],
+          [            -10000000,                    0, 'INT(9)'                ],
+          [            -99999999,                    0, 'INT(9)'                ],
+          [           -100000000,                    0, 'INT(10)'               ],
+          [           -999999999,                    0, 'INT(10)'               ],
+          [          -1000000000,                    0, 'INT(11)'               ],
+          [          -2147483648,                    0, 'INT(11)'               ],
+          [          -2147483649,                    0, 'BIGINT(11)'            ],
+          [          -9999999999,                    0, 'BIGINT(11)'            ],
+          [         -10000000000,                    0, 'BIGINT(12)'            ],
+          [         -99999999999,                    0, 'BIGINT(12)'            ],
+          [        -100000000000,                    0, 'BIGINT(13)'            ],
+          [        -999999999999,                    0, 'BIGINT(13)'            ],
+          [       -1000000000000,                    0, 'BIGINT(14)'            ],
+          [       -9999999999999,                    0, 'BIGINT(14)'            ],
+          [      -10000000000000,                    0, 'BIGINT(15)'            ],
+          [      -99999999999999,                    0, 'BIGINT(15)'            ],
+          [     -100000000000000,                    0, 'BIGINT(16)'            ],
+          [     -999999999999999,                    0, 'BIGINT(16)'            ],
+          [    -1000000000000000,                    0, 'BIGINT(17)'            ],
+          [    -9999999999999999,                    0, 'BIGINT(17)'            ],
+          [   -10000000000000000,                    0, 'BIGINT(18)'            ],
+          [   -99999999999999999,                    0, 'BIGINT(18)'            ],
+          [  -100000000000000000,                    0, 'BIGINT(19)'            ],
+          [  -999999999999999999,                    0, 'BIGINT(19)'            ],
+          [ -1000000000000000000,                    0, 'BIGINT(20)'            ],
+          [ -9223372036854775808,                    0, 'BIGINT(20)'            ],
+
+          [                  nil,           2147483647, 'INT(10) UNSIGNED'      ],
+          [                    0,                  nil, 'INT(10) UNSIGNED'      ],
+          [                  nil,                  nil, 'INTEGER'               ],
+        ].each do |min, max, statement|
+          options = { :key => true }
+          options[:min] = min if min
+          options[:max] = max if max
+
+          describe "with a min of #{min} and a max of #{max}" do
+            before :all do
+              @property = @model.property(:id, Integer, options)
+
+              @response = capture_log(DataObjects::Mysql) { @model.auto_migrate! }
+            end
+
+            it 'should return true' do
+              @response.should be_true
+            end
+
+            it "should create a #{statement} column" do
+              @output.last.should =~ %r{\ACREATE TABLE `blog_articles` \(`id` #{Regexp.escape(statement)} NOT NULL, PRIMARY KEY\(`id`\)\) ENGINE = InnoDB CHARACTER SET [a-z\d]+ COLLATE (?:[a-z\d](?:_?[a-z\d]+)*)\z}
+            end
+
+            options.only(:min, :max).each do |key, value|
+              it "should allow the #{key} value #{value} to be stored" do
+                lambda {
+                  resource = @model.create(@property => value)
+                  @model.first(@property => value).should eql(resource)
+                }.should_not raise_error
+              end
+            end
+          end
+        end
+      end
+
+      describe 'Text property' do
+        before :all do
+          @model.property(:id, DataMapper::Types::Serial)
+        end
+
+        [
+          [ 0,          'TINYTEXT'   ],
+          [ 1,          'TINYTEXT'   ],
+          [ 255,        'TINYTEXT'   ],
+          [ 256,        'TEXT'       ],
+          [ 65535,      'TEXT'       ],
+          [ 65536,      'MEDIUMTEXT' ],
+          [ 16777215,   'MEDIUMTEXT' ],
+          [ 16777216,   'LONGTEXT'   ],
+          [ 4294967295, 'LONGTEXT'   ],
+
+          [ nil,        'TEXT'       ],
+        ].each do |length, statement|
+          options = {}
+          options[:length] = length if length
+
+          describe "with a length of #{length}" do
+            before :all do
+              @property = @model.property(:body, DataMapper::Types::Text, options)
+
+              @response = capture_log(DataObjects::Mysql) { @model.auto_migrate! }
+            end
+
+            it 'should return true' do
+              @response.should be_true
+            end
+
+            it "should create a #{statement} column" do
+              @output.last.should =~ %r{\ACREATE TABLE `blog_articles` \(`id` INT\(10\) UNSIGNED NOT NULL AUTO_INCREMENT, `body` #{Regexp.escape(statement)}, PRIMARY KEY\(`id`\)\) ENGINE = InnoDB CHARACTER SET [a-z\d]+ COLLATE (?:[a-z\d](?:_?[a-z\d]+)*)\z}
+            end
+          end
+        end
+      end
+    end
+  end
+
+  supported_by :postgres do
+    before :all do
+      module ::Blog
+        class Article
+          include DataMapper::Resource
+        end
+      end
+
+      @model = ::Blog::Article
+    end
+
+    describe '#auto_migrate' do
+      describe 'Integer property' do
+        [
+          [                    0,                   1, 'SMALLINT' ],
+          [                    0,               32767, 'SMALLINT' ],
+          [                    0,               32768, 'INTEGER'  ],
+          [                    0,          2147483647, 'INTEGER'  ],
+          [                    0,          2147483648, 'BIGINT'   ],
+          [                    0, 9223372036854775807, 'BIGINT'   ],
+
+          [                   -1,                   1, 'SMALLINT' ],
+          [                   -1,               32767, 'SMALLINT' ],
+          [                   -1,               32768, 'INTEGER'  ],
+          [                   -1,          2147483647, 'INTEGER'  ],
+          [                   -1,          2147483648, 'BIGINT'   ],
+          [                   -1, 9223372036854775807, 'BIGINT'   ],
+
+          [                   -1,                   0, 'SMALLINT' ],
+          [               -32768,                   0, 'SMALLINT' ],
+          [               -32769,                   0, 'INTEGER'  ],
+          [          -2147483648,                   0, 'INTEGER'  ],
+          [          -2147483649,                   0, 'BIGINT'   ],
+          [ -9223372036854775808,                   0, 'BIGINT'   ],
+
+          [                  nil,          2147483647, 'INTEGER'  ],
+          [                    0,                 nil, 'INTEGER'  ],
+          [                  nil,                 nil, 'INTEGER'  ],
+        ].each do |min, max, statement|
+          options = { :key => true }
+          options[:min] = min if min
+          options[:max] = max if max
+
+          describe "with a min of #{min} and a max of #{max}" do
+            before :all do
+              @property = @model.property(:id, Integer, options)
+
+              @response = capture_log(DataObjects::Postgres) { @model.auto_migrate! }
+            end
+
+            it 'should return true' do
+              @response.should be_true
+            end
+
+            it "should create a #{statement} column" do
+              @output[-2].should == "CREATE TABLE \"blog_articles\" (\"id\" #{statement} NOT NULL, PRIMARY KEY(\"id\"))"
+            end
+
+            options.only(:min, :max).each do |key, value|
+              it "should allow the #{key} value #{value} to be stored" do
+                lambda {
+                  resource = @model.create(@property => value)
+                  @model.first(@property => value).should eql(resource)
+                }.should_not raise_error
+              end
+            end
+          end
+        end
+      end
+
+      describe 'Serial property' do
+        [
+          [                   1, 'SERIAL'    ],
+          [          2147483647, 'SERIAL'    ],
+          [          2147483648, 'BIGSERIAL' ],
+          [ 9223372036854775807, 'BIGSERIAL' ],
+
+          [                 nil, 'SERIAL'    ],
+        ].each do |max, statement|
+          options = {}
+          options[:max] = max if max
+
+          describe "with a max of #{max}" do
+            before :all do
+              @property = @model.property(:id, DataMapper::Types::Serial, options)
+
+              @response = capture_log(DataObjects::Postgres) { @model.auto_migrate! }
+            end
+
+            it 'should return true' do
+              @response.should be_true
+            end
+
+            it "should create a #{statement} column" do
+              @output[-2].should == "CREATE TABLE \"blog_articles\" (\"id\" #{statement} NOT NULL, PRIMARY KEY(\"id\"))"
+            end
+
+            options.only(:min, :max).each do |key, value|
+              it "should allow the #{key} value #{value} to be stored" do
+                lambda {
+                  resource = @model.create(@property => value)
+                  @model.first(@property => value).should eql(resource)
+                }.should_not raise_error
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/public/shared/resource_shared_spec.rb

@@ -237,8 +237,8 @@ share_examples_for 'A public Resource' do
           @resource.should be_frozen
         end
 
-        it 'should not be able to remove an already removed resource' do
-          @resource.destroy.should be_false
+        it "should return true when calling #{method} on a destroyed resource" do
+          @resource.send(method).should be_true
         end
 
         it 'should remove object from persistent storage' do

data/spec/semipublic/shared/condition_shared_spec.rb

@@ -0,0 +1,9 @@
+share_examples_for 'A valid query condition' do
+  before :all do
+    raise "+@comp+ should be defined in before block" unless instance_variable_get(:@comp)
+  end
+
+  it 'should be valid' do
+    @comp.should be_valid
+  end
+end

data/tasks/hoe.rb

@@ -40,6 +40,6 @@ hoe = Hoe.spec(GEM_NAME) do
 
   self.rubyforge_name = PROJECT_NAME
 
-  clean_globs |= %w[ {coverage,doc,log,tmp} **/*.{log,db} profile_results.* **/.DS_Store spec/db ]
-  extra_deps  |= GEM_DEPENDENCIES
+  self.clean_globs |= %w[ {coverage,doc,log,tmp} **/*.{log,db} profile_results.* **/.DS_Store spec/db ]
+  self.extra_deps  |= GEM_DEPENDENCIES
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: datamapper-dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Dan Kubb
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.13
+        version: 0.9.14
     version: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: "2.1"
     version: 
 description: Faster, Better, Simpler.
 email: 
@@ -56,6 +56,7 @@ files:
 - Rakefile
 - SPECS
 - TODO
+- deps.rip
 - dm-core.gemspec
 - lib/dm-core.rb
 - lib/dm-core/adapters.rb
@@ -124,6 +125,7 @@ files:
 - spec/public/associations/one_to_many_spec.rb
 - spec/public/associations/one_to_one_spec.rb
 - spec/public/collection_spec.rb
+- spec/public/migrations_spec.rb
 - spec/public/model/relationship_spec.rb
 - spec/public/model_spec.rb
 - spec/public/property_spec.rb
@@ -153,6 +155,7 @@ files:
 - spec/semipublic/query/path_spec.rb
 - spec/semipublic/query_spec.rb
 - spec/semipublic/resource_spec.rb
+- spec/semipublic/shared/condition_shared_spec.rb
 - spec/semipublic/shared/resource_shared_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb