dm-core 0.9.3 → 0.9.4

data/spec/integration/association_through_spec.rb

@@ -4,7 +4,6 @@ if ADAPTER
   describe 'through-associations' do
     before :all do
       repository(ADAPTER) do
-
         class Tag
           include DataMapper::Resource
           def self.default_repository_name
@@ -53,11 +52,11 @@ if ADAPTER
                  :through    => :relationships,
                  :class_name => "Post"
 
-          has n,  :void_tags,
-                  :through => :taggings,
-                  :class_name => "Tag",
-                  :remote_relationship_name => :tag,
-                  Post.taggings.tag.voided => true
+          has n, :void_tags,
+                 :through => :taggings,
+                 :class_name => "Tag",
+                 :remote_relationship_name => :tag,
+                 Post.taggings.tag.voided => true
         end
 
         class Relationship
@@ -74,7 +73,11 @@ if ADAPTER
         [Post, Tag, Tagging, Relationship].each do |descendant|
           descendant.auto_migrate!(ADAPTER)
         end
+      end
+    end
 
+    describe '(sample data)' do
+      before(:each) do
         post = Post.create(:title => "Entry")
         another_post = Post.create(:title => "Another")
 
@@ -106,51 +109,93 @@ if ADAPTER
         post.relationships << relation
         post.save
       end
-    end
 
-    it 'should return the right children for has n => belongs_to relationships' do
-      Post.first.tags.select do |tag|
-        tag.title == 'crap'
-      end.size.should == 1
-    end
+      it 'should return the right children for has n => belongs_to relationships' do
+        Post.first.tags.select do |tag|
+          tag.title == 'crap'
+        end.size.should == 1
+      end
 
-    it 'should return the right children for has n => belongs_to self-referential relationships' do
-      Post.first.related_posts.select do |post|
-        post.title == 'Another'
-      end.size.should == 1
-    end
+      it 'should return the right children for has n => belongs_to self-referential relationships' do
+        Post.first.related_posts.select do |post|
+          post.title == 'Another'
+        end.size.should == 1
+      end
 
-    it 'should handle all()' do
-      related_posts = Post.first.related_posts
-      related_posts.all.object_id.should == related_posts.object_id
-      related_posts.all(:id => 2).first.should == Post.get!(2)
-    end
+      it 'should handle all()' do
+        related_posts = Post.first.related_posts
+        related_posts.all.object_id.should == related_posts.object_id
+        related_posts.all(:id => 2).first.should == Post.get!(2)
+      end
 
-    it 'should handle first()' do
-      post = Post.get!(2)
-      related_posts = Post.first.related_posts
-      related_posts.first.should == post
-      related_posts.first(10).should == [ post ]
-      related_posts.first(:id => 2).should == post
-      related_posts.first(10, :id => 2).map { |r| r.id }.should == [ post.id ]
-    end
+      it 'should handle first()' do
+        post = Post.get!(2)
+        related_posts = Post.first.related_posts
+        related_posts.first.should == post
+        related_posts.first(10).should == [ post ]
+        related_posts.first(:id => 2).should == post
+        related_posts.first(10, :id => 2).map { |r| r.id }.should == [post.id]
+      end
 
-    it 'should handle get()' do
-      post = Post.get!(2)
-      related_posts = Post.first.related_posts
-      related_posts.get(2).should == post
+      it 'should handle get()' do
+        post = Post.get!(2)
+        related_posts = Post.first.related_posts
+        related_posts.get(2).should == post
+      end
+
+      it 'should proxy object should be frozen' do
+        Post.first.related_posts.should be_frozen
+      end
+
+      it "should respect tagging with conditions" do
+        post = Post.get(1)
+        post.tags.size
+        post.tags.select{ |t| t.voided == true }.size.should == 1
+        post.void_tags.size.should == 1
+        post.void_tags.all?{ |t| t.voided == true }.should be_true
+      end
     end
 
