djsun-mongomapper 0.3.1.1 → 0.3.3

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -27,30 +27,31 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
     
     lambda {
       room.messages = [
-        Enter.new(:body => 'John entered room'),
-        Chat.new(:body => 'Heyyyoooo!'),
-        Exit.new(:body => 'John exited room')
+        Enter.new(:body => 'John entered room', :position => 1),
+        Chat.new(:body => 'Heyyyoooo!',         :position => 2),
+        Exit.new(:body => 'John exited room',   :position => 3)
       ]
     }.should change { Message.count }.by(3)
     
     from_db = Room.find(room.id)
-    from_db.messages.size.should == 3
-    from_db.messages[0].body.should == 'John entered room'
-    from_db.messages[1].body.should == 'Heyyyoooo!'
-    from_db.messages[2].body.should == 'John exited room'
+    messages = from_db.messages.all :order => "position"
+    messages.size.should == 3
+    messages[0].body.should == 'John entered room'
+    messages[1].body.should == 'Heyyyoooo!'
+    messages[2].body.should == 'John exited room'
   end
-
-  # Intermittent failure (DJ, 2009-08-03)
-  should_eventually "correctly store type when using <<, push and concat" do
+  
+  should "correctly store type when using <<, push and concat" do
     room = Room.new
-    room.messages << Enter.new(:body => 'John entered the room')
-    room.messages.push Exit.new(:body => 'John entered the room')
-    room.messages.concat Chat.new(:body => 'Holla!')
+    room.messages <<      Enter.new(:body => 'John entered the room', :position => 1)
+    room.messages.push    Exit.new(:body => 'John entered the room', :position => 2)
+    room.messages.concat  Chat.new(:body => 'Holla!'             , :position => 3)
     
     from_db = Room.find(room.id)
-    from_db.messages[0]._type.should == 'Enter'
-    from_db.messages[1]._type.should == 'Exit'
-    from_db.messages[2]._type.should == 'Chat'
+    messages = from_db.messages.all :order => "position"
+    messages[0]._type.should == 'Enter'
+    messages[1]._type.should == 'Exit'
+    messages[2]._type.should == 'Chat'
   end
   
   context "build" do
@@ -125,97 +126,91 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
   context "Finding scoped to association" do
     setup do
       @lounge = Room.create(:name => 'Lounge')
-      @lm1 = Message.create(:body => 'Loungin!')
-      @lm2 = Message.create(:body => 'I love loungin!')
+      @lm1 = Message.create(:body => 'Loungin!', :position => 1)
+      @lm2 = Message.create(:body => 'I love loungin!', :position => 2)
       @lounge.messages = [@lm1, @lm2]
       @lounge.save
       
       @hall = Room.create(:name => 'Hall')
-      @hm1 = Message.create(:body => 'Do not fall in the hall')
-      @hm2 = Message.create(:body => 'Hall the king!')
-      @hm3 = Message.create(:body => 'Loungin!')
+      @hm1 = Message.create(:body => 'Do not fall in the hall', :position => 1)
+      @hm2 = Message.create(:body => 'Hall the king!', :position => 2)
+      @hm3 = Message.create(:body => 'Loungin!', :position => 3)
       @hall.messages = [@hm1, @hm2, @hm3]
       @hall.save
     end
     
     context "with :all" do
-      # Intermittent failure (DJ, 2009-08-03)
-      should_eventually "work" do
-        @lounge.messages.find(:all).should == [@lm1, @lm2]
+      should "work" do
+        @lounge.messages.find(:all, :order => "position").should == [@lm1, @lm2]
       end
       
       should "work with conditions" do
-        messages = @lounge.messages.find(:all, :conditions => {:body => 'Loungin!'})
+        messages = @lounge.messages.find(:all, :conditions => {:body => 'Loungin!'}, :order => "position")
         messages.should == [@lm1]
       end
       
-      # Intermittent failure (DJ, 2009-08-03)
-      should_eventually "work with order" do
-        messages = @lounge.messages.find(:all, :order => '$natural desc')
+      should "work with order" do
+        messages = @lounge.messages.find(:all, :order => 'position desc')
         messages.should == [@lm2, @lm1]
       end
     end
     
     context "with #all" do
       should "work" do
-        @lounge.messages.all.should == [@lm1, @lm2]
+        @lounge.messages.all(:order => "position").should == [@lm1, @lm2]
       end
       
       should "work with conditions" do
-        messages = @lounge.messages.all(:conditions => {'body' => 'Loungin!'})
+        messages = @lounge.messages.all(:conditions => {:body => 'Loungin!'}, :order => "position")
         messages.should == [@lm1]
       end
       
