mongo_mapper-unstable 2009.10.16 → 2009.10.31

data/test/functional/associations/test_many_embedded_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyEmbeddedProxyTest < Test::Unit::TestCase
   def setup
-    Project.collection.clear
-    RealPerson.collection.clear
+    Project.collection.remove
+    RealPerson.collection.remove
   end
     
   should "default reader to empty array" do
@@ -17,13 +17,6 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
     project.addresses.push Address.new
     project.addresses.size.should == 2
   end
-  
-  should "allow finding :all embedded documents" do
-    project = Project.new
-    project.addresses << Address.new
-    project.addresses << Address.new
-    project.save
-  end
 
   should "be embedded in document on save" do
     sb = Address.new(:city => 'South Bend', :state => 'IN')
@@ -45,7 +38,7 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
       set_collection_name 'test'
       key :person, Person
     end
-    @document.collection.clear
+    @document.collection.remove
     
     meg = Person.new(:name => "Meg")
     meg.child = Person.new(:name => "Steve")
@@ -92,7 +85,7 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
         set_collection_name 'test'
         many :people
       end
-      @document.collection.clear
+      @document.collection.remove
     end
 
     should "persist all embedded documents" do
@@ -130,45 +123,72 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase
       doc.people.first.pets.first._root_document.should == doc
     end
 
-    should "create properly-named reference to parent document when building off association proxy" do
-      person = RealPerson.new
-      pet = person.pets.build
-      person.should == pet.real_person
-    end
-
-
     should "create a reference to the root document for all embedded documents" do
-      meg = Person.new(:name => "Meg")
       sparky = Pet.new(:name => "Sparky", :species => "Dog")
-
+      meg = Person.new(:name => "Meg", :pets => [sparky])
       doc = @document.new
-
-      meg.pets << sparky
-
       doc.people << meg
       doc.save
 
-      from_db = @document.find(doc.id)
-      from_db.people.first._root_document.should == doc
-      from_db.people.first.pets.first._root_document.should == doc
+      doc = doc.reload
+      doc.people.first._root_document.should == doc
+      doc.people.first.pets.first._root_document.should == doc
     end
   end
   
-  should "allow retrieval via find(:all)" do
-    meg = Person.new(:name => "Meg")
+  should "allow finding by id" do
     sparky = Pet.new(:name => "Sparky", :species => "Dog")
-
-    meg.pets << sparky
-    
-    meg.pets.find(:all).should include(sparky)
+    meg = Person.new(:name => "Meg", :pets => [sparky])
+    meg.pets.find(sparky.id).should == sparky
   end
   
-  should "allow retrieval via find(id)" do
-    meg = Person.new(:name => "Meg")
-    sparky = Pet.new(:name => "Sparky", :species => "Dog")
-
-    meg.pets << sparky
+  context "extending the association" do
+    setup do
+      @address_class = Class.new do
+        include MongoMapper::EmbeddedDocument
+        key :address, String
+        key :city, String
+        key :state, String
+        key :zip, Integer
+      end
+      
+      @project_class = Class.new do
+        include MongoMapper::Document
+        key :name, String
+      end
+      
+      @project_class.collection.remove
+    end
     
-    meg.pets.find(sparky.id).should == sparky
+    should "work using a block passed to many" do
+      @project_class.many :addresses, :class => @address_class do
+        def find_all_by_state(state)
+          find_all { |a| a.state == state }
+        end
+      end
+      
+      addr1 = @address_class.new(:address => "Gate-3 Lankershim Blvd.", :city => "Universal City", :state => "CA", :zip => "91608")
+      addr2 = @address_class.new(:address => "3000 W. Alameda Ave.", :city => "Burbank", :state => "CA", :zip => "91523")
+      addr3 = @address_class.new(:address => "111 Some Ln", :city => "Nashville", :state => "TN", :zip => "37211")
+      project = @project_class.create(:name => "Some Project", :addresses => [addr1, addr2, addr3])
+      
+      project.addresses.find_all_by_state("CA").should == [addr1, addr2]
+    end
+  
+    should "work using many's :extend option" do
+      module FindByCity
+        def find_by_city(city)
+          find_all { |a| a.city == city }
+        end
+      end
+      @project_class.many :addresses, :class => @address_class, :extend => FindByCity
+      
+      addr1 = @address_class.new(:address => "Gate-3 Lankershim Blvd.", :city => "Universal City", :state => "CA", :zip => "91608")
+      addr2 = @address_class.new(:address => "3000 W. Alameda Ave.", :city => "Burbank", :state => "CA", :zip => "91523")
+      addr3 = @address_class.new(:address => "111 Some Ln", :city => "Nashville", :state => "TN", :zip => "37211")
+      project = @project_class.create(:name => "Some Project", :addresses => [addr1, addr2, addr3])
+      
+      project.addresses.find_by_city('Burbank').should == [addr2]
+    end
   end
 end

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -3,7 +3,8 @@ require 'models'
 
 class ManyPolymorphicProxyTest < Test::Unit::TestCase
   def setup
