dm-core 1.0.0.rc2 → 1.0.0.rc3

data/spec/public/shared/finder_shared_spec.rb

@@ -21,6 +21,10 @@ share_examples_for 'Finder Interface' do
     pending if @skip
   end
 
+  it 'should be Enumerable' do
+    @articles.should be_kind_of(Enumerable)
+  end
+
   [ :[], :slice ].each do |method|
     it { @articles.should respond_to(method) }
 
@@ -880,6 +884,71 @@ share_examples_for 'Finder Interface' do
     end
   end
 
+  it { @articles.should respond_to(:each) }
+
+  describe '#each' do
+    subject { @articles.each(&block) }
+
+    let(:yields) { []                                       }
+    let(:block)  { lambda { |resource| yields << resource } }
+
+    before do
+      @copy = @articles.kind_of?(Class) ? @articles : @articles.dup
+      @copy.to_a
+    end
+
+    it { should equal(@articles) }
+
+    it { method(:subject).should change { yields.dup }.from([]).to(@copy.to_a) }
+  end
+
+  it { @articles.should respond_to(:fetch) }
+
+  describe '#fetch' do
+    subject { @articles.fetch(*args, &block) }
+
+    let(:block) { nil }
+
+    context 'with a valid index and no default' do
+      let(:args) { [ 0 ] }
+
+      before do
+        @copy = @articles.kind_of?(Class) ? @articles : @articles.dup
+        @copy.to_a
+      end
+
+      should_not_be_a_kicker
+
+      it { should be_kind_of(DataMapper::Resource) }
+
+      it { should == @copy.entries.fetch(*args) }
+    end
+
+    context 'with an invalid index and no default' do
+      let(:args) { [ 42 ] }
+
+      it { method(:subject).should raise_error(IndexError) }
+    end
+
+    context 'with an invalid index and a default' do
+      let(:default) { mock('Default') }
+      let(:args)    { [ 42, default ] }
+
+      it { should equal(default) }
+    end
+
+    context 'with an invalid index and a block default' do
+      let(:yields)  { []                                          }
+      let(:default) { mock('Default')                             }
+      let(:block)   { lambda { |index| yields << index; default } }
+      let(:args)    { [ 42 ]                                      }
+
+      it { should equal(default) }
+
+      it { method(:subject).should change { yields.dup }.from([]).to([ 42 ]) }
+    end
+  end
+
   it { @articles.should respond_to(:first) }
 
   describe '#first' do
@@ -1200,6 +1269,16 @@ share_examples_for 'Finder Interface' do
       it 'should should be the last Resource in the Collection matching the query' do
         @resource.should == @article
       end
+
+      it 'should not update the original query order' do
+        collection     = @articles.all(:order => [ :title ])
+        original_order = collection.query.order[0].dup
+        last           = collection.last(:content => 'Sample')
+
+        last.should == @resource
+
+        collection.query.order[0].should == original_order
+      end
     end
 
     describe 'with a limit specified' do
@@ -1269,6 +1348,37 @@ share_examples_for 'Finder Interface' do
     end
   end
 
+  it { @articles.should respond_to(:values_at) }
+
+  describe '#values_at' do
+    subject { @articles.values_at(*args) }
+
+    before :all do
+      @copy = @articles.kind_of?(Class) ? @articles : @articles.dup
+      @copy.to_a
+    end
+
+    context 'with positive offset' do
+      let(:args) { [ 0 ] }
+
+      should_not_be_a_kicker
+
+      it { should be_kind_of(Array) }
+
+      it { should == @copy.entries.values_at(*args) }
+    end
+
+    describe 'with negative offset' do
+      let(:args) { [ -1 ] }
+
+      should_not_be_a_kicker
+
+      it { should be_kind_of(Array) }
+
+      it { should == @copy.entries.values_at(*args) }
+    end
+  end
+
   it 'should respond to a belongs_to relationship method with #method_missing' do
     pending_if 'Model#method_missing should delegate to relationships', @articles.kind_of?(Class) do
       @articles.should respond_to(:original)

data/spec/public/shared/property_shared_spec.rb

@@ -108,7 +108,7 @@ share_examples_for 'A public Property' do
       [true, false].each do |value|
         describe "when created with :#{method} => #{value}" do
           before :all do
-            opt = method.to_s.sub('?', '').to_sym
+            opt = method.to_s.chomp('?').to_sym
             @property = @type.new(@model, @name, opt => value)
           end
 

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/spec/semipublic/associations/many_to_many_spec.rb

@@ -50,6 +50,7 @@ describe 'Many to Many Associations' do
       end
     end
 
+
     @article_model = Blog::Article
     @author_model  = Blog::Author
 
