dm-core 1.1.0 → 1.2.0.rc1

data/spec/public/property/date_time_spec.rb

@@ -2,13 +2,21 @@ require 'spec_helper'
 
 describe DataMapper::Property::DateTime do
   before :all do
-    @name  = :created_at
-    @type  = DataMapper::Property::DateTime
-    @primitive = DateTime
-    @value = DateTime.now
-    @other_value = DateTime.now+15
+    @name          = :created_at
+    @type          = described_class
+    @primitive     = DateTime
+    @value         = DateTime.now
+    @other_value   = DateTime.now + 15
     @invalid_value = 1
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive) }
+  end
 end

data/spec/public/property/decimal_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe DataMapper::Property::Decimal do
   before :all do
     @name          = :rate
-    @type          = DataMapper::Property::Decimal
+    @type          = described_class
     @options       = { :precision => 5, :scale => 2 }
     @primitive     = BigDecimal
     @value         = BigDecimal('1.0')
@@ -11,5 +11,13 @@ describe DataMapper::Property::Decimal do
     @invalid_value = true
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive, :precision => 10, :scale => 0) }
+  end
 end

data/spec/public/property/discriminator_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe DataMapper::Property::Discriminator do
   before :all do
     module ::Blog
-      class Article
+      class Content
         include DataMapper::Resource
 
         property :id,    Serial
@@ -11,16 +11,26 @@ describe DataMapper::Property::Discriminator do
         property :type,  Discriminator
       end
 
+      class Article < Content; end
       class Announcement < Article; end
       class Release < Announcement; end
     end
     DataMapper.finalize
 
+    @content_model      = Blog::Content
     @article_model      = Blog::Article
     @announcement_model = Blog::Announcement
     @release_model      = Blog::Release
   end
 
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should include(:primitive => Class, :required => true) }
+  end
+
   it 'should typecast to a Model' do
     @article_model.properties[:type].typecast('Blog::Release').should equal(@release_model)
   end
@@ -84,6 +94,10 @@ describe DataMapper::Property::Discriminator do
   end
 
   describe 'Model#default_scope' do
+    it 'should have no default scope for the top level model' do
+      @content_model.default_scope[:type].should be_nil
+    end
+
     it 'should set the default scope for the grandparent model' do
       @article_model.default_scope[:type].to_a.should =~ [ @article_model, @announcement_model, @release_model ]
     end

data/spec/public/property/float_spec.rb

@@ -2,13 +2,21 @@ require 'spec_helper'
 
 describe DataMapper::Property::Float do
   before :all do
-    @name  = :rating
-    @type  = DataMapper::Property::Float
-    @primitive = Float
-    @value = 0.1
-    @other_value = 0.2
+    @name          = :rating
+    @type          = described_class
+    @primitive     = Float
+    @value         = 0.1
+    @other_value   = 0.2
     @invalid_value = '1'
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive, :precision => 10, :scale => nil) }
+  end
 end

data/spec/public/property/integer_spec.rb

@@ -2,13 +2,21 @@ require 'spec_helper'
 
 describe DataMapper::Property::Integer do
   before :all do
-    @name  = :age
-    @type  = DataMapper::Property::Integer
-    @primitive = Integer
-    @value = 1
-    @other_value = 2
+    @name          = :age
+    @type          = described_class
+    @primitive     = Integer
+    @value         = 1
+    @other_value   = 2
     @invalid_value = '1'
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive) }
+  end
 end

data/spec/public/property/object_spec.rb

@@ -19,6 +19,14 @@ describe DataMapper::Property, 'Object type' do
 
   subject { @property }
 
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should be_empty }
+  end
+
   it { should respond_to(:typecast) }
 
   describe '#typecast' do

data/spec/public/property/serial_spec.rb

@@ -2,13 +2,21 @@ require 'spec_helper'
 
 describe DataMapper::Property::Serial do
   before :all do
-    @name  = :id
-    @type  = DataMapper::Property::Serial
-    @primitive = Integer
-    @value = 1
-    @other_value = 2
+    @name          = :id
+    @type          = described_class
+    @primitive     = Integer
+    @value         = 1
+    @other_value   = 2
     @invalid_value = 'foo'
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive, :min => 1, :serial => true) }
+  end
 end

data/spec/public/property/string_spec.rb

@@ -2,13 +2,21 @@ require 'spec_helper'
 
 describe DataMapper::Property::String do
   before :all do
-    @name  = :name
-    @type  = DataMapper::Property::String
-    @primitive = String
-    @value = 'value'
-    @other_value = 'return value'
+    @name          = :name
+    @type          = described_class
+    @primitive     = String
+    @value         = 'value'
+    @other_value   = 'return value'
     @invalid_value = 1
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive, :length => 50) }
+  end
 end

data/spec/public/property/text_spec.rb

@@ -2,15 +2,23 @@ require 'spec_helper'
 
 describe DataMapper::Property::Text do
   before :all do
-    @name  = :title
-    @type  = DataMapper::Property::Text
-    @primitive = String
-    @value = 'value'
-    @other_value = 'return value'
+    @name          = :title
+    @type          = described_class
+    @primitive     = String
+    @value         = 'value'
+    @other_value   = 'return value'
     @invalid_value = 1
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive, :length => 65535, :lazy => true) }
+  end
 
   describe 'migration with an index' do
     supported_by :all do

data/spec/public/property/time_spec.rb

@@ -2,13 +2,21 @@ require 'spec_helper'
 
 describe DataMapper::Property::Time do
   before :all do
