dm-core 1.1.0 → 1.2.0.rc1

data/spec/semipublic/property/boolean_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe DataMapper::Property::Boolean do
   before :all do
-    @name  = :active
-    @type  = DataMapper::Property::Boolean
-    @value = true
-    @other_value = false
+    @name          = :active
+    @type          = described_class
+    @value         = true
+    @other_value   = false
     @invalid_value = 1
   end
 
-  it_should_behave_like "A semipublic Property"
+  it_should_behave_like 'A semipublic Property'
 
   describe '#load' do
     before :all do

data/spec/semipublic/property/class_spec.rb

@@ -8,14 +8,14 @@ describe DataMapper::Property::Class do
     class ::Foo; end
     class ::Bar; end
 
-    @name  = :type
-    @type  = DataMapper::Property::Class
-    @value = Foo
-    @other_value = Bar
+    @name          = :type
+    @type          = described_class
+    @value         = Foo
+    @other_value   = Bar
     @invalid_value = 1
   end
 
-  it_should_behave_like "A semipublic Property"
+  it_should_behave_like 'A semipublic Property'
 
   describe '#typecast_to_primitive' do
     it 'returns same value if a class' do

data/spec/semipublic/property/date_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe DataMapper::Property::Date do
   before :all do
-    @name  = :created_on
-    @type  = DataMapper::Property::Date
-    @value = Date.today
-    @other_value = Date.today+1
+    @name          = :created_on
+    @type          = described_class
+    @value         = Date.today
+    @other_value   = Date.today + 1
     @invalid_value = 1
   end
 
-  it_should_behave_like "A semipublic Property"
+  it_should_behave_like 'A semipublic Property'
 
   describe '#typecast_to_primitive' do
     describe 'and value given as a hash with keys like :year, :month, etc' do

data/spec/semipublic/property/date_time_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe DataMapper::Property::DateTime do
   before :all do
-    @name  = :created_at
-    @type  = DataMapper::Property::DateTime
-    @value = DateTime.now
-    @other_value = DateTime.now+15
+    @name          = :created_at
+    @type          = described_class
+    @value         = DateTime.now
+    @other_value   = DateTime.now + 15
     @invalid_value = 1
   end
 
-  it_should_behave_like "A semipublic Property"
+  it_should_behave_like 'A semipublic Property'
 
   describe '#typecast_to_primitive' do
     describe 'and value given as a hash with keys like :year, :month, etc' do

data/spec/semipublic/property/decimal_spec.rb

@@ -3,14 +3,14 @@ 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 }
     @value         = BigDecimal('1.0')
     @other_value   = BigDecimal('2.0')
     @invalid_value = true
   end
 
-  it_should_behave_like "A semipublic Property"
+  it_should_behave_like 'A semipublic Property'
 
   describe '#typecast_to_primitive' do
     it 'returns same value if a decimal' do

data/spec/semipublic/property/discriminator_spec.rb

@@ -8,12 +8,12 @@ describe DataMapper::Property::Discriminator do
     class ::Foo; end
     class ::Bar; end
 
-    @name  = :type
-    @type  = DataMapper::Property::Discriminator
-    @value = Foo
-    @other_value = Bar
+    @name          = :type
+    @type          = described_class
+    @value         = Foo
+    @other_value   = Bar
     @invalid_value = 1
   end
 
-  it_should_behave_like "A semipublic Property"
+  it_should_behave_like 'A semipublic Property'
 end

data/spec/semipublic/property/float_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe DataMapper::Property::Float do
   before :all do
-    @name  = :rating
-    @type  = DataMapper::Property::Float
-    @value = 0.1
-    @other_value = 0.2
+    @name          = :rating
+    @type          = described_class
+    @value         = 0.1
+    @other_value   = 0.2
     @invalid_value = '1'
   end
 
-  it_should_behave_like "A semipublic Property"
+  it_should_behave_like 'A semipublic Property'
 
   describe '#typecast_to_primitive' do
     it 'returns same value if a float' do

data/spec/semipublic/property/integer_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe DataMapper::Property::Integer do
   before :all do
-    @name  = :age
-    @type  = DataMapper::Property::Integer
-    @value = 1
-    @other_value = 2
+    @name          = :age
+    @type          = described_class
+    @value         = 1
+    @other_value   = 2
     @invalid_value = '1'
   end
 
