dm-core 0.9.2 → 0.9.3

data/spec/integration/association_through_spec.rb

@@ -18,7 +18,7 @@ if ADAPTER
           has n, :taggings
 
           has n, :relationships
-          has n, :related_posts, :through => :relationships, :class_name => 'Post'
+          has n, :related_posts, :through => :relationships, :class_name => 'Post', :child_key => [:post_id]
 
           has n, :posts, :through => :taggings
         end
@@ -68,7 +68,7 @@ if ADAPTER
 
           property :id, Serial
           belongs_to :post
-          belongs_to :related_post, :class_name => "Post"
+          belongs_to :related_post, :class_name => "Post", :child_key => [:related_post_id]
         end
 
         [Post, Tag, Tagging, Relationship].each do |descendant|
@@ -102,7 +102,7 @@ if ADAPTER
         good.taggings << goody
         good.save
 
-        relation = Relationship.new(:related_post => another_post)
+        relation = Relationship.new(:related_post_id => another_post.id)
         post.relationships << relation
         post.save
       end
@@ -135,6 +135,12 @@ if ADAPTER
       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
+    end
+
     it 'should proxy object should be frozen' do
       Post.first.related_posts.should be_frozen
     end

data/spec/integration/associations/many_to_many_spec.rb

@@ -13,6 +13,8 @@ describe DataMapper::Associations::ManyToMany::Proxy do
       has n, :books, :through => Resource
     end
 
+    Object.send(:remove_const, :Book) if defined?(Book)
+
     class Book
       include DataMapper::Resource
 
@@ -23,7 +25,9 @@ describe DataMapper::Associations::ManyToMany::Proxy do
 
       has n, :editors, :through => Resource
     end
+  end
 
+  before do
     [ Book, Editor, BookEditor ].each { |k| k.auto_migrate! }
 
     repository(ADAPTER) do
@@ -37,90 +41,150 @@ describe DataMapper::Associations::ManyToMany::Proxy do
       BookEditor.create(:book => book_1, :editor => editor_1)
       BookEditor.create(:book => book_2, :editor => editor_1)
       BookEditor.create(:book => book_1, :editor => editor_2)
+
+      @parent      = book_3
+      @association = @parent.editors
+      @other       = [ editor_1 ]
+    end
+  end
+
+  it 'should provide #replace' do
+    @association.should respond_to(:replace)
+  end
+
+  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
+      @association.replace(@other)
+      @parent.reload.should have(0).editors
+    end
+
+    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
+      @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') ]
+      other.first.should_not be_nil
+      @association.should == other
+      @parent.save
+      @association.reload.should == other
     end
   end
 
   it "should correctly link records" do
-    Editor.get(1).books.size.should == 2
-    Editor.get(2).books.size.should == 1
-    Book.get(1).editors.size.should == 2
-    Book.get(2).editors.size.should == 1
+    Book.get(1).should have(2).editors
+    Book.get(2).should have(1).editors
+    Book.get(3).should have(0).editors
+    Editor.get(1).should have(2).books
+    Editor.get(2).should have(1).books
   end
 
   it "should be able to have associated objects manually added" do
     book = Book.get(3)
-    # book.editors.size.should == 0
+    book.should have(0).editors
 
     be = BookEditor.new(:book_id => book.id, :editor_id => 2)
     book.book_editors << be
     book.save
 
-    book.reload
-    book.editors.size.should == 1
+    book.reload.should have(1).editors
   end
 
   it "should automatically added necessary through class" do
     book = Book.get(3)
+    book.should have(0).editors
+
     book.editors << Editor.get(1)
     book.editors << Editor.new(:name => "Jimmy John")
     book.save
-    book.editors.size.should == 3
+
+    book.reload.should have(2).editors
   end
 
   it "should react correctly to a new record" do
     book = Book.new(:title => "Finnegan's Wake")
-    book.editors << Editor.get(2)
+    editor = Editor.get(2)
+    book.should have(0).editors
+    editor.should have(1).books
+
+    book.editors << editor
     book.save
