tpitale-mongo_mapper 0.6.9 → 0.6.10

data/test/functional/test_embedded_document.rb

@@ -3,14 +3,11 @@ require 'models'
 
 class EmbeddedDocumentTest < Test::Unit::TestCase
   def setup
-    @document = Class.new do
-      include MongoMapper::Document
+    @document = Doc do
       set_collection_name 'users'
-
       key :first_name, String
       key :last_name, String
     end
-    @document.collection.remove
   end
     
   context "Saving a document with an embedded document" do
@@ -34,23 +31,13 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
     end
   end
   
-  context "Instantiating single collection inherited embedded documents" do
-    setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        key :message, Message
-      end
-    end
-
-    should "work" do
-      doc1 = @document.create(:message => Enter.new)
-      doc2 = @document.create(:message => Exit.new)
-      doc3 = @document.create(:message => Chat.new)
-
-      doc1.reload.message.class.should be(Enter)
-      doc2.reload.message.class.should be(Exit)
-      doc3.reload.message.class.should be(Chat)
+  should "correctly instantiate single collection inherited embedded documents" do
+    document = Doc('Foo') do
+      key :message, Message
     end
+    
+    doc1 = document.create(:message => Enter.new)
+    doc1.reload.message.class.should be(Enter)
   end
   
   context "new?" do

data/test/functional/test_modifiers.rb

