djsun-mongo_mapper 0.5.6.6 → 0.5.8.1

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

data/test/functional/test_document.rb

@@ -9,28 +9,10 @@ class DocumentTest < Test::Unit::TestCase
 
       key :first_name, String
       key :last_name, String
-      key :nick_name, String, :default => ""
       key :age, Integer
       key :date, Date
     end
-    @document.collection.clear
-  end
-
-  context "Accessing attributes on a document" do
-    setup do
-      @doc = @document.new(:first_name => 'John', :age => '27')
-    end
-    
-    should "access existing attributes" do
-      @doc[:first_name].should == 'John'
-      @doc[:age].should == 27
-    end
-
-    should "raise an exception for non-existing attributes" do
-      lambda {
-        @doc[:not_here].should == nil
-      }.should raise_error(MongoMapper::KeyNotFound)
-    end
+    @document.collection.remove
   end
 
   context "Saving a document with a custom id" do
@@ -212,7 +194,7 @@ class DocumentTest < Test::Unit::TestCase
           include MongoMapper::Document
           set_collection_name 'test'
         end
-        @document.collection.clear
+        @document.collection.remove
       end
 
       should "create the document" do
@@ -306,8 +288,12 @@ class DocumentTest < Test::Unit::TestCase
         @doc3 = @document.create({:first_name => 'Steph', :last_name => 'Nunemaker', :age => '26'})
       end
 
-      should "raise document not found if nothing provided" do
-        lambda { @document.find }.should raise_error(MongoMapper::DocumentNotFound)
+      should "return nil if nothing provided for find" do
+        @document.find.should be_nil
+      end
+
+      should "raise document not found if nothing provided for find!" do
+        lambda { @document.find! }.should raise_error(MongoMapper::DocumentNotFound)
       end
 
       context "with a single id" do
@@ -315,9 +301,13 @@ class DocumentTest < Test::Unit::TestCase
           @document.find(@doc1.id).should == @doc1
         end
 
-        should "raise error if document not found" do
+        should "return nil if document not found with find" do
+          @document.find(123).should be_nil
+        end
+
+        should "raise error if document not found with find!" do
           lambda {
-            @document.find(123)
+            @document.find!(123)
           }.should raise_error(MongoMapper::DocumentNotFound)
         end
       end
@@ -587,13 +577,13 @@ class DocumentTest < Test::Unit::TestCase
         class ::Property
           include MongoMapper::Document
         end
-        Property.collection.clear
+        Property.collection.remove
 
         class ::Thing
           include MongoMapper::Document
           key :name, String
         end
-        Thing.collection.clear
+        Thing.collection.remove
       end
 
       teardown do
@@ -719,7 +709,7 @@ class DocumentTest < Test::Unit::TestCase
           include MongoMapper::Document
           set_collection_name 'foobarbazwickdoesnotexist'
         end
-        @document.collection.clear
+        @document.collection.remove
 
         klass.count.should == 0
       end
@@ -755,8 +745,8 @@ class DocumentTest < Test::Unit::TestCase
       should "allow creating index on multiple keys" do
         @document.ensure_index [[:first_name, 1], [:last_name, -1]]
         MongoMapper.ensure_indexes!
-        
-        # order is different for different versions of ruby so instead of 
+
+        # order is different for different versions of ruby so instead of
         # just checking have_index('first_name_1_last_name_-1') I'm checking
         # the values of the indexes to make sure the index creation was successful
         @document.collection.index_information.detect do |index|
@@ -794,10 +784,6 @@ class DocumentTest < Test::Unit::TestCase
       @doc.age.should == 27
     end
 
-    should "set defaults correctly" do
-      @doc.nick_name.should == ""
-    end
-
     should "update attributes in the database" do
       from_db = @document.find(@doc.id)
       from_db.should == @doc
@@ -974,12 +960,12 @@ class DocumentTest < Test::Unit::TestCase
         key :_type, String
         key :name, String
       end
-      DocParent.collection.clear
-      
+      DocParent.collection.remove
+
       class ::DocDaughter < ::DocParent; end
       class ::DocSon < ::DocParent; end
       class ::DocGrandSon < ::DocSon; end
-      
+
       @parent = DocParent.new({:name => "Daddy Warbucks"})
       @daughter = DocDaughter.new({:name => "Little Orphan Annie"})
     end
@@ -1003,7 +989,7 @@ class DocumentTest < Test::Unit::TestCase
     should "load the document with the assigned type" do
       @parent.save
       @daughter.save