-    book.editors.size.should == 1
-    Editor.get(2).books.size.should == 3
+
+    book.reload.should have(1).editors
+    editor.reload.should have(2).books
   end
 
   it "should be able to delete intermediate model" do
-    book = Book.get(3)
-    be = BookEditor.get(3,1)
+    book = Book.get(1)
+    book.should have(2).book_editors
+    book.should have(2).editors
+
+    be = BookEditor.get(1,1)
     book.book_editors.delete(be)
     book.save
+
     book.reload
-    book = Book.get(3)
-    book.book_editors.size.should == 2
-    book.editors.size.should == 2
+    book.should have(1).book_editors
+    book.should have(1).editors
   end
 
   it "should be clearable" do
     repository(ADAPTER) do
       book = Book.get(2)
-      book.editors.size.should == 1
+      book.should have(1).book_editors
+      book.should have(1).editors
+
       book.editors.clear
       book.save
+
       book.reload
-      book.book_editors.size.should == 0
-      book.editors.size.should == 0
+      book.should have(0).book_editors
+      book.should have(0).editors
     end
     repository(ADAPTER) do
-      Book.get(2).editors.size.should == 0
+      Book.get(2).should have(0).editors
     end
   end
 
   it "should be able to delete one object" do
     book = Book.get(1)
-    editor = book.editors.first
+    book.should have(2).book_editors
+    book.should have(2).editors
 
-    book.editors.size.should == 2
+    editor = book.editors.first
     book.editors.delete(editor)
-    book.book_editors.size.should == 1
-    book.editors.size.should == 1
     book.save
+
     book.reload
-    Editor.get(1).books.should_not include(book)
+    book.should have(1).book_editors
+    book.should have(1).editors
+    editor.reload.books.should_not include(book)
   end
 
   it "should be destroyable" do
     pending 'cannot destroy a collection yet' do
-      book = Book.get(3)
+      book = Book.get(2)
+      book.should have(1).editors
+
       book.editors.destroy
       book.save
+
       book.reload
-      book.editors.size.should == 0
+      book.should have(0).editors
     end
   end
 
@@ -139,7 +203,9 @@ describe DataMapper::Associations::ManyToMany::Proxy do
       class Book
         has n, :authors, :through => Resource
       end
+    end
 
+    before do
       [ Author, AuthorBook ].each { |k| k.auto_migrate! }
 
       @author = Author.create(:name =>  'James Joyce')
@@ -162,10 +228,10 @@ describe DataMapper::Associations::ManyToMany::Proxy do
     end
 
     it 'should correctly link records' do
-      @author.books.should have(3).entries
-      @book_1.authors.should have(1).entries
-      @book_2.authors.should have(1).entries
-      @book_3.authors.should have(1).entries
+      @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
 end

data/spec/integration/associations/many_to_one_spec.rb

@@ -22,20 +22,55 @@ if ADAPTER
 
       property :id,   Serial
       property :name, String
+      property :type, Discriminator
 
       belongs_to :parent, :class_name => 'ManyToOneSpec::Parent'
     end
+
+    class StepChild < Child
+    end
   end
 
   describe DataMapper::Associations::ManyToOne::Proxy do
     before do
-      ManyToOneSpec::Parent.auto_migrate!
-      ManyToOneSpec::Child.auto_migrate!
+      [ ManyToOneSpec::Parent, ManyToOneSpec::Child ].each { |model| model.auto_migrate! }
+
+      repository(ADAPTER) do
+        @parent      = ManyToOneSpec::Parent.create(:name => 'parent')
+        @child       = ManyToOneSpec::Child.create(:name => 'child', :parent => @parent)
+        @other       = ManyToOneSpec::Parent.create(:name => 'other parent')
+        @step_child  = ManyToOneSpec::StepChild.create(:name => 'step child', :parent => @other)
+        @association = @child.parent
+      end
+    end
+
+    describe "#association_accessor (STI)" do
+      include LoggingHelper
+
+      it "should set parent" do
+        ManyToOneSpec::StepChild.first(:id => @step_child.id).parent.should == @other
+      end
+
+      it "should use the identity map for STI" do
+        repository(ADAPTER) do |r|
+          parent     = ManyToOneSpec::Parent.first(:id => @parent.id)
+          child      = ManyToOneSpec::Child.first(:id => @child.id)
+          step_child = ManyToOneSpec::StepChild.first(:id => @step_child.id)
+          logger do |log|
+            # should retrieve from the IdentityMap
+            child.parent.object_id.should == parent.object_id
+
+            # should retrieve from the datasource
+            other = step_child.parent
 
