dm-core 0.10.0 → 0.10.1

data/spec/public/shared/finder_shared_spec.rb

@@ -846,7 +846,7 @@ share_examples_for 'Finder Interface' do
       end
     end
 
-    describe 'with limit specified' do
+    describe 'with a limit specified' do
       before :all do
         @return = @resources = @articles.first(1)
       end
@@ -882,7 +882,7 @@ share_examples_for 'Finder Interface' do
       end
     end
 
-    # describe 'with limit specified', 'after prepending to the collection' do
+    # describe 'with a limit specified', 'after prepending to the collection' do
     #   before :all do
     #     @return = @resources = @articles.unshift(@other).first(1)
     #   end
@@ -904,7 +904,7 @@ share_examples_for 'Finder Interface' do
     #   end
     # end
 
-    describe 'with limit and query specified' do
+    describe 'with a limit and query specified' do
       before :all do
         @return = @resources = @articles.first(1, :content => 'Sample')
       end
@@ -1222,7 +1222,7 @@ share_examples_for 'Finder Interface' do
       # end
     end
 
-    describe 'with limit specified' do
+    describe 'with a limit specified' do
       before :all do
         @return = @resources = @articles.last(1)
       end
@@ -1258,7 +1258,7 @@ share_examples_for 'Finder Interface' do
       end
     end
 
-    # describe 'with limit specified', 'after appending to the collection' do
+    # describe 'with a limit specified', 'after appending to the collection' do
     #   before :all do
     #     @return = @resources = @articles.push(@other).last(1)
     #   end
@@ -1280,7 +1280,7 @@ share_examples_for 'Finder Interface' do
     #   end
     # end
 
-    describe 'with limit and query specified' do
+    describe 'with a limit and query specified' do
       before :all do
         @return = @resources = @articles.last(1, :content => 'Sample')
       end

data/spec/public/shared/resource_shared_spec.rb

@@ -237,8 +237,8 @@ share_examples_for 'A public Resource' do
           @resource.should be_frozen
         end
 
-        it 'should not be able to remove an already removed resource' do
-          @resource.destroy.should be_false
+        it "should return true when calling #{method} on a destroyed resource" do
+          @resource.send(method).should be_true
         end
 
         it 'should remove object from persistent storage' do

data/spec/semipublic/property_spec.rb

@@ -1,13 +1,505 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
+# class methods
+describe DataMapper::Property do
+  before :all do
+    module ::Blog
+      class Article
+        include DataMapper::Resource
+
+        property :id, Serial
+      end
+    end
+  end
+
+  describe '.new' do
+    before :all do
+      @model = Blog::Article
+      @name  = :title
+      @type  = String
+    end
+
+    describe 'when provided no options' do
+      before :all do
+        @property = DataMapper::Property.new(@model, @name, @type)
+      end
+
+      it 'should return a Property' do
+        @property.should be_kind_of(DataMapper::Property)
+      end
+
+      it 'should set the model' do
+        @property.model.should equal(@model)
+      end
+
+      it 'should set the type' do
+        @property.type.should equal(@type)
+      end
+
+      it 'should set the options to an empty Hash' do
+        @property.options.should == {}
+      end
+    end
+
+    [ :index, :unique_index, :unique, :lazy ].each do |attribute|
+      [ true, false, :title, [ :title ] ].each do |value|
+        describe "when provided #{(options = { attribute => value }).inspect}" do
+          before :all do
+            @property = DataMapper::Property.new(@model, @name, @type, options)
+          end
+
+          it 'should return a Property' do
+            @property.should be_kind_of(DataMapper::Property)
+          end
+
+          it 'should set the model' do
+            @property.model.should equal(@model)
+          end
+
+          it 'should set the type' do
+            @property.type.should equal(@type)
+          end
+
+          it "should set the options to #{options.inspect}" do
+            @property.options.should == options
+          end
+        end
+      end
+
+      [ [], nil ].each do |value|
+        describe "when provided #{(invalid_options = { attribute => value }).inspect}" do
+          it 'should raise an exception' do
+            lambda {
+              DataMapper::Property.new(@model, @name, @type, invalid_options)
+            }.should raise_error(ArgumentError, "options[#{attribute.inspect}] must be either true, false, a Symbol or an Array of Symbols")
+          end
+        end
+      end
+    end
+  end
+end
+
+# instance methods
 describe DataMapper::Property do
   before :all do
     module ::Blog
       class Author
         include DataMapper::Resource
 
