dm-core 0.10.2 → 1.0.0.rc1

data/spec/semipublic/query_spec.rb

@@ -9,8 +9,7 @@ require 'ostruct'
 # class methods
 describe DataMapper::Query do
   before :all do
-    class ::Password < DataMapper::Type
-      primitive String
+    class ::Password < DataMapper::Property::String
       length    40
     end
 
@@ -19,7 +18,7 @@ describe DataMapper::Query do
 
       property :name,     String,   :key => true
       property :password, Password
-      property :balance,  BigDecimal
+      property :balance,  Decimal
 
       belongs_to :referrer, self, :required => false
       has n, :referrals, self, :inverse => :referrer
@@ -171,7 +170,7 @@ describe DataMapper::Query do
         it 'should raise an exception' do
           lambda {
             DataMapper::Query.new(@repository, @model, @options.update(:fields => :name))
-          }.should raise_error(ArgumentError, '+options[:fields]+ should be Array, but was Symbol')
+          }.should raise_error(StandardError)
         end
       end
 
@@ -202,7 +201,7 @@ describe DataMapper::Query do
       describe 'that is an Array containing an unknown Property' do
         it 'should raise an exception' do
           lambda {
-            DataMapper::Query.new(@repository, @model, @options.update(:fields => [ DataMapper::Property.new(@model, :unknown, String) ]))
+            DataMapper::Query.new(@repository, @model, @options.update(:fields => [ DataMapper::Property::String.new(@model, :unknown) ]))
           }.should raise_error(ArgumentError, "+options[:field]+ entry :unknown does not map to a property in #{@model}")
         end
       end
@@ -265,7 +264,7 @@ describe DataMapper::Query do
         it 'should raise an exception' do
           lambda {
             DataMapper::Query.new(@repository, @model, @options.update(:links => :referral))
-          }.should raise_error(ArgumentError, '+options[:links]+ should be Array, but was Symbol')
+          }.should raise_error(StandardError)
         end
       end
 
@@ -521,16 +520,10 @@ describe DataMapper::Query do
 
           it { @return.should be_kind_of(DataMapper::Query) }
 
-          it 'should set the conditions' do
-            @return.conditions.should ==
-              DataMapper::Query::Conditions::Operation.new(
-                :and,
-                DataMapper::Query::Conditions::Comparison.new(
-                  :eql,
-                  @model.referrer.name,
-                  'Dan Kubb'
-                )
-              )
+          it 'should not set the conditions' do
+            pending do
+              @return.conditions.should be_nil
+            end
           end
 
           it 'should set the links' do
@@ -550,16 +543,10 @@ describe DataMapper::Query do
 
           it { @return.should be_kind_of(DataMapper::Query) }
 
-          it 'should set the conditions' do
-            @return.conditions.should ==
-              DataMapper::Query::Conditions::Operation.new(
-                :and,
-                DataMapper::Query::Conditions::Comparison.new(
-                  :eql,
-                  @model.referrer.name,
-                  'Dan Kubb'
-                )
-              )
+          it 'should not set the conditions' do
+            pending do
+              @return.conditions.should be_nil
+            end
           end
 
           it 'should set the links' do
@@ -700,7 +687,7 @@ describe DataMapper::Query do
           end
         end
 
-        describe 'with a Float for a BigDecimal property' do
+        describe 'with a Float for a Decimal property' do
           before :all do
             @options[:conditions] = { :balance => 50.5 }
             @return = DataMapper::Query.new(@repository, @model, @options.freeze)
@@ -846,7 +833,7 @@ describe DataMapper::Query do
         it 'should raise an exception' do
           lambda {
             DataMapper::Query.new(@repository, @model, @options.update(:offset => '0'))
-          }.should raise_error(ArgumentError, '+options[:offset]+ should be Integer, but was String')
+          }.should raise_error(StandardError)
         end
       end
 
@@ -896,7 +883,7 @@ describe DataMapper::Query do
         it 'should raise an exception' do
           lambda {
             DataMapper::Query.new(@repository, @model, @options.update(:limit => '1'))
-          }.should raise_error(ArgumentError, '+options[:limit]+ should be Integer, but was String')
+          }.should raise_error(StandardError)
         end
       end
 
