dm-core 0.10.1 → 0.10.2

data/spec/public/model_spec.rb

@@ -7,13 +7,13 @@ describe DataMapper::Model do
       class Article
         include DataMapper::Resource
 
-        property :id,      Serial
-        property :title,   String, :nullable => false
-        property :content, Text
+        property :id,       Serial
+        property :title,    String, :required => true
+        property :content,  Text,                       :writer => :private, :default => lambda { |resource, property| resource.title }
         property :subtitle, String
-        property :author,  String, :nullable => false
+        property :author,   String, :required => true
 
-        belongs_to :original, self, :nullable => true
+        belongs_to :original, self, :required => false
         has n, :revisions, self, :child_key => [ :original_id ]
         has 1, :previous,  self, :child_key => [ :original_id ], :order => [ :id.desc ]
       end
@@ -26,9 +26,9 @@ describe DataMapper::Model do
     before :all do
       @author = 'Dan Kubb'
 
-      @original = @article_model.create(:title => 'Original Article',                                               :author => @author)
-      @article  = @article_model.create(:title => 'Sample Article',   :content => 'Sample', :original => @original, :author => @author)
-      @other    = @article_model.create(:title => 'Other Article',    :content => 'Other',                          :author => @author)
+      @original = @article_model.create(:title => 'Original Article',                         :author => @author)
+      @article  = @article_model.create(:title => 'Sample Article',   :original => @original, :author => @author)
+      @other    = @article_model.create(:title => 'Other Article',                            :author => @author)
     end
 
     it { @article_model.should respond_to(:copy) }
@@ -40,8 +40,8 @@ describe DataMapper::Model do
             @return = @resources = @article_model.copy(@repository.name, @alternate_adapter.name)
           end
 
-          it 'should return an Enumerable' do
-            @return.should be_a_kind_of(Enumerable)
+          it 'should return a Collection' do
+            @return.should be_a_kind_of(DataMapper::Collection)
           end
 
           it 'should return Resources' do
@@ -84,8 +84,8 @@ describe DataMapper::Model do
             @return = @resources = @article_model.copy(@alternate_adapter.name, :default)
           end
 
-          it 'should return an Enumerable' do
-            @return.should be_a_kind_of(Enumerable)
+          it 'should return a Collection' do
+            @return.should be_a_kind_of(DataMapper::Collection)
           end
 
           it 'should return Resources' do
@@ -120,7 +120,7 @@ describe DataMapper::Model do
         property :content, Text
         property :subtitle, String
 
-        belongs_to :original, self, :nullable => true
+        belongs_to :original, self, :required => false
         has n, :revisions, self, :child_key => [ :original_id ]
         has 1, :previous,  self, :child_key => [ :original_id ], :order => [ :id.desc ]
         has n, :publications, :through => Resource

data/spec/public/property/object_spec.rb

@@ -0,0 +1,106 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+describe DataMapper::Property, 'Object type' do
+  before :all do
+    module ::Blog
+      class Article
+        include DataMapper::Resource
+
+        property :id,    Serial
+        property :title, String
+        property :meta,  Object, :required => true
+      end
+    end
+
+    @model    = Blog::Article
+    @property = @model.properties[:meta]
+  end
+
+  subject { @property }
+
+  it { should respond_to(:typecast) }
+
+  describe '#typecast' do
+    before do
+      @value = { 'lang' => 'en_CA' }
+    end
+
+    subject { @property.typecast(@value) }
+
+    it { should equal(@value) }
+  end
+
+  it { should respond_to(:value) }
+
+  describe '#value' do
+    describe 'with a value' do
+      before do
+        @value = { 'lang' => 'en_CA' }
+      end
+
+      subject { @property.value(@value) }
+
+      it { @property.type.load(subject, @property).should == @value }
+    end
+
+    describe 'with nil' do
+      subject { @property.value(nil) }
+
+      it { should be_nil }
+    end
+  end
+
+  it { should respond_to(:valid?) }
+
+  describe '#valid?' do
+    describe 'with a valid primitive' do
+      subject { @property.valid?('lang' => 'en_CA') }
+
+      it { should be_true }
+    end
+
+    describe 'with nil and property is not required' do
+      before do
+        @property = @model.property(:meta, Object, :required => false)
+      end
+
+      subject { @property.valid?(nil) }
+
+      it { should be_true }
+    end
+
+    describe 'with nil and property is required' do
+      subject { @property.valid?(nil) }
+
+      it { should be_false }
+    end
+
+    describe 'with nil and property is required, but validity is negated' do
+      subject { @property.valid?(nil, true) }
+
+      it { should be_true }
+    end
+  end
+
+  describe 'persistable' do
+    supported_by :all do
+      before :all do
+        @do_adapter = defined?(DataMapper::Adapters::DataObjectsAdapter) && @adapter.kind_of?(DataMapper::Adapters::DataObjectsAdapter)
+      end
+
+      before :all do
+        @resource = @model.create(:title => 'Test', :meta => { 'lang' => 'en_CA' })
+      end
+
+      subject { @resource.reload.meta }
+
+      it 'should load the correct value' do
+        pending_if 'Fix adapters to use different serialization methods', !@do_adapter do
+          pending_if 'Fix DO adapter to send String for Text primitive', !!(RUBY_PLATFORM =~ /java/) do
+            should == { 'lang' => 'en_CA' }
+          end
+        end
+      end
+    end
+  end
+end

