dm-core 1.0.0.rc2 → 1.0.0.rc3

data/spec/semipublic/resource/state/transient_spec.rb

@@ -11,18 +11,30 @@ describe DataMapper::Resource::State::Transient do
       property :description, Text,    :default => lambda { |resource, property| resource.name }
       property :active,      Boolean, :default => true
       property :coding,      Boolean, :default => true
+
+      belongs_to :parent, self, :required => false
+      has n, :children, self, :inverse => :parent
+
+      belongs_to :with_default, self, :required => false, :default => proc { first(:name => 'John Doe') }
     end
 
+    DataMapper.finalize
+
     @model = Author
   end
 
   before do
-    @resource = @model.new(:name => 'Dan Kubb', :coding => false)
+    @parent   = @model.create(:name => 'John Doe')
+    @resource = @model.new(:name => 'Dan Kubb', :coding => false, :parent => @parent)
 
     @state = @resource.persisted_state
     @state.should be_kind_of(DataMapper::Resource::State::Transient)
   end
 
+  after do
+    @model.destroy!
+  end
+
   describe '#commit' do
     subject { @state.commit }
 
@@ -35,8 +47,14 @@ describe DataMapper::Resource::State::Transient do
         method(:subject).should change(@resource, :id).from(nil)
       end
 
+      it 'should set the child key if the parent key changes' do
+        original_id = @parent.id
+        @parent.update(:id => 42).should be(true)
+        method(:subject).should change(@resource, :parent_id).from(original_id).to(42)
+      end
+
       it 'should set default values' do
-        method(:subject).should change { @model.properties[:active].get!(@resource) }.from(nil).to(true)
+        method(:subject).should change { @model.relationships[:with_default].get!(@resource) }.from(nil).to(@parent)
       end
 
       it 'should not set default values when they are already set' do
@@ -49,9 +67,16 @@ describe DataMapper::Resource::State::Transient do
       end
 
       it 'should reset original attributes' do
+        original_attributes = {
+          @model.properties[:name]      => nil,
+          @model.properties[:coding]    => nil,
+          @model.properties[:parent_id] => nil,
+          @model.relationships[:parent] => nil,
+        }
+
         expect do
           @resource.persisted_state = subject
-        end.should change { @resource.original_attributes.dup }.from(@model.properties[:name] => nil, @model.properties[:coding] => nil).to({})
+        end.should change { @resource.original_attributes.dup }.from(original_attributes).to({})
       end
 
       it 'should add the resource to the identity map' do
@@ -59,7 +84,7 @@ describe DataMapper::Resource::State::Transient do
           identity_map = repository.identity_map(@model)
           identity_map.should be_empty
           subject
-          identity_map.should == { @resource.key => @resource }
+          identity_map.should == { @parent.key => @parent, @resource.key => @resource }
         end
       end
     end
@@ -69,8 +94,10 @@ describe DataMapper::Resource::State::Transient do
     describe "##{method}" do
       subject { @state.send(method) }
 
-      it 'should be a no-op' do
-        should equal(@state)
+      supported_by :all do
+        it 'should be a no-op' do
+          should equal(@state)
+        end
       end
     end
   end
@@ -78,50 +105,52 @@ describe DataMapper::Resource::State::Transient do
   describe '#get' do
     subject { @state.get(@key) }
 
-    describe 'with a set value' do
-      before do
-        @key = @model.properties[:coding]
-        @key.should be_loaded(@resource)
-      end
+    supported_by :all do
+      describe 'with a set value' do
+        before do
+          @key = @model.properties[:coding]
+          @key.should be_loaded(@resource)
+        end
 
-      it 'should return value' do
-        should be(false)
-      end
+        it 'should return value' do
+          should be(false)
+        end
 
-      it 'should be idempotent' do
-        should equal(subject)
+        it 'should be idempotent' do
+          should equal(subject)
+        end
       end
-    end
 
-    describe 'with an unset value and no default value' do
-      before do
-        @key = @model.properties[:age]
-        @key.should_not be_loaded(@resource)
-        @key.should_not be_default
-      end
+      describe 'with an unset value and no default value' do
+        before do
+          @key = @model.properties[:age]
+          @key.should_not be_loaded(@resource)
+          @key.should_not be_default
+        end
 
