dm-core 1.0.2 → 1.1.0.rc1

data/spec/public/model/relationship_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 share_examples_for 'it creates a one accessor' do
   describe 'accessor' do
@@ -614,9 +614,7 @@ describe DataMapper::Associations do
           end
 
           it 'should also change the foreign key' do
-            pending 'a change to the foreign key should also change the related object' do
-              @engine.car.should eql(@car2)
-            end
+            @engine.car.should eql(@car2)
           end
 
           it 'should add the engine to the car' do

data/spec/public/model_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 # TODO: move these specs into shared specs for #copy
 describe DataMapper::Model do

data/spec/public/property/binary_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Binary do
   before :all do

data/spec/public/property/boolean_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Boolean do
   before :all do

data/spec/public/property/class_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Class do
   before :all do

data/spec/public/property/date_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Date do
   before :all do

data/spec/public/property/date_time_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::DateTime do
   before :all do

data/spec/public/property/decimal_spec.rb

@@ -1,12 +1,13 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Decimal do
   before :all do
-    @name  = :rate
-    @type  = DataMapper::Property::Decimal
-    @primitive = BigDecimal
-    @value = BigDecimal('1.0')
-    @other_value = BigDecimal('2.0')
+    @name          = :rate
+    @type          = DataMapper::Property::Decimal
+    @options       = { :precision => 5, :scale => 2 }
+    @primitive     = BigDecimal
+    @value         = BigDecimal('1.0')
+    @other_value   = BigDecimal('2.0')
     @invalid_value = true
   end
 

data/spec/public/property/discriminator_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Discriminator do
   before :all do

data/spec/public/property/float_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Float do
   before :all do

data/spec/public/property/integer_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Integer do
   before :all do

data/spec/public/property/object_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property, 'Object type' do
   before :all do
@@ -31,7 +31,7 @@ describe DataMapper::Property, 'Object type' do
     it { should equal(@value) }
   end
 
-  it { should respond_to(:value) }
+  it { should respond_to(:dump) }
 
   describe '#dump' do
     describe 'with a value' do

data/spec/public/property/serial_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Serial do
   before :all do

data/spec/public/property/string_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::String do
   before :all do

data/spec/public/property/text_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Text do
   before :all do
@@ -15,7 +15,8 @@ describe DataMapper::Property::Text do
   describe 'migration with an index' do
     supported_by :all do
       before do
-        @model = DataMapper::Model.new do
+        Object.send(:remove_const, :Foo) if Object.const_defined?(:Foo)
+        @model = DataMapper::Model.new('Foo') do
           storage_names[:default] = 'anonymous'
 
           property :id,   DataMapper::Property::Serial
@@ -34,7 +35,9 @@ describe DataMapper::Property::Text do
   describe 'migration with a unique index' do
     supported_by :all do
       before do
-        @model = DataMapper::Model.new do
+
+        Object.send(:remove_const, :Foo) if Object.const_defined?(:Foo)
+        @model = DataMapper::Model.new('Foo') do
           storage_names[:default] = 'anonymous'
 
           property :id,   DataMapper::Property::Serial

data/spec/public/property/time_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Time do
   before :all do

data/spec/public/property_spec.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 # instance methods
 describe DataMapper::Property do
@@ -22,6 +22,8 @@ describe DataMapper::Property do
       property :md5hash,      String, :key => true, :length => 32
       property :title,        String, :required => true, :unique => true
       property :description,  Text,   :length => 1..1024, :lazy => [ :detail ]
+      property :width,        Integer, :lazy => [:dimensions]
+      property :height,       Integer, :lazy => [:dimensions]
       property :format,       String, :default => 'jpeg'
       property :taken_at,     Time,   :default => proc { Time.now }
     end
@@ -39,12 +41,6 @@ describe DataMapper::Property do
       it 'sets field value using field naming convention on first reference'
     end
 
-    describe '#custom?' do
-      it 'is true for custom type fields (not provided by dm-core)'
-
-      it 'is false for core type fields (provided by dm-core)'
-    end
-
     describe '#default_for' do
       it 'returns default value for non-callables' do
         Image.properties[:format].default_for(Image.new).should == 'jpeg'
@@ -103,10 +99,6 @@ describe DataMapper::Property do
       describe 'when tracking strategy is explicitly given' do
         it 'uses tracking strategy from options'
       end
-
-      describe 'when custom type has tracking stragegy' do
-        it 'uses tracking strategy from type'
-      end
     end
 
     describe '#inspect' do
@@ -150,6 +142,16 @@ describe DataMapper::Property do
       end
     end
 
