dm-core 0.10.2 → 1.0.0.rc1

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

@@ -6,9 +6,10 @@ module DataMapper
     # (1 to 1, 1 to n, n to m) implements a subclass of this class
     # with methods like get and set overridden.
     class Relationship
-      include Extlib::Assertions
+      include DataMapper::Assertions
+      include Subject
 
-      OPTIONS = [ :child_repository_name, :parent_repository_name, :child_key, :parent_key, :min, :max, :inverse, :reader_visibility, :writer_visibility ].to_set
+      OPTIONS = [ :child_repository_name, :parent_repository_name, :child_key, :parent_key, :min, :max, :inverse, :reader_visibility, :writer_visibility, :default ].to_set
 
       # Relationship name
       #
@@ -319,8 +320,6 @@ module DataMapper
       #
       # @api semipublic
       def loaded?(resource)
-        assert_kind_of 'resource', resource, source_model
-
         resource.instance_variable_defined?(instance_variable_name)
       end
 
@@ -449,6 +448,7 @@ module DataMapper
         @max                    = @options[:max]
         @reader_visibility      = @options.fetch(:reader_visibility, :public)
         @writer_visibility      = @options.fetch(:writer_visibility, :public)
+        @default                = @options.fetch(:default, nil)
 
         # TODO: normalize the @query to become :conditions => AndOperation
         #  - Property/Relationship/Path should be left alone

data/lib/dm-core/collection.rb

@@ -352,8 +352,12 @@ module DataMapper
     def at(offset)
       if loaded? || partially_loaded?(offset)
         super
-      elsif offset >= 0
+      elsif offset == 0
+        first
+      elsif offset > 0
         first(:offset => offset)
+      elsif offset == -1
+        last
       else
         last(:offset => offset.abs - 1)
       end
@@ -787,7 +791,7 @@ module DataMapper
     #
     # @api public
     def create(attributes = {})
-      _create(true, attributes)
+      _create(attributes)
     end
 
     # Create a Resource in the Collection, bypassing hooks
@@ -800,7 +804,7 @@ module DataMapper
     #
     # @api public
     def create!(attributes = {})
-      _create(false, attributes)
+      _create(attributes, false)
     end
 
     # Update every Resource in the Collection
@@ -814,7 +818,7 @@ module DataMapper
     #   true if the resources were successfully updated
     #
     # @api public
-    def update(attributes = {})
+    def update(attributes)
       assert_update_clean_only(:update)
 
       dirty_attributes = model.new(attributes).dirty_attributes
@@ -832,7 +836,7 @@ module DataMapper
     #   true if the resources were successfully updated
     #
     # @api public
-    def update!(attributes = {})
+    def update!(attributes)
       assert_update_clean_only(:update!)
 
       model = self.model
@@ -866,7 +870,7 @@ module DataMapper
     #
     # @api public
     def save
-      _save(true)
+      _save
     end
 
     # Save every Resource in the Collection bypassing validation
@@ -915,7 +919,10 @@ module DataMapper
           return false
         end
 
-        each { |resource| resource.reset }
+        each do |resource|
+          resource.persisted_state = Resource::State::Immutable.new(resource)
+        end
+
         clear
       else
         mark_loaded
@@ -1192,8 +1199,8 @@ module DataMapper
 
     # Creates a resource in the collection
     #
-    # @param [Boolean] safe
-    #   Whether to use the safe or unsafe create
+    # @param [Boolean] execute_hooks
+    #   Whether to execute hooks or not
     # @param [Hash] attributes
     #   Attributes with which to create the new resource
     #
@@ -1201,8 +1208,8 @@ module DataMapper
     #   a saved Resource
     #
     # @api private
-    def _create(safe, attributes)
-      resource = repository.scope { model.send(safe ? :create : :create!, default_attributes.merge(attributes)) }
+    def _create(attributes, execute_hooks = true)
+      resource = repository.scope { model.send(execute_hooks ? :create : :create!, default_attributes.merge(attributes)) }
       self << resource if resource.saved?
       resource
     end