-      @parent      = ManyToOneSpec::Parent.create(:name => 'parent')
-      @child       = ManyToOneSpec::Child.create(:name => 'child', :parent => @parent)
-      @other       = ManyToOneSpec::Parent.create(:name => 'other parent')
-      @association = @child.parent
+            # should retrieve from the IdentityMap
+            step_child.parent.should == @other
+            step_child.parent.object_id.should == other.object_id
+
+            log.readlines.size.should == 1
+          end
+        end
+      end
     end
 
     describe '#replace' do

data/spec/integration/associations/one_to_many_spec.rb

@@ -9,10 +9,14 @@ describe "OneToMany" do
 
       property :id, Serial
       property :name, String
+      property :class_type, Discriminator
 
       has n, :players
     end
 
+    class BaseballTeam < Team
+    end
+
     class Player
       include DataMapper::Resource
 
@@ -26,7 +30,8 @@ describe "OneToMany" do
 
     [Team, Player].each { |k| k.auto_migrate!(ADAPTER) }
 
-    Team.create!(:name => "Cowboys")
+    Team.create(:name => "Cowboys")
+    BaseballTeam.create(:name => "Giants")
   end
 
   it "unsaved parent model should accept array of hashes for association" do
@@ -42,7 +47,7 @@ describe "OneToMany" do
     team.save
 
     repository(ADAPTER) do
-      Team.get(2).players.should == players
+      Team.get(3).players.should == players
     end
   end
 
@@ -63,4 +68,15 @@ describe "OneToMany" do
       Team.get(1).players.should == players
     end
   end
+
+  describe "STI" do
+    it "should work" do
+      repository(ADAPTER) do
+        Player.create(:name => "Barry Bonds", :team => BaseballTeam.first)
+      end
+      repository(ADAPTER) do
+        Player.first.team.should == BaseballTeam.first
+      end
+    end
+  end
 end

data/spec/integration/collection_spec.rb

@@ -29,6 +29,10 @@ if ADAPTER
     property :zebra_id, Integer
 
     belongs_to :zebra
+
+    def self.sort_by_name
+      all(:order => [ :name ])
+    end
   end
 
   class CollectionSpecParty
@@ -71,46 +75,6 @@ if ADAPTER
     end
   end
 
-  describe 'association proxying' do
-    include CollectionSpecHelper
-
-    before do
-      setup
-    end
-
-    it "should provide a Query" do
-      repository(ADAPTER) do
-        zebras = Zebra.all(:order => [ :name ])
-        zebras.query.order.should == [DataMapper::Query::Direction.new(Zebra.properties(ADAPTER)[:name])]
-      end
-    end
-
-    it "should proxy the relationships of the model" do
-      repository(ADAPTER) do
-        zebras = Zebra.all
-        zebras.should have(3).entries
-        zebras.find { |zebra| zebra.name == 'Nancy' }.stripes.should have(2).entries
-        zebras.stripes.should == [@babe, @snowball]
-      end
-    end
-
-    it "should preserve it's order on reload" do
-      repository(ADAPTER) do |r|
-        zebras = Zebra.all(:order => [ :name ])
-
-        order = %w{ Bessie Nancy Steve }
-
-        zebras.map { |z| z.name }.should == order
-
-        # Force a lazy-load call:
-        zebras.first.notes
-
-        # The order should be unaffected.
-        zebras.map { |z| z.name }.should == order
-      end
-    end
-  end
-
   describe DataMapper::Collection do
     include CollectionSpecHelper
 
