dm-core 0.9.11 → 0.10.0

data/SPECS

@@ -11,7 +11,7 @@ Writing Specs
   = DO:
 
   * Write more specs for error conditions than clean conditions.
-  * Write specs with readability in mind. Somebody knew to DataMapper should be
+  * Write specs with readability in mind. Somebody new to DataMapper should be
     able to read specs to learn how something works.
   * Use existing models that are part of a metaphor.
   * Nest describe blocks (2 or 3 levels deep is probably fine).
@@ -29,34 +29,7 @@ Writing Specs
   And a final do: Do go against the guidelines if your best judgement tells you
   to. These are just guidelines and are obviously not fast rules.
 
-Models
-======
-
-  Models are declared in separate files as opposed to individual spec files for
-  two reasons. The first is to improve readability. By creating as few models
-  as possible and sharing these models throughout the specs, a reader can
-  become familiar with the models being used quicker. Models also follow a
-  few simple metaphors, such as a zoo, a blog implementation, etc... Following
-  metaphors makes it easier for a reader to guess what is going on with respect
-  to the models.
-
-  The second reason is to allow the spec environment to be as pristine as
-  possible going into an example. Models being loaded from the model directory
-  are tracked and reloaded before each example. Any changes that might be made
-  to the model are reset at the end.
-
 Mocks and Stubs
 ===============
 
-  Obviously, mocks and stubs are a powerful feature when it comes to BDD;
-  however, remember that you are writing specs for behavior and NOT
-  implementation.
-
-Ordering Specs
-==============
-
-  Specs aren't much use if nobody can find where anything is, so keeping specs
-  well organized is critical. Currently, we are trying out the following
-  structure:
-
-    * List guidelines here...
+  Do not use mocks or stubs for any specs in DataMapper.

data/TODO

@@ -1 +1 @@
-See: http://github.com/sam/dm-core/wikis
+See: http://wiki.github.com/datamapper/dm-core

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,39 +2,35 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "0.9.11"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2009-03-29}
+  s.date = %q{2009-07-30}
   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/postgres_adapter.rb", "lib/dm-core/adapters/sqlite3_adapter.rb", "lib/dm-core/associations.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/associations/relationship_chain.rb", "lib/dm-core/auto_migrations.rb", "lib/dm-core/collection.rb", "lib/dm-core/dependency_queue.rb", "lib/dm-core/hook.rb", "lib/dm-core/identity_map.rb", "lib/dm-core/is.rb", "lib/dm-core/logger.rb", "lib/dm-core/migrations/destructive_migrations.rb", "lib/dm-core/migrator.rb", "lib/dm-core/model.rb", "lib/dm-core/naming_conventions.rb", "lib/dm-core/property.rb", "lib/dm-core/property_set.rb", "lib/dm-core/query.rb", "lib/dm-core/repository.rb", "lib/dm-core/resource.rb", "lib/dm-core/scope.rb", "lib/dm-core/support.rb", "lib/dm-core/support/array.rb", "lib/dm-core/support/assertions.rb", "lib/dm-core/support/errors.rb", "lib/dm-core/support/kernel.rb", "lib/dm-core/support/symbol.rb", "lib/dm-core/transaction.rb", "lib/dm-core/type.rb", "lib/dm-core/type_map.rb", "lib/dm-core/types.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/all", "script/performance.rb", "script/profile.rb", "spec/integration/association_spec.rb", "spec/integration/association_through_spec.rb", "spec/integration/associations/many_to_many_spec.rb", "spec/integration/associations/many_to_one_spec.rb", "spec/integration/associations/one_to_many_spec.rb", "spec/integration/auto_migrations_spec.rb", "spec/integration/collection_spec.rb", "spec/integration/data_objects_adapter_spec.rb", "spec/integration/dependency_queue_spec.rb", "spec/integration/model_spec.rb", "spec/integration/mysql_adapter_spec.rb", "spec/integration/postgres_adapter_spec.rb", "spec/integration/property_spec.rb", "spec/integration/query_spec.rb", "spec/integration/repository_spec.rb", "spec/integration/resource_spec.rb", "spec/integration/sqlite3_adapter_spec.rb", "spec/integration/sti_spec.rb", "spec/integration/strategic_eager_loading_spec.rb", "spec/integration/transaction_spec.rb", "spec/integration/type_spec.rb", "spec/lib/logging_helper.rb", "spec/lib/mock_adapter.rb", "spec/lib/model_loader.rb", "spec/lib/publicize_methods.rb", "spec/models/content.rb", "spec/models/vehicles.rb", "spec/models/zoo.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/unit/adapters/abstract_adapter_spec.rb", "spec/unit/adapters/adapter_shared_spec.rb", "spec/unit/adapters/data_objects_adapter_spec.rb", "spec/unit/adapters/in_memory_adapter_spec.rb", "spec/unit/adapters/postgres_adapter_spec.rb", "spec/unit/associations/many_to_many_spec.rb", "spec/unit/associations/many_to_one_spec.rb", "spec/unit/associations/one_to_many_spec.rb", "spec/unit/associations/one_to_one_spec.rb", "spec/unit/associations/relationship_spec.rb", "spec/unit/associations_spec.rb", "spec/unit/auto_migrations_spec.rb", "spec/unit/collection_spec.rb", "spec/unit/data_mapper_spec.rb", "spec/unit/identity_map_spec.rb", "spec/unit/is_spec.rb", "spec/unit/migrator_spec.rb", "spec/unit/model_spec.rb", "spec/unit/naming_conventions_spec.rb", "spec/unit/property_set_spec.rb", "spec/unit/property_spec.rb", "spec/unit/query_spec.rb", "spec/unit/repository_spec.rb", "spec/unit/resource_spec.rb", "spec/unit/scope_spec.rb", "spec/unit/transaction_spec.rb", "spec/unit/type_map_spec.rb", "spec/unit/type_spec.rb", "tasks/ci.rb", "tasks/dm.rb", "tasks/doc.rb", "tasks/gemspec.rb", "tasks/hoe.rb", "tasks/install.rb"]