-        property :name,  String, :key => true
-        property :alias, String
+        property :id,         Integer, :key => true
+        property :name,       String
+        property :rating,     Float
+        property :rate,       BigDecimal
+        property :type,       Class
+        property :alias,      String
+        property :active,     Boolean
+        property :deleted_at, Time
+        property :created_at, DateTime
+        property :created_on, Date
+      end
+    end
+
+    @model = Blog::Author
+  end
+
+  describe '#typecast' do
+    describe "when type is able to do typecasting on it's own" do
+      it 'delegates all the work to the type'
+    end
+
+    describe 'when value is nil' do
+      it 'returns value unchanged' do
+        @model.properties[:name].typecast(nil).should be(nil)
+      end
+    end
+
+    describe 'when value is a Ruby primitive' do
+      it 'returns value unchanged' do
+        @model.properties[:id].typecast([3200, 2400]).should == [3200, 2400]
+      end
+    end
+
+    describe 'when type primitive is a String' do
+      before :all do
+        @property = @model.properties[:name]
+      end
+
+      it 'returns same value if a string' do
+        @value = '1.0'
+        @property.typecast(@value).should equal(@value)
+      end
+    end
+
+    describe 'when type primitive is a Float' do
+      before :all do
+        @property = @model.properties[:rating]
+      end
+
+      it 'returns same value if a float' do
+        @value = 24.0
+        @property.typecast(@value).should equal(@value)
+      end
+
+      it 'returns float representation of a zero string integer' do
+        @property.typecast('0').should eql(0.0)
+      end
+
+      it 'returns float representation of a positive string integer' do
+        @property.typecast('24').should eql(24.0)
+      end
+
+      it 'returns float representation of a negative string integer' do
+        @property.typecast('-24').should eql(-24.0)
+      end
+
+      it 'returns float representation of a zero string float' do
+        @property.typecast('0.0').should eql(0.0)
+      end
+
+      it 'returns float representation of a positive string float' do
+        @property.typecast('24.35').should eql(24.35)
+      end
+
+      it 'returns float representation of a negative string float' do
+        @property.typecast('-24.35').should eql(-24.35)
+      end
+
+      it 'returns float representation of a zero string float, with no leading digits' do
+        @property.typecast('.0').should eql(0.0)
+      end
+
+      it 'returns float representation of a positive string float, with no leading digits' do
+        @property.typecast('.41').should eql(0.41)
+      end
+
+      it 'returns float representation of a zero integer' do
+        @property.typecast(0).should eql(0.0)
+      end
+
+      it 'returns float representation of a positive integer' do
+        @property.typecast(24).should eql(24.0)
+      end
+
+      it 'returns float representation of a negative integer' do
+        @property.typecast(-24).should eql(-24.0)
+      end
+
+      it 'returns float representation of a zero decimal' do
+        @property.typecast(BigDecimal('0.0')).should eql(0.0)
+      end
+
+      it 'returns float representation of a positive decimal' do
+        @property.typecast(BigDecimal('24.35')).should eql(24.35)
+      end
+
+      it 'returns float representation of a negative decimal' do
+        @property.typecast(BigDecimal('-24.35')).should eql(-24.35)
+      end
+
+      [ Object.new, true, '00.0', '0.', '-.0', 'string' ].each do |value|
+        it "does not typecast non-numeric value #{value.inspect}" do
+          @property.typecast(value).should equal(value)
+        end
+      end
+    end
+
+    describe 'when type primitive is a Integer' do
+      before :all do
+        @property = @model.properties[:id]
+      end
+
+      it 'returns same value if an integer' do
+        @value = 24
+        @property.typecast(@value).should equal(@value)
+      end
+
+      it 'returns integer representation of a zero string integer' do
+        @property.typecast('0').should eql(0)
+      end
+
+      it 'returns integer representation of a positive string integer' do
+        @property.typecast('24').should eql(24)
+      end
+
+      it 'returns integer representation of a negative string integer' do
+        @property.typecast('-24').should eql(-24)
+      end
+
+      it 'returns integer representation of a zero string float' do
+        @property.typecast('0.0').should eql(0)
+      end
+
+      it 'returns integer representation of a positive string float' do
+        @property.typecast('24.35').should eql(24)
+      end
+
+      it 'returns integer representation of a negative string float' do
+        @property.typecast('-24.35').should eql(-24)
+      end
+
+      it 'returns integer representation of a zero string float, with no leading digits' do
+        @property.typecast('.0').should eql(0)
+      end
+
+      it 'returns integer representation of a positive string float, with no leading digits' do
+        @property.typecast('.41').should eql(0)
+      end
+
+      it 'returns integer representation of a zero float' do
+        @property.typecast(0.0).should eql(0)
+      end
+
+      it 'returns integer representation of a positive float' do
+        @property.typecast(24.35).should eql(24)
+      end
+
+      it 'returns integer representation of a negative float' do
+        @property.typecast(-24.35).should eql(-24)
+      end
+
+      it 'returns integer representation of a zero decimal' do
+        @property.typecast(BigDecimal('0.0')).should eql(0)
+      end
+
+      it 'returns integer representation of a positive decimal' do
+        @property.typecast(BigDecimal('24.35')).should eql(24)
+      end
+
+      it 'returns integer representation of a negative decimal' do
+        @property.typecast(BigDecimal('-24.35')).should eql(-24)
+      end
+
+      [ Object.new, true, '00.0', '0.', '-.0', 'string' ].each do |value|
+        it "does not typecast non-numeric value #{value.inspect}" do
+          @property.typecast(value).should equal(value)
+        end
+      end
+    end
+
+    describe 'when type primitive is a BigDecimal' do
+      before :all do
+        @property = @model.properties[:rate]
+      end
+
+      it 'returns same value if a decimal' do
+        @value = BigDecimal('24.0')
+        @property.typecast(@value).should equal(@value)
+      end
+
+      it 'returns decimal representation of a zero string integer' do
+        @property.typecast('0').should eql(BigDecimal('0.0'))
+      end
+
+      it 'returns decimal representation of a positive string integer' do
+        @property.typecast('24').should eql(BigDecimal('24.0'))
+      end
+
+      it 'returns decimal representation of a negative string integer' do
+        @property.typecast('-24').should eql(BigDecimal('-24.0'))
+      end
+
+      it 'returns decimal representation of a zero string float' do
+        @property.typecast('0.0').should eql(BigDecimal('0.0'))
+      end
+
+      it 'returns decimal representation of a positive string float' do
+        @property.typecast('24.35').should eql(BigDecimal('24.35'))
+      end
+
+      it 'returns decimal representation of a negative string float' do
+        @property.typecast('-24.35').should eql(BigDecimal('-24.35'))
+      end
+
+      it 'returns decimal representation of a zero string float, with no leading digits' do
+        @property.typecast('.0').should eql(BigDecimal('0.0'))
+      end
+
+      it 'returns decimal representation of a positive string float, with no leading digits' do
+        @property.typecast('.41').should eql(BigDecimal('0.41'))
+      end
+
+      it 'returns decimal representation of a zero integer' do
+        @property.typecast(0).should eql(BigDecimal('0.0'))
+      end
+
+      it 'returns decimal representation of a positive integer' do
+        @property.typecast(24).should eql(BigDecimal('24.0'))
+      end
+
+      it 'returns decimal representation of a negative integer' do
+        @property.typecast(-24).should eql(BigDecimal('-24.0'))
+      end
+
+      it 'returns decimal representation of a zero float' do
+        @property.typecast(0.0).should eql(BigDecimal('0.0'))
+      end
+
+      it 'returns decimal representation of a positive float' do
+        @property.typecast(24.35).should eql(BigDecimal('24.35'))
+      end
+
+      it 'returns decimal representation of a negative float' do
+        @property.typecast(-24.35).should eql(BigDecimal('-24.35'))
+      end
+
+      [ Object.new, true, '00.0', '0.', '-.0', 'string' ].each do |value|
+        it "does not typecast non-numeric value #{value.inspect}" do
+          @property.typecast(value).should equal(value)
+        end
+      end
+    end
+
+    describe 'when type primitive is a DateTime' do
+      before :all do
+        @property = @model.properties[:created_at]
+      end
+
+      describe 'and value given as a hash with keys like :year, :month, etc' do
+        it 'builds a DateTime instance from hash values' do
+          result = @property.typecast(
+            'year'  => '2006',
+            'month' => '11',
+            'day'   => '23',
+            'hour'  => '12',
+            'min'   => '0',
+            'sec'   => '0'
+          )
+
+          result.should be_kind_of(DateTime)
+          result.year.should eql(2006)
+          result.month.should eql(11)
+          result.day.should eql(23)
+          result.hour.should eql(12)
+          result.min.should eql(0)
+          result.sec.should eql(0)
+        end
+      end
+
+      describe 'and value is a string' do
+        it 'parses the string' do
+          @property.typecast('Dec, 2006').month.should == 12
+        end
+      end
+
+      it 'does not typecast non-datetime values' do
+        @property.typecast('not-datetime').should eql('not-datetime')
+      end
+    end
+
+    describe 'when type primitive is a Date' do
+      before :all do
+        @property = @model.properties[:created_on]
+      end
+
+      describe 'and value given as a hash with keys like :year, :month, etc' do
+        it 'builds a Date instance from hash values' do
+          result = @property.typecast(
+            'year'  => '2007',
+            'month' => '3',
+            'day'   => '25'
+          )
+
+          result.should be_kind_of(Date)
+          result.year.should eql(2007)
+          result.month.should eql(3)
+          result.day.should eql(25)
+        end
+      end
+
+      describe 'and value is a string' do
+        it 'parses the string' do
+          result = @property.typecast('Dec 20th, 2006')
+          result.month.should == 12
+          result.day.should == 20
+          result.year.should == 2006
+        end
+      end
+
+      it 'does not typecast non-date values' do
+        @property.typecast('not-date').should eql('not-date')
+      end
+    end
+
+    describe 'when type primitive is a Time' do
+      before :all do
+        @property = @model.properties[:deleted_at]
+      end
+
+      describe 'and value given as a hash with keys like :year, :month, etc' do
+        it 'builds a Time instance from hash values' do
+          result = @property.typecast(
+            'year'  => '2006',
+            'month' => '11',
+            'day'   => '23',
+            'hour'  => '12',
+            'min'   => '0',
+            'sec'   => '0'
+          )
+
+          result.should be_kind_of(Time)
+          result.year.should  eql(2006)
+          result.month.should eql(11)
+          result.day.should   eql(23)
+          result.hour.should  eql(12)
+          result.min.should   eql(0)
+          result.sec.should   eql(0)
+        end
+      end
+
+      describe 'and value is a string' do
+        it 'parses the string' do
+          result = @property.typecast('22:24')
+          result.hour.should eql(22)
+          result.min.should eql(24)
+        end
+      end
+
+      it 'does not typecast non-time values' do
+        pending 'Time#parse is too permissive' do
+          @property.typecast('not-time').should eql('not-time')
+        end
+      end
+    end
+
+    describe 'when type primitive is a Class' do
+      before :all do
+        @property = @model.properties[:type]
+      end
+
+      it 'returns same value if a class' do
+        @property.typecast(@model).should equal(@model)
+      end
+
+      it 'returns the class if found' do
+        @property.typecast(@model.name).should eql(@model)
+      end
+
+      it 'does not typecast non-class values' do
+        @property.typecast('NoClass').should eql('NoClass')
+      end
+    end
+
+    describe 'when type primitive is a Boolean' do
+      before :all do
+        @property = @model.properties[:active]
+      end
+
+      [ true, 'true', 'TRUE', '1', 1, 't', 'T' ].each do |value|
+        it "returns true when value is #{value.inspect}" do
+          @property.typecast(value).should be_true
+        end
+      end
+
+      [ false, 'false', 'FALSE', '0', 0, 'f', 'F' ].each do |value|
+        it "returns false when value is #{value.inspect}" do
+          @property.typecast(value).should be_false
+        end
+      end
+
+      [ 'string', 2, 1.0, BigDecimal('1.0'), DateTime.now, Time.now, Date.today, Class, Object.new, ].each do |value|
+        it "does not typecast value #{value.inspect}" do
+          @property.typecast(value).should equal(value)
+        end
       end
     end
   end
