mongo_mapper 0.5.6 → 0.5.7

data/test/functional/associations/test_many_proxy.rb

@@ -215,7 +215,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 +231,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 +247,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 +258,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 +269,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 +280,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 +328,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_document.rb

@@ -298,7 +298,9 @@ class DocumentTest < Test::Unit::TestCase
         end
 
         should "raise error if document not found" do
-          lambda { @document.find(123) }.should raise_error(MongoMapper::DocumentNotFound)
+          lambda {
+            @document.find(123)
+          }.should raise_error(MongoMapper::DocumentNotFound)
         end
       end
 
@@ -327,14 +329,14 @@ class DocumentTest < Test::Unit::TestCase
         end
 
         should "be able to add conditions" do
-          @document.find(:all, :conditions => {:first_name => 'John'}).should == [@doc1]
+          @document.find(:all, :first_name => 'John').should == [@doc1]
         end
       end
 
       context "with #all" do
         should "find all documents based on criteria" do
           @document.all(:order => 'first_name').should == [@doc1, @doc3, @doc2]
-          @document.all(:conditions => {:last_name => 'Nunemaker'}, :order => 'age desc').should == [@doc1, @doc3]
+          @document.all(:last_name => 'Nunemaker', :order => 'age desc').should == [@doc1, @doc3]
         end
       end
 
@@ -347,7 +349,7 @@ class DocumentTest < Test::Unit::TestCase
       context "with #first" do
         should "find first document based on criteria" do
           @document.first(:order => 'first_name').should == @doc1
-          @document.first(:conditions => {:age => 28}).should == @doc2
+          @document.first(:age => 28).should == @doc2
         end
       end
 
@@ -360,7 +362,7 @@ class DocumentTest < Test::Unit::TestCase
       context "with #last" do
         should "find last document based on criteria" do
           @document.last(:order => 'age').should == @doc2
-          @document.last(:order => 'age', :conditions => {:age => 28}).should == @doc2
+          @document.last(:order => 'age', :age => 28).should == @doc2
         end
 
         should "raise error if no order provided" do
@@ -735,8 +737,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|
@@ -951,11 +953,11 @@ class DocumentTest < Test::Unit::TestCase
         key :name, String
       end
       DocParent.collection.clear
-      
+
       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
@@ -979,7 +981,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)
@@ -997,92 +999,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)
       }.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
     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)
@@ -1154,4 +1162,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_pagination.rb

@@ -43,41 +43,41 @@ class PaginationTest < Test::Unit::TestCase
 
     should "accept conditions" do
       result = @document.paginate({
-        :conditions => {:last_name => 'Nunemaker'},
-        :order      => "age DESC",
-        :per_page   => 2, 
-        :page       => 1,
+        :last_name => 'Nunemaker',
+        :order     => "age DESC",
+        :per_page  => 2, 
+        :page      => 1,
       })
       result.should == [@doc1, @doc3]
       result.first.age.should == 27
     end
     
-    should "withstand rigor" do
+    should "withstand rigor" do      
       result = @document.paginate({
-        :per_page   => 1, 
-        :page       => 1,
-        :order      => 'age desc', 
-        :conditions => {:last_name => 'Nunemaker'}
+        :per_page  => 1, 
+        :page      => 1,
+        :order     => 'age desc', 
+        :last_name => 'Nunemaker'
       })
       result.should == [@doc1]
       result.total_entries.should == 2
       result.total_pages.should == 2
       
       result = @document.paginate({
-        :per_page   => 1,
-        :page       => 2,
-        :order      => 'age desc',
-        :conditions => {:last_name => 'Nunemaker'}
+        :per_page  => 1,
+        :page      => 2,
+        :order     => 'age desc',
+        :last_name => 'Nunemaker'
       })
       result.should == [@doc3]
       result.total_entries.should == 2
       result.total_pages.should == 2
       
       result = @document.paginate({
-        :per_page   => 2, 
-        :page       => 1, 
-        :order      => 'age desc',
-        :conditions => {:last_name => 'Nunemaker'}
+        :per_page  => 2,
+        :page      => 1,
+        :order     => 'age desc',
+        :last_name => 'Nunemaker'
       })
       result.should == [@doc1, @doc3]
       result.total_entries.should == 2

data/test/functional/test_validations.rb

@@ -170,8 +170,8 @@ class ValidationsTest < Test::Unit::TestCase
       doc.save.should be_true
 
       @document \