@@ -1220,18 +1227,18 @@ module DataMapper
 
     # Saves a collection
     #
-    # @param [Symbol] method
-    #   The name of the Resource method to save the collection with
+    # @param [Boolean] execute_hooks
+    #   Whether to execute hooks or not
     #
     # @return [Boolean]
     #   Returns true if collection was updated
     #
     # @api private
-    def _save(safe)
+    def _save(execute_hooks = true)
       loaded_entries = self.loaded_entries
       loaded_entries.each { |resource| set_default_attributes(resource) }
       @removed.clear
-      loaded_entries.all? { |resource| resource.__send__(safe ? :save : :save!) }
+      loaded_entries.all? { |resource| resource.__send__(execute_hooks ? :save : :save!) }
     end
 
     # Returns default values to initialize new Resources in the Collection
@@ -1436,7 +1443,7 @@ module DataMapper
 
       if model.model_method_defined?(method)
         delegate_to_model(method, *args, &block)
-      elsif relationship = relationships[method] || relationships[method.to_s.singular.to_sym]
+      elsif relationship = relationships[method] || relationships[method.to_s.singularize.to_sym]
         delegate_to_relationship(relationship, *args)
       else
         super

data/lib/dm-core/core_ext/array.rb

@@ -0,0 +1,36 @@
+class Array
+
+  ##
+  # Transforms an Array of key/value pairs into a Hash
+  #
+  # This is a better idiom than using Hash[*array.flatten] in Ruby 1.8.6
+  # because it is not possible to limit the flattening to a single
+  # level.
+  #
+  # @return [Hash]
+  #   A Hash where each entry in the Array is turned into a key/value
+  #
+  # @api public
+  def to_hash
+    h = {}
+    each { |k,v| h[k] = v }
+    h
+  end
+
+  ##
+  # Transforms an Array of key/value pairs into a Mash
+  #
+  # This is a better idiom than using Mash[*array.flatten] in Ruby 1.8.6
+  # because it is not possible to limit the flattening to a single
+  # level.
+  #
+  # @return [Mash]
+  #   A Hash where each entry in the Array is turned into a key/value
+  #
+  # @api public
+  def to_mash
+    m = Mash.new
+    each { |k,v| m[k] = v }
+    m
+  end
+end # class Array

data/lib/dm-core/core_ext/hash.rb

@@ -0,0 +1,30 @@
+class Hash
+
+  ##
+  # Create a hash with *only* key/value pairs in receiver and +allowed+
+  #
+  #   { :one => 1, :two => 2, :three => 3 }.only(:one)    #=> { :one => 1 }
+  #
+  # @param [Array[String, Symbol]] *allowed The hash keys to include.
+  #
+  # @return [Hash] A new hash with only the selected keys.
+  #
+  # @api public
+  def only(*allowed)
+    hash = {}
+    allowed.each {|k| hash[k] = self[k] if self.has_key?(k) }
+    hash
+  end
+
+  # Convert to Mash. This class has semantics of ActiveSupport's
+  # HashWithIndifferentAccess and we only have it so that people can write
+  # params[:key] instead of params['key'].
+  #
+  # @return [Mash] This hash as a Mash for string or symbol key access.
+  def to_mash
+    hash = Mash.new(self)
+    hash.default = default
+    hash
+  end
+
+end

data/lib/dm-core/core_ext/module.rb

