dm-core 0.9.10 → 0.9.11

data/History.txt

@@ -1,3 +1,18 @@
+=== 0.9.11 / not released
+
+* 1 major enhancement:
+
+  * Added deprecation warning for inferred child_key naming convention change
+
+* 6 bug fixes:
+
+  * Removed unecessary code from SEL
+  * 1.9.1 fix for Logger to use Array#join instead of Array#to_s
+  * 1.9.1 fix for specs to pass
+  * Fix for multiple join models to create correct SQL
+  * Fix for STI and lazy loading
+  * Fixed Resource#eql?
+
 === 0.9.10 / 2009-01-19
 
 * 1 major enhancement:

data/Rakefile

@@ -9,18 +9,20 @@ require 'lib/dm-core/version'
 
 ROOT = Pathname(__FILE__).dirname.expand_path
 
-AUTHOR = "Dan Kubb"
-EMAIL  = "dan.kubb@gmail.com"
-GEM_NAME = "dm-core"
-GEM_VERSION = DataMapper::VERSION
-GEM_DEPENDENCIES = ["data_objects", "~>0.9.11"],
-                   ["extlib", "~>0.9.10"],
-                   ["addressable", "~>2.0.1"]
+AUTHOR           = 'Dan Kubb'
+EMAIL            = 'dan.kubb@gmail.com'
+GEM_NAME         = 'dm-core'
+GEM_VERSION      = DataMapper::VERSION
+GEM_DEPENDENCIES = [
+  %w[ data_objects ~>0.9.11 ],
+  %w[ extlib       ~>0.9.11 ],
+  %w[ addressable  ~>2.0.2  ],
+]
 
-PROJECT_NAME = "datamapper"
-PROJECT_DESCRIPTION = "Faster, Better, Simpler."
-PROJECT_SUMMARY = "An Object/Relational Mapper for Ruby"
-PROJECT_URL  = "http://datamapper.org"
+PROJECT_NAME        = 'datamapper'
+PROJECT_DESCRIPTION = 'Faster, Better, Simpler.'
+PROJECT_SUMMARY     = 'An Object/Relational Mapper for Ruby'
+PROJECT_URL         = 'http://datamapper.org'
 
 require ROOT + 'tasks/hoe'
 require ROOT + 'tasks/gemspec'

data/dm-core.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "0.9.10"
+  s.version = "0.9.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2009-01-19}
+  s.date = %q{2009-03-29}
   s.description = %q{Faster, Better, Simpler.}
   s.email = ["dan.kubb@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
@@ -25,16 +25,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<data_objects>, ["~> 0.9.11"])
-      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.10"])
-      s.add_runtime_dependency(%q<addressable>, ["~> 2.0.1"])
+      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.11"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.0.2"])
     else
       s.add_dependency(%q<data_objects>, ["~> 0.9.11"])
-      s.add_dependency(%q<extlib>, ["~> 0.9.10"])
-      s.add_dependency(%q<addressable>, ["~> 2.0.1"])
+      s.add_dependency(%q<extlib>, ["~> 0.9.11"])
+      s.add_dependency(%q<addressable>, ["~> 2.0.2"])
     end
   else
     s.add_dependency(%q<data_objects>, ["~> 0.9.11"])
-    s.add_dependency(%q<extlib>, ["~> 0.9.10"])
-    s.add_dependency(%q<addressable>, ["~> 2.0.1"])
+    s.add_dependency(%q<extlib>, ["~> 0.9.11"])
+    s.add_dependency(%q<addressable>, ["~> 2.0.2"])
   end
 end

data/lib/dm-core.rb

@@ -16,15 +16,15 @@ require 'set'
 require 'time'
 require 'yaml'
 
-gem 'addressable', '~>2.0.1'
+gem 'addressable', '~>2.0.2'
 require 'addressable/uri'
 
-gem 'extlib', '~>0.9.10'
+gem 'extlib', '~>0.9.11'
 require 'extlib'
 require 'extlib/inflection'
 
 begin
-  gem 'fastthread', '~>1.0.1'
+  gem 'fastthread', '~>1.0.4'
   require 'fastthread'
 rescue LoadError
   # fastthread not installed