-    Room.collection.clear
+    Room.collection.remove
+    Message.collection.remove
   end
   
   should "default reader to empty array" do
@@ -181,7 +182,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        messages = @lounge.messages.find(:all, :conditions => {:body => 'Loungin!'}, :order => "position")
+        messages = @lounge.messages.find(:all, :body => 'Loungin!', :order => "position")
         messages.should == [@lm1]
       end
       
@@ -197,7 +198,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        messages = @lounge.messages.all(:conditions => {:body => 'Loungin!'}, :order => "position")
+        messages = @lounge.messages.all(:body => 'Loungin!', :order => "position")
         messages.should == [@lm1]
       end
       
@@ -213,7 +214,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        message = @lounge.messages.find(:first, :conditions => {:body => 'I love loungin!'}, :order => "position asc")
+        message = @lounge.messages.find(:first, :body => 'I love loungin!', :order => "position asc")
         message.should == @lm2
       end
     end
@@ -224,7 +225,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        message = @lounge.messages.first(:conditions => {:body => 'I love loungin!'}, :order => "position asc")
+        message = @lounge.messages.first(:body => 'I love loungin!', :order => "position asc")
         message.should == @lm2
       end
     end
@@ -235,7 +236,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        message = @lounge.messages.find(:last, :conditions => {:body => 'Loungin!'}, :order => "position asc")
+        message = @lounge.messages.find(:last, :body => 'Loungin!', :order => "position asc")
         message.should == @lm1
       end
     end
@@ -246,7 +247,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        message = @lounge.messages.last(:conditions => {:body => 'Loungin!'}, :order => "position asc")
+        message = @lounge.messages.last(:body => 'Loungin!', :order => "position asc")
         message.should == @lm1
       end
     end
@@ -263,6 +264,20 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
     end
     
+    context "with query options/criteria" do
+      should "work with order on association" do
+        @lounge.messages.should == [@lm1, @lm2]
+      end
+      
+      should "allow overriding the order provided to the association" do
+        @lounge.messages.all(:order => 'position desc').should == [@lm2, @lm1]
+      end
+      
+      should "allow using conditions on association" do
+        @hall.latest_messages.should == [@hm3, @hm2]
+      end
+    end
+    
     context "with multiple ids" do
       should "work for ids in association" do
         messages = @lounge.messages.find(@lm1.id, @lm2.id)
@@ -294,4 +309,31 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context "extending the association" do
+    should "work using a block passed to many" do
+      room = Room.new(:name => "Amazing Room")
+      messages = room.messages = [
+        Enter.new(:body => 'John entered room',  :position => 3),
+        Chat.new(:body => 'Heyyyoooo!',          :position => 4),
+        Exit.new(:body => 'John exited room',    :position => 5),
+        Enter.new(:body => 'Steve entered room', :position => 6),
+        Chat.new(:body => 'Anyone there?',       :position => 7),
+        Exit.new(:body => 'Steve exited room',   :position => 8)
+      ]
+      room.save
+      room.messages.older.should == messages[3..5]
+    end
+  
+    should "work using many's :extend option" do
+      room = Room.new(:name => "Amazing Room")
+      accounts = room.accounts = [
+        Bot.new(:last_logged_in => 3.weeks.ago),
+        User.new(:last_logged_in => nil),
+        Bot.new(:last_logged_in => 1.week.ago)
+      ]
+      room.save
+      room.accounts.inactive.should == [accounts[1]]
+    end
+  end
 end

data/test/functional/associations/test_many_proxy.rb

@@ -3,8 +3,8 @@ require 'models'
 
 class ManyProxyTest < Test::Unit::TestCase
   def setup
-    Project.collection.clear
-    Status.collection.clear
+    Project.collection.remove
+    Status.collection.remove
   end
   
   should "default reader to empty array" do
@@ -14,9 +14,9 @@ class ManyProxyTest < Test::Unit::TestCase
 
   should "allow adding to association like it was an array" do
     project = Project.new
-    project.statuses <<     Status.new
-    project.statuses.push   Status.new
-    project.statuses.concat Status.new
+    project.statuses <<     Status.new(:name => 'Foo1!')
+    project.statuses.push   Status.new(:name => 'Foo2!')
+    project.statuses.concat Status.new(:name => 'Foo3!')
     project.statuses.size.should == 3
   end
 
@@ -59,14 +59,14 @@ class ManyProxyTest < Test::Unit::TestCase
   context "create" do
     should "assign foreign key" do
       project = Project.create
-      status = project.statuses.create
+      status = project.statuses.create(:name => 'Foo!')
       status.project_id.should == project.id
     end
     
     should "save record" do
       project = Project.create
       lambda {
-        project.statuses.create
+        project.statuses.create(:name => 'Foo!')
       }.should change { Status.count }
     end
     
@@ -77,13 +77,42 @@ class ManyProxyTest < Test::Unit::TestCase
     end
   end
   