-      # Intermittent failure (DJ, 2009-08-03)
-      should_eventually "work with order" do
-        messages = @lounge.messages.all(:order => '$natural desc')
+      should "work with order" do
+        messages = @lounge.messages.all(:order => 'position desc')
         messages.should == [@lm2, @lm1]
       end
     end
     
     context "with :first" do
-      # Intermittent failure (DJ, 2009-08-03)
-      should_eventually "work" do
-        @lounge.messages.find(:first).should == @lm1
+      should "work" do
+        @lounge.messages.find(:first, :order => "position asc").should == @lm1
       end
       
       should "work with conditions" do
-        message = @lounge.messages.find(:first, :conditions => {:body => 'I love loungin!'})
+        message = @lounge.messages.find(:first, :conditions => {:body => 'I love loungin!'}, :order => "position asc")
         message.should == @lm2
       end
     end
     
     context "with #first" do
-      # Intermittent failure (DJ, 2009-08-03)
-      should_eventually "work" do
-        @lounge.messages.first.should == @lm1
+      should "work" do
+        @lounge.messages.first(:order => "position asc").should == @lm1
       end
       
       should "work with conditions" do
-        message = @lounge.messages.first(:conditions => {:body => 'I love loungin!'})
+        message = @lounge.messages.first(:conditions => {:body => 'I love loungin!'}, :order => "position asc")
         message.should == @lm2
       end
     end
     
     context "with :last" do
       should "work" do
-        @lounge.messages.find(:last).should == @lm2
+        @lounge.messages.find(:last, :order => "position asc").should == @lm2
       end
       
       should "work with conditions" do
-        message = @lounge.messages.find(:last, :conditions => {:body => 'Loungin!'})
+        message = @lounge.messages.find(:last, :conditions => {:body => 'Loungin!'}, :order => "position asc")
         message.should == @lm1
       end
     end
-
+    
     context "with #last" do
-      # Intermittent failure (DJ, 2009-08-03)
-      should_eventually "work" do
-        @lounge.messages.last.should == @lm2
+      should "work" do
+        @lounge.messages.last(:order => "position asc").should == @lm2
       end
       
       should "work with conditions" do
-        message = @lounge.messages.last(:conditions => {:body => 'Loungin!'})
+        message = @lounge.messages.last(:conditions => {:body => 'Loungin!'}, :order => "position asc")
         message.should == @lm1
       end
     end
@@ -247,7 +242,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
     
     context "with #paginate" do
       setup do
-        @messages = @hall.messages.paginate(:per_page => 2, :page => 1, :order => '$natural asc')
+        @messages = @hall.messages.paginate(:per_page => 2, :page => 1, :order => 'position asc')
       end
       
       should "return total pages" do
@@ -258,10 +253,9 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
         @messages.total_entries.should == 3
       end
       
-      # Intermittent failure (DJ, 2009-08-03)
-      should_eventually "return the subject" do
+      should "return the subject" do
         @messages.should == [@hm1, @hm2]
       end
     end
   end
-end
+end

data/test/functional/associations/test_many_proxy.rb

@@ -98,11 +98,70 @@ class ManyProxyTest < Test::Unit::TestCase
     end
   end
   
+  context "Unassociating documents" do
+    setup do
+      @project = Project.create
+      @project.statuses << Status.create(:name => '1')
+      @project.statuses << Status.create(:name => '2')
+
+      @project2 = Project.create
+      @project2.statuses << Status.create(:name => '1')
+      @project2.statuses << Status.create(:name => '2')
+    end
+
+    should "work with destroy all" do
+      @project.statuses.count.should == 2
+      @project.statuses.destroy_all
+      @project.statuses.count.should == 0
+
+      @project2.statuses.count.should == 2
+      Status.count.should == 2
+    end
+    
+    should "work with destroy all and conditions" do
+      @project.statuses.count.should == 2
+      @project.statuses.destroy_all(:name => '1')
+      @project.statuses.count.should == 1
+
+      @project2.statuses.count.should == 2
+      Status.count.should == 3
+    end
+    
+    should "work with delete all" do
+      @project.statuses.count.should == 2
+      @project.statuses.delete_all
+      @project.statuses.count.should == 0
+      
+      @project2.statuses.count.should == 2
+      Status.count.should == 2
+    end
+    
+    should "work with delete all and conditions" do
+      @project.statuses.count.should == 2
+      @project.statuses.delete_all(:name => '1')
+      @project.statuses.count.should == 1
+      
+      @project2.statuses.count.should == 2
+      Status.count.should == 3
+    end
+    
+    should "work with nullify" do
+      @project.statuses.count.should == 2
+      @project.statuses.nullify
+      @project.statuses.count.should == 0
+      
+      @project2.statuses.count.should == 2
+      Status.count.should == 4
+      Status.count(:name => '1').should == 2
+      Status.count(:name => '2').should == 2
+    end
+  end  
+  
   context "Finding scoped to association" do
     setup do
       @project1          = Project.new(:name => 'Project 1')