@@ -171,7 +171,7 @@ module DataMapper
   # @demo spec/integration/repository_spec.rb
   def self.repository(name = nil) # :yields: current_context
     current_repository = if name
-      raise ArgumentError, "First optional argument must be a Symbol, but was #{args.first.inspect}" unless name.is_a?(Symbol)
+      raise ArgumentError, "First optional argument must be a Symbol, but was #{name.inspect}" unless name.is_a?(Symbol)
       Repository.context.detect { |r| r.name == name } || Repository.new(name)
     else
       Repository.context.last || Repository.new(Repository.default_name)

data/lib/dm-core/adapters.rb

@@ -3,20 +3,14 @@ dir = Pathname(__FILE__).dirname.expand_path / 'adapters'
 require dir / 'abstract_adapter'
 require dir / 'in_memory_adapter'
 
-# TODO Factor these out into dm-more
-require dir / 'data_objects_adapter'
-begin
-  require dir / 'sqlite3_adapter'
-rescue LoadError
-  # ignore it
-end
-begin
-  require dir / 'mysql_adapter'
-rescue LoadError
-  # ignore it
-end
-begin
-  require dir / 'postgres_adapter'
-rescue LoadError
-  # ignore it
+# NOTE: this is a temporary work-around to the load error problems,
+# and is better fixed in dm-core/next.  The main reason the fix is
+# not applied in dm-core/master is because the change is non-trivial.
+
+%w[ data_objects sqlite3 mysql postgres ].each do |gem|
+  begin
+    require dir / "#{gem}_adapter"
+  rescue LoadError, Gem::Exception
+    # ignore it
+  end
 end

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

@@ -266,14 +266,21 @@ module DataMapper
         end
 
         def links_statement(query)
-          table_name = query.model.storage_name(query.repository.name)
+          table_list = [query.model.storage_name(query.repository.name)]
 
           statement = ''
           query.links.each do |relationship|
             parent_table_name = relationship.parent_model.storage_name(query.repository.name)
             child_table_name  = relationship.child_model.storage_name(query.repository.name)
 
-            join_table_name = table_name == parent_table_name ? child_table_name : parent_table_name
+            join_table_name = if table_list.include?(parent_table_name)
+              child_table_name
+            elsif table_list.include?(child_table_name)
+              parent_table_name
+            else
+              raise ArgumentError, 'you\'re trying to join a table with no connection to this query'
+            end
+            table_list << join_table_name
 
             # We only do INNER JOIN for now
             statement << " INNER JOIN #{quote_table_name(join_table_name)} ON "

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

@@ -18,28 +18,28 @@ module DataMapper
       module Migration
         # TODO: move to dm-more/dm-migrations (if possible)
         def storage_exists?(storage_name)
-          statement = <<-EOS.compress_lines
+          statement = <<-SQL.compress_lines
             SELECT COUNT(*)
-            FROM "information_schema"."columns"
-            WHERE "table_name" = ?
+            FROM "information_schema"."tables"
+            WHERE "table_type" = 'BASE TABLE'
             AND "table_schema" = current_schema()
-          EOS
+            AND "table_name" = ?
+          SQL
 
           query(statement, storage_name).first > 0
         end
 
         # TODO: move to dm-more/dm-migrations (if possible)
         def field_exists?(storage_name, column_name)
-          statement = <<-EOS.compress_lines
+          statement = <<-SQL.compress_lines
             SELECT COUNT(*)
-            FROM "pg_class"
-            JOIN "pg_attribute" ON "pg_class"."oid" = "pg_attribute"."attrelid"
-            WHERE "pg_attribute"."attname" = ?
-            AND "pg_class"."relname" = ?
-            AND "pg_attribute"."attnum" >= 0
-          EOS
-
-          query(statement, column_name, storage_name).first > 0
+            FROM "information_schema"."columns"
+            WHERE "table_schema" = current_schema()
+            AND "table_name" = ?
+            AND "column_name" = ?
+          SQL
+
+          query(statement, storage_name, column_name).first > 0
         end
 
         # TODO: move to dm-more/dm-migrations
