dm-core 1.1.0.rc2 → 1.1.0.rc3

data/lib/dm-core/ext/blank.rb

@@ -0,0 +1,24 @@
+module DataMapper
+  module Ext
+    # Determines whether the specified +value+ is blank.
+    #
+    # An object is blank if it's false, empty, or a whitespace string.
+    # For example, "", "   ", +nil+, [], and {} are blank.
+    #
+    # @api semipublic
+    def self.blank?(value)
+      case value
+      when ::NilClass, ::FalseClass
+        true
+      when ::TrueClass, ::Numeric
+        false
+      when ::Array, ::Hash
+        value.empty?
+      when ::String
+        value !~ /\S/
+      else
+        value.nil? || (value.respond_to?(:empty?) && value.empty?)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+module DataMapper; module Ext
+  module Hash
+    # Creates a hash with *only* the specified key/value pairs from +hash+.
+    #
+    # @param [Hash] hash The hash from which to pick the key/value pairs.
+    # @param [Array] *keys The hash keys to include.
+    #
+    # @return [Hash] A new hash with only the selected keys.
+    #
+    # @example
+    #   hash = { :one => 1, :two => 2, :three => 3 }
+    #   Ext::Hash.only(hash, :one, :two) # => { :one => 1, :two => 2 }
+    #
+    # @api semipublic
+    def self.only(hash, *keys)
+      h = {}
+      keys.each {|k| h[k] = hash[k] if hash.has_key?(k) }
+      h
+    end
+
+    # Returns a hash that includes everything but the given +keys+.
+    #
+    # @param [Hash] hash The hash from which to pick the key/value pairs.
+    # @param [Array] *keys The hash keys to exclude.
+    #
+    # @return [Hash] A new hash without the specified keys.
+    #
+    # @example
+    #   hash = { :one => 1, :two => 2, :three => 3 }
+    #   Ext::Hash.except(hash, :one, :two) # => { :three => 3 }
+    #
+    # @api semipublic
+    def self.except(hash, *keys)
+      self.except!(hash.dup, *keys)
+    end
+
+    # Removes the specified +keys+ from the given +hash+.
+    #
+    # @param [Hash] hash The hash to modify.
+    # @param [Array] *keys The hash keys to exclude.
+    #
+    # @return [Hash] +hash+
+    #
+    # @example
+    #   hash = { :one => 1, :two => 2, :three => 3 }
+    #   Ext::Hash.except!(hash, :one, :two)
+    #   hash # => { :three => 3 }
+    #
+    # @api semipublic
+    def self.except!(hash, *keys)
+      keys.each { |key| hash.delete(key) }
+      hash
+    end
+
+    # Converts the specified +hash+ to a {Mash}.
+    #
+    # @param [Hash] hash The hash to convert.
+    # @return [Mash] The {Mash} for the specified +hash+.
+    #
+    # @api semipublic
+    def self.to_mash(hash)
+      h = Mash.new(hash)
+      h.default = hash.default
+      h
+    end
+  end
+end; end

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

@@ -0,0 +1,49 @@
+require 'dm-core/ext/object'
+
+module DataMapper; module Ext
+  module Module
+
+    # @api semipublic
+    def self.find_const(mod, const_name)
+      if const_name[0..1] == '::'
+        DataMapper::Ext::Object.full_const_get(const_name[2..-1])
+      else
+        nested_const_lookup(mod, const_name)
+      end
+    end
+
+  private
+
+    # Doesn't do any caching since constants can change with remove_const
+    def self.nested_const_lookup(mod, const_name)
+      unless mod.equal?(::Object)
+        constants = []
+
+        mod.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
+      DataMapper::Ext::Object.full_const_get(const_name)
+    end
+
+  end
+end; end

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

@@ -0,0 +1,57 @@
+module DataMapper; module Ext
+  module Object
+    # Returns the value of the specified constant.
+    #
+    # @overload full_const_get(obj, name)
+    #   Returns the value of the specified constant in +obj+.
+    #   @param [Object] obj The root object used as origin.
+    #   @param [String] name The name of the constant to get, e.g. "Merb::Router".
+    #
+    # @overload full_const_get(name)
+    #   Returns the value of the fully-qualified constant.
+    #   @param [String] name The name of the constant to get, e.g. "Merb::Router".
+    #
+    # @return [Object] The constant corresponding to +name+.
+    #
+    # @api semipublic
+    def self.full_const_get(obj, name = nil)
+      obj, name = ::Object, obj if name.nil?
+
+      list = name.split("::")
+      list.shift if DataMapper::Ext.blank?(list.first)
+      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
+
+    # Sets the specified constant to the given +value+.
+    #
+    # @overload full_const_set(obj, name)
+    #   Sets the specified constant in +obj+ to the given +value+.
+    #   @param [Object] obj The root object used as origin.
+    #   @param [String] name The name of the constant to set, e.g. "Merb::Router".
+    #   @param [Object] value The value to assign to the constant.
+    #
+    # @overload full_const_set(name)
+    #   Sets the fully-qualified constant to the given +value+.
+    #   @param [String] name The name of the constant to set, e.g. "Merb::Router".
+    #   @param [Object] value The value to assign to the constant.
+    #
+    # @return [Object] The constant corresponding to +name+.
+    #
+    # @api semipublic
+    def self.full_const_set(obj, name, value = nil)
+      obj, name, value = ::Object, obj, name if value.nil?
+
+      list = name.split("::")
+      toplevel = DataMapper::Ext.blank?(list.first)
+      list.shift if toplevel
+      last = list.pop
+      obj = list.empty? ? ::Object : DataMapper::Ext::Object.full_const_get(list.join("::"))
+      obj.const_set(last, value) if obj && !obj.const_defined?(last)
+    end
+  end
+end; end

data/lib/dm-core/ext/singleton_class.rb

@@ -0,0 +1,8 @@
+module Kernel
+  # Returns the object's singleton class.
+  def singleton_class
+    class << self
+      self
+    end
+  end unless respond_to?(:singleton_class) # exists in 1.9.2
+end

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

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

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

@@ -0,0 +1,12 @@
+module DataMapper
+  module Ext
+    def self.try_dup(value)
+      case value
+      when ::TrueClass, ::FalseClass, ::NilClass, ::Module, ::Numeric, ::Symbol
+        value
+      else
+        value.dup
+      end
+    end
+  end
+end

data/lib/dm-core/model.rb

@@ -564,7 +564,8 @@ module DataMapper
       discriminator   = properties(repository_name).discriminator
       no_reload       = !query.reload?
 
-      field_map = fields.map { |property| [ property, property.field ] }.to_hash
+      field_map = fields.map { |property| [ property, property.field ] }
+      field_map = DataMapper::Ext::Array.to_hash(field_map)
 
       records.map do |record|
         identity_map = nil

data/lib/dm-core/model/property.rb

@@ -65,7 +65,7 @@ module DataMapper
         # Add property to the other mappings as well if this is for the default
         # repository.
         if repository_name == default_repository_name
-          @properties.except(default_repository_name).each do |other_repository_name, properties|
+          DataMapper::Ext::Hash.except(@properties, default_repository_name).each do |other_repository_name, properties|
             next if properties.named?(name)
 
             # make sure the property is created within the correct repository scope
@@ -175,7 +175,8 @@ module DataMapper
 
       # @api private
       def key_conditions(repository, key)
-        self.key(repository.name).zip(key.nil? ? [] : key).to_hash
+        conditions = self.key(repository.name).zip(key.nil? ? [] : key)
+        DataMapper::Ext::Array.to_hash(conditions)
       end
 
       private

data/lib/dm-core/property.rb

@@ -764,7 +764,7 @@ module DataMapper
       @instance_variable_name = "@#{@name}".freeze
 
       @primitive = self.class.primitive
-      @field     = @options[:field].freeze
+      @field     = @options[:field].freeze unless @options[:field].nil?
       @default   = @options[:default]
 
       @serial       = @options.fetch(:serial,       false)

data/lib/dm-core/property/class.rb

@@ -15,7 +15,7 @@ module DataMapper
       #
       # @api private
       def typecast_to_primitive(value)
-        model.find_const(value.to_s)
+        DataMapper::Ext::Module.find_const(model, value.to_s)
       rescue NameError
         value
       end

data/lib/dm-core/property/date.rb

@@ -11,7 +11,7 @@ module DataMapper
       # Typecasts an arbitrary value to a Date
       # Handles both Hashes and Date instances.
       #
-      # @param [#to_mash, #to_s] value
+      # @param [Hash, #to_mash, #to_s] value
       #   value to be typecast
       #
       # @return [Date]
@@ -21,7 +21,7 @@ module DataMapper
       def typecast_to_primitive(value)
         if value.respond_to?(:to_date)
           value.to_date
-        elsif value.respond_to?(:to_mash)
+        elsif value.is_a?(::Hash) || value.respond_to?(:to_mash)
           typecast_hash_to_date(value)
         else
           ::Date.parse(value.to_s)
@@ -32,7 +32,7 @@ module DataMapper
 
       # Creates a Date instance from a Hash with keys :year, :month, :day
       #
-      # @param [#to_mash] value
+      # @param [Hash, #to_mash] value
       #   value to be typecast
       #
       # @return [Date]

data/lib/dm-core/property/date_time.rb

@@ -11,7 +11,7 @@ module DataMapper
       # Typecasts an arbitrary value to a DateTime.
       # Handles both Hashes and DateTime instances.
       #
-      # @param [#to_mash, #to_s] value
+      # @param [Hash, #to_mash, #to_s] value
       #   value to be typecast
       #
       # @return [DateTime]
@@ -19,7 +19,7 @@ module DataMapper
       #
       # @api private
       def typecast_to_primitive(value)
-        if value.respond_to?(:to_mash)
+        if value.is_a?(::Hash) || value.respond_to?(:to_mash)
           typecast_hash_to_datetime(value)
         else
           ::DateTime.parse(value.to_s)
@@ -31,7 +31,7 @@ module DataMapper
       # Creates a DateTime instance from a Hash with keys :year, :month, :day,
       # :hour, :min, :sec
       #
-      # @param [#to_mash] value
+      # @param [Hash, #to_mash] value
       #   value to be typecast
       #
       # @return [DateTime]

data/lib/dm-core/property/time.rb

@@ -11,7 +11,7 @@ module DataMapper
       # Typecasts an arbitrary value to a Time
       # Handles both Hashes and Time instances.
       #
-      # @param [#to_mash, #to_s] value
+      # @param [Hash, #to_mash, #to_s] value
       #   value to be typecast
       #
       # @return [Time]
@@ -21,7 +21,7 @@ module DataMapper
       def typecast_to_primitive(value)
         if value.respond_to?(:to_time)
           value.to_time
-        elsif value.respond_to?(:to_mash)
+        elsif value.is_a?(::Hash) || value.respond_to?(:to_mash)
           typecast_hash_to_time(value)
         else
           ::Time.parse(value.to_s)
@@ -33,7 +33,7 @@ module DataMapper
       # Creates a Time instance from a Hash with keys :year, :month, :day,
       # :hour, :min, :sec
       #
-      # @param [#to_mash] value
+      # @param [Hash, #to_mash] value
       #   value to be typecast
       #
       # @return [Time]

data/lib/dm-core/property/typecast/time.rb

@@ -7,7 +7,7 @@ module DataMapper
         # Extracts the given args from the hash. If a value does not exist, it
         # uses the value of Time.now.
         #
-        # @param [#to_mash] value
+        # @param [Hash, #to_mash] value
         #   value to extract time args from
         #
         # @return [Array]
@@ -15,7 +15,7 @@ module DataMapper
         #
         # @api private
         def extract_time(value)
-          mash = value.to_mash
+          mash = value.respond_to?(:to_mash) ? value.to_mash : DataMapper::Ext::Hash.to_mash(value)
           now  = ::Time.now
 
           [ :year, :month, :day, :hour, :min, :sec ].map do |segment|

data/lib/dm-core/property_set.rb

@@ -144,7 +144,7 @@ module DataMapper
 
     # @api private
     def field_map
-      map { |property| [ property.field, property ] }.to_hash
+      DataMapper::Ext::Array.to_hash(map { |property| [ property.field, property ] })
     end
 
     def inspect

data/lib/dm-core/query.rb

@@ -362,12 +362,12 @@ module DataMapper
       @options = @options.merge(other_options).freeze
       assert_valid_options(@options)
 
-      normalize = other_options.only(*OPTIONS - [ :conditions ]).map do |attribute, value|
-        instance_variable_set("@#{attribute}", value.try_dup)
+      normalize = DataMapper::Ext::Hash.only(other_options, *OPTIONS - [ :conditions ]).map do |attribute, value|
+        instance_variable_set("@#{attribute}", DataMapper::Ext.try_dup(value))
         attribute
       end
 
-      merge_conditions([ other_options.except(*OPTIONS), other_options[:conditions] ])
+      merge_conditions([ DataMapper::Ext::Hash.except(other_options, *OPTIONS), other_options[:conditions] ])
       normalize_options(normalize | [ :links, :unique ])
 
       self
@@ -689,7 +689,7 @@ module DataMapper
     #
     # @api private
     def to_relative_hash
-      to_hash.only(:fields, :order, :unique, :add_reversed, :reload)
+      DataMapper::Ext::Hash.only(to_hash, :fields, :order, :unique, :add_reversed, :reload)
     end
 
     private
@@ -737,7 +737,7 @@ module DataMapper
       @reload       = @options.fetch :reload,       false
       @raw          = false
 
-      merge_conditions([ @options.except(*OPTIONS), @options[:conditions] ])
+      merge_conditions([ DataMapper::Ext::Hash.except(@options, *OPTIONS), @options[:conditions] ])
       normalize_options
     end
 
@@ -748,7 +748,7 @@ module DataMapper
       @fields     = @fields.dup
       @links      = @links.dup
       @conditions = @conditions.dup
-      @order      = @order.try_dup
+      @order      = DataMapper::Ext.try_dup(@order)
     end
 
     # Validate the options
@@ -855,12 +855,9 @@ module DataMapper
               when Symbol, ::String
                 original = subject
                 subject  = subject.to_s
+                name     = subject[0, subject.index('.') || subject.length]
 
-                if subject.include?('.')
-                  unless @relationships.named?(subject[0, subject.index('.')])
-                    raise ArgumentError, "condition #{original.inspect} does not map to a relationship in #{model}"
-                  end
-                elsif !@properties.named?(subject) && !@relationships.named?(subject)
+                unless @properties.named?(name) || @relationships.named?(name)
                   raise ArgumentError, "condition #{original.inspect} does not map to a property or relationship in #{model}"
                 end
 
@@ -899,7 +896,7 @@ module DataMapper
 
           first_condition = conditions.first
 
-          unless first_condition.kind_of?(String) && !first_condition.blank?
+          unless first_condition.kind_of?(String) && !DataMapper::Ext.blank?(first_condition)
             raise ArgumentError, '+options[:conditions]+ should have a statement for the first entry'
           end
       end