-  s.has_rdoc = true
+  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/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.homepage = %q{http://datamapper.org}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{An Object/Relational Mapper for Ruby}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<data_objects>, ["~> 0.9.11"])
-      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.11"])
-      s.add_runtime_dependency(%q<addressable>, ["~> 2.0.2"])
+      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.13"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.0"])
     else
-      s.add_dependency(%q<data_objects>, ["~> 0.9.11"])
-      s.add_dependency(%q<extlib>, ["~> 0.9.11"])
-      s.add_dependency(%q<addressable>, ["~> 2.0.2"])
+      s.add_dependency(%q<extlib>, ["~> 0.9.13"])
+      s.add_dependency(%q<addressable>, ["~> 2.0"])
     end
   else
-    s.add_dependency(%q<data_objects>, ["~> 0.9.11"])
-    s.add_dependency(%q<extlib>, ["~> 0.9.11"])
-    s.add_dependency(%q<addressable>, ["~> 2.0.2"])
+    s.add_dependency(%q<extlib>, ["~> 0.9.13"])
+    s.add_dependency(%q<addressable>, ["~> 2.0"])
   end
 end

data/lib/dm-core.rb

@@ -4,27 +4,20 @@
 # * Requires fastthread, support libs, and base.
 # * Sets the application root and environment for compatibility with frameworks
 #   such as Rails or Merb.
-# * Checks for the database.yml and loads it if it exists.
-# * Sets up the database using the config from the Yaml file or from the
-#   environment.
 #
 
+require 'addressable/uri'
+require 'base64'
+require 'bigdecimal'
+require 'bigdecimal/util'
 require 'date'
+require 'extlib'
 require 'pathname'
-require 'rubygems'
 require 'set'
 require 'time'
 require 'yaml'
 
-gem 'addressable', '~>2.0.2'
-require 'addressable/uri'
-
-gem 'extlib', '~>0.9.11'
-require 'extlib'
-require 'extlib/inflection'
-
 begin
-  gem 'fastthread', '~>1.0.4'
   require 'fastthread'
 rescue LoadError
   # fastthread not installed
@@ -32,30 +25,57 @@ end
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-core'
 
