dm-core 1.0.0 → 1.0.1

data/.gitignore

@@ -31,6 +31,7 @@ measurements
 .bundle
 Gemfile.local
 Gemfile.lock
+Gemfile.local.lock
 
 ## PROJECT::SPECIFIC
 spec/db/

data/Gemfile

@@ -71,24 +71,24 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0'
+DM_VERSION = '~> 1.0.1'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 
   if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15',      :git => "#{DATAMAPPER}/extlib.git"
+    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git"
   else
-    gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
   end
 
-  gem 'addressable',     '~> 2.1'
+  gem 'addressable',     '~> 2.2'
 
 end
 
 group(:development) do # Development dependencies (as in the gemspec)
 
   gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 1.3'
+  gem 'rspec',          '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
   gem 'jeweler',        '~> 1.4'
 
 end
@@ -109,32 +109,31 @@ group :datamapper do # We need this because we want to pin these dependencies to
   gem 'dm-core', DM_VERSION, :path => File.dirname(__FILE__) # Make ourself available to the adapters
 
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
-  adapters = adapters.to_s.gsub(',',' ').split(' ') - ['in_memory']
+  adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
 
-  unless adapters.empty?
+  DO_VERSION     = '~> 0.10.2'
+  DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
-    DO_VERSION     = '~> 0.10.3'
-    DM_DO_ADAPTERS = %w[sqlite postgres mysql oracle sqlserver]
+  if (do_adapters = DM_DO_ADAPTERS & adapters).any?
+    options = {}
+    options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
 
-    gem 'data_objects',  DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+    gem 'data_objects',  DO_VERSION, options.dup
 
-    adapters.each do |adapter|
-      if DM_DO_ADAPTERS.any? { |dm_do_adapter| dm_do_adapter =~ /#{adapter}/  }
-        adapter = 'sqlite3' if adapter == 'sqlite'
-        gem "do_#{adapter}", DO_VERSION, :git => "#{DATAMAPPER}/do.git"
-      end
+    do_adapters.each do |adapter|
+      adapter = 'sqlite3' if adapter == 'sqlite'
+      gem "do_#{adapter}", DO_VERSION, options.dup
     end
 
     gem 'dm-do-adapter', DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
+  end
 
-    adapters.each do |adapter|
-      gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
-    end
-
+  adapters.each do |adapter|
+    gem "dm-#{adapter}-adapter", DM_VERSION, :git => "#{DATAMAPPER}/dm-#{adapter}-adapter.git"
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
-  plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
+  plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
     gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"

data/Rakefile

@@ -16,7 +16,7 @@ begin
     gem.rubyforge_project = 'datamapper'
 
     gem.add_dependency 'extlib',      '~> 0.9.15'
-    gem.add_dependency 'addressable', '~> 2.1'
+    gem.add_dependency 'addressable', '~> 2.2'
 
     gem.add_development_dependency 'rspec',   '~> 1.3'
     gem.add_development_dependency 'jeweler', '~> 1.4'

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/dm-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-09-07}
   s.description = %q{Faster, Better, Simpler.}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -47,7 +47,6 @@ Gem::Specification.new do |s|
      "lib/dm-core/core_ext/try_dup.rb",
      "lib/dm-core/identity_map.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",
@@ -63,6 +62,7 @@ Gem::Specification.new do |s|
      "lib/dm-core/property/discriminator.rb",
      "lib/dm-core/property/float.rb",
      "lib/dm-core/property/integer.rb",
+     "lib/dm-core/property/lookup.rb",
      "lib/dm-core/property/numeric.rb",
      "lib/dm-core/property/object.rb",
      "lib/dm-core/property/serial.rb",
@@ -95,11 +95,14 @@ Gem::Specification.new do |s|
      "lib/dm-core/spec/lib/spec_helper.rb",
      "lib/dm-core/spec/setup.rb",
      "lib/dm-core/spec/shared/adapter_spec.rb",
+     "lib/dm-core/spec/shared/public/property_spec.rb",
      "lib/dm-core/spec/shared/resource_spec.rb",
      "lib/dm-core/spec/shared/sel_spec.rb",
+     "lib/dm-core/spec/shared/semipublic/property_spec.rb",
      "lib/dm-core/support/assertions.rb",
      "lib/dm-core/support/chainable.rb",
      "lib/dm-core/support/deprecate.rb",
+     "lib/dm-core/support/descendant_set.rb",
      "lib/dm-core/support/equalizer.rb",
      "lib/dm-core/support/hook.rb",
      "lib/dm-core/support/lazy_array.rb",
@@ -122,6 +125,7 @@ Gem::Specification.new do |s|
      "spec/public/associations/many_to_many_spec.rb",
      "spec/public/associations/many_to_one_spec.rb",
      "spec/public/associations/many_to_one_with_boolean_cpk_spec.rb",
+     "spec/public/associations/many_to_one_with_custom_fk_spec.rb",
      "spec/public/associations/one_to_many_spec.rb",
      "spec/public/associations/one_to_one_spec.rb",
      "spec/public/associations/one_to_one_with_boolean_cpk_spec.rb",