@@ -1094,7 +1081,7 @@ describe DataMapper::Query do
 
       describe 'that contains a Query::Direction with a property that is not part of the model' do
         before :all do
-          @property = DataMapper::Property.new(@model, :unknown, String)
+          @property = DataMapper::Property::String.new(@model, :unknown)
           @direction = DataMapper::Query::Direction.new(@property, :desc)
         end
 
@@ -1123,7 +1110,7 @@ describe DataMapper::Query do
 
       describe 'that contains a Property that is not part of the model' do
         before :all do
-          @property = DataMapper::Property.new(@model, :unknown, String)
+          @property = DataMapper::Property::String.new(@model, :unknown)
         end
 
         it 'should raise an exception' do
@@ -1280,7 +1267,7 @@ describe DataMapper::Query do
         it 'should raise an exception' do
           lambda {
             DataMapper::Query.new(@repository, @model, 'invalid')
-          }.should raise_error(ArgumentError, '+options+ should be Hash, but was String')
+          }.should raise_error(StandardError)
         end
       end
     end
@@ -1354,7 +1341,7 @@ describe DataMapper::Query do
         @return = @query == @query
       end
 
-      it { @return.should be_true }
+      it { @return.should be(true) }
     end
 
     describe 'when other is equivalent' do
@@ -1362,7 +1349,7 @@ describe DataMapper::Query do
         @return = @query == @query.dup
       end
 
-      it { @return.should be_true }
+      it { @return.should be(true) }
     end
 
     DataMapper::Query::OPTIONS.each do |name|
@@ -1371,7 +1358,7 @@ describe DataMapper::Query do
           @return = @query == @query.merge(name => @other_options[name])
         end
 
-        it { @return.should be_false }
+        it { @return.should be(false) }
       end
     end
 
@@ -1394,7 +1381,7 @@ describe DataMapper::Query do
         @return = @query == @other
       end
 
-      it { @return.should be_true }
+      it { @return.should be(false) }
     end
 
     describe 'when other is a different type of object that can be compared, and is not equivalent' do
@@ -1416,7 +1403,7 @@ describe DataMapper::Query do
         @return = @query == @other
       end
 
-      it { @return.should be_false }
+      it { @return.should be(false) }
     end
 
     describe 'when other is a different type of object that cannot be compared' do
@@ -1424,7 +1411,7 @@ describe DataMapper::Query do
         @return = @query == 'invalid'
       end
 
-      it { @return.should be_false }
+      it { @return.should be(false) }
     end
   end
 
@@ -1467,8 +1454,8 @@ describe DataMapper::Query do
             {
               :child_key              => @key.map { |p| p.name },
               :parent_key             => @key.map { |p| p.name },
-              :child_repository_name  => @repository,
-              :parent_repository_name => @repository,
+              :child_repository_name  => @repository.name,
+              :parent_repository_name => @repository.name,
             }
           )
 
@@ -1629,9 +1616,7 @@ describe DataMapper::Query do
           it { should_not equal(@other) }
 
           it 'should put each query into a subquery and AND them together, and negate the other query' do
-            pending_if 'TODO: Fix once table aliasing works', @do_adapter do
-              subject.conditions.should == @expected
-            end
+            subject.conditions.should == @expected
           end
         end
 
@@ -1657,9 +1642,7 @@ describe DataMapper::Query do
           it { should_not equal(@other) }
 
           it 'should put each query into a subquery and AND them together, and negate the other query' do
-            pending_if 'TODO: Fix once table aliasing works', @do_adapter do
-              subject.conditions.should == @expected
-            end
+            subject.conditions.should == @expected
           end
         end
 
@@ -1841,7 +1824,7 @@ describe DataMapper::Query do
         @return = @query.eql?(@query)
       end
 
-      it { @return.should be_true }
+      it { @return.should be(true) }
     end
 
     describe 'when other is eql' do
@@ -1849,7 +1832,7 @@ describe DataMapper::Query do
         @return = @query.eql?(@query.dup)
       end
 