-require dir / 'support'
-require dir / 'resource'
+require dir / 'support' / 'chainable'
+require dir / 'support' / 'deprecate'
+
 require dir / 'model'
+require dir / 'model' / 'descendant_set'
+require dir / 'model' / 'hook'
+require dir / 'model' / 'is'
+require dir / 'model' / 'scope'
+require dir / 'model' / 'relationship'
+require dir / 'model' / 'property'
 
-require dir / 'dependency_queue'
-require dir / 'type'
-require dir / 'type_map'
-require dir / 'types'
-require dir / 'hook'
-require dir / 'associations'
-require dir / 'auto_migrations'
+require dir / 'collection'
+
+require dir / 'adapters'
+require dir / 'adapters' / 'abstract_adapter'
+require dir / 'associations' / 'relationship'
+require dir / 'associations' / 'one_to_many'
+require dir / 'associations' / 'one_to_one'
+require dir / 'associations' / 'many_to_one'
+require dir / 'associations' / 'many_to_many'
 require dir / 'identity_map'
-require dir / 'logger'
-require dir / 'migrator'
-require dir / 'naming_conventions'
+require dir / 'migrations'                      # TODO: move to dm-more
+require dir / 'property'
 require dir / 'property_set'
 require dir / 'query'
-require dir / 'transaction'
+require dir / 'query' / 'conditions' / 'operation'
+require dir / 'query' / 'conditions' / 'comparison'
+require dir / 'query' / 'operator'
+require dir / 'query' / 'direction'
+require dir / 'query' / 'path'
+require dir / 'query' / 'sort'
 require dir / 'repository'
-require dir / 'scope'
-require dir / 'property'
-require dir / 'adapters'
-require dir / 'collection'
-require dir / 'is'
+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' / '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)
 
 # == Setup and Configuration
 # DataMapper uses URIs or a connection hash to connect to your data-store.
@@ -76,10 +96,10 @@ require dir / 'is'
 # address the data-store on the server.
 #
 # Here's some examples
-#   DataMapper.setup(:default, "sqlite3://path/to/your/project/db/development.db")
-#   DataMapper.setup(:default, "mysql://localhost/dm_core_test")
+#   DataMapper.setup(:default, 'sqlite3://path/to/your/project/db/development.db')
+#   DataMapper.setup(:default, 'mysql://localhost/dm_core_test')
 #     # no auth-info
-#   DataMapper.setup(:default, "postgres://root:supahsekret@127.0.0.1/dm_core_test")
+#   DataMapper.setup(:default, 'postgres://root:supahsekret@127.0.0.1/dm_core_test')
 #     # with auth-info
 #
 #
@@ -88,7 +108,7 @@ require dir / 'is'
 #
 #   DataMapper.setup(:default, {
 #     :adapter  => 'adapter_name_here',
-#     :database => "path/to/repo",
+#     :database => 'path/to/repo',
 #     :username => 'username',
 #     :password => 'password',
 #     :host     => 'hostname'
@@ -97,67 +117,71 @@ require dir / 'is'
 # === Logging
 # To turn on error logging to STDOUT, issue:
 #
-#   DataMapper::Logger.new(STDOUT, 0)
+#   DataMapper::Logger.new(STDOUT, :debug)
 #
 # You can pass a file location ("/path/to/log/file.log") in place of STDOUT.
 # see DataMapper::Logger for more information.
 #
 module DataMapper
-  extend Assertions
+  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
+
+  # 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,
+  # but you try to fetch or scope down comments (1:n case), or
+  # 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
+
+  # TODO: document
+  # @api private
   def self.root
-    @root ||= Pathname(__FILE__).dirname.parent.expand_path
+    @root ||= Pathname(__FILE__).dirname.parent.expand_path.freeze
   end
 
-  ##
   # Setups up a connection to a data-store
   #
-  # @param Symbol name a name for the context, defaults to :default
-  # @param [Hash{Symbol => String}, Addressable::URI, String] uri_or_options
+  # @param [Symbol] name
+  #   a name for the context, defaults to :default
+  # @param [Hash(Symbol => String), Addressable::URI, String] uri_or_options
   #   connection information
   #