@@ -153,7 +157,6 @@ Gem::Specification.new do |s|
      "spec/public/shared/collection_finder_shared_spec.rb",
      "spec/public/shared/collection_shared_spec.rb",
      "spec/public/shared/finder_shared_spec.rb",
-     "spec/public/shared/property_shared_spec.rb",
      "spec/rcov.opts",
      "spec/semipublic/adapters/abstract_adapter_spec.rb",
      "spec/semipublic/adapters/in_memory_adapter_spec.rb",
@@ -174,6 +177,7 @@ Gem::Specification.new do |s|
      "spec/semipublic/property/discriminator_spec.rb",
      "spec/semipublic/property/float_spec.rb",
      "spec/semipublic/property/integer_spec.rb",
+     "spec/semipublic/property/lookup_spec.rb",
      "spec/semipublic/property/serial_spec.rb",
      "spec/semipublic/property/string_spec.rb",
      "spec/semipublic/property/text_spec.rb",
@@ -191,13 +195,12 @@ Gem::Specification.new do |s|
      "spec/semipublic/resource/state_spec.rb",
      "spec/semipublic/resource_spec.rb",
      "spec/semipublic/shared/condition_shared_spec.rb",
-     "spec/semipublic/shared/property_shared_spec.rb",
      "spec/semipublic/shared/resource_shared_spec.rb",
      "spec/semipublic/shared/resource_state_shared_spec.rb",
      "spec/semipublic/shared/subject_shared_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/support/types/huge_integer.rb",
+     "spec/support/properties/huge_integer.rb",
      "spec/unit/array_spec.rb",
      "spec/unit/hash_spec.rb",
      "spec/unit/hook_spec.rb",
@@ -224,6 +227,7 @@ Gem::Specification.new do |s|
      "spec/public/associations/many_to_many_spec.rb",
      "spec/public/associations/many_to_one_spec.rb",
      "spec/public/associations/many_to_one_with_boolean_cpk_spec.rb",
+     "spec/public/associations/many_to_one_with_custom_fk_spec.rb",
      "spec/public/associations/one_to_many_spec.rb",
      "spec/public/associations/one_to_one_spec.rb",
      "spec/public/associations/one_to_one_with_boolean_cpk_spec.rb",
@@ -255,7 +259,6 @@ Gem::Specification.new do |s|
      "spec/public/shared/collection_finder_shared_spec.rb",
      "spec/public/shared/collection_shared_spec.rb",
      "spec/public/shared/finder_shared_spec.rb",
-     "spec/public/shared/property_shared_spec.rb",
      "spec/semipublic/adapters/abstract_adapter_spec.rb",
      "spec/semipublic/adapters/in_memory_adapter_spec.rb",
      "spec/semipublic/associations/many_to_many_spec.rb",
@@ -275,6 +278,7 @@ Gem::Specification.new do |s|
      "spec/semipublic/property/discriminator_spec.rb",
      "spec/semipublic/property/float_spec.rb",
      "spec/semipublic/property/integer_spec.rb",
+     "spec/semipublic/property/lookup_spec.rb",
      "spec/semipublic/property/serial_spec.rb",
      "spec/semipublic/property/string_spec.rb",
      "spec/semipublic/property/text_spec.rb",
@@ -292,12 +296,11 @@ Gem::Specification.new do |s|
      "spec/semipublic/resource/state_spec.rb",
      "spec/semipublic/resource_spec.rb",
      "spec/semipublic/shared/condition_shared_spec.rb",
-     "spec/semipublic/shared/property_shared_spec.rb",
      "spec/semipublic/shared/resource_shared_spec.rb",
      "spec/semipublic/shared/resource_state_shared_spec.rb",
      "spec/semipublic/shared/subject_shared_spec.rb",
      "spec/spec_helper.rb",
-     "spec/support/types/huge_integer.rb",
+     "spec/support/properties/huge_integer.rb",
      "spec/unit/array_spec.rb",
      "spec/unit/hash_spec.rb",
      "spec/unit/hook_spec.rb",
@@ -313,18 +316,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<extlib>, ["~> 0.9.15"])
-      s.add_runtime_dependency(%q<addressable>, ["~> 2.1"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.2"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.4"])
     else
       s.add_dependency(%q<extlib>, ["~> 0.9.15"])