-      it { @return.should be_true }
+      it { @return.should be(true) }
     end
 
     DataMapper::Query::OPTIONS.each do |name|
@@ -1858,7 +1841,7 @@ describe DataMapper::Query do
           @return = @query.eql?(@query.merge(name => @other_options[name]))
         end
 
-        it { @return.should be_false }
+        it { @return.should be(false) }
       end
     end
 
@@ -1881,7 +1864,7 @@ describe DataMapper::Query do
         @return = @query.eql?(@other)
       end
 
-      it { @return.should be_false }
+      it { @return.should be(false) }
     end
   end
 
@@ -1941,10 +1924,10 @@ describe DataMapper::Query do
         #<DataMapper::Query
           @repository=:default
           @model=User
-          @fields=[#<DataMapper::Property @model=User @name=:name>, #<DataMapper::Property @model=User @name=:citizenship>, #<DataMapper::Property @model=User @name=:referrer_name>]
+          @fields=[#<DataMapper::Property::String @model=User @name=:name>, #<DataMapper::Property::String @model=User @name=:citizenship>, #<DataMapper::Property::String @model=User @name=:referrer_name>]
           @links=[]
           @conditions=nil
-          @order=[#<DataMapper::Query::Direction @target=#<DataMapper::Property @model=User @name=:name> @operator=:asc>]
+          @order=[#<DataMapper::Query::Direction @target=#<DataMapper::Property::String @model=User @name=:name> @operator=:asc>]
           @limit=3
           @offset=0
           @reload=false
@@ -1968,8 +1951,8 @@ describe DataMapper::Query do
             {
               :child_key              => @key.map { |p| p.name },
               :parent_key             => @key.map { |p| p.name },
-              :child_repository_name  => @repository,
-              :parent_repository_name => @repository,
+              :child_repository_name  => @repository.name,
+              :parent_repository_name => @repository.name,
             }
           )
 
@@ -2130,9 +2113,7 @@ describe DataMapper::Query do
           it { should_not equal(@other) }
 
           it 'should put each query into a subquery and AND them together' do
-            pending_if 'TODO: Fix once table aliasing works', @do_adapter do
-              subject.conditions.should == @expected
-            end
+            subject.conditions.should == @expected
           end
         end
 
@@ -2156,9 +2137,7 @@ describe DataMapper::Query do
           it { should_not equal(@other) }
 
           it 'should put each query into a subquery and AND them together' do
-            pending_if 'TODO: Fix once table aliasing works', @do_adapter do
-              subject.conditions.should == @expected
-            end
+            subject.conditions.should == @expected
           end
         end
 
@@ -3107,8 +3086,8 @@ describe DataMapper::Query do
             {
               :child_key              => @key.map { |p| p.name },
               :parent_key             => @key.map { |p| p.name },
-              :child_repository_name  => @repository,
-              :parent_repository_name => @repository,
+              :child_repository_name  => @repository.name,
+              :parent_repository_name => @repository.name,
             }
           )
 
@@ -3265,9 +3244,7 @@ describe DataMapper::Query do
           it { should_not equal(@other) }
 
           it 'should put each query into a subquery and OR them together' do
-            pending_if 'TODO: Fix once table aliasing works', @do_adapter do
-              subject.conditions.should == @expected
-            end
+            subject.conditions.should == @expected
           end
         end
 
@@ -3291,9 +3268,7 @@ describe DataMapper::Query do
           it { should_not equal(@other) }
 
           it 'should put each query into a subquery and OR them together' do
-            pending_if 'TODO: Fix once table aliasing works', @do_adapter do
-              subject.conditions.should == @expected
-            end
+            subject.conditions.should == @expected
           end
         end
 
@@ -3742,16 +3717,10 @@ describe DataMapper::Query do
 
         it { @return.should be_kind_of(DataMapper::Query) }
 
-        it 'should set the conditions' do
-          @return.conditions.should ==
-            DataMapper::Query::Conditions::Operation.new(
-              :and,
-              DataMapper::Query::Conditions::Comparison.new(
-                :eql,
-                @model.grandparents.name,
-                'Dan Kubb'
-              )
-            )
+        it 'should not set the conditions' do
+          pending do
+            @return.conditions.should be_nil
+          end
         end
 
         it 'should set the links' do

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

@@ -0,0 +1,88 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper'))
+
+describe DataMapper::Resource::State::Clean do
+  before :all do
+    class ::Author
+      include DataMapper::Resource
+
+      property :id,     HugeInteger, :key => true, :default => 1
+      property :name,   String
+      property :active, Boolean,     :default => true
+      property :coding, Boolean,     :default => true
+
+      belongs_to :parent, self, :required => false
+      has n, :children, self, :inverse => :parent
+    end
+
+    @model = Author
+  end
+
+  before do
+    @resource = @model.create(:name => 'Dan Kubb')
+
+    @state = @resource.persisted_state
+    @state.should be_kind_of(DataMapper::Resource::State::Clean)
+  end
+
+  after do
+    @resource.destroy
+  end
+
+  [ :commit, :rollback ].each do |method|
+    describe "##{method}" do
+      subject { @state.send(method) }
+
+      supported_by :all do
+        it 'should be a no-op' do
+          should equal(@state)
+        end
+      end
+    end
+  end
+
+  describe '#delete' do
+    subject { @state.delete }
+
+    supported_by :all do
+      it 'should return a Deleted state' do
+        should eql(DataMapper::Resource::State::Deleted.new(@resource))
+      end
+    end
+  end
+
+  describe '#get' do
+    it_should_behave_like 'Resource::State::Persisted#get'
+  end
+
+  describe '#set' do
+    subject { @state.set(@key, @value) }
+
+    supported_by :all do
+      describe 'with attributes that make the resource dirty' do
+        before do
+          @key   = @model.properties[:name]
+          @value = nil
+        end
+
+        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))
+        end
+      end
+
+      describe 'with attributes that keep the resource clean' do
+        before do
+          @key   = @model.properties[:name]
+          @value = 'Dan Kubb'
+        end
+
+        it_should_behave_like 'A method that does not delegate to the superclass #set'
+
+        it 'should return a Clean state' do
+          should equal(@state)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,78 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper'))
+
+describe DataMapper::Resource::State::Deleted do
+  before :all do
+    class ::Author
+      include DataMapper::Resource
+
+      property :id,     HugeInteger, :key => true, :default => 1
+      property :name,   String
+      property :active, Boolean,     :default => true
+      property :coding, Boolean,     :default => true
+
+      belongs_to :parent, self, :required => false
+      has n, :children, self, :inverse => :parent
+    end
+
+    @model = Author
+  end
+
+  before do
+    @resource = @model.create(:name => 'Dan Kubb')
+
+    @state = DataMapper::Resource::State::Deleted.new(@resource)
+  end
+
+  after do
+    @resource.destroy
+  end
+
+  describe '#commit' do
+    subject { @state.commit }
+
+    supported_by :all do
+      it 'should return an Immutable state' do
+        should eql(DataMapper::Resource::State::Immutable.new(@resource))
+      end
+
+      it 'should delete the resource' do
+        subject
+        @model.get(*@resource.key).should be_nil
+      end
+
+      it 'should remove the resource from the identity map' do
+        identity_map = @resource.repository.identity_map(@model)
+        method(:subject).should change { identity_map.dup }.from(@resource.key => @resource).to({})
+      end
+    end
+  end
+
+  describe '#delete' do
+    subject { @state.delete }
+
+    supported_by :all do
+      it 'should be a no-op' do
+        should equal(@state)
+      end
+    end
+  end
+
+  describe '#get' do
+    it_should_behave_like 'Resource::State::Persisted#get'
+  end
+
+  describe '#set' do
+    subject { @state.set(@key, @value) }
+
+    supported_by :all do
+      before do
+        @key   = @model.properties[:name]
+        @value = @key.get!(@resource)
+      end
+
+      it 'should raise an exception' do
+        method(:subject).should raise_error(DataMapper::ImmutableDeletedError, 'Deleted resource cannot be modified')
+      end
+    end
+  end
+end