@@ -61,6 +62,8 @@ describe 'Many to Many Associations' do
     @subject_without_default       = @article_model.has(n, :without_default,       'Author', :through => :without_default_join,       :via => :author)
     @subject_with_default          = @article_model.has(n, :with_default,          'Author', :through => :with_default_join,          :via => :author, :default => @default_value)
     @subject_with_default_callable = @article_model.has(n, :with_default_callable, 'Author', :through => :with_default_callable_join, :via => :author, :default => lambda { |resource, relationship| @default_value_callable })
+
+    DataMapper.finalize
   end
 
   supported_by :all do

data/spec/semipublic/associations/many_to_one_spec.rb

@@ -32,6 +32,8 @@ describe 'Many to One Associations' do
 
     @default_value.with_default          = nil
     @default_value.with_default_callable = nil
+
+    DataMapper.finalize
   end
 
   supported_by :all do

data/spec/semipublic/associations/one_to_many_spec.rb

@@ -32,6 +32,8 @@ describe 'One to Many Associations' do
     @subject_without_default       = @article_model.has(n, :without_default,       @author_model, :child_key => [ :without_default_id       ])
     @subject_with_default          = @article_model.has(n, :with_default,          @author_model, :child_key => [ :with_default_id          ], :default => @default_value)
     @subject_with_default_callable = @article_model.has(n, :with_default_callable, @author_model, :child_key => [ :with_default_callable_id ], :default => lambda { |resource, relationship| @default_value_callable })
+
+    DataMapper.finalize
   end
 
   supported_by :all do

data/spec/semipublic/associations/one_to_one_spec.rb

@@ -30,6 +30,8 @@ describe 'One to One Associations' do
     @subject_without_default       = @article_model.has(1, :without_default,       @author_model, :child_key => [ :without_default_id       ])
     @subject_with_default          = @article_model.has(1, :with_default,          @author_model, :child_key => [ :with_default_id          ], :default => @default_value)
     @subject_with_default_callable = @article_model.has(1, :with_default_callable, @author_model, :child_key => [ :with_default_callable_id ], :default => lambda { |resource, relationship| @default_value_callable })
+
+    DataMapper.finalize
   end
 
   supported_by :all do

data/spec/semipublic/associations/relationship_spec.rb

@@ -38,6 +38,7 @@ describe DataMapper::Associations::Relationship do
         # TODO: move this to spec/public/model/relationship_spec.rb
         @article_relationship.child_repository_name.should == :default
         @article_relationship.parent_repository_name.should be_nil
+        DataMapper.finalize
       end
 
       it 'should return the inverted relationships' do
@@ -58,6 +59,7 @@ describe DataMapper::Associations::Relationship do
         # TODO: move this to spec/public/model/relationship_spec.rb
         @article_relationship.child_repository_name.should == :default
         @article_relationship.parent_repository_name.should be_nil
+        DataMapper.finalize
       end
 
       it 'should return the inverted relationships' do
@@ -78,6 +80,7 @@ describe DataMapper::Associations::Relationship do
         # TODO: move this to spec/public/model/relationship_spec.rb
         @article_relationship.child_repository_name.should == :default
         @article_relationship.parent_repository_name.should == :default
+        DataMapper.finalize
       end
 
       it 'should return the inverted relationships' do
@@ -98,6 +101,7 @@ describe DataMapper::Associations::Relationship do
 
         # after Relationship#inverse to ensure no match
         @expected = @comment_model.belongs_to(:article)
+        DataMapper.finalize
       end
 
       it 'should return a Relationship' do
@@ -129,6 +133,7 @@ describe DataMapper::Associations::Relationship do
 
         # after Relationship#inverse to ensure no match
         @expected = @article_model.has(n, :comments)
+        DataMapper.finalize
       end
 
       it 'should return a Relationship' do
@@ -156,6 +161,7 @@ describe DataMapper::Associations::Relationship do
   describe '#valid?' do
     before :all do
       @relationship = @article_model.has(n, :comments)
+      DataMapper.finalize
     end
 
     supported_by :all do

data/spec/semipublic/query/conditions/comparison_spec.rb

@@ -14,6 +14,8 @@ shared_examples_for 'DataMapper::Query::Conditions::AbstractComparison' do
       end
     end
 
+    DataMapper.finalize
+
     @model = Blog::Article
   end
 
@@ -270,6 +272,7 @@ describe DataMapper::Query::Conditions::Comparison do
         property :title, String, :required => true
       end
     end
+    DataMapper.finalize
 
     @model = Blog::Article
   end

data/spec/semipublic/query/conditions/operation_spec.rb

@@ -47,6 +47,7 @@ shared_examples_for 'DataMapper::Query::Conditions::AbstractOperation' do
         property :title, String, :required => true
       end
     end
+    DataMapper.finalize
 
     @model = Blog::Article
   end

data/spec/semipublic/query/path_spec.rb

@@ -24,6 +24,7 @@ describe DataMapper::Query::Path do
     @relationship  = Author.relationships[:articles]
     @relationships = [ @relationship ]
     @property      = Article.properties[:title]
