dm-core 1.0.0.rc2 → 1.0.0.rc3

data/spec/public/model/property_spec.rb

@@ -8,6 +8,7 @@ describe DataMapper::Model::Property do
 
       property :id, Serial
     end
+    DataMapper.finalize
   end
 
   describe '#property' do

data/spec/public/model/relationship_spec.rb

@@ -468,6 +468,7 @@ describe DataMapper::Associations do
 
       Car.belongs_to(@name, :required => false)
       Engine.has(1, :car)
+      DataMapper.finalize
     end
 
     supported_by :all do
@@ -486,6 +487,7 @@ describe DataMapper::Associations do
       describe 'with a :key option' do
         before :all do
           @relationship = Car.belongs_to("#{@name}_with_key".to_sym, @model, :required => false, :key => true)
+          DataMapper.finalize
         end
 
         it 'should create a foreign key that is part of the key' do
@@ -501,6 +503,7 @@ describe DataMapper::Associations do
       before :all do
         Car.has(1, :engine)
         Engine.belongs_to(:car)
+        DataMapper.finalize
       end
 
       supported_by :all do
@@ -628,6 +631,7 @@ describe DataMapper::Associations do
     describe 'with a model' do
       before :all do
         Engine.belongs_to(:vehicle, Car)
+        DataMapper.finalize
       end
 
       it 'should set the relationship target model' do
@@ -638,6 +642,7 @@ describe DataMapper::Associations do
     describe 'with a :model option' do
       before :all do
         Engine.belongs_to(:vehicle, :model => Car)
+        DataMapper.finalize
       end
 
       it 'should set the relationship target model' do
@@ -648,6 +653,7 @@ describe DataMapper::Associations do
     describe 'with a single element as :child_key option' do
       before :all do
         Engine.belongs_to(:vehicle, :model => Car, :child_key => :bike_id)
+        DataMapper.finalize
       end
 
       it 'should set the relationship child key' do
@@ -658,6 +664,7 @@ describe DataMapper::Associations do
     describe 'with an array as :child_key option' do
       before :all do
         Engine.belongs_to(:vehicle, :model => Car, :child_key => [:bike_id])
+        DataMapper.finalize
       end
 
       it 'should set the relationship child key' do
@@ -668,6 +675,7 @@ describe DataMapper::Associations do
     describe 'with a single element as :parent_key option' do
       before :all do
         Engine.belongs_to(:vehicle, :model => Car, :parent_key => :name)
+        DataMapper.finalize
       end
 
       it 'should set the relationship parent key' do
@@ -678,6 +686,7 @@ describe DataMapper::Associations do
     describe 'with an array as :parent_key option' do
       before :all do
         Engine.belongs_to(:vehicle, :model => Car, :parent_key => [:name])
+        DataMapper.finalize
       end
 
       it 'should set the relationship parent key' do
@@ -696,6 +705,7 @@ describe DataMapper::Associations do
 
         Car.has(1, @name)
         Engine.belongs_to(:car)
+        DataMapper.finalize
       end
 
       supported_by :all do
@@ -720,6 +730,7 @@ describe DataMapper::Associations do
 
         Car.has(1, @name, :through => DataMapper::Resource)
         Engine.has(1, :car, :through => DataMapper::Resource)
+        DataMapper.finalize
       end
 
       supported_by :all do
@@ -753,6 +764,7 @@ describe DataMapper::Associations do
 
         Car.has(1..4, @name)
         Door.belongs_to(:car, :required => false)
+        DataMapper.finalize
       end
 
       supported_by :all do
@@ -777,6 +789,7 @@ describe DataMapper::Associations do
 
         Window.has(1, :car, :through => DataMapper::Resource)
         Car.has(1..4, :windows, :through => DataMapper::Resource)
+        DataMapper.finalize
       end
 
       supported_by :all do
@@ -806,6 +819,7 @@ describe DataMapper::Associations do
     describe 'when the 3rd argument is a Model' do
       before :all do
         Car.has(1, :engine, Engine)
+        DataMapper.finalize
       end
 
       it 'should set the relationship target model' do
@@ -816,6 +830,7 @@ describe DataMapper::Associations do
     describe 'when the 3rd argument is a String' do
       before :all do
         Car.has(1, :engine, 'Engine')
+        DataMapper.finalize
       end
 
       it 'should set the relationship target model' do
@@ -836,6 +851,7 @@ describe DataMapper::Associations do
     describe 'when a relationship has an inverse' do
       before :all do
         @engine_relationship = Car.has(1, :engine, :inverse => Engine.belongs_to(:sports_car, Car))
+        DataMapper.finalize
       end
 
       supported_by :all do
@@ -848,6 +864,7 @@ describe DataMapper::Associations do
     describe 'when a relationship does not have an inverse' do
       before :all do
         @engine_relationship = Car.has(1, :engine)