-    it 'should proxy object should be frozen' do
-      Post.first.related_posts.should be_frozen
+    describe "Saved Tag, Post, Tagging" do
+      before(:each) do
+        @tag      = Tag.create
+        @post     = Post.create
+        @tagging  = Tagging.create(
+          :tag  => @tag,
+          :post => @post
+        )
+      end
+
+      it "should get posts of a tag" do
+        @tag.posts.should == [@post]
+      end
+
+      it "should get tags of a post" do
+        @post.tags.should == [@tag]
+      end
     end
 
-    it "should respect tagging with conditions" do
-      post = Post.get(1)
-      post.tags.size
-      post.tags.select{|t| t.voided == true}.size.should == 1
-      post.void_tags.size.should == 1
-      post.void_tags.all?{|t| t.voided == true}.should be_true
+    describe "In-memory Tag, Post, Tagging" do
+      before(:each) do
+        @tag      = Tag.new
+        @post     = Post.new
+        @tagging  = Tagging.new(
+          :tag  => @tag,
+          :post => @post
+        )
+      end
+
+      it "should get posts of a tag" do
+        pending("DataMapper does not yet support in-memory associations") do
+          @tag.posts.should == [@post]
+        end
+      end
+
+      it "should get tags of a post" do
+        pending("DataMapper does not yet support in-memory associations") do
+          @post.tags.should == [@tag]
+        end
+      end
     end
   end
 end

data/spec/integration/associations/many_to_many_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
 
 describe DataMapper::Associations::ManyToMany::Proxy do
   before :all do
@@ -48,36 +48,36 @@ describe DataMapper::Associations::ManyToMany::Proxy do
     end
   end
 
-  it 'should provide #replace' do
+  it "should provide #replace" do
     @association.should respond_to(:replace)
   end
 
-  describe '#replace' do
-    it 'should remove the resource from the collection' do
+  describe "#replace" do
+    it "should remove the resource from the collection" do
       @association.should have(0).entries
       @association.replace(@other)
       @association.should == @other
     end
 
-    it 'should not automatically save that the resource was removed from the association' do
+    it "should not automatically save that the resource was removed from the association" do
       @association.replace(@other)
       @parent.reload.should have(0).editors
     end
 
-    it 'should return the association' do
+    it "should return the association" do
       @association.replace(@other).object_id.should == @association.object_id
     end
 
-    it 'should add the new resources so they will be saved when saving the parent' do
+    it "should add the new resources so they will be saved when saving the parent" do
       @association.replace(@other)
       @association.should == @other
       @parent.save
       @association.reload.should == @other
     end
 
-    it 'should instantiate the remote model if passed an array of hashes' do
-      @association.replace([ { :name => 'Jim Smith' } ])
-      other = [ Editor.first(:name => 'Jim Smith') ]
+    it "should instantiate the remote model if passed an array of hashes" do
+      @association.replace([ { :name => "Jim Smith" } ])
+      other = [ Editor.first(:name => "Jim Smith") ]
       other.first.should_not be_nil
       @association.should == other
       @parent.save
@@ -176,7 +176,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
   end
 
   it "should be destroyable" do
-    pending 'cannot destroy a collection yet' do
+    pending "cannot destroy a collection yet" do
       book = Book.get(2)
       book.should have(1).editors
 
@@ -188,7 +188,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
     end
   end
 
-  describe 'with natural keys' do
+  describe "with natural keys" do
     before :all do
       class Author
         include DataMapper::Resource
@@ -208,7 +208,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
     before do
       [ Author, AuthorBook ].each { |k| k.auto_migrate! }
 
-      @author = Author.create(:name =>  'James Joyce')
+      @author = Author.create(:name =>  "James Joyce")
 
       @book_1 = Book.get!(1)
       @book_2 = Book.get!(2)
@@ -219,19 +219,79 @@ describe DataMapper::Associations::ManyToMany::Proxy do
       AuthorBook.create(:book => @book_3, :author => @author)
     end
 