-  it_should_behave_like "A semipublic Property"
+  it_should_behave_like 'A semipublic Property'
 
   describe '#typecast_to_primitive' do
     it 'returns same value if an integer' do

data/spec/semipublic/property/lookup_spec.rb

@@ -12,15 +12,15 @@ describe DataMapper::Property::Lookup do
       end
     end
 
-    it "should provide access to Property classes" do
+    it 'should provide access to Property classes' do
       @klass::Serial.should == DataMapper::Property::Serial
     end
 
-    it "should provide access to Property classes from outside of the Property namespace" do
+    it 'should provide access to Property classes from outside of the Property namespace' do
       @klass::OtherProperty.should be(Foo::OtherProperty)
     end
 
-    it "should not provide access to unknown Property classes" do
+    it 'should not provide access to unknown Property classes' do
       lambda {
         @klass::Bla
       }.should raise_error(NameError)

data/spec/semipublic/property/serial_spec.rb

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

data/spec/semipublic/property/string_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe DataMapper::Property::String do
   before :all do
-    @name  = :name
-    @type  = DataMapper::Property::String
-    @value = 'value'
-    @other_value = 'return value'
+    @name          = :name
+    @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

data/spec/semipublic/property/text_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe DataMapper::Property::Text do
   before :all do
-    @name  = :title
-    @type  = DataMapper::Property::Text
-    @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'
 
   describe '#load' do
     before :all do

data/spec/semipublic/property/time_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe DataMapper::Property::Time do
   before :all do
-    @name  = :deleted_at
-    @type  = DataMapper::Property::Time
-    @value = Time.now
-    @other_value = Time.now+15
+    @name          = :deleted_at
+    @type          = described_class
+    @value         = Time.now
+    @other_value   = Time.now + 15
     @invalid_value = 1
   end
 
-  it_should_behave_like "A semipublic Property"
+  it_should_behave_like 'A semipublic Property'
 
   describe '#typecast_to_primitive' do
     describe 'and value given as a hash with keys like :year, :month, etc' do

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

@@ -149,7 +149,7 @@ describe DataMapper::Query::Conditions::EqualToComparison do
       end
 
       describe 'with a Relationship subject' do
-        describe 'with a Relationship subject and a nil value' do
+        describe 'with a nil value' do
           before do
             @parent = @model.create(:title => 'Parent')
             @child  = @parent.children.create(:title => 'Child')
@@ -182,7 +182,7 @@ describe DataMapper::Query::Conditions::EqualToComparison do
           end
         end
 
-        describe 'with a Relationship subject and a Hash value' do
+        describe 'with a Hash value' do
           before do
             @parent = @model.create(:title => 'Parent')
             @child  = @parent.children.create(:title => 'Child')
@@ -215,7 +215,7 @@ describe DataMapper::Query::Conditions::EqualToComparison do
           end
         end
 
-        describe 'with a Relationship subject and new Resource value' do
+        describe 'with new Resource value' do
           before do
             @parent = @model.create(:title => 'Parent')
             @child  = @parent.children.create(:title => 'Child')
@@ -250,7 +250,7 @@ describe DataMapper::Query::Conditions::EqualToComparison do
           end
         end
 
-        describe 'with a Relationship subject and saved Resource value' do
+        describe 'with a saved Resource value' do
           before do
             @parent = @model.create(:title => 'Parent')
             @child  = @parent.children.create(:title => 'Child')
@@ -1194,6 +1194,16 @@ describe DataMapper::Query::Conditions::GreaterThanComparison do
 
         it { should be(false) }
       end
+
+      describe 'with an expected value of nil' do
+        subject { @comparison.matches?(@model.new(@property => 2)) }
+
+        before do
+          @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, nil)
+        end
+
+        it { should be(false) }
+      end
     end
   end
 
@@ -1276,6 +1286,16 @@ describe DataMapper::Query::Conditions::LessThanComparison do
 
         it { should be(false) }
       end
+
+      describe 'with an expected value of nil' do
+        subject { @comparison.matches?(@model.new(@property => 0)) }
+
+        before do
+          @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, nil)
+        end
+
+        it { should be(false) }
+      end
     end
   end
 
@@ -1358,6 +1378,16 @@ describe DataMapper::Query::Conditions::GreaterThanOrEqualToComparison do
 
         it { should be(false) }
       end