@@ -112,8 +112,9 @@ module DataMapper
           def sequence_exists?(repository, property)
             statement = <<-EOS.compress_lines
               SELECT COUNT(*)
-              FROM "pg_class"
-              WHERE "relkind" = 'S' AND "relname" = ?
+              FROM "information_schema"."sequences"
+              WHERE "sequence_name" = ?
+              AND "sequence_schema" = current_schema()
             EOS
 
             query(statement, sequence_name(repository, property)).first > 0

data/lib/dm-core/associations.rb

@@ -146,6 +146,13 @@ module DataMapper
     # @api public
     def belongs_to(name, options={})
       @_valid_relations = false
+
+      if options.key?(:class_name) && !options.key?(:child_key)
+        warn "The inferred child_key will changing to be prefixed with the relationship name #{name}. " \
+          "When using :class_name in belongs_to specify the :child_key explicitly to avoid problems." \
+          "#{caller(0)[1]}"
+      end
+
       relationship = ManyToOne.setup(name, self, options)
       # Please leave this in - I will release contextual serialization soon
       # which requires this -- guyvdb

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

@@ -67,7 +67,7 @@ module DataMapper
           EOS
 
           names.each do |n|
-            model.belongs_to(Extlib::Inflection.underscore(n).gsub("/", "_").to_sym, :class_name => n)
+            model.belongs_to(Extlib::Inflection.underscore(n).gsub('/', '_').to_sym)
           end
 
           Object.const_set(model_name, model)

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

@@ -99,7 +99,7 @@ module DataMapper
 
         def push(*resources)
           assert_mutable
-          resources.reject { |resource| !resource.new_record? && self.include?(resource) }
+          resources.reject! { |resource| !resource.new_record? && self.include?(resource) }
           children.push(*resources)
           resources.each { |resource| relate_resource(resource) }
           self
@@ -107,7 +107,7 @@ module DataMapper
 
         def unshift(*resources)
           assert_mutable
-          resources.reject { |resource| !resource.new_record? && self.include?(resource) }
+          resources.reject! { |resource| !resource.new_record? && self.include?(resource) }
           children.unshift(*resources)
           resources.each { |resource| relate_resource(resource) }
           self

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

@@ -81,10 +81,8 @@ module DataMapper
 
         with_repository(child_model) do |r|
           parent_identity_map = parent.repository.identity_map(parent_model)
-          child_identity_map  = r.identity_map(child_model)
 
           query_values = parent_identity_map.keys
-          query_values.reject! { |k| child_identity_map[k] }
 
           bind_values = query_values unless query_values.empty?
           query = child_key.zip(bind_values.transpose).to_hash

data/lib/dm-core/collection.rb

@@ -35,7 +35,9 @@ module DataMapper
     # @api public
     def reload(query = {})
       @query = scoped_query(query)
-      @query.update(:fields => @query.fields | @key_properties)
+      inheritance_property  = model.base_model.inheritance_property
+      fields  = (@key_properties | [inheritance_property]).compact
+      @query.update(:fields => @query.fields | fields)
       replace(all(:reload => true))
     end
 

data/lib/dm-core/logger.rb

@@ -178,7 +178,7 @@ module DataMapper
     #
     def flush
       return unless @buffer.size > 0
-      @log.write_method(@buffer.slice!(0..-1).to_s)
+      @log.write_method(@buffer.slice!(0..-1).join)
     end
 
     # Close and remove the current log object.

data/lib/dm-core/model.rb

@@ -234,6 +234,10 @@ module DataMapper
       properties(repository_name).key
     end
 
+    def inheritance_property(repository_name = default_repository_name)
+      @properties[repository_name].detect { |property| property.type == DataMapper::Types::Discriminator }
+    end
+
     def default_order(repository_name = default_repository_name)
       @default_order ||= {}
       @default_order[repository_name] ||= key(repository_name).map { |property| Query::Direction.new(property) }
@@ -344,6 +348,9 @@ module DataMapper
         model = values.at(inheritance_property_index) || model
       end
 