data/spec/public/property_spec.rb

@@ -20,7 +20,7 @@ describe DataMapper::Property do
       include DataMapper::Resource
 
       property :md5hash,      String, :key => true, :length => 32
-      property :title,        String, :nullable => false, :unique => true
+      property :title,        String, :required => true, :unique => true
       property :description,  Text,   :length => 1..1024, :lazy => [ :detail ]
       property :format,       String, :default => 'jpeg'
       property :taken_at,     Time,   :default => proc { Time.now }
@@ -255,13 +255,13 @@ describe DataMapper::Property do
       end
     end
 
-    describe '#nullable?' do
+    describe '#allow_nil?' do
       it 'returns true when property can accept nil as its value' do
-        Track.properties[:artist].nullable?.should be_true
+        Track.properties[:artist].allow_nil?.should be_true
       end
 
       it 'returns false when property nil value is prohibited for this property' do
-        Image.properties[:title].nullable?.should be_false
+        Image.properties[:title].allow_nil?.should be_false
       end
     end
 
@@ -282,16 +282,18 @@ describe DataMapper::Property do
     # (since original value is set, property is no longer dirty)
     describe '#set_original_value' do
       before :all do
-        @image = Image.create(:md5hash     => '5268f0f3f452844c79843e820f998869',
-                              :title       => 'Rome at the sunset',
-                              :description => 'Just wow')
-        @image.reload
+        @image = Image.create(
+          :md5hash     => '5268f0f3f452844c79843e820f998869',
+          :title       => 'Rome at the sunset',
+          :description => 'Just wow'
+        )
+
         @property = Image.properties[:title]
       end
 
       describe 'when value changes' do
         before :all do
-          @property.set_original_value(@image, 'Rome at the sunset')
+          @property.set_original_value(@image, 'New title')
         end
 
         it 'sets original value of the property' do
@@ -306,7 +308,7 @@ describe DataMapper::Property do
 
         it 'only sets original value when it has changed' do
           @property.set_original_value(@image, 'Rome at the sunset')
-          @image.original_attributes[@property].should be_blank
+          @image.original_attributes.should_not have_key(@property)
         end
       end
     end
@@ -315,10 +317,12 @@ describe DataMapper::Property do
       before :all do
         # keep in mind we must run these examples with a
         # saved model instance
-        @image = Image.create(:md5hash     => '5268f0f3f452844c79843e820f998869',
-                              :title       => 'Rome at the sunset',
-                              :description => 'Just wow')
-        @image.reload
+        @image = Image.create(
+          :md5hash     => '5268f0f3f452844c79843e820f998869',
+          :title       => 'Rome at the sunset',
+          :description => 'Just wow'
+        )
+
         @property = Image.properties[:title]
       end
 

data/spec/public/resource_spec.rb

@@ -12,7 +12,10 @@ describe DataMapper::Resource do
         property :description, Text
         property :admin,       Boolean, :accessor => :private
 
-        belongs_to :referrer, self, :nullable => true
+        belongs_to :parent, self, :required => false
+        has n, :children, self, :inverse => :parent
+
+        belongs_to :referrer, self, :required => false
         has n, :comments
 
         # FIXME: figure out a different approach than stubbing things out
