dm-core 0.10.2 → 1.0.0.rc1

data/lib/dm-core.rb

@@ -2,71 +2,140 @@ require 'addressable/uri'
 require 'bigdecimal'
 require 'bigdecimal/util'
 require 'date'
-require 'extlib'
 require 'pathname'
 require 'set'
 require 'time'
 require 'yaml'
 
+begin
+
+  # Prefer active_support
+
+  require 'active_support/core_ext/kernel/singleton_class'
+  require 'active_support/core_ext/class/inheritable_attributes'
+  require 'active_support/core_ext/object/blank'
+  require 'active_support/core_ext/hash/except'
+
+  require 'active_support/hash_with_indifferent_access'
+  require 'active_support/inflector'
+
+  Mash = ActiveSupport::HashWithIndifferentAccess
+
+  require 'dm-core/core_ext/hash'
+  require 'dm-core/core_ext/object'
+  require 'dm-core/core_ext/string'
+
+rescue LoadError
+
+  # Default to extlib
+
+  require 'extlib/inflection'
+  require 'extlib/mash'
+  require 'extlib/string'
+  require 'extlib/class'
+  require 'extlib/hash'
+  require 'extlib/object'
+  require 'extlib/blank'
+
+  class Object
+    unless respond_to?(:singleton_class)
+      def singleton_class
+        class << self; self end
+      end
+    end
+  end
+
+  module ActiveSupport
+    Inflector = Extlib::Inflection
+  end
+
+end
+
 begin
   require 'fastthread'
 rescue LoadError
   # fastthread not installed
 end
 
-dir = Pathname(__FILE__).dirname.expand_path / 'dm-core'
-
-require dir / 'support' / 'chainable'
-require dir / 'support' / 'deprecate'
-require dir / 'support' / 'equalizer'
-
-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 / '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'
-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 / 'migrations'                      # TODO: move to dm-more
-require dir / 'property'
-require dir / 'property_set'
-require dir / 'query'
-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 / 'resource'
-require dir / 'support' / 'logger'
-require dir / 'support' / 'naming_conventions'
-require dir / 'transaction'                     # TODO: move to dm-more
-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
+require 'dm-core/core_ext/pathname'
+require 'dm-core/core_ext/module'
+require 'dm-core/core_ext/array'
+
+require 'dm-core/support/chainable'
+require 'dm-core/support/deprecate'
+require 'dm-core/support/equalizer'
+require 'dm-core/support/assertions'
+require 'dm-core/support/lazy_array'
+require 'dm-core/support/local_object_space'
+require 'dm-core/support/hook'
+require 'dm-core/support/subject'
+require 'dm-core/model'
+require 'dm-core/model/descendant_set'
+require 'dm-core/model/hook'
+require 'dm-core/model/is'
+require 'dm-core/model/scope'
+require 'dm-core/model/relationship'
+require 'dm-core/model/property'
+
+require 'dm-core/collection'
+
+require 'dm-core/type'
+require 'dm-core/types/boolean'
+require 'dm-core/types/discriminator'
+require 'dm-core/types/text'
+require 'dm-core/types/object'
+require 'dm-core/types/serial'
+
+require 'dm-core/property'
+require 'dm-core/property/object'
+require 'dm-core/property/string'
+require 'dm-core/property/binary'
+require 'dm-core/property/text'
+require 'dm-core/property/numeric'
+require 'dm-core/property/float'
+require 'dm-core/property/decimal'
+require 'dm-core/property/boolean'
+require 'dm-core/property/integer'
+require 'dm-core/property/serial'
+require 'dm-core/property/date'
+require 'dm-core/property/date_time'
+require 'dm-core/property/time'
+require 'dm-core/property/class'
+require 'dm-core/property/discriminator'
+require 'dm-core/property_set'
+
+require 'dm-core/adapters'
+require 'dm-core/adapters/abstract_adapter'
+require 'dm-core/associations/relationship'
+require 'dm-core/associations/one_to_many'
+require 'dm-core/associations/one_to_one'
+require 'dm-core/associations/many_to_one'
+require 'dm-core/associations/many_to_many'
+require 'dm-core/identity_map'
+require 'dm-core/property'
+require 'dm-core/property_set'
+require 'dm-core/query'
+require 'dm-core/query/conditions/operation'
+require 'dm-core/query/conditions/comparison'
+require 'dm-core/query/operator'
+require 'dm-core/query/direction'
+require 'dm-core/query/path'
+require 'dm-core/query/sort'
+require 'dm-core/repository'
+require 'dm-core/resource'
+require 'dm-core/resource/state'
+require 'dm-core/resource/state/transient'
+require 'dm-core/resource/state/immutable'
+require 'dm-core/resource/state/persisted'
+require 'dm-core/resource/state/clean'
+require 'dm-core/resource/state/deleted'
+require 'dm-core/resource/state/dirty'
+require 'dm-core/support/logger'
+require 'dm-core/support/naming_conventions'
+require 'dm-core/version'
+
+require 'dm-core/core_ext/kernel'             # TODO: do not load automatically
+require 'dm-core/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)
@@ -121,7 +190,7 @@ end
 # see DataMapper::Logger for more information.
 #
 module DataMapper