-      it 'should return nil' do
-        should be_nil
-      end
+        it 'should return nil' do
+          should be_nil
+        end
 
-      it 'should be idempotent' do
-        should equal(subject)
+        it 'should be idempotent' do
+          should equal(subject)
+        end
       end
-    end
 
-    describe 'with an unset value and a default value' do
-      before do
-        @key = @model.properties[:description]
-        @key.should_not be_loaded(@resource)
-        @key.should be_default
-      end
+      describe 'with an unset value and a default value' do
+        before do
+          @key = @model.properties[:description]
+          @key.should_not be_loaded(@resource)
+          @key.should be_default
+        end
 
-      it 'should return the name' do
-        should == 'Dan Kubb'
-      end
+        it 'should return the name' do
+          should == 'Dan Kubb'
+        end
 
-      it 'should be idempotent' do
-        should equal(subject)
+        it 'should be idempotent' do
+          should equal(subject)
+        end
       end
     end
   end

data/spec/semipublic/resource/state_spec.rb

@@ -12,6 +12,8 @@ describe DataMapper::Resource::State do
       belongs_to :parent, self, :required => false
     end
 
+    DataMapper.finalize
+
     @model = Author
   end
 
@@ -30,53 +32,55 @@ describe DataMapper::Resource::State do
   describe '#==' do
     subject { @state == @other }
 
-    describe 'with the same class and resource' do
-      before do
-        @other = DataMapper::Resource::State.new(@resource)
-      end
+    supported_by :all do
+      describe 'with the same class and resource' do
+        before do
+          @other = DataMapper::Resource::State.new(@resource)
+        end
 
-      it { should be(true) }
+        it { should be(true) }
 
-      it 'should be symmetric' do
-        should == (@other == @state)
+        it 'should be symmetric' do
+          should == (@other == @state)
+        end
       end
-    end
 
-    describe 'with the same class and different resource' do
-      before do
-        @other = DataMapper::Resource::State.new(@model.new)
-      end
+      describe 'with the same class and different resource' do
+        before do
+          @other = DataMapper::Resource::State.new(@model.new)
+        end
 
-      it { should be(false) }
+        it { should be(false) }
 
-      it 'should be symmetric' do
-        should == (@other == @state)
+        it 'should be symmetric' do
+          should == (@other == @state)
+        end
       end
-    end
 
-    describe 'with a different class and the same resource' do
-      before do
-        @other = DataMapper::Resource::State::Clean.new(@resource)
-      end
+      describe 'with a different class and the same resource' do
+        before do
+          @other = DataMapper::Resource::State::Clean.new(@resource)
+        end
 
-      it 'should be true for a subclass' do
-        should be(true)
-      end
+        it 'should be true for a subclass' do
+          should be(true)
+        end
 
-      it 'should be symmetric' do
-        should == (@other == @state)
+        it 'should be symmetric' do
+          should == (@other == @state)
+        end
       end
-    end
 
-    describe 'with a different class and different resource' do
-      before do
-        @other = DataMapper::Resource::State::Clean.new(@model.new)
-      end
+      describe 'with a different class and different resource' do
+        before do
+          @other = DataMapper::Resource::State::Clean.new(@model.new)
+        end
 
-      it { should be(false) }
+        it { should be(false) }
 
-      it 'should be symmetric' do
-        should == (@other == @state)
+        it 'should be symmetric' do
+          should == (@other == @state)
+        end
       end
     end
   end
@@ -94,51 +98,53 @@ describe DataMapper::Resource::State do
   describe '#eql?' do
     subject { @state.eql?(@other) }
 
-    describe 'with the same class and resource' do
-      before do
-        @other = DataMapper::Resource::State.new(@resource)
-      end
+    supported_by :all do
+      describe 'with the same class and resource' do
+        before do
+          @other = DataMapper::Resource::State.new(@resource)
+        end
 
-      it { should be(true) }
+        it { should be(true) }
 