-            
+
       collection = DocParent.find(:all)
       collection.size.should == 2
       collection.first.should be_kind_of(DocParent)
@@ -1021,92 +1007,98 @@ class DocumentTest < Test::Unit::TestCase
       collection.last.should == doc
       collection.last.should be_kind_of(DocParent)
     end
-    
+
     should "find scoped to class" do
       john = DocSon.create(:name => 'John')
       steve = DocSon.create(:name => 'Steve')
       steph = DocDaughter.create(:name => 'Steph')
       carrie = DocDaughter.create(:name => 'Carrie')
-      
+
       DocGrandSon.all(:order => 'name').should  == []
       DocSon.all(:order => 'name').should       == [john, steve]
       DocDaughter.all(:order => 'name').should  == [carrie, steph]
       DocParent.all(:order => 'name').should    == [carrie, john, steph, steve]
     end
     
+    should "work with nested hash conditions" do
+      john = DocSon.create(:name => 'John')
+      steve = DocSon.create(:name => 'Steve')
+      DocSon.all(:name => {'$ne' => 'Steve'}).should == [john]
+    end
+
     should "raise error if not found scoped to class" do
       john = DocSon.create(:name => 'John')
       steph = DocDaughter.create(:name => 'Steph')
-      
+
       lambda {
-        DocSon.find(steph.id)
+        DocSon.find!(steph.id)
       }.should raise_error(MongoMapper::DocumentNotFound)
     end
-    
+
     should "not raise error for find with parent" do
       john = DocSon.create(:name => 'John')
-      
-      DocParent.find(john.id).should == john
+
+      DocParent.find!(john.id).should == john
     end
-    
+
     should "count scoped to class" do
       john = DocSon.create(:name => 'John')
       steve = DocSon.create(:name => 'Steve')
       steph = DocDaughter.create(:name => 'Steph')
       carrie = DocDaughter.create(:name => 'Carrie')
-      
+
       DocGrandSon.count.should  == 0
       DocSon.count.should       == 2
       DocDaughter.count.should  == 2
       DocParent.count.should    == 4
     end
-    
+
     should "know if it is single_collection_inherited?" do
       DocParent.single_collection_inherited?.should be_false
-      
+
       DocDaughter.single_collection_inherited?.should be_true
       DocSon.single_collection_inherited?.should be_true
     end
-    
+
     should "know if single_collection_inherited_superclass?" do
       DocParent.single_collection_inherited_superclass?.should be_false
-      
+
       DocDaughter.single_collection_inherited_superclass?.should be_true
       DocSon.single_collection_inherited_superclass?.should be_true
       DocGrandSon.single_collection_inherited_superclass?.should be_true
     end
-    
+
     should "not be able to destroy each other" do
       john = DocSon.create(:name => 'John')
       steph = DocDaughter.create(:name => 'Steph')
-      
+
       lambda {
         DocSon.destroy(steph.id)
       }.should raise_error(MongoMapper::DocumentNotFound)
     end
-    
+
     should "not be able to delete each other" do
       john = DocSon.create(:name => 'John')
       steph = DocDaughter.create(:name => 'Steph')
-      
+
       lambda {
         DocSon.delete(steph.id)
       }.should_not change { DocParent.count }
     end
-    
+
     should "be able to destroy using parent" do
       john = DocSon.create(:name => 'John')
       steph = DocDaughter.create(:name => 'Steph')
-      
+
       lambda {
         DocParent.destroy_all
       }.should change { DocParent.count }.by(-2)
     end
-    
+
     should "be able to delete using parent" do
       john = DocSon.create(:name => 'John')
       steph = DocDaughter.create(:name => 'Steph')
-      
+
       lambda {
         DocParent.delete_all
       }.should change { DocParent.count }.by(-2)
@@ -1178,4 +1170,16 @@ class DocumentTest < Test::Unit::TestCase
       @document.exists?(:first_name => "Jean").should == false
     end
   end
+
+  context "reload" do
+    setup do
+      @doc_instance_1 = @document.create({:first_name => 'Ryan', :last_name => 'Koopmans', :age => '37'})
+      @doc_instance_2 = @document.update(@doc_instance_1.id, {:age => '39'})
+    end
+
+    should "load fresh information from the database" do
+      @doc_instance_1.age.should == 37
+      @doc_instance_1.reload.age.should == 39
+    end
+  end
 end

data/test/functional/test_embedded_document.rb

@@ -10,7 +10,7 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       key :first_name, String
       key :last_name, String
     end
-    @document.collection.clear
+    @document.collection.remove
   end
     
   context "Saving a document with an embedded document" do