-  extend Extlib::Assertions
+  extend DataMapper::Assertions
 
   class RepositoryNotSetupError < StandardError; end
 
@@ -137,6 +206,12 @@ module DataMapper
 
   class UpdateConflictError < PersistenceError; end
 
+  class SaveFailureError < PersistenceError; end
+
+  class ImmutableError < RuntimeError; end
+
+  class ImmutableDeletedError < ImmutableError; 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,
@@ -195,7 +270,7 @@ module DataMapper
     context = Repository.context
 
     current_repository = if name
-      assert_kind_of 'name', name, Symbol
+      name = name.to_sym
       context.detect { |repository| repository.name == name }
     else
       name = Repository.default_name

data/lib/dm-core/adapters.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Adapters
     extend Chainable
-    extend Extlib::Assertions
+    extend DataMapper::Assertions
 
     # Set up an adapter for a storage engine
     #
@@ -10,7 +10,35 @@ module DataMapper
     # @api private
     def self.new(repository_name, options)
       options = normalize_options(options)
-      adapter_class(options[:adapter]).new(repository_name, options)
+      adapter_class(options.fetch(:adapter)).new(repository_name, options)
+    end
+
+    # The path used to require the in memory adapter
+    #
+    # Set this if you want to register your own adapter
+    # to be used when you specify an 'in_memory' connection
+    # during
+    #
+    # @see DataMapper.setup
+    #
+    # @param [String] path
+    #   the path used to require the desired in memory adapter
+    #
+    # @api semipublic
+    def self.in_memory_adapter_path=(path)
+      @in_memory_adapter_path = path
+    end
+
+    # The path used to require the in memory adapter
+    #
+    # @see DataMapper.setup
+    #
+    # @return [String]
+    #   the path used to require the desired in memory adapter
+    #
+    # @api semipublic
+    def self.in_memory_adapter_path
+      @in_memory_adapter_path ||= 'dm-core/adapters/in_memory_adapter'
     end
 
     class << self
@@ -65,11 +93,11 @@ module DataMapper
 
         # Extract the name/value pairs from the query portion of the
         # connection uri, and set them as options directly.
-        if options[:query]
+        if options.fetch(:query)
           options.update(uri.query_values)
         end
 
-        options[:adapter] = options[:scheme]
+        options[:adapter] = options.fetch(:scheme)
 
         options
       end
@@ -89,6 +117,9 @@ module DataMapper
 
       # Return the adapter class constant
       #
+      # @example
+      #   DataMapper::Adapters.send(:adapter_class, 'mysql') # => DataMapper::Adapters::MysqlAdapter
+      #
       # @param [Symbol] name
       #   the name of the adapter
       #
@@ -97,11 +128,28 @@ module DataMapper
       #
       # @api private
       def adapter_class(name)
-        class_name = (Extlib::Inflection.camelize(name) << 'Adapter').to_sym
-        load_adapter(name) unless const_defined?(class_name)
+        adapter_name = normalize_adapter_name(name)
+        class_name = (ActiveSupport::Inflector.camelize(adapter_name) << 'Adapter').to_sym
+        load_adapter(adapter_name) unless const_defined?(class_name)
         const_get(class_name)
       end
 
+      # Return the name of the adapter
+      #
+      # @example
+      #   DataMapper::Adapters.adapter_name('MysqlAdapter') # => 'mysql'
+      #
+      # @param [String] const_name
+      #   the adapter constant name
+      #
+      # @return [String]
+      #   the name of the adapter
+      #
+      # @api semipublic
+      def adapter_name(const_name)
+        const_name.to_s.sub('Adapter', '').downcase
+      end
+
       # Require the adapter library
       #
       # @param [String, Symbol] name
@@ -112,17 +160,53 @@ module DataMapper
       #
       # @api private
       def load_adapter(name)