-  # @return Repository the resulting setup repository
+  # @return [DataMapper::Adapters::AbstractAdapter]
+  #   the resulting setup adapter
   #
-  # @raise ArgumentError "+name+ must be a Symbol, but was..." indicates that
-  #   an invalid argument was passed for name[Symbol]
-  # @raise [ArgumentError] "+uri_or_options+ must be a Hash, URI or String,
-  #   but was..." indicates that connection information could not be gleaned
-  #   from the given uri_or_options<Hash, Addressable::URI, String>
+  # @raise [ArgumentError] "+name+ must be a Symbol, but was..."
+  #   indicates that an invalid argument was passed for name[Symbol]
+  # @raise [ArgumentError] "+uri_or_options+ must be a Hash, URI or String, but was..."
+  #   indicates that connection information could not be gleaned from
+  #   the given uri_or_options[Hash, Addressable::URI, String]
   #
-  # -
   # @api public
-  def self.setup(name, uri_or_options)
-    assert_kind_of 'name',           name,           Symbol
-    assert_kind_of 'uri_or_options', uri_or_options, Addressable::URI, Hash, String
-
-    case uri_or_options
-      when Hash
-        adapter_name = uri_or_options[:adapter].to_s
-      when String, DataObjects::URI, Addressable::URI
-        uri_or_options = DataObjects::URI.parse(uri_or_options) if uri_or_options.kind_of?(String)
-        adapter_name = uri_or_options.scheme
-    end
-
-    class_name = Extlib::Inflection.classify(adapter_name) + 'Adapter'
-
-    unless Adapters::const_defined?(class_name)
-      lib_name = "#{Extlib::Inflection.underscore(adapter_name)}_adapter"
-      begin
-        require root / 'lib' / 'dm-core' / 'adapters' / lib_name
-      rescue LoadError => e
-        begin
-          require lib_name
-        rescue Exception
-          # library not found, raise the original error
-          raise e
-        end
-      end
+  def self.setup(*args)
+    adapter = if args.first.kind_of?(Adapters::AbstractAdapter)
+      args.first
+    else
+      DataMapper::Adapters.new(*args)
     end
 
-    Repository.adapters[name] = Adapters::const_get(class_name).new(name, uri_or_options)
+    Repository.adapters[adapter.name] = adapter
   end
 
-  ##
   # Block Syntax
   #   Pushes the named repository onto the context-stack,
   #   yields a new session, and pops the context-stack.
@@ -167,12 +191,14 @@ module DataMapper
   #   a new Session.
   #
   # @param [Symbol] args the name of a repository to act within or return, :default is default
+  #
   # @yield [Proc] (optional) block to execute within the context of the named repository
-  # @demo spec/integration/repository_spec.rb
-  def self.repository(name = nil) # :yields: current_context
+  #
+  # @api public
+  def self.repository(name = nil)
     current_repository = if name
-      raise ArgumentError, "First optional argument must be a Symbol, but was #{name.inspect}" unless name.is_a?(Symbol)
-      Repository.context.detect { |r| r.name == name } || Repository.new(name)
+      assert_kind_of 'name', name, Symbol
+      Repository.context.detect { |repository| repository.name == name } || Repository.new(name)
     else
       Repository.context.last || Repository.new(Repository.default_name)
     end
@@ -183,35 +209,4 @@ module DataMapper
       current_repository
     end
   end
-
-  # A logger should always be present. Lets be consistent with DO
-  Logger.new(nil, :off)
-
-  ##
-  # destructively migrates the repository upwards to match model definitions
-  #
-  # @param [Symbol] name repository to act on, :default is the default
-  def self.migrate!(name = Repository.default_name)
-    repository(name).migrate!
-  end
-
-  ##
-  # drops and recreates the repository upwards to match model definitions
-  #
-  # @param [Symbol] name repository to act on, :default is the default
-  def self.auto_migrate!(repository_name = nil)
-    AutoMigrator.auto_migrate(repository_name)
-  end
-
-  def self.auto_upgrade!(repository_name = nil)
-    AutoMigrator.auto_upgrade(repository_name)
-  end
-
-  def self.prepare(*args, &blk)
-    yield repository(*args)
-  end
-
-  def self.dependency_queue
-    @dependency_queue ||= DependencyQueue.new
-  end
 end