+  context "create!" do
+    should "assign foreign key" do
+      project = Project.create
+      status = project.statuses.create!(:name => 'Foo!')
+      status.project_id.should == project.id
+    end
+    
+    should "save record" do
+      project = Project.create
+      lambda {
+        project.statuses.create!(:name => 'Foo!')
+      }.should change { Status.count }
+    end
+    
+    should "allow passing attributes" do
+      project = Project.create
+      status = project.statuses.create!(:name => 'Foo!')
+      status.name.should == 'Foo!'
+    end
+    
+    should "raise exception if not valid" do
+      project = Project.create
+      lambda {
+        project.statuses.create!(:name => nil)
+      }.should raise_error(MongoMapper::DocumentNotValid)
+    end
+  end
+  
+  
   context "count" do
     should "work scoped to association" do
       project = Project.create
-      3.times { project.statuses.create }
+      3.times { project.statuses.create(:name => 'Foo!') }
       
       other_project = Project.create
-      2.times { other_project.statuses.create }
+      2.times { other_project.statuses.create(:name => 'Foo!') }
       
       project.statuses.count.should == 3
       other_project.statuses.count.should == 2
@@ -215,7 +244,7 @@ class ManyProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        statuses = @project1.statuses.find(:all, :conditions => {'name' => 'Complete'})
+        statuses = @project1.statuses.find(:all, :name => 'Complete')
         statuses.should == [@complete]
       end
       
@@ -231,7 +260,7 @@ class ManyProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        statuses = @project1.statuses.all(:conditions => {'name' => 'Complete'})
+        statuses = @project1.statuses.all(:name => 'Complete')
         statuses.should == [@complete]
       end
       
@@ -247,7 +276,7 @@ class ManyProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        status = @project1.statuses.find(:first, :conditions => {:name => 'Complete'})
+        status = @project1.statuses.find(:first, :name => 'Complete')
         status.should == @complete
       end
     end
@@ -258,7 +287,7 @@ class ManyProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        status = @project1.statuses.first(:conditions => {:name => 'Complete'})
+        status = @project1.statuses.first(:name => 'Complete')
         status.should == @complete
       end
     end
@@ -269,7 +298,7 @@ class ManyProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        status = @project1.statuses.find(:last, :order => 'position', :conditions => {:name => 'New'})
+        status = @project1.statuses.find(:last, :order => 'position', :name => 'New')
         status.should == @brand_new
       end
     end
@@ -280,7 +309,7 @@ class ManyProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        status = @project1.statuses.last(:order => 'position', :conditions => {:name => 'New'})
+        status = @project1.statuses.last(:order => 'position', :name => 'New')
         status.should == @brand_new
       end
     end
@@ -328,4 +357,25 @@ class ManyProxyTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "extending the association" do
+    should "work using a block passed to many" do
+      project = Project.new(:name => "Some Project")
+      status1 = Status.new(:name => "New")
+      status2 = Status.new(:name => "Assigned")
+      status3 = Status.new(:name => "Closed")
+      project.statuses = [status1, status2, status3]
+      project.save
+      project.statuses.open.should == [status1, status2]
+    end
+  
+    should "work using many's :extend option" do
+      project = Project.new(:name => "Some Project")
+      collaborator1 = Collaborator.new(:name => "zing")
+      collaborator2 = Collaborator.new(:name => "zang")
+      project.collaborators = [collaborator1, collaborator2]
+      project.save
+      project.collaborators.top.should == collaborator1
+    end
+  end
 end

data/test/functional/test_associations.rb

@@ -8,7 +8,7 @@ class AssociationsTest < Test::Unit::TestCase
       
       many :posts, :class_name => 'AssociationsTest::AwesomePost', :foreign_key => :creator_id
     end
-    AwesomeUser.collection.clear
+    AwesomeUser.collection.remove
     
     class AwesomeTag
       include MongoMapper::EmbeddedDocument
@@ -28,8 +28,8 @@ class AssociationsTest < Test::Unit::TestCase
       many :tags, :class_name => 'AssociationsTest::AwesomeTag', :foreign_key => :post_id
     end
     
-    AwesomeUser.collection.clear
-    AwesomePost.collection.clear
+    AwesomeUser.collection.remove
+    AwesomePost.collection.remove
     
     user = AwesomeUser.create
     tag1 = AwesomeTag.new(:name => 'awesome')

data/test/functional/test_binary.rb

@@ -7,7 +7,7 @@ class BinaryTest < Test::Unit::TestCase
       set_collection_name 'test'
       key :contents, Binary
     end
-    klass.collection.clear
+    klass.collection.remove
     
     doc = klass.new(:contents => '010101')
     doc.save

data/test/functional/test_callbacks.rb

@@ -30,7 +30,7 @@ class CallbacksTest < Test::Unit::TestCase
           @history = nil
         end
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "get the order right for creating documents" do

data/test/functional/test_dirty.rb

@@ -8,10 +8,10 @@ class DirtyTest < Test::Unit::TestCase
       set_collection_name 'test'
       key :phrase, String
     end
-    @document.collection.clear
+    @document.collection.remove
     
-    Status.collection.clear
-    Project.collection.clear
+    Status.collection.remove
+    Project.collection.remove
   end
   
   context "marking changes" do