-    it 'should have a join resource where the natural key is a property' do
+    it "should have a join resource where the natural key is a property" do
       AuthorBook.properties[:author_name].primitive.should == String
     end
 
-    it 'should have a join resource where every property is part of the key' do
+    it "should have a join resource where every property is part of the key" do
       AuthorBook.key.should == AuthorBook.properties.to_a
     end
 
-    it 'should correctly link records' do
+    it "should correctly link records" do
       @author.should have(3).books
       @book_1.should have(1).authors
       @book_2.should have(1).authors
       @book_3.should have(1).authors
     end
   end
+
+  describe "When join model has non-serial (integer) natural keys." do
+    before :all do
+      class Tag
+        include DataMapper::Resource
+
+        def self.default_repository_name; ADAPTER end
+
+        property :id,    Serial
+        property :name,  String, :size => 128
+
+        has n, :book_taggings
+        has n, :books, :through => :book_taggings
+      end
+
+      class BookTagging
+        include DataMapper::Resource
+
+        def self.default_repository_name; ADAPTER end
+
+        property :book_id, Integer, :key => true
+        property :tag_id, Integer, :key => true
+
+        belongs_to :book
+        belongs_to :tag
+      end
+
+      class Book
+        has n, :book_taggings
+        has n, :tags, :through => :book_taggings
+      end
+    end
+
+    before do
+      [ Tag, BookTagging ].each { |k| k.auto_migrate! }
+
+      @tag_1 = Tag.create(:name =>  "good")
+      @tag_2 = Tag.create(:name =>  "long")
+
+      @book_1 = Book.get!(1)
+      @book_2 = Book.get!(2)
+      @book_3 = Book.get!(3)
+
+      BookTagging.create(:book => @book_2, :tag => @tag_1)
+      BookTagging.create(:book => @book_2, :tag => @tag_2)
+      BookTagging.create(:book => @book_3, :tag => @tag_2)
+    end
+
+    it "should fetch all tags for a book" do
+      @book_1.tags.should have(0).tags
+      @book_2.tags.should have(2).tags
+      @book_3.tags.should have(1).tags
+    end
+
+    it "should allow for adding an association using the << operator" do
+      @book_1.book_taggings << @tag_1
+      @book_1.tags.should have(0).tags
+    end
+  end
+
 end

data/spec/integration/associations/many_to_one_spec.rb

@@ -24,7 +24,7 @@ if ADAPTER
       property :name, String
       property :type, Discriminator
 
-      belongs_to :parent, :class_name => 'ManyToOneSpec::Parent'
+      belongs_to :parent
     end
 
     class StepChild < Child
@@ -108,6 +108,7 @@ if ADAPTER
       describe 'when the parent is not a new record' do
         before do
           @parent.should_not be_new_record
+          @child.should_not be_new_record
         end
 
         it 'should not save the parent' do
@@ -118,6 +119,10 @@ if ADAPTER
         it 'should return true' do
           @association.save.should == true
         end
+
+        it "should return true to the child" do
+          @child.save.should == true
+        end
       end
 
       describe 'when the parent is a new record' do

data/spec/integration/associations/one_to_many_spec.rb

@@ -34,6 +34,75 @@ describe "OneToMany" do
     BaseballTeam.create(:name => "Giants")
   end
 