+      key_values = nil
+      identity_map = nil
+
       if key_property_indexes = query.key_property_indexes(repository)
         key_values   = values.values_at(*key_property_indexes)
         identity_map = repository.identity_map(model)
@@ -353,7 +360,6 @@ module DataMapper
         else
           resource = model.allocate
           resource.instance_variable_set(:@repository, repository)
-          identity_map.set(key_values, resource)
         end
       else
         resource = model.allocate
@@ -376,6 +382,10 @@ module DataMapper
         end
       end
 
+      if key_values && identity_map
+        identity_map.set(key_values, resource)
+      end
+
       resource
     end
 
@@ -476,8 +486,9 @@ module DataMapper
         return DataMapper::Query::Path.new(repository, [ relationship ], klass)
       end
 
-      if property = properties(repository_name)[method]
-        return property
+      property_set = properties(repository_name)
+      if property_set.has_property?(method)
+        return property_set[method]
       end
 
       super

data/lib/dm-core/resource.rb

@@ -149,6 +149,11 @@ module DataMapper
 
     # Compares if its the same object or if attributes are equal
     #
+    # The comparaison is
+    #  * false if object not from same repository
+    #  * false if object has no all same properties
+    #
+    #
     # ==== Parameters
     # other<Object>:: Object to compare to
     #
@@ -158,15 +163,25 @@ module DataMapper
     # -
     # @api public
     def eql?(other)
-      return true if object_id == other.object_id
+      return true if equal?(other)
+
+      # two instances for different models cannot be equivalent
       return false unless other.kind_of?(model)
-      return true if repository == other.repository && key == other.key
 
-      properties.each do |property|
-        return false if property.get!(self) != property.get!(other)
+      # two instances with different keys cannot be equivalent
+      return false if key != other.key
+
+      # neither object has changed since loaded, so they are equivalent
+      return true if repository == other.repository && !dirty? && !other.dirty?
+
+      # get all the loaded and non-loaded properties that are not keys,
+      # since the key comparison was performed earlier
+      loaded, not_loaded = properties.select { |p| !p.key? }.partition do |property|
+        attribute_loaded?(property.name) && other.attribute_loaded?(property.name)
       end
 
-      true
+      # check all loaded properties, and then all unloaded properties
+      (loaded + not_loaded).all? { |p| p.get(self) == p.get(other) }
     end
 
     alias == eql?

data/lib/dm-core/transaction.rb

@@ -264,4 +264,4 @@ module DataMapper
     end
 
   end # class Transaction
-end # module DataMapper
+end # module DataMapper

data/lib/dm-core/type_map.rb

@@ -77,4 +77,4 @@ module DataMapper
       end
     end
   end # class TypeMap
-end # module DataMapper
+end # module DataMapper

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '0.9.10' unless defined?(DataMapper::VERSION)
+  VERSION = '0.9.11'.freeze
 end

data/script/performance.rb

@@ -12,7 +12,7 @@ require 'rbench'
 gem 'faker', '~>0.3.1'
 require 'faker'
 
-gem 'activerecord', '~>2.2.2'
+gem 'activerecord', '~>2.3.2'
 require 'active_record'
 
 socket_file = Pathname.glob(%w[

data/script/profile.rb

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-core')
 
 require 'rubygems'
 
-gem 'ruby-prof', '~>0.7.1'
+gem 'ruby-prof', '~>0.7.3'
 require 'ruby-prof'
 
 gem 'faker', '~>0.3.1'

data/spec/integration/association_spec.rb

@@ -1100,7 +1100,6 @@ if ADAPTER
           customer.name == 'John Johnsen'
         end
         customers.size.should == 1
-        # another example can be found here: http://pastie.textmate.org/private/tt1hf1syfsytyxdgo4qxawfl
       end
 
       it 'should return the right children for has n => has 1 relationships' do

data/spec/integration/auto_migrations_spec.rb

@@ -116,7 +116,7 @@ if HAS_SQLITE3
       }
 
       types.each do |name,(klass,type,nullable,default,key)|
-        describe "a #{klass} property" do
+        describe "a #{klass} property (#{name})" do
           it "should be created as a #{type}" do
             @table_set[name.to_s].type.should == type
           end
@@ -228,7 +228,7 @@ if HAS_MYSQL
       }
 
       types.each do |name,(klass,type,nullable,default,key)|