+        DataMapper.finalize
       end
 
       supported_by :all do
@@ -865,6 +882,7 @@ describe DataMapper::Associations do
           class ::ElectricCar < Car; end
 
           Car.has(1, :engine, :inverse => Engine.belongs_to(:sports_car, Car))
+          DataMapper.finalize
         end
 
         supported_by :all do
@@ -889,6 +907,7 @@ describe DataMapper::Associations do
           class ::ElectricCar < Car; end
 
           Car.has(1, :engine)
+          DataMapper.finalize
         end
 
         supported_by :all do
@@ -915,6 +934,7 @@ describe DataMapper::Associations do
           class ::ElectricCar < Car; end
 
           ElectricCar.has(1, :engine, :inverse => Engine.belongs_to(:sports_car, Car))
+          DataMapper.finalize
         end
 
         supported_by :all do
@@ -939,6 +959,7 @@ describe DataMapper::Associations do
           class ::ElectricCar < Car; end
 
           ElectricCar.has(1, :engine)
+          DataMapper.finalize
         end
 
         supported_by :all do
@@ -978,6 +999,7 @@ describe DataMapper::Associations do
         belongs_to :owner, Employee, :required => false
         has n, :employees
       end
+      DataMapper.finalize
     end
 
     supported_by :all do

data/spec/public/model_spec.rb

@@ -18,6 +18,7 @@ describe DataMapper::Model do
         has 1, :previous,  self, :child_key => [ :original_id ], :order => [ :id.desc ]
       end
     end
+    DataMapper.finalize
 
     @article_model = Blog::Article
   end
@@ -121,9 +122,9 @@ describe DataMapper::Model do
       class Article
         include DataMapper::Resource
 
-        property :id,      Serial
-        property :title,   String
-        property :content, Text
+        property :id,       Serial
+        property :title,    String, :required => true, :default => 'Default Title'
+        property :content,  Text
         property :subtitle, String
 
         belongs_to :original, self, :required => false
@@ -141,6 +142,7 @@ describe DataMapper::Model do
         has n, :articles, :through => Resource
       end
     end
+    DataMapper.finalize
 
     @article_model     = Blog::Article
     @publication_model = Blog::Publication
@@ -160,6 +162,139 @@ describe DataMapper::Model do
       @other    = @articles.create(:title => 'Other Article',  :content => 'Other')
     end
 
+    describe '#new' do
+      subject { model.new(*args) }
+
+      let(:model) { @article_model }
+
+      context 'with no arguments' do
+        let(:args) { [] }
+
+        it { should be_instance_of(model) }
+
+        its(:attributes) { should == { :title => 'Default Title' } }
+      end
+
+      context 'with an empty Hash' do
+        let(:args) { [ {} ] }
+
+        it { should be_instance_of(model) }
+
+        its(:attributes) { should == { :title => 'Default Title' } }
+      end
+
+      context 'with a non-empty Hash' do
+        let(:attributes) { { :title => 'A Title' } }
+        let(:args)       { [ attributes ]          }
+
+        it { should be_instance_of(model) }
+
+        its(:attributes) { should == attributes }
+      end
+
+      context 'with nil' do
+        let(:args) { [ nil ] }
+
+        it { should be_instance_of(model) }
+
+        its(:attributes) { should == { :title => 'Default Title' } }
+      end
+    end
+
+    [ :create, :create! ].each do |method|
+      describe "##{method}" do
+        subject { model.send(method, *args) }
+
+        let(:model) { @article_model }
+
+        context 'with no arguments' do
+          let(:args) { [] }
+
+          it { should be_instance_of(model) }
+
+          it { should be_saved }
+        end
+
+        context 'with an empty Hash' do
+          let(:args) { [ {} ] }
+
+          it { should be_instance_of(model) }
+
+          it { should be_saved }
+        end
+
+        context 'with a non-empty Hash' do
+          let(:attributes) { { :title => 'A Title' } }
+          let(:args)       { [ attributes ]          }
+
+          it { should be_instance_of(model) }
+
+          it { should be_saved }
+
+          its(:title) { should == attributes[:title] }
+        end
+
+        context 'with nil' do
+          let(:args) { [ nil ] }
+
+          it { should be_instance_of(model) }
+
+          it { should be_saved }
+        end
+      end
+    end
+
+    [ :destroy, :destroy! ].each do |method|
+      describe "##{method}" do
+        subject { model.send(method) }
+
+        let(:model) { @article_model }
+
+        it 'should remove all resources' do
+          method(:subject).should change { model.any? }.from(true).to(false)
+        end
+      end
+    end
+
+    [ :update, :update! ].each do |method|
+      describe "##{method}" do
+        subject { model.send(method, *args) }
+
+        let(:model) { @article_model }
+
+        context 'with attributes' do
+          let(:attributes) { { :title => 'Updated Title' } }
+          let(:args)       { [ attributes ]                }
+
+          it { should be(true) }
+
+          it 'should persist the changes' do
+            subject
+            model.all(:fields => [ :title ]).map { |resource| resource.title }.uniq.should == [ attributes[:title] ]
+          end
+        end
+
+        context 'with attributes where one is a parent association' do
+          let(:attributes) { { :original => @other } }
+          let(:args)       { [ attributes ]          }
+
+          it { should be(true) }
+
+          it 'should persist the changes' do
+            subject
+            model.all(:fields => [ :original_id ]).map { |resource| resource.original }.uniq.should == [ attributes[:original] ]
+          end
+        end
+
+        context 'with attributes where a required property is nil' do
+          let(:attributes) { { :title => nil } }
+          let(:args)       { [ attributes ]    }
+
+          it { should be(false) }
+        end
+      end
+    end
+
     it_should_behave_like 'Finder Interface'
 
     it 'DataMapper::Model should respond to raise_on_save_failure' do