+  describe "(saved parent, saved child)" do
+    before(:each) do
+      @dc_united = Team.create
+      @emilio = Player.create(:team => @dc_united)
+    end
+
+    it "child association should return parent" do
+      @emilio.team.should == @dc_united
+    end
+
+    it "parent association should return children" do
+      @dc_united.players.should == [@emilio]
+    end
+  end
+
+  describe "(saved parent, unsaved child)" do
+    before(:each) do
+      @dc_united = Team.create
+      @emilio = Player.new(:team => @dc_united)
+    end
+
+    it "child association should return parent" do
+      @emilio.team.should == @dc_united
+    end
+
+    it "parent association should return children" do
+      pending("DataMapper does not yet support in-memory associations") do
+        @dc_united.players.should == [@emilio]
+      end
+    end
+  end
+
+  describe "(unsaved parent, saved child)" do
+    before(:each) do
+      @dc_united = Team.new
+      @emilio = Player.create(:team => @dc_united)
+    end
+
+    it "child association should return parent" do
+      @emilio.team.should == @dc_united
+    end
+
+    it "parent association should return children" do
+      @dc_united.players.should == [@emilio]
+    end
+
+    it "should return true to child.save" do
+      @emilio.should_not be_a_new_record
+      @emilio.save.should be_true
+    end
+  end
+
+  describe "(unsaved parent, unsaved child)" do
+    before(:each) do
+      @dc_united = Team.new
+      @emilio = Player.new(:team => @dc_united)
+    end
+
+    it "child association should return parent" do
+      @emilio.team.should == @dc_united
+    end
+
+    it "parent association should return children" do
+      pending("DataMapper does not yet support in-memory associations") do
+        @dc_united.players.should == [@emilio]
+      end
+    end
+  end
+
   it "unsaved parent model should accept array of hashes for association" do
     players = [{ :name => "Brett Favre" }, { :name => "Reggie White" }]
 

data/spec/integration/collection_spec.rb

@@ -1055,6 +1055,13 @@ if ADAPTER
             collection.length.should == 2
             collection.should be_loaded
           end
+
+          it "should load lazy columns when using offset" do
+            repository(ADAPTER) do
+              zebras = Zebra.all(:offset => 1, :limit => 2)
+              zebras.first.notes.should_not be_nil
+            end
+          end
         end
       end
     end

data/spec/integration/query_spec.rb

@@ -34,7 +34,7 @@ if ADAPTER
 
       property :id,   Serial
       property :name, String
-			property :type, String
+   property :type, String
 
       def self.default_repository_name
         ADAPTER
@@ -250,6 +250,23 @@ if ADAPTER
         end
       end
 
+      it "should find by conditions passed in as an array" do
+        repository(ADAPTER) do
+          find = QuerySpec::SailBoat.all(:id => [1,2])
+          find.should_not be_nil
+          find.should have(2).entries
+
+          find = QuerySpec::SailBoat.all(:id.not => [1,2])
+          find.should have(1).entries
+
+          find = QuerySpec::SailBoat.all(:id => [])
+          find.should have(0).entries
+
+          find = QuerySpec::SailBoat.all(:id.not => [])
+          find.should have(3).entries
+        end
+      end
+
       it "should order results" do
         repository(ADAPTER) do
           result = QuerySpec::SailBoat.all(:order => [
@@ -432,12 +449,12 @@ if ADAPTER
         vehicle.name.should == '10 ton delivery truck'
       end
 
-			it "should accept 'id' and 'type' as endpoints on ah DM::QueryPath" do
-				vehicle = QuerySpec::Vehicle.first( QuerySpec::Vehicle.factory.region.type => 'commercial' )
-				vehicle.name.should == '10 ton delivery truck'
-				vehicle = QuerySpec::Vehicle.first( QuerySpec::Vehicle.factory.region.id => 1 )
-				vehicle.name.should == '10 ton delivery truck'
-			end
+   it "should accept 'id' and 'type' as endpoints on ah DM::QueryPath" do
+    vehicle = QuerySpec::Vehicle.first( QuerySpec::Vehicle.factory.region.type => 'commercial' )
+    vehicle.name.should == '10 ton delivery truck'
+    vehicle = QuerySpec::Vehicle.first( QuerySpec::Vehicle.factory.region.id => 1 )
+    vehicle.name.should == '10 ton delivery truck'
+   end
 
       it 'should auto generate the link if a DM::Property from a different resource is in the :fields option'