-        assert_kind_of 'name', name, String, Symbol
+        require "dm-#{name}-adapter"
+      rescue LoadError
+        require in_memory_adapter?(name) ? in_memory_adapter_path : legacy_path(name)
+      end
+
+      # Returns wether or not the given adapter name is considered an in memory adapter
+      #
+      # @param [String, Symbol] name
+      #   the name of the adapter
+      #
+      # @return [Boolean]
+      #   true if the adapter is considered to be an in memory adapter
+      #
+      # @api private
+      def in_memory_adapter?(name)
+        name.to_s == 'in_memory'
+      end
 
-        lib  = "#{name}_adapter"
-        file = DataMapper.root / 'lib' / 'dm-core' / 'adapters' / "#{lib}.rb"
+      # Returns the fallback filename that would be used to require the named adapter
+      #
+      # The fallback format is "#{name}_adapter" and will be phased out in favor of
+      # the properly 'namespaced' "dm-#{name}-adapter" format.
+      #
+      # @param [String, Symbol] name
+      #   the name of the adapter to require
+      #
+      # @return [String]
+      #   the filename that gets required for the adapter identified by name
+      #
+      # @api private
+      def legacy_path(name)
+        "#{name}_adapter"
+      end
 
-        if file.file?
-          require file
-        else
-          require lib
-        end
+      # Adjust the adapter name to match the name used in the gem providing the adapter
+      #
+      # @param [String, Symbol] name
+      #   the name of the adapter
+      #
+      # @return [String]
+      #   the normalized adapter name
+      #
+      # @api private
+      def normalize_adapter_name(name)
+        (original = name.to_s) == 'sqlite3' ? 'sqlite' : original
       end
+
     end
 
     extendable do

data/lib/dm-core/adapters/abstract_adapter.rb

@@ -12,8 +12,8 @@ module DataMapper
     # Note that in case of adapters to relational databases it makes
     # sense to inherit from DataObjectsAdapter class.
     class AbstractAdapter
-      include Extlib::Assertions
-      extend Extlib::Assertions
+      include DataMapper::Assertions
+      extend DataMapper::Assertions
       extend Equalizer
 
       equalize :name, :options, :resource_naming_convention, :field_naming_convention
@@ -27,7 +27,7 @@ module DataMapper
       #
       # DataMapper.setup(:default, 'postgres://postgres@localhost/dm_core_test')
       #
-      # then adapter name is currently be set to is :default
+      # the adapter name is currently set to :default
       #
       # @return [Symbol]
       #   the adapter name
@@ -142,6 +142,26 @@ module DataMapper
         raise NotImplementedError, "#{self.class}#delete not implemented"
       end
 
+      # Create a Query object or subclass.
+      #
+      # Alter this method if you'd like to return an adapter specific Query subclass.
+      #
+      # @param [Repository] repository
+      #   the Repository to retrieve results from
+      # @param [Model] model
+      #   the Model to retrieve results from
+      # @param [Hash] options
+      #   the conditions and scope
+      #
+      # @return [Query]
+      #
+      # @api semipublic
+      #--
+      # TODO: DataObjects::Connection.create_command style magic (Adapter)::Query?
+      def new_query(repository, model, options = {})
+        Query.new(repository, model, options)
+      end
+
       protected
 
       # Set the serial value of the Resource
@@ -178,7 +198,7 @@ module DataMapper
       #
       # @api semipublic
       def attributes_as_fields(attributes)
-        attributes.map { |property, value| [ property.field, value ] }.to_hash
+        attributes.map { |property, value| [ property.field, property.dump(value) ] }.to_hash
       end
 
       private

data/lib/dm-core/adapters/in_memory_adapter.rb

@@ -23,7 +23,7 @@ module DataMapper
 
         resources.each do |resource|
           initialize_serial(resource, records.size.succ)
-          records << resource.attributes(:field)
+          records << attributes_as_fields(resource.attributes(nil))
         end
       end
 
@@ -55,7 +55,7 @@ module DataMapper
       # @api semipublic
       def update(attributes, collection)
         attributes = attributes_as_fields(attributes)
-        read(collection.query).each { |resource| resource.update(attributes) }.size
+        read(collection.query).each { |record| record.update(attributes) }.size
       end
 
       # Destroys all the records matching the given query. "DELETE" in SQL.
@@ -74,6 +74,11 @@ module DataMapper
         records_to_delete.size
       end
 
+      # TODO consider proper automigrate functionality
+      def reset
+        @records = {}
+      end
+
       private
 
       # Make a new instance of the adapter. The @records ivar is the 'data-store'