@@ -0,0 +1,238 @@
+require 'test_helper'
+
+class ModifierTest < Test::Unit::TestCase
+  def setup
+    @page_class = Doc do
+      key :title, String
+      key :day_count, Integer, :default => 0
+      key :week_count, Integer, :default => 0
+      key :month_count, Integer, :default => 0
+      key :tags, Array
+    end
+  end
+  
+  def assert_page_counts(page, day_count, week_count, month_count)
+    page.reload
+    page.day_count.should == day_count
+    page.week_count.should == week_count
+    page.month_count.should == month_count
+  end
+  
+  should "be able to increment with criteria and modifier hashes" do
+    page = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.increment({:title => 'Home'}, {
+      :day_count => 1, :week_count => 2, :month_count => 3
+    })
+    
+    assert_page_counts page, 1, 2, 3
+    assert_page_counts page2, 1, 2, 3
+  end
+  
+  should "be able to increment with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.increment(page.id, page2.id, {
+      :day_count => 1, :week_count => 2, :month_count => 3
+    })
+    
+    assert_page_counts page, 1, 2, 3
+    assert_page_counts page2, 1, 2, 3
+  end
+  
+  should "be able to decrement with criteria and modifier hashes" do
+    page = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    page2 = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    
+    @page_class.decrement({:title => 'Home'}, {
+      :day_count => 1, :week_count => 2, :month_count => 3
+    })
+    
+    assert_page_counts page, 0, 0, 0
+    assert_page_counts page2, 0, 0, 0
+  end
+  
+  should "be able to decrement with ids and modifier hash" do
+    page = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    page2 = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    
+    @page_class.decrement(page.id, page2.id, {
+      :day_count => 1, :week_count => 2, :month_count => 3
+    })
+    
+    assert_page_counts page, 0, 0, 0
+    assert_page_counts page2, 0, 0, 0
+  end
+  
+  should "always decrement when decrement is called whether number is positive or negative" do
+    page = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    page2 = @page_class.create(:title => 'Home', :day_count => 1, :week_count => 2, :month_count => 3)
+    
+    @page_class.decrement(page.id, page2.id, {
+      :day_count => -1, :week_count => 2, :month_count => -3
+    })
+    
+    assert_page_counts page, 0, 0, 0
+    assert_page_counts page2, 0, 0, 0
+  end
+  
+  should "be able to set with criteria and modifier hashes" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.set({:title => 'Home'}, :title => 'Home Revised')
+    
+    page.reload
+    page.title.should == 'Home Revised'
+    
+    page2.reload
+    page2.title.should == 'Home Revised'
+  end
+  
+  should "be able to set with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.set(page.id, page2.id, :title => 'Home Revised')
+    
+    page.reload
+    page.title.should == 'Home Revised'
+    
+    page2.reload
+    page2.title.should == 'Home Revised'
+  end
+  
+  should "be able to push with criteria and modifier hashes" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.push({:title => 'Home'}, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(foo)
+    
+    page2.reload
+    page.tags.should == %w(foo)
+  end
+  
+  should "be able to push with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.push(page.id, page2.id, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(foo)
+    
+    page2.reload
+    page.tags.should == %w(foo)
+  end
+
+  should "be able to push all with criteria and modifier hashes" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    tags = %w(foo bar)
+    
+    @page_class.push_all({:title => 'Home'}, :tags => tags)
+    
+    page.reload
+    page.tags.should == tags
+    
+    page2.reload
+    page.tags.should == tags
+  end
+  
+  should "be able to push all with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home')
+    page2 = @page_class.create(:title => 'Home')
+    tags = %w(foo bar)
+    
+    @page_class.push_all(page.id, page2.id, :tags => tags)
+    
+    page.reload
+    page.tags.should == tags
+    
+    page2.reload
+    page.tags.should == tags
+  end
+  
+  should "be able to pull with criteria and modifier hashes" do
+    page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    
+    @page_class.pull({:title => 'Home'}, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(bar)
+    
+    page2.reload
+    page.tags.should == %w(bar)
+  end
+  
+  should "be able to pull with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    
+    @page_class.pull(page.id, page2.id, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(bar)
+    
+    page2.reload
+    page.tags.should == %w(bar)
+  end
+
+  should "be able to pull all with criteria and modifier hashes" do
+    page  = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+    page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+    
+    @page_class.pull_all({:title => 'Home'}, :tags => %w(foo bar))
+    
+    page.reload
+    page.tags.should == %w(baz)
+    
+    page2.reload
+    page.tags.should == %w(baz)
+  end
+  
+  should "be able to pull all with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+    page2 = @page_class.create(:title => 'Home', :tags => %w(foo bar baz))
+    
+    @page_class.pull_all(page.id, page2.id, :tags => %w(foo bar))
+    
+    page.reload
+    page.tags.should == %w(baz)
+    
+    page2.reload
+    page.tags.should == %w(baz)
+  end
+
+  should "be able to push uniq with criteria and modifier hash" do
+    page  = @page_class.create(:title => 'Home', :tags => 'foo')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.push_uniq({:title => 'Home'}, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(foo)
+    
+    page2.reload
+    page.tags.should == %w(foo)
+  end
+  
+  should "be able to push uniq with ids and modifier hash" do
+    page  = @page_class.create(:title => 'Home', :tags => 'foo')
+    page2 = @page_class.create(:title => 'Home')
+    
+    @page_class.push_uniq(page.id, page2.id, :tags => 'foo')
+    
+    page.reload
+    page.tags.should == %w(foo)
+    
+    page2.reload
+    page.tags.should == %w(foo)
+  end
+end

data/test/functional/test_pagination.rb

@@ -3,8 +3,7 @@ require 'test_helper'
 class PaginationTest < Test::Unit::TestCase
   context "Paginating" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
+      @document = Doc do
         set_collection_name 'users'
 
         key :first_name, String
@@ -13,7 +12,6 @@ class PaginationTest < Test::Unit::TestCase
         
         def self.per_page; 1 end
       end
-      @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_string_id_compatibility.rb

@@ -2,19 +2,17 @@ require 'test_helper'
 
 class StringIdCompatibilityTest < Test::Unit::TestCase
   def setup
-    @note_class = Class.new do
-      include MongoMapper::EmbeddedDocument
+    @note_class = EDoc do
       key :_id, String
     end
     
-    @task_class = Class.new do
-      include MongoMapper::Document
+    @task_class = Doc do
       key :_id, String
       key :project_id, String
       belongs_to :project
     end
     
-    @project_class = Class.new do
+    @project_class = Doc do
       include MongoMapper::Document
       key :_id, String
     end
@@ -22,9 +20,6 @@ class StringIdCompatibilityTest < Test::Unit::TestCase
     @task_class.belongs_to :project, :class => @project_class
     @project_class.many :notes, :class => @note_class
     @project_class.many :tasks, :class => @task_class, :foreign_key => 'project_id'
-    
-    @project_class.collection.remove
-    @task_class.collection.remove
   end
   
   should "assign correct _id for documents" do

data/test/functional/test_validations.rb

@@ -3,12 +3,9 @@ require 'test_helper'
 class ValidationsTest < Test::Unit::TestCase  
   context "Saving a new document that is invalid" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String, :required => true
       end
-      @document.collection.remove
     end
     
     should "not insert document" do
@@ -25,31 +22,11 @@ class ValidationsTest < Test::Unit::TestCase
     end
   end
 
-  context "Skipping validations when saving" do
-    setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        key :name, String, :required => true
-      end
-      @document.collection.remove
-    end
-
-    should "insert document" do
-      doc = @document.new
-      doc.save(false)
-      @document.count.should == 1
-    end
-  end
-
   context "Saving a document that is invalid (destructive)" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String, :required => true
       end
-      @document.collection.remove
     end
     
     should "raise error" do
@@ -60,12 +37,9 @@ class ValidationsTest < Test::Unit::TestCase
 
   context "Creating a document that is invalid (destructive)" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String, :required => true
       end
-      @document.collection.remove
     end
     
     should "raise error" do
@@ -80,12 +54,9 @@ class ValidationsTest < Test::Unit::TestCase
   
   context "Saving an existing document that is invalid" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
+      @document = Doc do
         key :name, String, :required => true
       end
-      @document.collection.remove
       
       @doc = @document.create(:name => 'John Nunemaker')
     end
@@ -105,16 +76,12 @@ class ValidationsTest < Test::Unit::TestCase
   
   context "Adding validation errors" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :action, String
         def action_present
           errors.add(:action, 'is invalid') if action.blank?
         end
       end
-      @document.collection.remove
     end
     
     should "work with validate_on_create callback" do
@@ -150,14 +117,10 @@ class ValidationsTest < Test::Unit::TestCase
   
   context "validating uniqueness of" do
     setup do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :name, String
         validates_uniqueness_of :name
       end
-      @document.collection.remove
     end
 
     should "not fail if object is new" do
@@ -166,10 +129,7 @@ class ValidationsTest < Test::Unit::TestCase
     end
 
     should "not fail when new object is out of scope" do
-      document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      document = Doc do
         key :name
         key :adult
         validates_uniqueness_of :name, :scope => :adult
@@ -179,7 +139,6 @@ class ValidationsTest < Test::Unit::TestCase
 
       doc2 = document.new("name" => "joe", :adult => false)
       doc2.should be_valid
-
     end
 
     should "allow to update an object" do
@@ -210,10 +169,7 @@ class ValidationsTest < Test::Unit::TestCase
     end
     
     should "allow multiple blank entries if :allow_blank => true" do
-      document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      document = Doc do
         key :name
         validates_uniqueness_of :name, :allow_blank => :true
       end
@@ -231,10 +187,7 @@ class ValidationsTest < Test::Unit::TestCase
     end
 
     should "allow entries that differ only in case by default" do
-      document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-
+      document = Doc do
         key :name
         validates_uniqueness_of :name
       end
@@ -248,10 +201,7 @@ class ValidationsTest < Test::Unit::TestCase
 
     context "with :case_sensitive => false" do
       setup do
-        @document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-
+        @document = Doc do
           key :name
           validates_uniqueness_of :name, :case_sensitive => false
         end
@@ -273,15 +223,11 @@ class ValidationsTest < Test::Unit::TestCase
 
     context "scoped by a single attribute" do
       setup do
-        @document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-          
+        @document = Doc do
           key :name, String
           key :scope, String
           validates_uniqueness_of :name, :scope => :scope
         end
-        @document.collection.remove
       end
 
       should "fail if the same name exists in the scope" do
@@ -313,16 +259,12 @@ class ValidationsTest < Test::Unit::TestCase
 
     context "scoped by a multiple attributes" do
       setup do
-        @document = Class.new do
-          include MongoMapper::Document
-          set_collection_name 'test'
-          
+        @document = Doc do
           key :name, String
           key :first_scope, String
           key :second_scope, String
           validates_uniqueness_of :name, :scope => [:first_scope, :second_scope]
         end
-        @document.collection.remove
       end
       
       should "fail if the same name exists in the scope" do
@@ -355,13 +297,9 @@ class ValidationsTest < Test::Unit::TestCase
   
   context "validates uniqueness of with :unique shortcut" do
     should "work" do
-      @document = Class.new do
-        include MongoMapper::Document
-        set_collection_name 'test'
-        
+      @document = Doc do
         key :name, String, :unique => true
       end
-      @document.collection.remove
       
       doc = @document.create(:name => 'John')
       doc.should_not have_error_on(:name)

data/test/models.rb

@@ -100,7 +100,7 @@ class Account
   
   belongs_to :room
 end
-class User < Account; end
+class AccountUser < Account; end
 class Bot < Account; end
 
 class Answer

data/test/support/timing.rb

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

data/test/test_helper.rb

@@ -16,6 +16,34 @@ require 'support/timing'
 
 class Test::Unit::TestCase
   include CustomMatchers
+  
+  cattr_accessor :mm_document_count
+  self.mm_document_count = 0
+  
+  def Doc(name=nil, &block)
+    Test::Unit::TestCase.mm_document_count += 1
+    
+    klass = Class.new do
+      include MongoMapper::Document
+      set_collection_name "test#{rand(20)}"
+      
+      if name
+        class_eval "def self.name; '#{name}' end"
+        class_eval "def self.to_s; '#{name}' end"
+      end
+      
+      class_eval(&block) if block_given?
+    end
+    klass.collection.remove
+    klass
+  end
+  
+  def EDoc(&block)
+    Class.new do
+      include MongoMapper::EmbeddedDocument
+      instance_eval(&block) if block_given?
+    end
+  end
 end
 
 test_dir = File.expand_path(File.dirname(__FILE__) + '/../tmp')

data/test/unit/associations/test_base.rb

@@ -50,23 +50,17 @@ class AssociationBaseTest < Test::Unit::TestCase
     
     should "be false if not many" do
       Base.new(:belongs_to, :foo).many?.should be_false
+      Base.new(:one, :foo).many?.should be_false
     end
   end
   
-  context "finder_options" do
-    should "default to empty hash" do
-      base = Base.new(:many, :foos)
-      base.finder_options.should == {}
+  context "one?" do
+    should "be true if one" do
+      Base.new(:one, :foo).one?.should be_true
     end
     
-    should "work with order" do
-      base = Base.new(:many, :foos, :order => 'position')
-      base.finder_options.should == {:order => 'position'}
-    end
-    
-    should "correctly parse from options" do
-      base = Base.new(:many, :foos, :order => 'position', :somekey => 'somevalue')
-      base.finder_options.should == {:order => 'position', :somekey => 'somevalue'}
+    should "be false if not one" do
+      Base.new(:many, :foo).one?.should be_false
     end
   end
   
@@ -90,6 +84,43 @@ class AssociationBaseTest < Test::Unit::TestCase
     end
   end
   
+  context "as?" do
+    should "be true if one" do
+      Base.new(:one, :foo, :as => :commentable).as?.should be_true
+    end
+    
+    should "be false if not one" do
+      Base.new(:many, :foo).as?.should be_false
+    end
+  end
+  
+  context "in_array?" do
+    should "be true if one" do
+      Base.new(:one, :foo, :in => :list_ids).in_array?.should be_true
+    end
+    
+    should "be false if not one" do
+      Base.new(:many, :foo).in_array?.should be_false
+    end
+  end
+  
+  context "finder_options" do
+    should "default to empty hash" do
+      base = Base.new(:many, :foos)
+      base.finder_options.should == {}
+    end
+    
+    should "work with order" do
+      base = Base.new(:many, :foos, :order => 'position')
+      base.finder_options.should == {:order => 'position'}
+    end
+    
+    should "correctly parse from options" do
+      base = Base.new(:many, :foos, :order => 'position', :somekey => 'somevalue')
+      base.finder_options.should == {:order => 'position', :somekey => 'somevalue'}
+    end
+  end
+  
   context "type_key_name" do
     should "be _type for many" do
       Base.new(:many, :foos).type_key_name.should == '_type'
@@ -101,7 +132,7 @@ class AssociationBaseTest < Test::Unit::TestCase
   end
   
   context "foreign_key" do
-    should "default to assocation_name_id" do
+    should "default to assocation name _id for belongs to" do
       base = Base.new(:belongs_to, :foo)
       base.foreign_key.should == 'foo_id'
     end
@@ -161,6 +192,16 @@ class AssociationBaseTest < Test::Unit::TestCase
       base = Base.new(:belongs_to, :target, :polymorphic => true)
       base.proxy_class.should == BelongsToPolymorphicProxy
     end
+    
+    should "be OneProxy for one" do
+      base = Base.new(:one, :target, :polymorphic => true)
+      base.proxy_class.should == OneProxy
+    end
+    
+    should "be InArrayProxy for many with :in option" do
+      base = Base.new(:many, :messages, :in => :message_ids)
+      base.proxy_class.should == InArrayProxy
+    end
   end
   
 end