-    @name  = :deleted_at
-    @type  = DataMapper::Property::Time
-    @primitive = Time
-    @value = Time.now
-    @other_value = Time.now+15
+    @name          = :deleted_at
+    @type          = described_class
+    @primitive     = Time
+    @value         = Time.now
+    @other_value   = Time.now + 15
     @invalid_value = 1
   end
 
-  it_should_behave_like "A public Property"
+  it_should_behave_like 'A public Property'
+
+  describe '.options' do
+    subject { described_class.options }
+
+    it { should be_kind_of(Hash) }
+
+    it { should eql(:primitive => @primitive) }
+  end
 end

data/spec/public/resource_spec.rb

@@ -222,5 +222,63 @@ describe DataMapper::Resource do
         end
       end
     end
+
+    describe '#attribute_get' do
+      subject { object.attribute_get(name) }
+
+      let(:object) { @user }
+
+      context 'with a known property' do
+        let(:name) { :name }
+
+        it 'returns the attribute value' do
+          should == 'dbussink'
+        end
+      end
+
+      context 'with an unknown property' do
+        let(:name) { :unknown }
+
+        it 'returns nil' do
+          should be_nil
+        end
+      end
+    end
+
+    describe '#attribute_set' do
+      subject { object.attribute_set(name, value) }
+
+      let(:object) { @user.dup }
+
+      context 'with a known property' do
+        let(:name)  { :name   }
+        let(:value) { 'dkubb' }
+
+        it 'sets the attribute' do
+          expect { subject }.to change { object.name }.
+            from('dbussink').
+            to('dkubb')
+        end
+
+        it 'makes the object dirty' do
+          expect { subject }.to change { object.dirty? }.
+            from(false).
+            to(true)
+        end
+      end
+
+      context 'with an unknown property' do
+        let(:name)  { :unknown              }
+        let(:value) { mock('Unknown Value') }
+
+        it 'does not set the attribute' do
+          expect { subject }.to_not change { object.attributes.dup }
+        end
+
+        it 'does not make the object dirty' do
+          expect { subject }.to_not change { object.dirty? }
+        end
+      end
+    end
   end
 end

data/spec/public/shared/finder_shared_spec.rb

@@ -343,7 +343,8 @@ share_examples_for 'Finder Interface' do
       describe 'with a collection' do
         before :all do
           @collection = @article_model.all(
-            DataMapper::Ext::Array.to_hash(@article_model.key.zip(@original.key)))
+            Hash[ @article_model.key.zip(@original.key) ]
+          )
 
           @return = @articles.all(:original => @collection)
         end
@@ -481,7 +482,8 @@ share_examples_for 'Finder Interface' do
       describe 'with a collection' do
         before :all do
           @collection = @article_model.all(
-            DataMapper::Ext::Array.to_hash(@article_model.key.zip(@new.key)))
+            Hash[ @article_model.key.zip(@new.key) ]
+          )
 
           @return = @articles.all(:previous => @collection)
         end
@@ -618,7 +620,8 @@ share_examples_for 'Finder Interface' do
       describe 'with a collection' do
         before :all do
           @collection = @article_model.all(
-            DataMapper::Ext::Array.to_hash(@article_model.key.zip(@new.key)))
+            Hash[ @article_model.key.zip(@new.key) ]
+          )
 
           @return = @articles.all(:revisions => @collection)
         end
@@ -759,7 +762,8 @@ share_examples_for 'Finder Interface' do
       describe 'with a collection' do
         before :all do
           @collection = @publication_model.all(
-            DataMapper::Ext::Array.to_hash(@publication_model.key.zip(@publication.key)))
+            Hash[ @publication_model.key.zip(@publication.key) ]
+          )
 
           @return = @articles.all(:publications => @collection)
         end

data/spec/semipublic/associations/many_to_many_spec.rb

@@ -54,6 +54,8 @@ describe 'Many to Many Associations' do
     @article_model = Blog::Article
     @author_model  = Blog::Author
 
+    DataMapper.finalize
+
     n = @article_model.n
 
     @default_value          = [ @author_model.new(:name => 'Dan Kubb') ]

data/spec/semipublic/associations/many_to_one_spec.rb

@@ -23,6 +23,8 @@ describe 'Many to One Associations' do
     @user_model    = User
     @comment_model = Comment
 
+    DataMapper.finalize
+
     @default_value          = @user_model.new(:name => 'dkubb', :age => 34, :description => 'Test')
     @default_value_callable = @user_model.new(:name => 'jdoe',  :age => 21, :description => 'Test')
 

data/spec/semipublic/associations/one_to_many_spec.rb

@@ -24,6 +24,8 @@ describe 'One to Many Associations' do
     @article_model = Blog::Article
     @author_model  = Blog::Author
 
+    DataMapper.finalize
+
     n = @article_model.n
 
     @default_value          = [ @author_model.new(:name => 'Dan Kubb') ]

data/spec/semipublic/associations/one_to_one_spec.rb

@@ -24,6 +24,8 @@ describe 'One to One Associations' do
     @article_model = Blog::Article
     @author_model  = Blog::Author
 
+    DataMapper.finalize
+
     @default_value          = @author_model.new(:name => 'Dan Kubb')
     @default_value_callable = @author_model.new(:name => 'John Doe')
 

data/spec/semipublic/property/binary_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe DataMapper::Property::Binary do
   before :all do
-    @name  = :title
-    @type  = DataMapper::Property::Binary
-    @value = 'value'
-    @other_value = 'return value'
+    @name          = :title
+    @type          = described_class
+    @value         = 'value'
+    @other_value   = 'return value'
     @invalid_value = 1
   end
 
-  it_should_behave_like "A semipublic Property"
+  it_should_behave_like 'A semipublic Property'
 end