-        .stubs(:find) \
-        .with(:first, :conditions => {:name => 'joe'}, :limit => 1) \
+        .stubs(:first) \
+        .with(:name => 'joe') \
         .returns(doc)
 
       doc.name = "joe"
@@ -184,14 +184,35 @@ class ValidationsTest < Test::Unit::TestCase
       doc.save.should be_true
 
       @document \
-        .stubs(:find) \
-        .with(:first, :conditions => {:name => 'joe'}, :limit => 1) \
+        .stubs(:first) \
+        .with(:name => 'joe') \
         .returns(doc)
 
       doc2 = @document.new("name" => "joe")
       doc2.should have_error_on(:name)
     end
     
+    should "allow multiple blank entries if :allow_blank => true" do
+      document = Class.new do
+        include MongoMapper::Document
+        set_collection_name 'test'
+        
+        key :name
+        validates_uniqueness_of :name, :allow_blank => :true
+      end
+      
+      doc = document.new("name" => "")
+      doc.save.should be_true
+
+      document \
+        .stubs(:first) \
+        .with(:name => '') \
+        .returns(doc)
+
+      doc2 = document.new("name" => "")
+      doc2.should_not have_error_on(:name)
+    end
+    
     context "scoped by a single attribute" do
       setup do
         @document = Class.new do
@@ -210,8 +231,8 @@ class ValidationsTest < Test::Unit::TestCase
         doc.save.should be_true
         
         @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'joe', :scope => "one"}, :limit => 1) \
+          .stubs(:first) \
+          .with(:name => 'joe', :scope => "one") \
           .returns(doc)
 
         doc2 = @document.new("name" => "joe", "scope" => "one")
@@ -223,8 +244,8 @@ class ValidationsTest < Test::Unit::TestCase
         doc.save.should be_true
         
         @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'joe', :scope => "two"}, :limit => 1) \
+          .stubs(:first) \
+          .with(:name => 'joe', :scope => 'two') \
           .returns(nil)
 
         doc2 = @document.new("name" => "joe", "scope" => "two")
@@ -251,8 +272,8 @@ class ValidationsTest < Test::Unit::TestCase
         doc.save.should be_true
         
         @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'joe', :first_scope => "one", :second_scope => "two"}, :limit => 1) \
+          .stubs(:first) \
+          .with(:name => 'joe', :first_scope => 'one', :second_scope => 'two') \
           .returns(doc)
 
         doc2 = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
@@ -264,8 +285,8 @@ class ValidationsTest < Test::Unit::TestCase
         doc.save.should be_true
         
         @document \
-          .stubs(:find) \
-          .with(:first, :conditions => {:name => 'joe', :first_scope => "one", :second_scope => "one"}, :limit => 1) \
+          .stubs(:first) \
+          .with(:name => 'joe', :first_scope => 'one', :second_scope => 'one') \
           .returns(nil)
 
         doc2 = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "one")
@@ -288,8 +309,8 @@ class ValidationsTest < Test::Unit::TestCase
       doc.should_not have_error_on(:name)
       
       @document \
-        .stubs(:find) \
-        .with(:first, :conditions => {:name => 'John'}, :limit => 1) \
+        .stubs(:first) \
+        .with(:name => 'John') \
         .returns(doc)
       
       second_john = @document.create(:name => 'John')

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
@@ -89,8 +113,40 @@ class Project
   include MongoMapper::Document
 
   key :name, String
-  many :statuses
-  many :addresses
+  
+  module PeopleExtensions
+    def find_by_name(name)
+      detect { |p| p.name == name }
+    end
+  end
+  many :people, :extend => PeopleExtensions
+  
+  module CollaboratorsExtensions
+    def top
+      first
+    end
+  end
+  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
@@ -109,9 +165,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 +198,8 @@ class Media
 
   key :_type, String
   key :file, String
+  
+  key :visible, Boolean
 end
 
 class Video < Media
@@ -155,8 +217,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 +232,7 @@ module TrModels
 
     key :_type, String
     key :license_plate, String
+    key :purchased_on, Date
   end
 
   class Car < TrModels::Transport
@@ -189,7 +257,14 @@ module TrModels
   class Fleet
     include MongoMapper::Document
 
-    many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
+    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 :transports, :polymorphic => true, :class_name => "TrModels::Transport", :extend => TransportsExtension
     key :name, String
   end
 end