@@ -0,0 +1,46 @@
+require 'dm-core/core_ext/object'
+
+class Module
+
+  def find_const(const_name)
+    if const_name[0..1] == '::'
+      Object.full_const_get(const_name[2..-1])
+    else
+      nested_const_lookup(const_name)
+    end
+  end
+
+  private
+
+  # Doesn't do any caching since constants can change with remove_const
+  def nested_const_lookup(const_name)
+    unless equal?(Object)
+      constants = []
+
+      name.split('::').each do |part|
+        const = constants.last || Object
+        constants << const.const_get(part)
+      end
+
+      parts = const_name.split('::')
+
+      # from most to least specific constant, use each as a base and try
+      # to find a constant with the name const_name within them
+      constants.reverse_each do |const|
+        # return the nested constant if available
+        return const if parts.all? do |part|
+          const = if RUBY_VERSION >= '1.9.0'
+            const.const_defined?(part, false) ? const.const_get(part, false) : nil
+          else
+            const.const_defined?(part) ? const.const_get(part) : nil
+          end
+        end
+      end
+    end
+
+    # no relative constant found, fallback to an absolute lookup and
+    # use const_missing if not found
+    Object.full_const_get(const_name)
+  end
+
+end

data/lib/dm-core/core_ext/object.rb

@@ -0,0 +1,31 @@
+class Object
+
+  # @param name<String> The name of the constant to get, e.g. "Merb::Router".
+  #
+  # @return [Object] The constant corresponding to the name.
+  def full_const_get(name)
+    list = name.split("::")
+    list.shift if list.first.blank?
+    obj = self
+    list.each do |x|
+      # This is required because const_get tries to look for constants in the
+      # ancestor chain, but we only want constants that are HERE
+      obj = obj.const_defined?(x) ? obj.const_get(x) : obj.const_missing(x)
+    end
+    obj
+  end
+
+  # @param name<String> The name of the constant to get, e.g. "Merb::Router".
+  # @param value<Object> The value to assign to the constant.
+  #
+  # @return [Object] The constant corresponding to the name.
+  def full_const_set(name, value)
+    list = name.split("::")
+    toplevel = list.first.blank?
+    list.shift if toplevel
+    last = list.pop
+    obj = list.empty? ? Object : Object.full_const_get(list.join("::"))
+    obj.const_set(last, value) if obj && !obj.const_defined?(last)
+  end
+
+end

data/lib/dm-core/core_ext/pathname.rb

@@ -0,0 +1,20 @@
+class Pathname
+  # Append path segments and expand to absolute path
+  #
+  #   file = Pathname(Dir.pwd) / "subdir1" / :subdir2 / "filename.ext"
+  #
+  # @param [Pathname, String, #to_s] path path segment to concatenate with receiver
+  #
+  # @return [Pathname]
+  #   receiver with _path_ appended and expanded to an absolute path
+  #
+  # @api public
+  def /(path)
+    (self + path).expand_path
+  end
+
+  # alias to_s to to_str when to_str not defined
+  unless public_instance_methods(false).any? { |m| m.to_sym == :to_str }
+    alias to_str to_s
+  end
+end # class Pathname

data/lib/dm-core/core_ext/string.rb

@@ -0,0 +1,22 @@
+class String
+
+  ##
+  # Replace sequences of whitespace (including newlines) with either
+  # a single space or remove them entirely (according to param _spaced_)
+  #
+  #   <<QUERY.compress_lines
+  #     SELECT name
+  #     FROM users
+  #   QUERY => "SELECT name FROM users"
+  #
+  # @param [TrueClass, FalseClass] spaced (default=true)
+  #   Determines whether returned string has whitespace collapsed or removed
+  #
+  # @return [String] Receiver with whitespace (including newlines) replaced
+  #
+  # @api public
+  def compress_lines(spaced = true)
+    split($/).map { |line| line.strip }.join(spaced ? ' ' : '')
+  end
+
+end

data/lib/dm-core/core_ext/try_dup.rb

@@ -0,0 +1,44 @@
+class Object
+  # Override this in a child if it cannot be dup'ed
+  #
+  # @return [Object]
+  def try_dup
+    self.dup
+  end
+end
+
+class TrueClass
+  def try_dup
+    self
+  end
+end
+
+class FalseClass
+  def try_dup
+    self
+  end
+end
+
+class Module
+  def try_dup
+    self
+  end
+end
+
+class NilClass
+  def try_dup
+    self
+  end
+end
+
+class Numeric
+  def try_dup
+    self
+  end
+end
+
+class Symbol
+  def try_dup
+    self
+  end
+end