@@ -51,6 +54,12 @@ describe DataMapper::Resource do
       end
     end
 
+    class ::Default
+      include DataMapper::Resource
+
+      property :name, String, :key => true, :default => 'a default value'
+    end
+
     @user_model      = Blog::User
     @author_model    = Blog::Author
     @comment_model   = Blog::Comment

data/spec/public/sel_spec.rb

@@ -1,48 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-describe 'SEL', 'with different key types' do
-  before :all do
-    module ::Blog
-      class Author
-        include DataMapper::Resource
-
-        property :id,   Serial
-        property :name, String
-
-        has n, :articles
-      end
-
-      class Article
-        include DataMapper::Resource
-
-        property :id,    Serial
-        property :title, String, :nullable => false
-
-        property :author_id, String  # different type
-
-        belongs_to :author
-      end
-    end
-
-    @author_model  = Blog::Author
-    @article_model = Blog::Article
-  end
-
-  supported_by :all do
-    before :all do
-      @author1 = @author_model.create(:name => 'Dan Kubb')
-      @author2 = @author_model.create(:name => 'Carl Porth')
-
-      @article1 = @author1.articles.create(:title => 'Sample Article')
-      @article2 = @author2.articles.create(:title => 'Other Article')
-    end
-
-    it 'should return expected results' do
-      @article_model.all.map { |article| article.author }.should == [ @author1, @author2 ]
-    end
-  end
-end
-
 describe 'SEL', 'with STI subclasses' do
   before :all do
     module ::Blog
@@ -60,7 +17,7 @@ describe 'SEL', 'with STI subclasses' do
 
         property :id,    Serial
         property :type,  Discriminator
-        property :title, String, :nullable => false
+        property :title, String, :required => true
 
         belongs_to :author
       end
@@ -77,12 +34,22 @@ describe 'SEL', 'with STI subclasses' do
 
   supported_by :all do
     before :all do
-      author1 = @author_model.create(:name => 'Dan Kubb')
-      author2 = @author_model.create(:name => 'Sindre Aarsaether')
+      @skip = defined?(DataMapper::Adapters::YamlAdapter) && @adapter.kind_of?(DataMapper::Adapters::YamlAdapter)
+    end
+
+    before :all do
+      rescue_if 'TODO: fix YAML serialization/deserialization', @skip do
+        author1 = @author_model.create(:name => 'Dan Kubb')
+        author2 = @author_model.create(:name => 'Sindre Aarsaether')
+
+        @article_model.create(:title => 'SEL',               :author => author1)
+        @article_model.create(:title => 'STI',               :author => author1)
+        @comment_model.create(:title => 'SEL and STI error', :author => author2)
+      end
+    end
 
-      @article_model.create(:title => 'SEL',               :author => author1)
-      @article_model.create(:title => 'STI',               :author => author1)
-      @comment_model.create(:title => 'SEL and STI error', :author => author2)
+    before do
+      pending if @skip
     end
 
     it 'should allow STI loading of mixed relationships' do

data/spec/public/setup_spec.rb

@@ -114,7 +114,7 @@ describe DataMapper do
       end
     end
 
-    supported_by :postgres, :mysql, :sqlite3 do
+    supported_by :postgres, :mysql, :sqlite3, :sqlserver do
       { :path => :database, :user => :username }.each do |original_key, new_key|
         describe "using #{new_key.inspect} option" do
           before :all do

data/spec/public/shared/association_collection_shared_spec.rb

@@ -22,10 +22,6 @@ share_examples_for 'It can transfer a Resource from another association' do
     pending if @skip
   end
 
-  it 'should relate the Resource to the Collection' do
-    @resource.collection.should equal(@articles)
-  end
-
   it 'should remove the Resource from the original Collection' do
     pending do
       @original.should_not be_include(@resource)
@@ -64,7 +60,7 @@ share_examples_for 'A public Association Collection' do
         @original = @other_articles
         @resource = @original.first
 
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @return = @articles << @resource
         end
       end
@@ -107,7 +103,7 @@ share_examples_for 'A public Association Collection' do
         @original = @other_articles
         @resource = @original.first
 
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @return = @articles.concat([ @resource ])
         end
       end