data/lib/dm-core/adapters.rb

@@ -1,16 +1,135 @@
-dir = Pathname(__FILE__).dirname.expand_path / 'adapters'
-
-require dir / 'abstract_adapter'
-require dir / 'in_memory_adapter'
-
-# NOTE: this is a temporary work-around to the load error problems,
-# and is better fixed in dm-core/next.  The main reason the fix is
-# not applied in dm-core/master is because the change is non-trivial.
-
-%w[ data_objects sqlite3 mysql postgres ].each do |gem|
-  begin
-    require dir / "#{gem}_adapter"
-  rescue LoadError, Gem::Exception
-    # ignore it
-  end
-end
+module DataMapper
+  module Adapters
+    extend Chainable
+    extend Extlib::Assertions
+
+    # Set up an adapter for a storage engine
+    #
+    # @see DataMapper.setup
+    #
+    # @api private
+    def self.new(repository_name, options)
+      options = normalize_options(options)
+      adapter_class(options[:adapter]).new(repository_name, options)
+    end
+
+    class << self
+      private
+
+      # Normalize the arguments passed to new()
+      #
+      # Turns options hash or connection URI into the options hash used
+      # by the adapter.
+      #
+      # @param [Hash, Addressable::URI, String] options
+      #   the options to be normalized
+      #
+      # @return [Mash]
+      #   the options normalized as a Mash
+      #
+      # @api private
+      def normalize_options(options)
+        case options
+          when Hash             then normalize_options_hash(options)
+          when Addressable::URI then normalize_options_uri(options)
+          when String           then normalize_options_string(options)
+          else
+            assert_kind_of 'options', options, Hash, Addressable::URI, String
+        end
+      end
+
+      # Normalize Hash options into a Mash
+      #
+      # @param [Hash] hash
+      #   the hash to be normalized
+      #
+      # @return [Mash]
+      #   the options normalized as a Mash
+      #
+      # @api private
+      def normalize_options_hash(hash)
+        hash.to_mash
+      end
+
+      # Normalize Addressable::URI options into a Mash
+      #
+      # @param [Addressable::URI] uri
+      #   the uri to be normalized
+      #
+      # @return [Mash]
+      #   the options normalized as a Mash
+      #
+      # @api private
+      def normalize_options_uri(uri)
+        options = normalize_options_hash(uri.to_hash)
+
+        # Extract the name/value pairs from the query portion of the
+        # connection uri, and set them as options directly.
+        if options[:query]
+          options.update(uri.query_values)
+        end
+
+        options[:adapter] = options[:scheme]
+
+        options
+      end
+
+      # Normalize String options into a Mash
+      #
+      # @param [String] string
+      #   the string to be normalized
+      #
+      # @return [Mash]
+      #   the options normalized as a Mash
+      #
+      # @api private
+      def normalize_options_string(string)
+        normalize_options_uri(Addressable::URI.parse(string))
+      end
+
+      # Return the adapter class constant
+      #
+      # @param [Symbol] name
+      #   the name of the adapter
+      #
+      # @return [Class]
+      #   the AbstractAdapter subclass
+      #
+      # @api private
+      def adapter_class(name)
+        class_name = (Extlib::Inflection.camelize(name) << 'Adapter').to_sym
+        load_adapter(name) unless const_defined?(class_name)
+        const_get(class_name)
+      end
+
+      # Require the adapter library
+      #
+      # @param [String, Symbol] name
+      #   the name of the adapter
+      #
+      # @return [Boolean]
+      #   true if the adapter is loaded
+      #
+      # @api private
+      def load_adapter(name)
+        assert_kind_of 'name', name, String, Symbol
+
+        lib  = "#{name}_adapter"
+        file = DataMapper.root / 'lib' / 'dm-core' / 'adapters' / "#{lib}.rb"
+
+        if file.file?
+          require file
+        else
+          require lib
+        end
+      end
+    end
+
+    extendable do
+      # TODO: document
+      # @api private
+      def const_added(const_name)
+      end
+    end
+  end # module Adapters
+end # module DataMapper