-        describe "a #{klass} property" do
+        describe "a #{klass} property (#{name})" do
           it "should be created as a #{type}" do
             @table_set[name.to_s].type.should == type
           end
@@ -372,7 +372,7 @@ if HAS_POSTGRES
       }
 
       types.each do |name,(klass,type,nullable,default,key)|
-        describe "a #{Extlib::Inflection.classify(name.to_s)} property" do
+        describe "a #{klass} property (#{name})" do
           it "should be created as a #{type}" do
             @table_set[name.to_s].type.should == type
           end

data/spec/integration/property_spec.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-if RUBY_VERSION >= '1.9.0'
-  require 'csv'
-else
-  gem 'fastercsv', '~>1.4.0'
-  require 'fastercsv'
-end
+# if RUBY_VERSION >= '1.9.0'
+#   require 'csv'
+# else
+#   gem 'fastercsv', '~>1.4.0'
+#   require 'fastercsv'
+# end
 
 describe DataMapper::Property do
   before do

data/spec/integration/resource_spec.rb

@@ -9,6 +9,7 @@ if ADAPTER
   describe "DataMapper::Resource with #{ADAPTER}" do
 
     load_models_for_metaphor :zoo
+    load_models_for_metaphor :content
 
     before(:each) do
       DataMapper.auto_migrate!(ADAPTER)
@@ -59,12 +60,39 @@ if ADAPTER
     end
 
     describe '#eql?' do
-      it "should return true if the objects are the same instances"
-      it "should return false if the other object is not an instance of the same model"
-      it "should return false if the other object is a different class"
+
+      it "should return true if the objects are the same instances" do
+        z = Zoo.first
+        z2 = z
+        z.should be_eql(z2)
+      end
+
+      it "should return false if the other object is not an instance of the same model" do
+        z = Zoo.first
+        z2 = Zoo.create(:name => 'New York')
+        z.should_not be_eql(z2)
+      end
+
+      it "should return false if the other object is a different class" do
+        z = Zoo.first
+        o = Content::Dialect.first
+        z.should_not be_eql(o)
+      end
+
       it "should return true if the repositories are the same and the primary key is the same"
-      it "should return true if all the properties are the same"
-      it "should return false if any of the properties are different"
+      it "should return false if the repository is not the same and the primary key is the same"
+
+      it "should return true if all the properties are the same" do
+        z = Zoo.first
+        z2 = Zoo.new(z.attributes.delete_if{|key, value| key == :mission})
+        z.should be_eql(z2)
+      end
+
+      it "should return false if any of the properties are different" do
+        z = Zoo.first
+        z2 = Zoo.new(z.attributes.delete_if{|key, value| key == :mission}.merge(:description => 'impressive'))
+        z.should_not be_eql(z2)
+      end
     end
 
     describe '#hash' do
@@ -162,127 +190,127 @@ end
 
 # ---------- Old specs... BOOOOOOOOOO ---------------
 if ADAPTER
-  class Orange
-    include DataMapper::Resource
+  describe "DataMapper::Resource with #{ADAPTER}" do
+    before :all do
+      class ::Orange
+        include DataMapper::Resource
 
-    def self.default_repository_name
-      ADAPTER
-    end
+        def self.default_repository_name
+          ADAPTER
+        end
 
-    property :name, String, :key => true
-    property :color, String
-  end
+        property :name, String, :key => true
+        property :color, String
+      end
 
-  class Apple
-    include DataMapper::Resource
+      class ::Apple
+        include DataMapper::Resource
 
-    def self.default_repository_name
-      ADAPTER
-    end
+        def self.default_repository_name
+          ADAPTER
+        end
 
-    property :id, Serial
-    property :color, String, :default => 'green', :nullable => true
-  end
+        property :id, Serial
+        property :color, String, :default => 'green', :nullable => true
+      end
 
-  class FortunePig
-    include DataMapper::Resource
+      class ::FortunePig
+        include DataMapper::Resource
 