@@ -15,29 +507,53 @@ describe DataMapper::Property do
   describe '#valid?' do
     describe 'when provided a valid value' do
       it 'should return true' do
-        Blog::Author.properties[:name].valid?('Dan Kubb').should be_true
+        @model.properties[:name].valid?('Dan Kubb').should be_true
       end
     end
 
     describe 'when provide an invalid value' do
       it 'should return false' do
-        Blog::Author.properties[:name].valid?(1).should be_false
+        @model.properties[:name].valid?(1).should be_false
       end
     end
 
     describe 'when provide a nil value when not nullable' do
       it 'should return false' do
-        Blog::Author.properties[:name].valid?(nil).should be_false
+        @model.properties[:id].valid?(nil).should be_false
       end
     end
 
     describe 'when provide a nil value when nullable' do
       it 'should return false' do
-        Blog::Author.properties[:alias].valid?(nil).should be_true
+        @model.properties[:alias].valid?(nil).should be_true
+      end
+    end
+
+    describe 'when type primitive is a Boolean' do
+      before do
+        @property = @model.properties[:active]
+      end
+
+      [ true, false ].each do |value|
+        it "returns true when value is #{value.inspect}" do
+          @property.valid?(value).should be_true
+        end
+      end
+
+      [ 'true', 'TRUE', '1', 1, 't', 'T', 'false', 'FALSE', '0', 0, 'f', 'F' ].each do |value|
+        it "returns false for #{value.inspect}" do
+          @property.valid?(value).should be_false
+        end
       end
     end
   end
 