-      it 'should be symmetric' do
-        should == @other.eql?(@state)
+        it 'should be symmetric' do
+          should == @other.eql?(@state)
+        end
       end
-    end
 
-    describe 'with the same class and different resource' do
-      before do
-        @other = DataMapper::Resource::State.new(@model.new)
-      end
+      describe 'with the same class and different resource' do
+        before do
+          @other = DataMapper::Resource::State.new(@model.new)
+        end
 
-      it { should be(false) }
+        it { should be(false) }
 
-      it 'should be symmetric' do
-        should == @other.eql?(@state)
+        it 'should be symmetric' do
+          should == @other.eql?(@state)
+        end
       end
-    end
 
-    describe 'with a different class and the same resource' do
-      before do
-        @other = DataMapper::Resource::State::Clean.new(@resource)
-      end
+      describe 'with a different class and the same resource' do
+        before do
+          @other = DataMapper::Resource::State::Clean.new(@resource)
+        end
 
-      it { should be(false) }
+        it { should be(false) }
 
-      it 'should be symmetric' do
-        should == @other.eql?(@state)
+        it 'should be symmetric' do
+          should == @other.eql?(@state)
+        end
       end
-    end
 
-    describe 'with a different class and different resource' do
-      before do
-        @other = DataMapper::Resource::State::Clean.new(@model.new)
-      end
+      describe 'with a different class and different resource' do
+        before do
+          @other = DataMapper::Resource::State::Clean.new(@model.new)
+        end
 
-      it { should be(false) }
+        it { should be(false) }
 
-      it 'should be symmetric' do
-        should == @other.eql?(@state)
+        it 'should be symmetric' do
+          should == @other.eql?(@state)
+        end
       end
     end
   end
@@ -175,8 +181,8 @@ describe DataMapper::Resource::State do
   describe '#hash' do
     subject { @state.hash }
 
-    it 'should be the object_id hash of the resource' do
-      should == @resource.object_id.hash
+    it 'should be the hash of the resource' do
+      should == @resource.hash
     end
   end
 

data/spec/semipublic/shared/property_shared_spec.rb

@@ -13,6 +13,7 @@ share_examples_for 'A semipublic Property' do
 
     @model = Blog::Article
     @property = @type.new(@model, @name)
+    DataMapper.finalize
   end
 
   describe '.new' do

data/spec/semipublic/shared/resource_shared_spec.rb

@@ -160,6 +160,7 @@ share_examples_for 'A semipublic Resource' do
         property :name,  String
         property :value, Integer
       end
+      DataMapper.finalize
     end
 
     with_alternate_adapter do

data/spec/spec_helper.rb

@@ -35,13 +35,3 @@ Spec::Runner.configure do |config|
   end
 
 end
-
-# remove the Resource#send method to ensure specs/internals do no rely on it
-module RemoveSend
-  def self.included(model)
-    model.send(:undef_method, :send)
-    model.send(:undef_method, :freeze)
-  end
-
-  DataMapper::Model.append_inclusions self
-end

data/tasks/spec.rake

@@ -35,4 +35,7 @@ rescue LoadError
   end
 end
 
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
 task :default => :spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Dan Kubb
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 37
         segments: 
         - 0
         - 9
-        - 14
-        version: 0.9.14
+        - 15
+        version: 0.9.15
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -199,6 +199,7 @@ files:
 - spec/public/associations/one_to_one_spec.rb
 - spec/public/associations/one_to_one_with_boolean_cpk_spec.rb
 - spec/public/collection_spec.rb
+- spec/public/finalize_spec.rb
 - spec/public/model/hook_spec.rb
 - spec/public/model/property_spec.rb
 - spec/public/model/relationship_spec.rb
@@ -329,6 +330,7 @@ test_files:
 - spec/public/associations/one_to_one_spec.rb
 - spec/public/associations/one_to_one_with_boolean_cpk_spec.rb
 - spec/public/collection_spec.rb
+- spec/public/finalize_spec.rb
 - spec/public/model/hook_spec.rb
 - spec/public/model/property_spec.rb
 - spec/public/model/relationship_spec.rb