-    def self.default_repository_name
-      ADAPTER
-    end
+        def self.default_repository_name
+          ADAPTER
+        end
 
-    property :id, Serial
-    property :name, String
+        property :id, Serial
+        property :name, String
 
-    def to_s
-      name
-    end
+        def to_s
+          name
+        end
 
-    after :create do
-      @created_id = self.id
-    end
+        after :create do
+          @created_id = self.id
+        end
 
-    after :save do
-      @save_id = self.id
-    end
-  end
+        after :save do
+          @save_id = self.id
+        end
+      end
 
-  class Car
-    include DataMapper::Resource
+      class ::Car
+        include DataMapper::Resource
 
-    def self.default_repository_name
-      ADAPTER
-    end
+        def self.default_repository_name
+          ADAPTER
+        end
 
-    property :brand, String, :key => true
-    property :color, String
-    property :created_on, Date
-    property :touched_on, Date
-    property :updated_on, Date
+        property :brand, String, :key => true
+        property :color, String
+        property :created_on, Date
+        property :touched_on, Date
+        property :updated_on, Date
 
-    before :save do
-      self.touched_on = Date.today
-    end
+        before :save do
+          self.touched_on = Date.today
+        end
 
-    before :create do
-      self.created_on = Date.today
-    end
+        before :create do
+          self.created_on = Date.today
+        end
 
-    before :update do
-      self.updated_on = Date.today
-    end
-  end
+        before :update do
+          self.updated_on = Date.today
+        end
+      end
 
-  class Male
-    include DataMapper::Resource
+      class ::Male
+        include DataMapper::Resource
 
-    def self.default_repository_name
-      ADAPTER
-    end
+        def self.default_repository_name
+          ADAPTER
+        end
 
-    property :id, Serial
-    property :name, String
-    property :iq, Integer, :default => 100
-    property :type, Discriminator
-    property :data, Object
+        property :id, Serial
+        property :name, String
+        property :iq, Integer, :default => 100
+        property :type, Discriminator
+        property :data, Object
 
-    def iq=(i)
-      attribute_set(:iq, i - 1)
-    end
-  end
+        def iq=(i)
+          attribute_set(:iq, i - 1)
+        end
+      end
 
-  class Bully < Male; end
+      class ::Bully < Male; end
 
-  class Mugger < Bully; end
+      class ::Mugger < Bully; end
 
-  class Maniac < Bully; end
+      class ::Maniac < Bully; end
 
-  class Psycho < Maniac; end
+      class ::Psycho < Maniac; end
 
-  class Geek < Male
-    property :awkward, Boolean, :default => true
+      class ::Geek < Male
+        property :awkward, Boolean, :default => true
 
-    def iq=(i)
-      attribute_set(:iq, i + 30)
-    end
-  end
+        def iq=(i)
+          attribute_set(:iq, i + 30)
+        end
+      end
 
-  class Flanimal
-    include DataMapper::Resource
+      class ::Flanimal
+        include DataMapper::Resource
 
-    def self.default_repository_name
-      ADAPTER
-    end
+        def self.default_repository_name
+          ADAPTER
+        end
 
-    property :id, Serial
-    property :type, Discriminator
-    property :name, String
-  end
+        property :id, Serial
+        property :type, Discriminator
+        property :name, String
+      end
 
-  class Sprog < Flanimal; end
+      class ::Sprog < Flanimal; end
 
-  describe "DataMapper::Resource with #{ADAPTER}" do
-    before :all do
       Orange.auto_migrate!(ADAPTER)
       Apple.auto_migrate!(ADAPTER)
       FortunePig.auto_migrate!(ADAPTER)

data/spec/integration/sti_spec.rb

@@ -14,6 +14,7 @@ if HAS_SQLITE3
         property :id,       Serial
         property :title,    String,     :nullable => false
         property :isbn,     Integer,    :nullable => false
+        property :content,  Text
         property :class_type, Discriminator
       end
 
@@ -226,5 +227,47 @@ if HAS_SQLITE3
         end
       end
     end