data/spec/public/property/discriminator_spec.rb

@@ -14,6 +14,7 @@ describe DataMapper::Property::Discriminator do
       class Announcement < Article; end
       class Release < Announcement; end
     end
+    DataMapper.finalize
 
     @article_model      = Blog::Article
     @announcement_model = Blog::Announcement

data/spec/public/property/object_spec.rb

@@ -12,6 +12,7 @@ describe DataMapper::Property, 'Object type' do
       end
     end
 
+    DataMapper.finalize
     @model    = Blog::Article
     @property = @model.properties[:meta]
   end

data/spec/public/property_spec.rb

@@ -25,6 +25,7 @@ describe DataMapper::Property do
       property :format,       String, :default => 'jpeg'
       property :taken_at,     Time,   :default => proc { Time.now }
     end
+    DataMapper.finalize
   end
 
   supported_by :all do
@@ -93,8 +94,8 @@ describe DataMapper::Property do
         Track.properties[:album].index.should eql(:artist_album)
       end
 
-      it 'returns nil when property has no index' do
-        Track.properties[:musicbrainz_hash].index.should be_nil
+      it 'returns false when property has no index' do
+        Track.properties[:musicbrainz_hash].index.should be(false)
       end
     end
 
@@ -308,8 +309,16 @@ describe DataMapper::Property do
         Track.properties[:musicbrainz_hash].unique_index.should be(true)
       end
 
-      it 'returns nil when property has no unique index' do
-        Image.properties[:title].unique_index.should be_nil
+      it 'returns false when property has no unique index' do
+        Track.properties[:title].unique_index.should be(false)
+      end
+
+      it 'returns true when property is unique' do
+        Image.properties[:title].unique_index.should be(true)
+      end
+
+      it 'returns :key when property is a key' do
+        Track.properties[:id].unique_index.should == :key
       end
     end
 

data/spec/public/resource_spec.rb

@@ -59,6 +59,7 @@ describe DataMapper::Resource do
 
       property :name, String, :key => true, :default => 'a default value'
     end
+    DataMapper.finalize
 
     @user_model      = Blog::User
     @author_model    = Blog::Author

data/spec/public/sel_spec.rb

@@ -26,6 +26,8 @@ describe 'SEL', 'with STI subclasses' do
       class Comment < Message; end
     end
 
+    DataMapper.finalize
+
     @author_model  = Blog::Author
     @message_model = Blog::Message
     @article_model = Blog::Article

data/spec/public/shared/collection_shared_spec.rb

@@ -481,51 +481,6 @@ share_examples_for 'A public Collection' do
     end
   end
 
-  # TODO: move this to enumerable_shared_spec.rb
-  it { should respond_to(:each) }
-
-  describe '#each' do
-    before :all do
-      rescue_if @skip do
-        @resources = @articles.dup.entries
-        @resources.should_not be_empty
-
-        @yield       = []
-        @collections = []
-
-        @return = @articles.each do |resource|
-          @yield       << resource
-          @collections << [ resource, resource.collection.object_id ]
-        end
-      end
-    end
-
-    it 'should return a Collection' do
-      @return.should be_kind_of(DataMapper::Collection)
-    end
-
-    it 'should return self' do
-      @return.should equal(@articles)
-    end
-
-    it 'should yield to each entry' do
-      @yield.should == @articles
-    end
-
-    it 'should yield Resources' do
-      @yield.each { |resource| resource.should be_kind_of(DataMapper::Resource) }
-    end
-
-    it 'should relate the Resource collection to the Collection within the block only' do
-      pending_if 'Fix SEL for m:m', @many_to_many do
-        @collections.each do |resource, object_id|
-          resource.collection.should_not equal(@articles)  # collection outside block
-          object_id.should == @articles.object_id          # collection inside block
-        end
-      end
-    end
-  end
-
   it { should respond_to(:insert) }
 
   describe '#insert' do