+
+      describe 'with an expected value of nil' do
+        subject { @comparison.matches?(@model.new(@property => 1)) }
+
+        before do
+          @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, nil)
+        end
+
+        it { should be(false) }
+      end
     end
   end
 
@@ -1440,6 +1470,16 @@ describe DataMapper::Query::Conditions::LessThanOrEqualToComparison do
 
         it { should be(false) }
       end
+
+      describe 'with an expected value of nil' do
+        subject { @comparison.matches?(@model.new(@property => 1)) }
+
+        before do
+          @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, nil)
+        end
+
+        it { should be(false) }
+      end
     end
   end
 

data/spec/semipublic/query_spec.rb

@@ -3472,22 +3472,13 @@ describe DataMapper::Query do
       it { should_not be_unique }
     end
 
-    describe 'when 1..n links are provided, but unique is not specified' do
-      before :all do
-        @query.should_not be_unique
-        @query.update(:links => [ :referrals ])
-      end
-
-      it { should be_unique }
-    end
-
-    describe 'when 0..1 links are provided, but unique is not specified' do
+    describe 'when links are provided, but unique is not specified' do
       before :all do
         @query.should_not be_unique
         @query.update(:links => [ :referrer ])
       end
 
-      it { should_not be_unique }
+      it { should be_unique }
     end
 
     describe 'when links are provided, but unique is false' do

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

@@ -1,5 +1,5 @@
 require 'spec_helper'
-describe DataMapper::Resource::State::Clean do
+describe DataMapper::Resource::PersistenceState::Clean do
   before :all do
     class ::Author
       include DataMapper::Resource
@@ -20,8 +20,8 @@ describe DataMapper::Resource::State::Clean do
   before do
     @resource = @model.create(:name => 'Dan Kubb')
 
-    @state = @resource.persisted_state
-    @state.should be_kind_of(DataMapper::Resource::State::Clean)
+    @state = @resource.persistence_state
+    @state.should be_kind_of(DataMapper::Resource::PersistenceState::Clean)
   end
 
   after do
@@ -45,13 +45,13 @@ describe DataMapper::Resource::State::Clean do
 
     supported_by :all do
       it 'should return a Deleted state' do
-        should eql(DataMapper::Resource::State::Deleted.new(@resource))
+        should eql(DataMapper::Resource::PersistenceState::Deleted.new(@resource))
       end
     end
   end
 
   describe '#get' do
-    it_should_behave_like 'Resource::State::Persisted#get'
+    it_should_behave_like 'Resource::PersistenceState::Persisted#get'
   end
 
   describe '#set' do
@@ -67,7 +67,7 @@ describe DataMapper::Resource::State::Clean do
         it_should_behave_like 'A method that delegates to the superclass #set'
 
         it 'should return a Dirty state' do
-          should eql(DataMapper::Resource::State::Dirty.new(@resource))
+          should eql(DataMapper::Resource::PersistenceState::Dirty.new(@resource))
         end
       end
 

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

@@ -1,5 +1,5 @@
 require 'spec_helper'
-describe DataMapper::Resource::State::Deleted do
+describe DataMapper::Resource::PersistenceState::Deleted do
   before :all do
     class ::Author
       include DataMapper::Resource
@@ -20,7 +20,7 @@ describe DataMapper::Resource::State::Deleted do
   before do
     @resource = @model.create(:name => 'Dan Kubb')
 
-    @state = DataMapper::Resource::State::Deleted.new(@resource)
+    @state = DataMapper::Resource::PersistenceState::Deleted.new(@resource)
   end
 
   after do
@@ -32,7 +32,7 @@ describe DataMapper::Resource::State::Deleted do
 
     supported_by :all do
       it 'should return an Immutable state' do
-        should eql(DataMapper::Resource::State::Immutable.new(@resource))
+        should eql(DataMapper::Resource::PersistenceState::Immutable.new(@resource))
       end
 
       it 'should delete the resource' do
@@ -58,7 +58,7 @@ describe DataMapper::Resource::State::Deleted do
   end
 
   describe '#get' do
-    it_should_behave_like 'Resource::State::Persisted#get'
+    it_should_behave_like 'Resource::PersistenceState::Persisted#get'
   end
 
   describe '#set' do