dm-core 0.10.1 → 0.10.2

data/.autotest

@@ -0,0 +1,29 @@
+Autotest.add_hook :initialize do |at|
+  %w[ .git log script tasks LICENSE README.rdoc ].each do |exception|
+    at.add_exception(exception)
+  end
+
+  at.clear_mappings
+
+  spec_folders = /(?:semi)?public/
+
+  # when a file is updated, make sure it's dependent public and semipublic specs pass
+  at.add_mapping %r{\Alib/dm\-core/(.+)\.rb\z} do |_,match|
+    at.files_matching %r{\Aspec/#{spec_folders}/#{match[1]}_spec\.rb\z}
+  end
+
+  # when the spec configuration changes make sure all specs pass
+  at.add_mapping %r{\Aspec/spec_helper\.rb\z} do
+    at.files_matching %r{\Aspec/.+_spec\.rb\z}
+  end
+
+  # when a spec is updated, make sure it passes
+  at.add_mapping %r{\Aspec/#{spec_folders}/(.+)_spec\.rb\z} do |filename,_|
+    filename
+  end
+
+  # when the collection shared spec is update, make sure all dependent specs pass
+  at.add_mapping %r{\Aspec/lib/collection_shared_spec\.rb\z} do
+    at.files_matching %r{\Aspec/#{spec_folders}/collection_spec\.rb\z}
+  end
+end

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,27 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+tmp
+doc
+log
+.yardoc
+
+## PROJECT::SPECIFIC
+
+spec/db/

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Dan Kubb
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{README.txt → README.rdoc}

@@ -1,6 +1,3 @@
-
-:include:QUICKLINKS
-
 = Why DataMapper?
 
 == Open Development
@@ -191,3 +188,17 @@ need other comparisons though? Try these:
 
 See? Fewer SQL fragments dirtying your Ruby code. And that's just a few of the
 nice syntax tweaks DataMapper delivers out of the box...
+
+== Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2009 Dan Kubb. See LICENSE for details.

data/Rakefile

@@ -1,29 +1,30 @@
-require 'pathname'
 require 'rubygems'
 require 'rake'
-require 'rake/rdoctask'
 
-ROOT = Pathname(__FILE__).dirname.expand_path
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
 
-require ROOT + 'lib/dm-core/version'
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'dm-core'
+    gem.summary     = 'An Object/Relational Mapper for Ruby'
+    gem.description = 'Faster, Better, Simpler.'
+    gem.email       = 'dan.kubb@gmail.com'
+    gem.homepage    = 'http://github.com/datamapper/dm-core'
+    gem.authors     = [ 'Dan Kubb' ]
 
-AUTHOR           = 'Dan Kubb'
-EMAIL            = 'dan.kubb@gmail.com'
-GEM_NAME         = 'dm-core'
-GEM_VERSION      = DataMapper::VERSION
-GEM_DEPENDENCIES = [
-  %w[ extlib      ~>0.9.13 ],
-  %w[ addressable ~>2.1    ],
-]
+    gem.rubyforge_project = 'datamapper'
 
-PROJECT_NAME        = 'datamapper'
-PROJECT_DESCRIPTION = 'Faster, Better, Simpler.'
-PROJECT_SUMMARY     = 'An Object/Relational Mapper for Ruby'
-PROJECT_URL         = 'http://datamapper.org'
+    gem.add_dependency 'extlib',      '~> 0.9.14'
+    gem.add_dependency 'addressable', '~> 2.1'
 
-require ROOT + 'tasks/hoe'
-require ROOT + 'tasks/gemspec'
-require ROOT + 'tasks/install'
-require ROOT + 'tasks/dm'
-require ROOT + 'tasks/doc'
-require ROOT + 'tasks/ci'
+    gem.add_development_dependency 'rspec', '~> 1.2.9'
+    gem.add_development_dependency 'yard',  '~> 0.4.0'
+  end
+
+  Jeweler::GemcutterTasks.new
+
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+end

data/VERSION

@@ -0,0 +1 @@
+0.10.2

data/dm-core.gemspec

@@ -1,36 +1,227 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "0.10.1"
+  s.version = "0.10.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2009-09-30}
+  s.date = %q{2009-12-11}
   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", "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.email = %q{dan.kubb@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".autotest",
+     ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "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/sqlserver_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/enumerable.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/many_to_one_with_boolean_cpk_spec.rb",
+     "spec/public/associations/one_to_many_spec.rb",
+     "spec/public/associations/one_to_one_spec.rb",
+     "spec/public/associations/one_to_one_with_boolean_cpk_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/object_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_finder_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/rcov.opts",
+     "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/sqlserver_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/model_spec.rb",
+     "spec/semipublic/property_spec.rb",
+     "spec/semipublic/query/conditions/comparison_spec.rb",
+     "spec/semipublic/query/conditions/operation_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.rake",
+     "tasks/metrics.rake",
+     "tasks/spec.rake",
+     "tasks/yard.rake",
+     "tasks/yardstick.rake"
+  ]
+  s.homepage = %q{http://github.com/datamapper/dm-core}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{An Object/Relational Mapper for Ruby}
+  s.test_files = [
+    "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/many_to_one_with_boolean_cpk_spec.rb",
+     "spec/public/associations/one_to_many_spec.rb",
+     "spec/public/associations/one_to_one_spec.rb",
+     "spec/public/associations/one_to_one_with_boolean_cpk_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/object_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_finder_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/sqlserver_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/model_spec.rb",
+     "spec/semipublic/property_spec.rb",
+     "spec/semipublic/query/conditions/comparison_spec.rb",
+     "spec/semipublic/query/conditions/operation_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_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     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<extlib>, ["~> 0.9.14"])
       s.add_runtime_dependency(%q<addressable>, ["~> 2.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
     else
-      s.add_dependency(%q<extlib>, ["~> 0.9.13"])
+      s.add_dependency(%q<extlib>, ["~> 0.9.14"])
       s.add_dependency(%q<addressable>, ["~> 2.1"])
+      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_dependency(%q<yard>, ["~> 0.4.0"])
     end
   else
-    s.add_dependency(%q<extlib>, ["~> 0.9.13"])
+    s.add_dependency(%q<extlib>, ["~> 0.9.14"])
     s.add_dependency(%q<addressable>, ["~> 2.1"])
+    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+    s.add_dependency(%q<yard>, ["~> 0.4.0"])
   end
 end
+

data/lib/dm-core.rb

@@ -30,6 +30,15 @@ require dir / 'model' / 'property'
 
 require dir / 'collection'
 
+require dir / 'type'
+require dir / 'types' / 'boolean'
+require dir / 'types' / 'discriminator'
+require dir / 'types' / 'text'
+require dir / 'types' / 'paranoid_datetime'     # TODO: move to dm-more
+require dir / 'types' / 'paranoid_boolean'      # TODO: move to dm-more
+require dir / 'types' / 'object'
+require dir / 'types' / 'serial'
+
 require dir / 'adapters'
 require dir / 'adapters' / 'abstract_adapter'
 require dir / 'associations' / 'relationship'
@@ -53,22 +62,19 @@ require dir / 'resource'
 require dir / 'support' / 'logger'
 require dir / 'support' / 'naming_conventions'
 require dir / 'transaction'                     # TODO: move to dm-more
-require dir / 'type'
-require dir / 'types' / 'boolean'
-require dir / 'types' / 'discriminator'
-require dir / 'types' / 'text'
-require dir / 'types' / 'paranoid_datetime'     # TODO: move to dm-more
-require dir / 'types' / 'paranoid_boolean'      # TODO: move to dm-more
-require dir / 'types' / 'object'
-require dir / 'types' / 'serial'
 require dir / 'version'
 
+require dir / 'core_ext' / 'enumerable'
 require dir / 'core_ext' / 'kernel'             # TODO: do not load automatically
 require dir / 'core_ext' / 'symbol'             # TODO: do not load automatically
 
 # A logger should always be present. Lets be consistent with DO
 DataMapper::Logger.new(StringIO.new, :fatal)
 
+unless defined?(Infinity)
+  Infinity = 1.0/0
+end
+
 # == Setup and Configuration
 # DataMapper uses URIs or a connection hash to connect to your data-store.
 # URI connections takes the form of:
@@ -117,21 +123,20 @@ DataMapper::Logger.new(StringIO.new, :fatal)
 module DataMapper
   extend Extlib::Assertions
 
-  # TODO: move to dm-validations
-  class ValidationError < StandardError; end
-
-  class ObjectNotFoundError < StandardError; end
-
   class RepositoryNotSetupError < StandardError; end
 
   class IncompleteModelError < StandardError; end
 
   class PluginNotFoundError < StandardError; end
 
-  class UpdateConflictError < StandardError; end
-
   class UnknownRelationshipError < StandardError; end
 
+  class ObjectNotFoundError < RuntimeError; end
+
+  class PersistenceError < RuntimeError; end
+
+  class UpdateConflictError < PersistenceError; end
+
   # Raised on attempt to operate on collection of child objects
   # when parent object is not yet saved.
   # For instance, if your article object is not saved,
@@ -139,9 +144,8 @@ module DataMapper
   # publications (n:m case), operation cannot be completed
   # because parent object's keys are not yet persisted,
   # and thus there is no FK value to use in the query.
-  class UnsavedParentError < RuntimeError; end
+  class UnsavedParentError < PersistenceError; end
 
-  # TODO: document
   # @api private
   def self.root
     @root ||= Pathname(__FILE__).dirname.parent.expand_path.freeze
@@ -165,10 +169,10 @@ module DataMapper
   #
   # @api public
   def self.setup(*args)
-    adapter = if args.first.kind_of?(Adapters::AbstractAdapter)
-      args.first
-    else
-      DataMapper::Adapters.new(*args)
+    adapter = args.first
+
+    unless adapter.kind_of?(Adapters::AbstractAdapter)
+      adapter = Adapters.new(*args)
     end
 
     Repository.adapters[adapter.name] = adapter
@@ -188,13 +192,18 @@ module DataMapper
   #
   # @api public
   def self.repository(name = nil)
+    context = Repository.context
+
     current_repository = if name
       assert_kind_of 'name', name, Symbol
-      Repository.context.detect { |repository| repository.name == name } || Repository.new(name)
+      context.detect { |repository| repository.name == name }
     else
-      Repository.context.last || Repository.new(Repository.default_name)
+      name = Repository.default_name
+      context.last
     end
 
+    current_repository ||= Repository.new(name)
+
     if block_given?
       current_repository.scope { |*block_args| yield(*block_args) }
     else