jnunemaker-mongomapper 0.3.3 → 0.3.4

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -27,29 +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
   
   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
@@ -124,91 +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
       should "work" do
-        @lounge.messages.find(:all).should == [@lm1, @lm2]
+        @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
       
       should "work with order" do
-        messages = @lounge.messages.find(:all, :order => '$natural desc')
+        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
       
       should "work with order" do
-        messages = @lounge.messages.all(:order => '$natural desc')
+        messages = @lounge.messages.all(:order => 'position desc')
         messages.should == [@lm2, @lm1]
       end
     end
     
     context "with :first" do
       should "work" do
-        @lounge.messages.find(:first).should == @lm1
+        @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
       should "work" do
-        @lounge.messages.first.should == @lm1
+        @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
       should "work" do
-        @lounge.messages.last.should == @lm2
+        @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
@@ -240,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
@@ -256,4 +258,4 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/functional/associations/test_many_proxy.rb

@@ -160,8 +160,8 @@ class ManyProxyTest < Test::Unit::TestCase
   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
       
@@ -175,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
@@ -191,7 +191,7 @@ class ManyProxyTest < Test::Unit::TestCase
 
     context "with #all" do
       should "work" do
-        @project1.statuses.all.should == [@brand_new, @complete]
+        @project1.statuses.all(:order => "position asc").should == [@brand_new, @complete]
       end
       
       should "work with conditions" do
@@ -229,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
@@ -240,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
@@ -292,4 +292,4 @@ class ManyProxyTest < Test::Unit::TestCase
       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

data/test/functional/test_document.rb

@@ -331,13 +331,13 @@ class DocumentTest < Test::Unit::TestCase
 
       context "with :last" do
         should "find last document" do
-          @document.find(:last, :order => 'age desc').should == @doc2
+          @document.find(:last, :order => 'age').should == @doc2
         end
       end
 
       context "with #last" do
         should "find last document based on criteria" do
-          @document.last(:order => 'age desc').should == @doc2
+          @document.last(:order => 'age').should == @doc2
           @document.last(:conditions => {:age => 28}).should == @doc2
         end
       end
@@ -375,7 +375,7 @@ class DocumentTest < Test::Unit::TestCase
         end
 
         should "find last document based on arguments" do
-          doc = @document.find_last_by_last_name('Nunemaker', :order => 'age desc')
+          doc = @document.find_last_by_last_name('Nunemaker', :order => 'age')
           doc.should == @doc1
         end
 
@@ -561,6 +561,7 @@ class DocumentTest < Test::Unit::TestCase
       context "many" do
         context "=> destroy" do
           setup do
+            Property.key :thing_id, String
             Property.belongs_to :thing, :dependent => :destroy
             Thing.many :properties, :dependent => :destroy
 
@@ -583,6 +584,7 @@ class DocumentTest < Test::Unit::TestCase
 
         context "=> delete_all" do
           setup do
+            Property.key :thing_id, String
             Property.belongs_to :thing
             Thing.has_many :properties, :dependent => :delete_all
 
@@ -605,6 +607,7 @@ class DocumentTest < Test::Unit::TestCase
 
         context "=> nullify" do
           setup do
+            Property.key :thing_id, String
             Property.belongs_to :thing
             Thing.has_many :properties, :dependent => :nullify
 
@@ -629,6 +632,7 @@ class DocumentTest < Test::Unit::TestCase
       context "belongs_to" do
         context "=> destroy" do
           setup do
+            Property.key :thing_id, String
             Property.belongs_to :thing, :dependent => :destroy
             Thing.has_many :properties
 
@@ -713,7 +717,7 @@ class DocumentTest < Test::Unit::TestCase
           index_name = @document.ensure_index [[:first_name, 1], [:last_name, -1]]
         }.should change { @document.collection.index_information.size }.by(1)
 
-        index_name.should == 'first_name_1_last_name_-1'
+        [ 'first_name_1_last_name_-1', 'last_name_-1_first_name_1' ].should include(index_name)
 
         index = @document.collection.index_information[index_name]
         index.should_not be_nil
@@ -910,6 +914,10 @@ class DocumentTest < Test::Unit::TestCase
   end
 
   context "timestamping" do
+    setup do
+      @document.timestamps!
+    end
+    
     should "set created_at and updated_at on create" do
       doc = @document.new(:first_name => 'John', :age => 27)
       doc.created_at.should be(nil)

data/test/models.rb

@@ -1,5 +1,30 @@
+class Post
+  include MongoMapper::Document
+
+  key :title, String
+  key :body, String
+
+  has_many :comments, :as => :commentable, :class_name => 'PostComment'
+
+  timestamps!
+end
+
+class PostComment
+  include MongoMapper::Document
+
+  key :username, String, :default => 'Anonymous'
+  key :body, String
+
+  key :commentable_id, String
+  key :commentable_type, String
+  belongs_to :commentable, :polymorphic => true
+
+  timestamps!
+end
+
 class Address
   include MongoMapper::EmbeddedDocument
+
   key :address, String
   key :city,    String
   key :state,   String
@@ -8,22 +33,35 @@ end
 
 class Message
   include MongoMapper::Document
+
   key :body, String
+  key :position, Integer
+  key :_type, String
+  key :room_id, String
+
   belongs_to :room
 end
 
+class Answer
+  include MongoMapper::Document
+
+  key :body, String
+end
+
 class Enter < Message; end
 class Exit < Message;  end
 class Chat < Message;  end
 
 class Room
   include MongoMapper::Document
+
   key :name, String
   many :messages, :polymorphic => true
 end
 
 class Project
   include MongoMapper::Document
+
   key :name, String
   many :statuses
   many :addresses
@@ -31,13 +69,20 @@ end
 
 class Status
   include MongoMapper::Document
+
+  key :project_id, String
+  key :target_id, String
+  key :target_type, String
+  key :name, String
+  key :position, Integer
+
   belongs_to :project
   belongs_to :target, :polymorphic => true
-  key :name, String
 end
 
 class RealPerson
   include MongoMapper::Document
+  
   many :pets
   key :name, String
 
@@ -48,19 +93,24 @@ end
 
 class Person
   include MongoMapper::EmbeddedDocument
+
   key :name, String
   key :child, Person
+
   many :pets
 end
 
 class Pet
   include MongoMapper::EmbeddedDocument
+
   key :name, String
   key :species, String
 end
 
 class Media
   include MongoMapper::EmbeddedDocument
+
+  key :_type, String
   key :file, String
 end
 
@@ -79,34 +129,41 @@ end
 
 class Catalog
   include MongoMapper::Document
+
   many :medias, :polymorphic => true
 end
 
 module TrModels
   class Transport
     include MongoMapper::EmbeddedDocument
+
+    key :_type, String
     key :license_plate, String
   end
 
   class Car < TrModels::Transport
     include MongoMapper::EmbeddedDocument
+
     key :model, String
     key :year, Integer
   end
 
   class Bus < TrModels::Transport
     include MongoMapper::EmbeddedDocument
+
     key :max_passengers, Integer
   end
 
   class Ambulance < TrModels::Transport
     include MongoMapper::EmbeddedDocument
+
     key :icu, Boolean
   end
 
   class Fleet
     include MongoMapper::Document
+
     many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
     key :name, String
   end
-end
+end