+    describe "#lazy_load_properties" do
+      it "returns all lazy properties in the same context" do
+        Image.properties[:width].__send__(:lazy_load_properties).should == Image.properties.values_at(:width, :height)
+      end
+
+      it "returns all properties by default" do
+        Track.properties[:artist].__send__(:lazy_load_properties).should == Track.properties
+      end
+    end
+
     describe '#length' do
       it 'returns upper bound for Range values' do
         Image.properties[:description].length.should eql(1024)

data/spec/public/resource_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Resource do
   before :all do
@@ -180,5 +180,47 @@ describe DataMapper::Resource do
         end
       end
     end
+
+    [ :update, :update! ].each do |method|
+      describe 'with attributes where one is a foreign key' do
+        before :all do
+          rescue_if @skip do
+            @dkubb = @user.referrer = @user_model.create(:name => 'dkubb', :age => 33)
+            @user.save
+            @user = @user_model.get(*@user.key)
+            @user.referrer.should == @dkubb
+
+            @solnic = @user_model.create(:name => 'solnic', :age => 28)
+
+            @attributes = {}
+
+            relationship = @user_model.relationships[:referrer]
+            relationship.child_key.to_a.each_with_index do |k, i|
+              @attributes[k.name] = relationship.parent_key.to_a[i].get(@solnic)
+            end
+
+            @return = @user.__send__(method, @attributes)
+          end
+        end
+
+        it 'should return true' do
+          @return.should be(true)
+        end
+
+        it 'should update attributes of Resource' do
+          @attributes.each { |key, value| @user.__send__(key).should == value }
+        end
+
+        it 'should persist the changes' do
+          resource = @user_model.get(*@user.key)
+          @attributes.each { |key, value| resource.__send__(key).should == value }
+        end
+
+        it 'should return correct parent' do
+          resource = @user_model.get(*@user.key)
+          resource.referrer.should == @solnic
+        end
+      end
+    end
   end
 end

data/spec/public/sel_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe 'SEL', 'with STI subclasses' do
   before :all do

data/spec/public/setup_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper do
   describe '.setup' do

data/spec/public/shared/collection_shared_spec.rb

@@ -566,7 +566,8 @@ share_examples_for 'A public Collection' do
   describe '#new' do
     describe 'when scoped to a property' do
       before :all do
-        @return = @resource = @articles.new
+        @source = @articles.new(:attachment => "A File")
+        @return = @resource = @articles.new(:original => @source)
       end
 
       it 'should return a Resource' do
@@ -584,6 +585,10 @@ share_examples_for 'A public Collection' do
       it 'should use the query conditions to set default values' do
         @resource.title.should == 'Sample Article'
       end
+
+      it 'should use the query conditions to set default values when accessed through a m:1 relationship' do
+        @resource.original.attachment.should == 'A File'
+      end
     end
 
     describe 'when scoped to the key' do

data/spec/semipublic/adapters/abstract_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe 'AbstractAdapter' do
   before :all do

data/spec/semipublic/adapters/in_memory_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 require DataMapper.root / 'lib' / 'dm-core' / 'spec' / 'shared' / 'adapter_spec'
 
 describe 'Adapter' do

data/spec/semipublic/associations/many_to_many_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe 'Many to Many Associations' do
   before :all do

data/spec/semipublic/associations/many_to_one_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe 'Many to One Associations' do
   before :all do

data/spec/semipublic/associations/one_to_many_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe 'One to Many Associations' do
   before :all do

data/spec/semipublic/associations/one_to_one_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe 'One to One Associations' do
   before :all do

data/spec/semipublic/associations/relationship_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Associations::Relationship do
   before :all do

data/spec/semipublic/associations_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Associations do
   before :all do

data/spec/semipublic/collection_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 # run the specs once with a loaded collection and once not
 [ false, true ].each do |loaded|

data/spec/semipublic/model_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Model do
 

data/spec/semipublic/property/binary_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Binary do
   before :all do

data/spec/semipublic/property/boolean_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Boolean do
   before :all do

data/spec/semipublic/property/class_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Class do
   before :all do

data/spec/semipublic/property/date_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Date do
   before :all do

data/spec/semipublic/property/date_time_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::DateTime do
   before :all do

data/spec/semipublic/property/decimal_spec.rb

@@ -1,11 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Decimal do
   before :all do
-    @name  = :rate
-    @type  = DataMapper::Property::Decimal
-    @value = BigDecimal('1.0')
-    @other_value = BigDecimal('2.0')
+    @name          = :rate
+    @type          = DataMapper::Property::Decimal
+    @options       = { :precision => 5, :scale => 2 }
+    @value         = BigDecimal('1.0')
+    @other_value   = BigDecimal('2.0')
     @invalid_value = true
   end
 

data/spec/semipublic/property/discriminator_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Discriminator do
   before :all do

data/spec/semipublic/property/float_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Float do
   before :all do

data/spec/semipublic/property/integer_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'spec_helper'
 
 describe DataMapper::Property::Integer do
   before :all do