@@ -163,7 +159,7 @@ share_examples_for 'A public Association Collection' do
         @original = @other_articles
         @resource = @original.first
 
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @return = @articles.insert(0, @resource)
         end
       end
@@ -226,7 +222,7 @@ share_examples_for 'A public Association Collection' do
         @original = @other_articles
         @resource = @original.first
 
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @return = @articles.push(@resource)
         end
       end
@@ -249,7 +245,7 @@ share_examples_for 'A public Association Collection' do
         @original = @other_articles
         @resource = @original.first
 
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @return = @articles.replace([ @resource ])
         end
       end
@@ -262,10 +258,6 @@ share_examples_for 'A public Association Collection' do
         @return.should equal(@articles)
       end
 
-      it 'should relate the Resource to the Collection' do
-        @resource.collection.should equal(@articles)
-      end
-
       it_should_behave_like 'It can transfer a Resource from another association'
     end
   end
@@ -276,7 +268,7 @@ share_examples_for 'A public Association Collection' do
         @original = @other_articles
         @resource = @original.first
 
-        rescue_if 'TODO', @skip do
+        rescue_if @skip do
           @return = @articles.unshift(@resource)
         end
       end

data/spec/public/shared/collection_finder_shared_spec.rb

@@ -0,0 +1,267 @@
+share_examples_for 'Collection Finder Interface' do
+  before :all do
+    %w[ @article_model @article @other @articles ].each do |ivar|
+      raise "+#{ivar}+ should be defined in before block" unless instance_variable_defined?(ivar)
+      raise "+#{ivar}+ should not be nil in before block" unless instance_variable_get(ivar)
+    end
+  end
+
+  before :all do
+    @no_join = defined?(DataMapper::Adapters::InMemoryAdapter) && @adapter.kind_of?(DataMapper::Adapters::InMemoryAdapter) ||
+               defined?(DataMapper::Adapters::YamlAdapter)     && @adapter.kind_of?(DataMapper::Adapters::YamlAdapter)
+
+    @many_to_many = @articles.kind_of?(DataMapper::Associations::ManyToMany::Collection)
+
+    @skip = @no_join && @many_to_many
+  end
+
+  before do
+    pending if @skip
+  end
+
+  describe '#at' do
+    before :all do
+      @copy = @articles.dup
+      @copy.to_a
+    end
+
+    describe 'with positive offset', 'after prepending to the collection' do
+      before :all do
+        @return = @resource = @articles.unshift(@other).at(0)
+      end
+
+      should_not_be_a_kicker
+
+      it 'should return a Resource' do
+        @return.should be_kind_of(DataMapper::Resource)
+      end
+
+      it 'should return expected Resource' do
+        @resource.should equal(@other)
+      end
+    end
+
+    describe 'with negative offset', 'after appending to the collection' do
+      before :all do
+        @return = @resource = @articles.push(@other).at(-1)
+      end
+
+      should_not_be_a_kicker
+
+      it 'should return a Resource' do
+        @return.should be_kind_of(DataMapper::Resource)
+      end
+
+      it 'should return expected Resource' do
+        @resource.should equal(@other)
+      end
+    end
+  end
+
+  describe '#first' do
+    before :all do
+      1.upto(5) { |number| @articles.create(:content => "Article #{number}") }
+
+      @copy = @articles.dup
+      @copy.to_a
+
+      # reload the articles
+      @articles = @article_model.all(@articles.query)
+    end
+
+    describe 'with no arguments' do
+      before :all do
+        @return = @resource = @articles.first
+      end
+
+      it 'should return a Resource' do
+        @return.should be_kind_of(DataMapper::Resource)
+      end
+
+      it 'should be first Resource in the Collection' do
+        @resource.should equal(@copy.entries.first)
+      end
+
+      it 'should return the same Resource every time' do
+        @return.should equal(@articles.first)
+      end
+    end
+
+    describe 'with no arguments', 'after prepending to the collection' do
+      before :all do
+        @return = @resource = @articles.unshift(@other).first
+      end
+
+      it 'should return a Resource' do
+        @return.should be_kind_of(DataMapper::Resource)
+      end
+
+      it 'should return expected Resource' do
+        @resource.should equal(@other)
+      end
+
+      it 'should be first Resource in the Collection' do
+        @resource.should equal(@copy.entries.unshift(@other).first)
+      end
+    end
+
+    describe 'with empty query', 'after prepending to the collection' do
+      before :all do
+        @return = @resource = @articles.unshift(@other).first({})
+      end
+
+      it 'should return a Resource' do
+        @return.should be_kind_of(DataMapper::Resource)
+      end
+
+      it 'should return expected Resource' do
+        @resource.should equal(@other)
+      end
+
+      it 'should be first Resource in the Collection' do
+        @resource.should equal(@copy.entries.unshift(@other).first)
+      end
+    end
+
+    describe 'with a limit specified', 'after prepending to the collection' do
+      before :all do
+        @return = @resources = @articles.unshift(@other).first(1)
+      end
+
+      it 'should return a Collection' do
+        @return.should be_kind_of(DataMapper::Collection)
+      end
+
+      it 'should be the expected Collection' do
+        @resources.should == [ @other ]
+      end
+
+      it 'should be the first N Resources in the Collection' do
+        @resources.should == @copy.entries.unshift(@other).first(1)
+      end
+    end
+  end
+
+  [ :get, :get! ].each do |method|
+    describe 'with a key to a Resource within a Collection using a limit' do
+      before :all do
+        rescue_if @skip && method == :get! do
+          @articles = @articles.all(:limit => 1)
+
+          @return = @resource = @articles.send(method, *@article.key)
+        end
+      end
+
+      it 'should return a Resource' do
+        @return.should be_kind_of(DataMapper::Resource)
+      end
+
+      it 'should be matching Resource in the Collection' do
+        @resource.should == @article
+      end
+    end
+
+    describe 'with a key to a Resource within a Collection using an offset' do
+      before :all do
+        rescue_if @skip && method == :get! do
+          @new = @articles.create(:content => 'New Article')
+          @articles = @articles.all(:offset => 1, :limit => 1)
+
+          @return = @resource = @articles.send(method, *@new.key)
+        end
+      end
+
+      it 'should return a Resource' do
+        @return.should be_kind_of(DataMapper::Resource)
+      end
+
+      it 'should be matching Resource in the Collection' do
+        @resource.should equal(@new)
+      end
+    end
+  end
+
+  describe '#last' do
+    before :all do
+      1.upto(5) { |number| @articles.create(:content => "Article #{number}") }
+
+      @copy = @articles.dup
+      @copy.to_a
+
+      # reload the articles
+      @articles = @article_model.all(@articles.query)
+    end
+
+    describe 'with no arguments' do
+      before :all do
+        @return = @resource = @articles.last
+      end
+
+      it 'should return a Resource' do
+        @return.should be_kind_of(DataMapper::Resource)
+      end
+
+      it 'should be last Resource in the Collection' do
+        @resource.should equal(@copy.entries.last)
+      end
+
+      it 'should return the same Resource every time' do
+        @return.should equal(@articles.last)
+      end
+    end
+
+    describe 'with no arguments', 'after appending to the collection' do
+      before :all do
+        @return = @resource = @articles.push(@other).last
+      end
+
+      it 'should return a Resource' do
+        @return.should be_kind_of(DataMapper::Resource)
+      end
+
+      it 'should return expected Resource' do
+        @resource.should equal(@other)
+      end
+
+      it 'should be last Resource in the Collection' do
+        @resource.should equal(@copy.entries.push(@other).last)
+      end
+    end
+
+    describe 'with empty query', 'after appending to the collection' do
+      before :all do
+        @return = @resource = @articles.push(@other).last({})
+      end
+
+      it 'should return a Resource' do
+        @return.should be_kind_of(DataMapper::Resource)
+      end
+
+      it 'should return expected Resource' do
+        @resource.should equal(@other)
+      end
+
+      it 'should be last Resource in the Collection' do
+        @resource.should equal(@copy.entries.push(@other).last)
+      end
+    end
+
+    describe 'with a limit specified', 'after appending to the collection' do
+      before :all do
+        @return = @resources = @articles.push(@other).last(1)
+      end
+
+      it 'should return a Collection' do
+        @return.should be_kind_of(DataMapper::Collection)
+      end
+
+      it 'should be the expected Collection' do
+        @resources.should == [ @other ]
+      end
+
+      it 'should be the last N Resources in the Collection' do
+        @resources.should == @copy.entries.push(@other).last(1)
+      end
+    end
+  end
+end