-      @brand_new         = Status.create(:name => 'New')
-      @complete          = Status.create(:name => 'Complete')
+      @brand_new         = Status.create(:name => 'New', :position => 1 )
+      @complete          = Status.create(:name => 'Complete', :position => 2)
       @project1.statuses = [@brand_new, @complete]
       @project1.save
       
@@ -116,7 +175,7 @@ class ManyProxyTest < Test::Unit::TestCase
     
     context "with :all" do
       should "work" do
-        @project1.statuses.find(:all).should == [@brand_new, @complete]
+        @project1.statuses.find(:all, :order => "position asc").should == [@brand_new, @complete]
       end
       
       should "work with conditions" do
@@ -131,8 +190,8 @@ class ManyProxyTest < Test::Unit::TestCase
     end
 
     context "with #all" do
-      should_eventually "work" do
-        @project1.statuses.all.should == [@brand_new, @complete]
+      should "work" do
+        @project1.statuses.all(:order => "position asc").should == [@brand_new, @complete]
       end
       
       should "work with conditions" do
@@ -148,7 +207,7 @@ class ManyProxyTest < Test::Unit::TestCase
     
     context "with :first" do
       should "work" do
-        @project1.statuses.find(:first).should == @brand_new
+        @project1.statuses.find(:first, :order => 'name').should == @complete
       end
       
       should "work with conditions" do
@@ -159,7 +218,7 @@ class ManyProxyTest < Test::Unit::TestCase
     
     context "with #first" do
       should "work" do
-        @project1.statuses.first.should == @brand_new
+        @project1.statuses.first(:order => 'name').should == @complete
       end
       
       should "work with conditions" do
@@ -170,7 +229,7 @@ class ManyProxyTest < Test::Unit::TestCase
     
     context "with :last" do
       should "work" do
-        @project1.statuses.find(:last).should == @complete
+        @project1.statuses.find(:last, :order => "position asc").should == @complete
       end
       
       should "work with conditions" do
@@ -181,7 +240,7 @@ class ManyProxyTest < Test::Unit::TestCase
     
     context "with #last" do
       should "work" do
-        @project1.statuses.last.should == @complete
+        @project1.statuses.last(:order => "position asc").should == @complete
       end
       
       should "work with conditions" do
@@ -217,7 +276,7 @@ class ManyProxyTest < Test::Unit::TestCase
     
     context "with #paginate" do
       setup do
-        @statuses = @project2.statuses.paginate(:per_page => 2, :page => 1, :order => '$natural asc')
+        @statuses = @project2.statuses.paginate(:per_page => 2, :page => 1, :order => 'name asc')
       end
       
       should "return total pages" do
@@ -229,8 +288,8 @@ class ManyProxyTest < Test::Unit::TestCase
       end
       
       should "return the subject" do
-        @statuses.should == [@in_progress, @archived]
+        @statuses.collect(&:name).should == %w(Archived Complete)
       end
     end
   end
-end
+end

data/test/functional/test_associations.rb

@@ -5,21 +5,28 @@ class AssociationsTest < Test::Unit::TestCase
   def setup
     clear_all_collections
   end
-  
+    
   should "allow changing class names" do
     class AwesomeUser
       include MongoMapper::Document
+      
       many :posts, :class_name => 'AssociationsTest::AwesomePost', :foreign_key => :creator_id
     end
     
     class AwesomeTag
       include MongoMapper::EmbeddedDocument
+      
       key :name, String
+      key :post_id, String
+      
       belongs_to :post, :class_name => 'AssociationsTest::AwesomeUser'
     end
     
     class AwesomePost
       include MongoMapper::Document
+      
+      key :creator_id, String
+      
       belongs_to :creator, :class_name => 'AssociationsTest::AwesomeUser'
       many :tags, :class_name => 'AssociationsTest::AwesomeTag', :foreign_key => :post_id
     end
@@ -36,5 +43,5 @@ class AssociationsTest < Test::Unit::TestCase
     
     post1_from_db = AwesomePost.find(post1.id)
     post1_from_db.tags.should == [tag1]
-  end
+  end  
 end