data/test/functional/test_pagination.rb

@@ -13,7 +13,7 @@ class PaginationTest < Test::Unit::TestCase
         
         def self.per_page; 1 end
       end
-      @document.collection.clear
+      @document.collection.remove
       
       @doc1 = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
       @doc2 = @document.create({:first_name => 'Steve', :last_name => 'Smith', :age => '28'})

data/test/functional/test_rails_compatibility.rb

@@ -14,7 +14,7 @@ class TestRailsCompatibility < Test::Unit::TestCase
   
   context "Document" do
     setup do
-      Order.collection.clear
+      Order.collection.remove
     end
 
     should "alias new to new_record?" do

data/test/functional/test_validations.rb

@@ -8,7 +8,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "not insert document" do
@@ -32,7 +32,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "raise error" do
@@ -48,7 +48,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "raise error" do
@@ -68,7 +68,7 @@ class ValidationsTest < Test::Unit::TestCase
         set_collection_name 'test'
         key :name, String, :required => true
       end
-      @document.collection.clear
+      @document.collection.remove
       
       @doc = @document.create(:name => 'John Nunemaker')
     end
@@ -97,7 +97,7 @@ class ValidationsTest < Test::Unit::TestCase
           errors.add(:action, 'is invalid') if action.blank?
         end
       end
-      @document.collection.clear
+      @document.collection.remove
     end
     
     should "work with validate_on_create callback" do
@@ -140,7 +140,7 @@ class ValidationsTest < Test::Unit::TestCase
         key :name, String
         validates_uniqueness_of :name
       end
-      @document.collection.clear
+      @document.collection.remove
     end
 
     should "not fail if object is new" do
@@ -212,7 +212,39 @@ class ValidationsTest < Test::Unit::TestCase
       doc2 = document.new("name" => "")
       doc2.should_not have_error_on(:name)
     end
-    
+
+    should "allow entries that differ only in case by default" do
+      document = Class.new do
+        include MongoMapper::Document
+        set_collection_name 'test'
+
+        key :name
+        validates_uniqueness_of :name
+      end
+
+      doc = document.new("name" => "BLAMMO")
+      doc.save.should be_true
+
+      doc2 = document.new("name" => "blammo")
+      doc2.should_not have_error_on(:name)
+    end
+
+    should "fail on entries that differ only in case if :case_sensitive => false" do
+      document = Class.new do
+        include MongoMapper::Document
+        set_collection_name 'test'
+
+        key :name
+        validates_uniqueness_of :name, :case_sensitive => false
+      end
+
+      doc = document.new("name" => "BLAMMO")
+      doc.save.should be_true
+
+      doc2 = document.new("name" => "blammo")
+      doc2.should have_error_on(:name)
+    end
+
     context "scoped by a single attribute" do
       setup do
         @document = Class.new do
@@ -223,9 +255,9 @@ class ValidationsTest < Test::Unit::TestCase
           key :scope, String
           validates_uniqueness_of :name, :scope => :scope
         end
-        @document.collection.clear
+        @document.collection.remove
       end
-      
+
       should "fail if the same name exists in the scope" do
         doc = @document.new("name" => "joe", "scope" => "one")
         doc.save.should be_true
@@ -238,11 +270,11 @@ class ValidationsTest < Test::Unit::TestCase
         doc2 = @document.new("name" => "joe", "scope" => "one")
         doc2.should have_error_on(:name)
       end
-      
+
       should "pass if the same name exists in a different scope" do
         doc = @document.new("name" => "joe", "scope" => "one")
         doc.save.should be_true
-        
+
         @document \
           .stubs(:first) \
           .with(:name => 'joe', :scope => 'two') \
@@ -252,7 +284,7 @@ class ValidationsTest < Test::Unit::TestCase
         doc2.should_not have_error_on(:name)
       end
     end
-    
+
     context "scoped by a multiple attributes" do
       setup do
         @document = Class.new do
@@ -264,7 +296,7 @@ class ValidationsTest < Test::Unit::TestCase
           key :second_scope, String
           validates_uniqueness_of :name, :scope => [:first_scope, :second_scope]
         end
-        @document.collection.clear
+        @document.collection.remove
       end
       
       should "fail if the same name exists in the scope" do
@@ -303,7 +335,7 @@ class ValidationsTest < Test::Unit::TestCase
         
         key :name, String, :unique => true
       end
-      @document.collection.clear
+      @document.collection.remove
       
       doc = @document.create(:name => 'John')
       doc.should_not have_error_on(:name)

data/test/models.rb