data/lib/dm-core/model.rb

@@ -1,5 +1,8 @@
 # TODO: add Model#create!, Model#update, Model#update!, Model#destroy and Model#destroy!
 
+# TODO: DRY up raise_on_save_failure with attr_accessor_with_default
+# once AS branch is merged in
+
 module DataMapper
   module Model
     extend Chainable
@@ -30,7 +33,7 @@ module DataMapper
         warn "Passing in +storage_name+ to #{name}.new is deprecated (#{caller[0]})"
         model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def self.default_storage_name
-            #{Extlib::Inflection.classify(storage_name).inspect}.freeze
+            #{ActiveSupport::Inflector.classify(storage_name).inspect}.freeze
           end
         RUBY
       end
@@ -72,6 +75,68 @@ module DataMapper
     # @api semipublic
     attr_reader :descendants
 
+    # Return if Resource#save should raise an exception on save failures (globally)
+    #
+    # This is false by default.
+    #
+    #   DataMapper::Model.raise_on_save_failure  # => false
+    #
+    # @return [Boolean]
+    #   true if a failure in Resource#save should raise an exception
+    #
+    # @api public
+    def self.raise_on_save_failure
+      if defined?(@raise_on_save_failure)
+        @raise_on_save_failure
+      else
+        false
+      end
+    end
+
+    # Specify if Resource#save should raise an exception on save failures (globally)
+    #
+    # @param [Boolean]
+    #   a boolean that if true will cause Resource#save to raise an exception
+    #
+    # @return [Boolean]
+    #   true if a failure in Resource#save should raise an exception
+    #
+    # @api public
+    def self.raise_on_save_failure=(raise_on_save_failure)
+      @raise_on_save_failure = raise_on_save_failure
+    end
+
+    # Return if Resource#save should raise an exception on save failures (per-model)
+    #
+    # This delegates to DataMapper::Model.raise_on_save_failure by default.
+    #
+    #   User.raise_on_save_failure  # => false
+    #
+    # @return [Boolean]
+    #   true if a failure in Resource#save should raise an exception
+    #
+    # @api public
+    def raise_on_save_failure
+      if defined?(@raise_on_save_failure)
+        @raise_on_save_failure
+      else
+        DataMapper::Model.raise_on_save_failure
+      end
+    end
+
+    # Specify if Resource#save should raise an exception on save failures (per-model)
+    #
+    # @param [Boolean]
+    #   a boolean that if true will cause Resource#save to raise an exception
+    #
+    # @return [Boolean]
+    #   true if a failure in Resource#save should raise an exception
+    #
+    # @api public
+    def raise_on_save_failure=(raise_on_save_failure)
+      @raise_on_save_failure = raise_on_save_failure
+    end
+
     # Appends a module for inclusion into the model class after Resource.
     #
     # This is a useful way to extend Resource while still retaining a
@@ -147,6 +212,8 @@ module DataMapper
       model.instance_variable_set(:@default_order, {})
       model.instance_variable_set(:@descendants,   descendants.class.new(model, descendants))
 
+      model.extend(Chainable)
+
       extra_extensions.each { |mod| model.extend(mod)         }
       extra_inclusions.each { |mod| model.send(:include, mod) }
     end
@@ -163,13 +230,6 @@ module DataMapper
         model.instance_variable_set(:@storage_names, @storage_names.dup)
         model.instance_variable_set(:@default_order, @default_order.dup)
         model.instance_variable_set(:@descendants,   descendants.class.new(model, descendants))
-
-        # TODO: move this into dm-validations
-        if respond_to?(:validators)
-          validators.contexts.each do |context, validators|
-            model.validators.context(context).concat(validators)
-          end
-        end
       end
     end
 