-      s.add_dependency(%q<addressable>, ["~> 2.1"])
+      s.add_dependency(%q<addressable>, ["~> 2.2"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.4"])
     end
   else
     s.add_dependency(%q<extlib>, ["~> 0.9.15"])
-    s.add_dependency(%q<addressable>, ["~> 2.1"])
+    s.add_dependency(%q<addressable>, ["~> 2.2"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.4"])
   end

data/lib/dm-core.rb

@@ -7,6 +7,10 @@ require 'set'
 require 'time'
 require 'yaml'
 
+module DataMapper
+  module Undefined; end
+end
+
 begin
 
   # Prefer active_support
@@ -25,6 +29,10 @@ begin
   require 'dm-core/core_ext/object'
   require 'dm-core/core_ext/string'
 
+  module DataMapper
+    Inflector = ActiveSupport::Inflector
+  end
+
 rescue LoadError
 
   # Default to extlib
@@ -45,7 +53,7 @@ rescue LoadError
     end
   end
 
-  module ActiveSupport
+  module DataMapper
     Inflector = Extlib::Inflection
   end
 
@@ -63,19 +71,13 @@ require 'dm-core/core_ext/array'
 
 require 'dm-core/support/chainable'
 require 'dm-core/support/deprecate'
+require 'dm-core/support/descendant_set'
 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'
 
@@ -102,8 +104,17 @@ 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/lookup'
 require 'dm-core/property_set'
 
+require 'dm-core/model'
+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/adapters'
 require 'dm-core/adapters/abstract_adapter'
 require 'dm-core/associations/relationship'
@@ -112,8 +123,6 @@ 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'
@@ -327,15 +336,15 @@ module DataMapper
       raise IncompleteModelError, "#{name} must have at least one property or many to one relationship to be valid"
     end
 
-    if model.key(repository_name).empty?
-      raise IncompleteModelError, "#{name} must have a key to be valid"
-    end
-
     # initialize join models and target keys
     relationships.each do |relationship|
       relationship.child_key
       relationship.through if relationship.respond_to?(:through)
       relationship.via     if relationship.respond_to?(:via)
     end
+
+    if model.key(repository_name).empty?
+      raise IncompleteModelError, "#{name} must have a key to be valid"
+    end
   end
 end

data/lib/dm-core/adapters.rb

@@ -129,7 +129,7 @@ module DataMapper
       # @api private
       def adapter_class(name)
         adapter_name = normalize_adapter_name(name)
-        class_name = (ActiveSupport::Inflector.camelize(adapter_name) << 'Adapter').to_sym
+        class_name = (DataMapper::Inflector.camelize(adapter_name) << 'Adapter').to_sym
         load_adapter(adapter_name) unless const_defined?(class_name)
         const_get(class_name)
       end
@@ -161,8 +161,12 @@ module DataMapper
       # @api private
       def load_adapter(name)
         require "dm-#{name}-adapter"
-      rescue LoadError
-        require in_memory_adapter?(name) ? in_memory_adapter_path : legacy_path(name)
+      rescue LoadError => original_error
+        begin
+          require in_memory_adapter?(name) ? in_memory_adapter_path : legacy_path(name)
+        rescue LoadError
+          raise original_error
+        end
       end
 
       # Returns wether or not the given adapter name is considered an in memory adapter

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

@@ -20,18 +20,12 @@ module DataMapper
 
       # @api semipublic
       def self.descendants
-        @descendants ||= Set.new
+        @descendants ||= DescendantSet.new
       end
 
       # @api private
-      def self.inherited(subclass)
-        add_descendant(subclass)
-      end
-
-      # @api private
-      def self.add_descendant(subclass)
-        descendants << subclass
-        superclass.add_descendant(subclass) if superclass.respond_to?(:add_descendant)
+      def self.inherited(descendant)
+        descendants << descendant
       end
 
       # Adapter name

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

@@ -196,7 +196,7 @@ module DataMapper
         def through_relationship_name
           if anonymous_through_model?
             namespace = through_model_namespace_name.first
-            relationship_name = ActiveSupport::Inflector.underscore(through_model.name.sub(/\A#{namespace.name}::/, '')).tr('/', '_')
+            relationship_name = DataMapper::Inflector.underscore(through_model.name.sub(/\A#{namespace.name}::/, '')).tr('/', '_')
             relationship_name.pluralize.to_sym
           else
             options[:through]

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

@@ -55,8 +55,7 @@ module DataMapper
             properties[property_name] || begin
               # create the property within the correct repository
               DataMapper.repository(repository_name) do
-                type = parent_property.send(parent_property.type == DataMapper::Property::Boolean ? :type : :primitive)
-                model.property(property_name, type, child_key_options(parent_property))
+                model.property(property_name, parent_property.to_child_key, child_key_options(parent_property))
               end
             end
           end
@@ -181,7 +180,7 @@ module DataMapper
 
           @required      = options.fetch(:required, true)
           @key           = options.fetch(:key,      false)
-          target_model ||= ActiveSupport::Inflector.camelize(name)
+          target_model ||= DataMapper::Inflector.camelize(name)
           options        = { :min => @required ? 1 : 0, :max => 1 }.update(options)
           super
         end
@@ -222,7 +221,7 @@ module DataMapper
         #
         # @api private
         def inverse_name
-          super || ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(source_model.name)).pluralize.to_sym
+          super || DataMapper::Inflector.underscore(DataMapper::Inflector.demodulize(source_model.name)).pluralize.to_sym
         end
 
         # @api private

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

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

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

@@ -72,7 +72,7 @@ module DataMapper
         # @api semipublic
         def initialize(name, target_model, source_model, options = {})
           klass = options.key?(:through) ? ManyToMany::Relationship : OneToMany::Relationship
-          target_model ||= ActiveSupport::Inflector.camelize(name).freeze
+          target_model ||= DataMapper::Inflector.camelize(name).freeze
           @relationship = klass.new(name, target_model, source_model, options)
         end