+    DataMapper.finalize
   end
 
   it { DataMapper::Query::Path.should respond_to(:new) }
@@ -103,6 +104,7 @@ describe DataMapper::Query::Path do
     @property      = Article.properties[:title]
 
     @path = DataMapper::Query::Path.new(@relationships)
+    DataMapper.finalize
   end
 
   it { @path.should respond_to(:==) }

data/spec/semipublic/query_spec.rb

@@ -1306,9 +1306,8 @@ describe DataMapper::Query do
       property :id, Serial
     end
 
-    # TODO: figure out how to remove these
-    User.send(:assert_valid)
-    Other.send(:assert_valid)
+    # finalize the models
+    DataMapper.finalize
 
     @repository = DataMapper::Repository.new(:default)
     @model      = User

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

@@ -13,6 +13,7 @@ describe DataMapper::Resource::State::Clean do
       belongs_to :parent, self, :required => false
       has n, :children, self, :inverse => :parent
     end
+    DataMapper.finalize
 
     @model = Author
   end
@@ -25,7 +26,7 @@ describe DataMapper::Resource::State::Clean do
   end
 
   after do
-    @resource.destroy
+    @model.destroy!
   end
 
   [ :commit, :rollback ].each do |method|

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

@@ -14,6 +14,7 @@ describe DataMapper::Resource::State::Deleted do
       has n, :children, self, :inverse => :parent
     end
 
+    DataMapper.finalize
     @model = Author
   end
 
@@ -24,7 +25,7 @@ describe DataMapper::Resource::State::Deleted do
   end
 
   after do
-    @resource.destroy
+    @model.destroy!
   end
 
   describe '#commit' do

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

@@ -14,11 +14,15 @@ describe DataMapper::Resource::State::Dirty do
       has n, :children, self, :inverse => :parent
     end
 
+    DataMapper.finalize
+
     @model = Author
   end
 
   before do
-    @resource = @model.create(:name => 'Dan Kubb')
+    @parent = @model.create(:name => 'Jane Doe')
+
+    @resource = @model.create(:id => 2, :name => 'Dan Kubb', :parent => @parent)
     @resource.attributes = { :name => 'John Doe' }
 
     @state = @resource.persisted_state
@@ -26,35 +30,53 @@ describe DataMapper::Resource::State::Dirty do
   end
 
   after do
-    @resource.destroy
-  end
-
-  after do
-    @model.all.destroy!
+    @model.destroy!
   end
 
   describe '#commit' do
     subject { @state.commit }
 
     supported_by :all do
-      before do
-        @new_id = @resource.id = @resource.id.succ
-      end
+      context 'with valid attributes' do
+        let(:state) { @state }
 
-      it 'should return a Clean state' do
-        should eql(DataMapper::Resource::State::Clean.new(@resource))
-      end
+        before do
+          @new_id = @resource.id = @resource.id.succ
+        end
+
+        it 'should return a Clean state' do
+          should eql(DataMapper::Resource::State::Clean.new(@resource))
+        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_s).to('42')
+        end
+
+        it 'should update the resource' do
+          subject
+          @model.get!(*@resource.key).should == @resource
+        end
 
-      it 'should update the resource' do
-        subject
-        @model.get!(*@resource.key).should == @resource
+        it 'should update the resource to the identity map if the key changed' do
+          identity_map = @resource.repository.identity_map(@model)
+          identity_map.should == { @resource.key => @resource }
+          subject
+          identity_map.should == { [ @new_id ] => @resource }
+        end
       end
 
-      it 'should update the resource to the identity map if the key changed' do
-        identity_map = @resource.repository.identity_map(@model)
-        identity_map.should == { @resource.key => @resource }
-        subject
-        identity_map.should == { [ @new_id ] => @resource }
+      context 'with invalid attributes' do
+        before do
+          @resource.coding = 'yes'
+        end
+
+        it { should equal(@state) }
+
+        it 'should update the resource to the identity map if the key changed' do
+          method(:subject).should_not change { @resource.repository.identity_map(@model).dup }
+        end
       end
     end
   end

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

@@ -13,11 +13,13 @@ describe DataMapper::Resource::State::Immutable do
       belongs_to :parent, self, :required => false
     end
 
+    DataMapper.finalize
+
     @model = Author
   end
 
   before do
-    @parent  = @model.create(:name => 'John Doe')
+    @parent = @model.create(:name => 'John Doe')
 
     @resource = @model.create(:name => 'Dan Kubb', :parent => @parent)
     @resource = @model.first(@model.key.zip(@resource.key).to_hash.merge(:fields => [ :name, :parent_id ]))
@@ -26,6 +28,10 @@ describe DataMapper::Resource::State::Immutable do
     @state.should be_kind_of(DataMapper::Resource::State::Immutable)
   end
 
+  after do
+    @model.destroy!
+  end
+
   describe '#commit' do
     subject { @state.commit }