+  describe '#value' do
+    it 'returns value for core types'
+
+    it 'triggers dump operation for custom types'
+  end
+
   describe 'override property definition in other repository' do
     before(:all) do
       module ::Blog
@@ -50,12 +566,11 @@ describe DataMapper::Property do
     end
 
     it 'should return property options in other repository' do
-      ::Blog::Author.properties(:other)[:name].options[:field].should == 'other_name'
+      @model.properties(:other)[:name].options[:field].should == 'other_name'
     end
 
     it 'should return property options in default repository' do
-      ::Blog::Author.properties[:name].options[:field].should be_nil
+      @model.properties[:name].options[:field].should be_nil
     end
   end
-
 end

data/spec/semipublic/query_spec.rb

@@ -757,8 +757,8 @@ describe DataMapper::Query do
 
         it { @return.should be_kind_of(DataMapper::Query) }
 
-        it 'should set conditions to an empty And operation' do
-          @return.conditions.should == DataMapper::Query::Conditions::Operation.new(:and)
+        it 'should set conditions to nil by default' do
+          @return.conditions.should be_nil
         end
 
         it 'should be valid' do
@@ -1346,7 +1346,7 @@ describe DataMapper::Query do
         @other = OpenStruct.new(
           :repository    => @query.repository,
           :model         => @query.model,
-          :fields        => @query.fields,
+          :sorted_fields => @query.sorted_fields,
           :links         => @query.links,
           :conditions    => @query.conditions,
           :order         => @query.order,
@@ -1368,7 +1368,7 @@ describe DataMapper::Query do
         @other = OpenStruct.new(
           :repository    => @query.repository,
           :model         => @query.model,
-          :fields        => @query.fields,
+          :sorted_fields => @query.sorted_fields,
           :links         => @query.links,
           :conditions    => @query.conditions,
           :order         => @query.order,
@@ -1458,7 +1458,7 @@ describe DataMapper::Query do
         @other = OpenStruct.new(
           :repository    => @query.repository,
           :model         => @query.model,
-          :fields        => @query.fields,
+          :sorted_fields => @query.sorted_fields,
           :links         => @query.links,
           :conditions    => @query.conditions,
           :order         => @query.order,
@@ -1534,7 +1534,7 @@ describe DataMapper::Query do
           @model=User
           @fields=[#<DataMapper::Property @model=User @name=:name>, #<DataMapper::Property @model=User @name=:citizenship>, #<DataMapper::Property @model=User @name=:referrer_name>]
           @links=[]
-          @conditions=#<DataMapper::Query::Conditions::AndOperation @operands=[]>
+          @conditions=nil
           @order=[#<DataMapper::Query::Direction @target=#<DataMapper::Property @model=User @name=:name> @operator=:asc>]
           @limit=3
           @offset=0

data/tasks/hoe.rb

@@ -40,6 +40,6 @@ hoe = Hoe.spec(GEM_NAME) do
 
   self.rubyforge_name = PROJECT_NAME
 
-  clean_globs |= %w[ {coverage,doc,log,tmp} **/*.{log,db} profile_results.* **/.DS_Store spec/db ]
-  extra_deps  |= GEM_DEPENDENCIES
+  self.clean_globs |= %w[ {coverage,doc,log,tmp} **/*.{log,db} profile_results.* **/.DS_Store spec/db ]
+  self.extra_deps  |= GEM_DEPENDENCIES
 end