@@ -163,6 +127,49 @@ if ADAPTER
       results.first.should == bob
     end
 
+    describe 'model proxying' do
+      it 'should delegate to a model method' do
+        stripes = @model.first.stripes
+        stripes.should respond_to(:sort_by_name)
+        stripes.sort_by_name.should == [ @babe, @snowball ]
+      end
+    end
+
+    describe 'association proxying' do
+      it "should provide a Query" do
+        repository(ADAPTER) do
+          zebras = Zebra.all(:order => [ :name ])
+          zebras.query.order.should == [DataMapper::Query::Direction.new(Zebra.properties(ADAPTER)[:name])]
+        end
+      end
+
+      it "should proxy the relationships of the model" do
+        repository(ADAPTER) do
+          zebras = Zebra.all
+          zebras.should have(3).entries
+          zebras.find { |zebra| zebra.name == 'Nancy' }.stripes.should have(2).entries
+          zebras.should respond_to(:stripes)
+          zebras.stripes.should == [@babe, @snowball]
+        end
+      end
+
+      it "should preserve it's order on reload" do
+        repository(ADAPTER) do |r|
+          zebras = Zebra.all(:order => [ :name ])
+
+          order = %w{ Bessie Nancy Steve }
+
+          zebras.map { |z| z.name }.should == order
+
+          # Force a lazy-load call:
+          zebras.first.notes
+
+          # The order should be unaffected.
+          zebras.map { |z| z.name }.should == order
+        end
+      end
+    end
+
     describe '.new' do
       describe 'with non-index keys' do
         it 'should instantiate read-only resources' do
@@ -295,6 +302,32 @@ if ADAPTER
           end
         end
 
+        describe '#build' do
+          it 'should build a new resource' do
+            resource = @collection.build(:name => 'John')
+            resource.should be_kind_of(@model)
+            resource.should be_new_record
+          end
+
+          it 'should append the new resource to the collection' do
+            resource = @collection.build(:name => 'John')
+            resource.should be_new_record
+            resource.collection.object_id.should == @collection.object_id
+            @collection.should include(resource)
+          end
+
+          it 'should use the query conditions to set default values' do
+            resource = @collection.build
+            resource.should be_new_record
+            resource.name.should be_nil
+
+            @collection.query.update(:name => 'John')
+
+            resource = @collection.build
+            resource.name.should == 'John'
+          end
+        end
+
         describe '#clear' do
           it 'should orphan the resource from the collection' do
             entries = @collection.entries
@@ -508,6 +541,14 @@ if ADAPTER
           end
         end
 
+        describe '#freeze' do
+          it 'should freeze the underlying array' do
+            @collection.should_not be_frozen
+            @collection.freeze
+            @collection.should be_frozen
+          end
+        end
+
         describe '#get' do
           it 'should find a resource in a collection by key' do
             resource = @collection.get(*@nancy.key)
@@ -515,9 +556,15 @@ if ADAPTER
             resource.id.should == @nancy.id
           end
 
+          it "should find a resource in a collection by typecasting the key" do
+            resource = @collection.get(@nancy.key.to_s)
+            resource.should be_kind_of(DataMapper::Resource)
+            resource.id.should == @nancy.id
+          end
+
           it 'should not find a resource not in the collection' do
             @query.update(:offset => 0, :limit => 3)
-            @david = Zebra.create!(:name => 'David', :age => 15,  :notes => 'Albino')
+            @david = Zebra.create(:name => 'David', :age => 15,  :notes => 'Albino')
             @collection.get(@david.key).should be_nil
           end
         end
@@ -531,7 +578,7 @@ if ADAPTER
 
           it 'should raise an exception if the resource is not found' do
             @query.update(:offset => 0, :limit => 3)
-            @david = Zebra.create!(:name => 'David', :age => 15,  :notes => 'Albino')
+            @david = Zebra.create(:name => 'David', :age => 15,  :notes => 'Albino')
             lambda {
               @collection.get!(@david.key)
             }.should raise_error(DataMapper::ObjectNotFoundError)