@@ -23,14 +23,13 @@ class WindowSize
   end
 end
 
-
 class Post
   include MongoMapper::Document
 
   key :title, String
   key :body, String
 
-  has_many :comments, :as => :commentable, :class_name => 'PostComment'
+  many :comments, :as => :commentable, :class_name => 'PostComment'
 
   timestamps!
 end
@@ -72,11 +71,36 @@ class Enter < Message; end
 class Exit < Message;  end
 class Chat < Message;  end
 
+module AccountsExtensions
+  def inactive
+    all(:last_logged_in => nil)
+  end
+end
+
+class Account
+  include MongoMapper::Document
+  
+  key :_type, String
+  key :room_id, String
+  key :last_logged_in, Time
+  
+  belongs_to :room
+end
+class User < Account; end
+class Bot < Account; end
+
 class Room
   include MongoMapper::Document
 
   key :name, String
-  many :messages, :polymorphic => true
+  many :messages, :polymorphic => true do
+    def older
+      all(:position => {'$gt' => 5})
+    end
+  end
+  many :latest_messages, :class_name => 'Message', :order => 'position desc', :limit => 2
+  
+  many :accounts, :polymorphic => true, :extend => AccountsExtensions
 end
 
 class Answer
@@ -85,12 +109,45 @@ class Answer
   key :body, String
 end
 
+module PeopleExtensions
+  def find_by_name(name)
+    detect { |p| p.name == name }
+  end
+end
+
+module CollaboratorsExtensions
+  def top
+    first
+  end
+end
+
 class Project
   include MongoMapper::Document
 
   key :name, String
-  many :statuses
-  many :addresses
+  
+  many :people, :extend => PeopleExtensions
+  many :collaborators, :extend => CollaboratorsExtensions
+  
+  many :statuses, :order => 'position' do
+    def open
+      all(:name => %w(New Assigned))
+    end
+  end
+  
+  many :addresses do
+    def find_all_by_state(state)
+      # can't use select here for some reason
+      find_all { |a| a.state == state }
+    end
+  end
+end
+
+class Collaborator
+  include MongoMapper::Document
+  key :project_id, String
+  key :name, String
+  belongs_to :project
 end
 
 class Status
@@ -99,7 +156,7 @@ class Status
   key :project_id, String
   key :target_id, String
   key :target_type, String
-  key :name, String
+  key :name, String, :required => true
   key :position, Integer
 
   belongs_to :project
@@ -109,9 +166,13 @@ end
 class RealPerson
   include MongoMapper::Document
 
-  many :pets
+  key :room_id, String
   key :name, String
-
+  
+  belongs_to :room
+  
+  many :pets
+  
   def realname=(n)
     self.name = n
   end
@@ -138,6 +199,8 @@ class Media
 
   key :_type, String
   key :file, String
+  
+  key :visible, Boolean
 end
 
 class Video < Media
@@ -155,8 +218,13 @@ end
 
 class Catalog
   include MongoMapper::Document
-
-  many :medias, :polymorphic => true
+  
+  many :medias, :polymorphic => true do
+    def visible
+      # for some reason we can't use select here
+      find_all { |m| m.visible? }
+    end
+  end
 end
 
 module TrModels
@@ -165,6 +233,7 @@ module TrModels
 
     key :_type, String
     key :license_plate, String
+    key :purchased_on, Date
   end
 
   class Car < TrModels::Transport
@@ -189,31 +258,14 @@ module TrModels
   class Fleet
     include MongoMapper::Document
 
-    many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
-    key :name, String
-  end
-end
-
-module Hollywood
-  class Movie
-    include MongoMapper::Document
-    
-    many :roles
-  end
-
-  class Actor
-    include MongoMapper::Document
+    module TransportsExtension
+      def to_be_replaced
+        # for some reason we can't use select
+        find_all { |t| t.purchased_on < 2.years.ago.to_date }
+      end
+    end
     
-    many :roles
-  end
-  
-  class Role
-    include MongoMapper::Document
-
-    key :movie_id, String
-    key :actor_id, String
-    
-    belongs_to :movie
-    belongs_to :actor
+    many :transports, :polymorphic => true, :class_name => "TrModels::Transport", :extend => TransportsExtension
+    key :name, String
   end
 end

data/test/support/{test_timing.rb → timing.rb}

@@ -5,7 +5,7 @@ class Test::Unit::TestCase
     end_time = Time.now
  
     duration = end_time - begin_time
-    threshold = 0.3
+    threshold = 0.5
     
     if duration > threshold
       puts "\nSLOW TEST: #{duration} - #{self.name}"