+
+    describe "with lazy property" do
+      before :all do
+        Book.auto_migrate!(:sqlite3)
+        repository(:sqlite3) do
+          ShortStory.create(
+            :title => "The Science of Happiness",
+            :isbn => "129038",
+            :content => 'This doesn\'t feel like a normal academic conference. True, the three-day Positive Psychology Summit i',
+            :moral => "Bullshit might get you to the top, but it won't keep you there."
+          )
+
+          ShortStory.create(
+            :title => "Blank as white paper",
+            :isbn => "129039",
+            :content => '',
+            :moral => "none."
+          )
+        end
+      end
+
+      it "should be able to access the properties from the parent collection" do
+        repository(:sqlite3) do
+          books = Book.all
+
+          books.each do |book|
+            book.title.should_not be_nil
+            book.isbn.should_not be_nil
+            book.moral.should_not be_nil
+          end
+
+          books[0].content
+
+          books.each do |book|
+            book.title.should_not be_nil
+            book.isbn.should_not be_nil
+            book.moral.should_not be_nil
+          end
+
+        end
+      end
+    end
   end
 end

data/spec/integration/type_spec.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-if RUBY_VERSION >= '1.9.0'
-  require 'csv'
-else
-  gem 'fastercsv', '~>1.4.0'
-  require 'fastercsv'
-end
+# if RUBY_VERSION >= '1.9.0'
+#   require 'csv'
+# else
+#   gem 'fastercsv', '~>1.4.0'
+#   require 'fastercsv'
+# end
 
 if ADAPTER
   module ::TypeTests

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.1.11'
+gem 'rspec', '~>1.2'
 require 'spec'
 
 SPEC_ROOT = Pathname(__FILE__).dirname.expand_path

data/spec/unit/adapters/data_objects_adapter_spec.rb

@@ -339,7 +339,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
 
       if method == :read_one
         it 'should return a DataMapper::Resource' do
-          do_read.should == be_kind_of(DataMapper::Resource)
+          do_read.should be_kind_of(DataMapper::Resource)
         end
       else
         it 'should return a DataMapper::Collection' do

data/spec/unit/adapters/postgres_adapter_spec.rb

@@ -36,7 +36,7 @@ if HAS_POSTGRES
       end
 
       it 'should check to make sure the sequences exist' do
-        statement = %q[SELECT COUNT(*) FROM "pg_class" WHERE "relkind" = 'S' AND "relname" = ?]
+        statement = %q[SELECT COUNT(*) FROM "information_schema"."sequences" WHERE "sequence_name" = ? AND "sequence_schema" = current_schema()]
         @adapter.should_receive(:query).with(statement, 'models_property_seq').and_return([ 0 ])
         @adapter.upgrade_model_storage(@repository, @model)
       end
@@ -78,7 +78,7 @@ if HAS_POSTGRES
       end
 
       it 'should check to make sure the sequences exist' do
-        statement = %q[SELECT COUNT(*) FROM "pg_class" WHERE "relkind" = 'S' AND "relname" = ?]
+        statement = %q[SELECT COUNT(*) FROM "information_schema"."sequences" WHERE "sequence_name" = ? AND "sequence_schema" = current_schema()]
         @adapter.should_receive(:query).with(statement, 'models_property_seq').and_return([ 0 ])
         @adapter.create_model_storage(@repository, @model)
       end

data/spec/unit/associations_spec.rb

@@ -231,11 +231,11 @@ describe "DataMapper::Associations" do
 
     it "should create a many-to-one association with options" do
       DataMapper::Associations::ManyToOne.should_receive(:setup).
-        with(:vehicle, Manufacturer, { :class_name => 'Car' }).
+        with(:vehicle, Manufacturer, :class_name => 'Car', :child_key => [ :car_id ]).
         and_return(@relationship)
 
       class ::Manufacturer
-        belongs_to(:vehicle, :class_name => 'Car').should == mock_relationship
+        belongs_to(:vehicle, :class_name => 'Car', :child_key => [ :car_id ]).should == mock_relationship
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Dan Kubb
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -08:00
+date: 2009-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.10
+        version: 0.9.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 2.0.2
     version: 
 description: Faster, Better, Simpler.
 email: