dm-core 1.1.0.rc2 → 1.1.0.rc3

data/Gemfile

@@ -5,17 +5,10 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0.rc2'
+DM_VERSION     = '~> 1.1.0.rc3'
 DO_VERSION     = '~> 0.10.2'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
-if ENV['EXTLIB']
-  gem 'extlib',        '~> 0.9.15', SOURCE => "#{DATAMAPPER}/extlib#{REPO_POSTFIX}", :require => nil
-else
-  gem 'activesupport', '~> 3.0.4', :require => nil
-  gem 'i18n',          '~> 0.5.0'
-end
-
 gem 'addressable', '~> 2.2.4'
 
 group :development do

data/VERSION

@@ -1 +1 @@
-1.1.0.rc2
+1.1.0.rc3

data/dm-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "1.1.0.rc2"
+  s.version = "1.1.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-10}
   s.description = %q{Faster, Better, Simpler.}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -35,15 +35,17 @@ Gem::Specification.new do |s|
     "lib/dm-core/associations/one_to_one.rb",
     "lib/dm-core/associations/relationship.rb",
     "lib/dm-core/collection.rb",
-    "lib/dm-core/core_ext/array.rb",
-    "lib/dm-core/core_ext/hash.rb",
     "lib/dm-core/core_ext/kernel.rb",
-    "lib/dm-core/core_ext/module.rb",
-    "lib/dm-core/core_ext/object.rb",
     "lib/dm-core/core_ext/pathname.rb",
-    "lib/dm-core/core_ext/string.rb",
     "lib/dm-core/core_ext/symbol.rb",
-    "lib/dm-core/core_ext/try_dup.rb",
+    "lib/dm-core/ext/array.rb",
+    "lib/dm-core/ext/blank.rb",
+    "lib/dm-core/ext/hash.rb",
+    "lib/dm-core/ext/module.rb",
+    "lib/dm-core/ext/object.rb",
+    "lib/dm-core/ext/singleton_class.rb",
+    "lib/dm-core/ext/string.rb",
+    "lib/dm-core/ext/try_dup.rb",
     "lib/dm-core/identity_map.rb",
     "lib/dm-core/model.rb",
     "lib/dm-core/model/hook.rb",
@@ -106,9 +108,14 @@ Gem::Specification.new do |s|
     "lib/dm-core/support/descendant_set.rb",
     "lib/dm-core/support/equalizer.rb",
     "lib/dm-core/support/hook.rb",
+    "lib/dm-core/support/inflections.rb",
+    "lib/dm-core/support/inflector.rb",
+    "lib/dm-core/support/inflector/inflections.rb",
+    "lib/dm-core/support/inflector/methods.rb",
     "lib/dm-core/support/lazy_array.rb",
     "lib/dm-core/support/local_object_space.rb",
     "lib/dm-core/support/logger.rb",
+    "lib/dm-core/support/mash.rb",
     "lib/dm-core/support/naming_conventions.rb",
     "lib/dm-core/support/ordered_set.rb",
     "lib/dm-core/support/subject.rb",
@@ -196,8 +203,11 @@ Gem::Specification.new do |s|
     "spec/semipublic/shared/subject_shared_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb",
+    "spec/support/core_ext/hash.rb",
+    "spec/support/core_ext/inheritable_attributes.rb",
     "spec/support/properties/huge_integer.rb",
     "spec/unit/array_spec.rb",
+    "spec/unit/blank_spec.rb",
     "spec/unit/data_mapper/ordered_set/append_spec.rb",
     "spec/unit/data_mapper/ordered_set/clear_spec.rb",
     "spec/unit/data_mapper/ordered_set/delete_spec.rb",
@@ -252,6 +262,7 @@ Gem::Specification.new do |s|
     "spec/unit/hash_spec.rb",
     "spec/unit/hook_spec.rb",
     "spec/unit/lazy_array_spec.rb",
+    "spec/unit/mash_spec.rb",
     "spec/unit/module_spec.rb",
     "spec/unit/object_spec.rb",
     "spec/unit/try_dup_spec.rb",
@@ -263,7 +274,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-core}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{An Object/Relational Mapper for Ruby}
   s.test_files = [
     "spec/lib/rspec_immediate_feedback_formatter.rb",
@@ -344,8 +355,11 @@ Gem::Specification.new do |s|
     "spec/semipublic/shared/resource_state_shared_spec.rb",
     "spec/semipublic/shared/subject_shared_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/core_ext/hash.rb",
+    "spec/support/core_ext/inheritable_attributes.rb",
     "spec/support/properties/huge_integer.rb",
     "spec/unit/array_spec.rb",
+    "spec/unit/blank_spec.rb",
     "spec/unit/data_mapper/ordered_set/append_spec.rb",
     "spec/unit/data_mapper/ordered_set/clear_spec.rb",
     "spec/unit/data_mapper/ordered_set/delete_spec.rb",
@@ -400,6 +414,7 @@ Gem::Specification.new do |s|
     "spec/unit/hash_spec.rb",
     "spec/unit/hook_spec.rb",
     "spec/unit/lazy_array_spec.rb",
+    "spec/unit/mash_spec.rb",
     "spec/unit/module_spec.rb",
     "spec/unit/object_spec.rb",
     "spec/unit/try_dup_spec.rb"
@@ -409,23 +424,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
-      s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
       s.add_runtime_dependency(%q<addressable>, ["~> 2.2.4"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
-      s.add_dependency(%q<i18n>, ["~> 0.5.0"])
       s.add_dependency(%q<addressable>, ["~> 2.2.4"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
-    s.add_dependency(%q<i18n>, ["~> 0.5.0"])
     s.add_dependency(%q<addressable>, ["~> 2.2.4"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])

data/lib/dm-core.rb

@@ -11,53 +11,12 @@ module DataMapper
   module Undefined; end
 end
 
-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'
-
-  module DataMapper
-    Inflector = ActiveSupport::Inflector
-  end
-
-rescue LoadError
+require 'dm-core/ext/singleton_class'
+require 'dm-core/ext/blank'
 
-  # 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 DataMapper
-    Inflector = Extlib::Inflection
-  end
-
-end
+require 'dm-core/ext/hash'
+require 'dm-core/ext/object'
+require 'dm-core/ext/string'
 
 begin
   require 'fastthread'
@@ -66,9 +25,11 @@ rescue LoadError
 end
 
 require 'dm-core/core_ext/pathname'
-require 'dm-core/core_ext/module'
-require 'dm-core/core_ext/array'
+require 'dm-core/ext/module'
+require 'dm-core/ext/array'
 
+require 'dm-core/support/mash'
+require 'dm-core/support/inflector'
 require 'dm-core/support/chainable'
 require 'dm-core/support/deprecate'
 require 'dm-core/support/descendant_set'

data/lib/dm-core/adapters.rb

@@ -76,7 +76,7 @@ module DataMapper
       #
       # @api private
       def normalize_options_hash(hash)
-        hash.to_mash
+        DataMapper::Ext::Hash.to_mash(hash)
       end
 
       # Normalize Addressable::URI options into a Mash

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

@@ -208,7 +208,8 @@ module DataMapper
       #
       # @api semipublic
       def attributes_as_fields(attributes)
-        attributes.map { |property, value| [ property.field, property.dump(value) ] }.to_hash
+        pairs = attributes.map { |property, value| [ property.field, property.dump(value) ] }
+        DataMapper::Ext::Array.to_hash(pairs)
       end
 
       private

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

@@ -87,7 +87,7 @@ module DataMapper
           repository_name = through.relative_target_repository_name
           through_model   = through.target_model
           relationships   = through_model.relationships(repository_name)
-          singular_name   = name.to_s.singularize.to_sym
+          singular_name   = DataMapper::Inflector.singularize(name.to_s).to_sym
 
           @via = relationships[@via] ||
             relationships[name]      ||
@@ -195,7 +195,7 @@ module DataMapper
           if anonymous_through_model?
             namespace = through_model_namespace_name.first
             relationship_name = DataMapper::Inflector.underscore(through_model.name.sub(/\A#{namespace.name}::/, '')).tr('/', '_')
-            relationship_name.pluralize.to_sym
+            DataMapper::Inflector.pluralize(relationship_name).to_sym
           else
             options[:through]
           end
@@ -292,7 +292,7 @@ module DataMapper
 
           options = self.options
 
-          options.only(*OPTIONS - [ :min, :max ]).update(
+          DataMapper::Ext::Hash.only(options, *OPTIONS - [ :min, :max ]).update(
             :through    => through,
             :child_key  => options[:parent_key],
             :parent_key => options[:child_key],

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

@@ -118,8 +118,13 @@ module DataMapper
         # @api semipublic
         def get(source, query = nil)
           lazy_load(source)
-          collection = get_collection(source)
-          collection.first(query) if collection
+
+          if query
+            collection = get_collection(source)
+            collection.first(query) if collection
+          else
+            get!(source)
+          end
         end
 
         def get_collection(source)
@@ -229,12 +234,18 @@ module DataMapper
         #
         # @api private
         def inverse_name
-          super || DataMapper::Inflector.underscore(DataMapper::Inflector.demodulize(source_model.name)).pluralize.to_sym
+          name = super
+          return name if name
+
+          name = DataMapper::Inflector.demodulize(source_model.name)
+          name = DataMapper::Inflector.underscore(name)
+          name = DataMapper::Inflector.pluralize(name)
+          name.to_sym
         end
 
         # @api private
         def source_key_options(target_property)
-          options = target_property.options.only(:length, :precision, :scale).update(
+          options = DataMapper::Ext::Hash.only(target_property.options, :length, :precision, :scale).update(
             :index    => name,
             :required => required?,
             :key      => key?

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

@@ -109,7 +109,7 @@ module DataMapper
 
         # @api semipublic
         def initialize(name, target_model, source_model, options = {})
-          target_model ||= DataMapper::Inflector.camelize(name.to_s.singularize)
+          target_model ||= DataMapper::Inflector.camelize(DataMapper::Inflector.singularize(name.to_s))
           options        = { :min => 0, :max => source_model.n }.update(options)
           super
         end

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

@@ -168,7 +168,7 @@ module DataMapper
       def child_model
         return @child_model if defined?(@child_model)
         child_model_name = self.child_model_name
-        @child_model = (@parent_model || Object).find_const(child_model_name)
+        @child_model = DataMapper::Ext::Module.find_const(@parent_model || Object, child_model_name)
       rescue NameError
         raise NameError, "Cannot find the child_model #{child_model_name} for #{parent_model_name} in #{name}"
       end
@@ -221,7 +221,7 @@ module DataMapper
       def parent_model
         return @parent_model if defined?(@parent_model)
         parent_model_name = self.parent_model_name
-        @parent_model = (@child_model || Object).find_const(parent_model_name)
+        @parent_model = DataMapper::Ext::Module.find_const(@child_model || Object, parent_model_name)
       rescue NameError
         raise NameError, "Cannot find the parent_model #{parent_model_name} for #{child_model_name} in #{name}"
       end
@@ -414,6 +414,7 @@ module DataMapper
 
       # @api private
       def hash
+        self.class.hash             ^
         name.hash                   ^
         child_repository_name.hash  ^
         parent_repository_name.hash ^
@@ -451,8 +452,8 @@ module DataMapper
         @options                = options.dup.freeze
         @child_repository_name  = @options[:child_repository_name]
         @parent_repository_name = @options[:parent_repository_name]
-        @child_properties       = @options[:child_key].try_dup.freeze
-        @parent_properties      = @options[:parent_key].try_dup.freeze
+        @child_properties       = DataMapper::Ext.try_dup(@options[:child_key]).freeze
+        @parent_properties      = DataMapper::Ext.try_dup(@options[:parent_key]).freeze
         @min                    = @options[:min]
         @max                    = @options[:max]
         @reader_visibility      = @options.fetch(:reader_visibility, :public)
@@ -470,7 +471,7 @@ module DataMapper
         #    query as :condition => and_object from self.query
         #  - this should provide the best performance
 
-        @query = @options.except(*self.class::OPTIONS).freeze
+        @query = DataMapper::Ext::Hash.except(@options, *self.class::OPTIONS).freeze
       end
 
       # Set the correct ivars for the named object
@@ -586,7 +587,7 @@ module DataMapper
 
       # @api private
       def inverted_options
-        options.only(*OPTIONS - [ :min, :max ]).update(:inverse => self)
+        DataMapper::Ext::Hash.only(options, *OPTIONS - [ :min, :max ]).update(:inverse => self)
       end
 
       # @api private

data/lib/dm-core/collection.rb

@@ -730,6 +730,11 @@ module DataMapper
       super
     end
 
+    # Determines whether the collection is empty.
+    #
+    # @api public
+    alias_method :blank?, :empty?
+
     # Finds the first Resource by conditions, or initializes a new
     # Resource with the attributes if none found
     #
@@ -973,7 +978,7 @@ module DataMapper
 
     # @api semipublic
     def hash
-      query.hash
+      self.class.hash ^ query.hash
     end
 
     protected
@@ -1437,7 +1442,7 @@ module DataMapper
 
       if model.respond_to?(method)
         delegate_to_model(method, *args, &block)
-      elsif relationship = relationships[method] || relationships[method.to_s.singularize.to_sym]
+      elsif relationship = relationships[method] || relationships[DataMapper::Inflector.singularize(method.to_s).to_sym]
         delegate_to_relationship(relationship, *args)
       else
         super

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

@@ -1,18 +1,4 @@
 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_method :to_s, :to to_str when to_str not defined
   unless public_instance_methods(false).any? { |m| m.to_sym == :to_str }
     alias_method :to_str, :to_s

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

@@ -0,0 +1,41 @@
+module DataMapper; module Ext
+  module 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.
+    #
+    # @param [Array] array
+    #   The array of key/value pairs to transform.
+    #
+    # @return [Hash]
+    #   A Hash where each entry in the Array is turned into a key/value.
+    #
+    # @api semipublic
+    def self.to_hash(array)
+      h = {}
+      array.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.
+    #
+    # @param [Array] array
+    #   The array of key/value pairs to transform.
+    #
+    # @return [Mash]
+    #   A {Mash} where each entry in the Array is turned into a key/value.
+    #
+    # @api semipublic
+    def self.to_mash(array)
+      m = Mash.new
+      array.each { |k,v| m[k] = v }
+      m
+    end
+  end # class Array
+end; end