@@ -410,7 +470,7 @@ module DataMapper
     #
     # @api public
     def create(attributes = {})
-      _create(true, attributes)
+      _create(attributes)
     end
 
     # Create a Resource, bypassing hooks
@@ -423,7 +483,7 @@ module DataMapper
     #
     # @api public
     def create!(attributes = {})
-      _create(false, attributes)
+      _create(attributes, false)
     end
 
     # Copy a set of records from one repository to another.
@@ -452,7 +512,7 @@ module DataMapper
 
         all(query.merge(:repository => source_repository_name)).each do |resource|
           new_resource = new
-          query[:fields].each { |property| property.set(new_resource, property.get(resource)) }
+          query[:fields].each { |property| new_resource.__send__("#{property.name}=", property.get(resource)) }
           resources << new_resource if new_resource.save
         end
 
@@ -490,7 +550,7 @@ module DataMapper
             record = record.dup
             field_map.each { |property, field| record[property] = record.delete(field) if record.key?(field) }
 
-            model     = discriminator && record[discriminator] || self
+            model     = discriminator && discriminator.load(record[discriminator]) || self
             model_key = model.key(repository_name)
 
             resource = if model_key.valid?(key_values = record.values_at(*model_key))
@@ -507,9 +567,7 @@ module DataMapper
 
               # TODO: typecasting should happen inside the Adapter
               # and all values should come back as expected objects
-              if property.custom?
-                value = property.type.load(value, property)
-              end
+              value = property.load(value)
 
               property.set!(resource, value)
             end
@@ -533,14 +591,15 @@ module DataMapper
         end
 
         resource.instance_variable_set(:@_repository, repository)
-        resource.instance_variable_set(:@_saved,      true)
 
         if identity_map
+          resource.persisted_state = Resource::State::Clean.new(resource) unless resource.persisted_state?
+
           # defer setting the IdentityMap so second level caches can
           # record the state of the resource after loaded
           identity_map[key_values] = resource
         else
-          resource.instance_variable_set(:@_readonly, true)
+          resource.persisted_state = Resource::State::Immutable.new(resource)
         end
 
         resource
@@ -622,9 +681,9 @@ module DataMapper
     private
 
     # @api private
-    def _create(safe, attributes)
+    def _create(attributes, execute_hooks = true)
       resource = new(attributes)
-      resource.__send__(safe ? :save : :save!)
+      resource.__send__(execute_hooks ? :save : :save!)
       resource
     end
 
@@ -635,8 +694,10 @@ module DataMapper
         self
       elsif name == :Resource
         Resource
-      elsif Types.const_defined?(name)
-        Types.const_get(name)
+      elsif DataMapper::Property.const_defined?(name)
+        DataMapper::Property.const_get(name)
+      elsif DataMapper::Types.const_defined?(name)
+        DataMapper::Types.const_get(name)
       else
         super
       end
@@ -681,14 +742,14 @@ module DataMapper
         if self.query.repository == repository
           query
         else
-          Query.new(repository, self, query.options)
+          repository.new_query(self, query.options)
         end
       end
     end
 
     # @api private
-    def assert_valid # :nodoc:
-      return if @valid
+    def assert_valid(force = false) # :nodoc:
+      return if @valid && !force
       @valid = true
 
       name            = self.name
@@ -704,8 +765,8 @@ module DataMapper
       end
 
       # initialize join models and target keys
-      @relationships.each_value do |relationships|
-        relationships.each_value do |relationship|
+      @relationships.values.each do |relationships|
+        relationships.values.each do |relationship|
           relationship.child_key
           relationship.through if relationship.respond_to?(:through)
           relationship.via     if relationship.respond_to?(:via)
@@ -715,7 +776,7 @@ module DataMapper
 
     # @api private
     def model_methods
-      @model_methods ||= ancestor_instance_methods { |mod| mod.meta_class }
+      @model_methods ||= ancestor_instance_methods { |mod| mod.singleton_class }
     end
 
     # @api private