mongo_mapper 0.6.10 → 0.7.0

data/test/functional/test_modifiers.rb

@@ -2,17 +2,13 @@ require 'test_helper'
 
 class ModifierTest < Test::Unit::TestCase
   def setup
-    @page_class = Class.new do
-      include MongoMapper::Document
-      
+    @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
-    
-    @page_class.collection.remove
   end
   
   def assert_page_counts(page, day_count, week_count, month_count)
@@ -239,4 +235,18 @@ class ModifierTest < Test::Unit::TestCase
     page2.reload
     page.tags.should == %w(foo)
   end
+  
+  should "be able to remove the last element the array" do
+    page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    @page_class.pop(page.id, :tags => 1)
+    page.reload
+    page.tags.should == %w(foo)
+  end
+
+  should "be able to remove the first element of the array" do
+    page  = @page_class.create(:title => 'Home', :tags => %w(foo bar))
+    @page_class.pop(page.id, :tags => -1)
+    page.reload
+    page.tags.should == %w(bar)
+  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_protected.rb

@@ -0,0 +1,155 @@
+require 'test_helper'
+
+class ProtectedTest < Test::Unit::TestCase
+  context 'A document with protected attributes' do
+    setup do
+      @doc_class = Doc do
+        key :name, String
+        key :admin, Boolean, :default => false
+
+        attr_protected :admin
+      end
+
+      @doc = @doc_class.create(:name => 'Steve Sloan')
+    end
+
+    should 'have protected attributes class method' do
+      @doc_class.protected_attributes.should == [:admin].to_set
+    end
+    
+    should "default protected attributes to nil" do
+      Doc().protected_attributes.should be_nil
+    end
+
+    should "have protected attributes instance method" do
+      @doc.protected_attributes.should equal(@doc_class.protected_attributes)
+    end
+
+    should "work with :protected shortcut when defining key" do
+      Doc() do
+        key :user_id, ObjectId, :protected => true
+      end.protected_attributes.should == [:user_id].to_set
+    end
+
+    should 'assign protected attribute through accessor' do
+      @doc.admin = true
+      @doc.admin.should be_true
+    end
+
+    should "ignore protected attribute on #initialize" do
+      doc = @doc_class.new(:name => 'John', :admin => true)
+      doc.admin.should be_false
+      doc.name.should == 'John'
+    end
+
+    should "not ignore protected attributes on #initialize from the database" do
+      doc = @doc_class.new(:name => 'John')
+      doc.admin = true
+      doc.save!
+      
+      doc = @doc_class.first(:name => 'John')
+      doc.admin.should be_true
+      doc.name.should == 'John'
+    end
+
+    should 'ignore protected attribute on #update_attributes' do
+      @doc.update_attributes(:name => 'Ren Hoek', :admin => true)
+      @doc.name.should == 'Ren Hoek'
+      @doc.admin.should be_false
+    end
+
+    should 'ignore protected attribute on #update_attributes!' do
+      @doc.update_attributes!(:name => 'Stimpson J. Cat', :admin => true)
+      @doc.name.should == 'Stimpson J. Cat'
+      @doc.admin.should be_false
+    end
+  end
+  
+  context "Single collection inherited protected attributes" do
+    setup do
+      class ::GrandParent
+        include MongoMapper::Document
+
+        key :_type, String
+        key :site_id, ObjectId
+
+        attr_protected :site_id
+      end
+      GrandParent.collection.remove
+
+      class ::Child < ::GrandParent
+        key :position, Integer
+
+        attr_protected :position
+      end
+
+      class ::GrandChild < ::Child; end
+
+      class ::OtherChild < ::GrandParent
+        key :blog_id, ObjectId
+
+        attr_protected :blog_id
+      end
+    end
+
+    teardown do
+      Object.send :remove_const, 'GrandParent' if defined?(::GrandParent)
+      Object.send :remove_const, 'Child'       if defined?(::Child)
+      Object.send :remove_const, 'GrandChild'  if defined?(::GrandChild)
+      Object.send :remove_const, 'OtherChild'  if defined?(::OtherChild)
+    end
+
+    should "share keys down the inheritance trail" do
+      GrandParent.protected_attributes.should == [:site_id].to_set
+      Child.protected_attributes.should == [:site_id, :position].to_set
+      GrandChild.protected_attributes.should == [:site_id, :position].to_set
+      OtherChild.protected_attributes.should == [:site_id, :blog_id].to_set
+    end
+  end
+
+  context 'An embedded document with protected attributes' do
+    setup do
+      @doc_class = Doc('Project')
+      @edoc_class = EDoc('Person') do
+        key :name, String
+        key :admin, Boolean, :default => false
+
+        attr_protected :admin
+      end
+      @doc_class.many :people, :class => @edoc_class
+
+      @doc = @doc_class.create(:title => 'MongoMapper')
+      @edoc = @edoc_class.new(:name => 'Steve Sloan')
+      @doc.people << @edoc
+    end
+
+    should 'have protected attributes class method' do
+      @edoc_class.protected_attributes.should == [:admin].to_set
+    end
+    
+    should "default protected attributes to nil" do
+      EDoc().protected_attributes.should be_nil
+    end
+
+    should "have protected attributes instance method" do
+      @edoc.protected_attributes.should equal(@edoc_class.protected_attributes)
+    end
+
+    should 'assign protected attribute through accessor' do
+      @edoc.admin = true
+      @edoc.admin.should be_true
+    end
+
+    should 'ignore protected attribute on #update_attributes' do
+      @edoc.update_attributes(:name => 'Ren Hoek', :admin => true)
+      @edoc.name.should == 'Ren Hoek'
+      @edoc.admin.should be_false
+    end
+
+    should 'ignore protected attribute on #update_attributes!' do
+      @edoc.update_attributes!(:name => 'Stimpson J. Cat', :admin => true)
+      @edoc.name.should == 'Stimpson J. Cat'
+      @edoc.admin.should be_false
+    end
+  end
+end

data/test/functional/test_string_id_compatibility.rb

@@ -2,29 +2,24 @@ 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
     
     @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
+    @project_class.many :tasks, :class => @task_class, :foreign_key => 'project_id', :order => :position.asc
   end
   
   should "assign correct _id for documents" do
@@ -60,9 +55,9 @@ class StringIdCompatibilityTest < Test::Unit::TestCase
   end
   
   should "be able to associate records" do
-    t1 = @task_class.new(:body => 'First task')
-    t2 = @task_class.new(:body => 'Second task')
-    t3 = @task_class.new(:body => 'Third task')
+    t1 = @task_class.new(:body => 'First task', :position => 1)
+    t2 = @task_class.new(:body => 'Second task', :position => 2)
+    t3 = @task_class.new(:body => 'Third task', :position => 3)
     project = @project_class.create(:name => 'MM', :tasks => [t1, t2, t3])
     
     project = project.reload

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
@@ -27,12 +24,9 @@ class ValidationsTest < Test::Unit::TestCase
 
   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
@@ -43,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
@@ -63,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
@@ -88,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
@@ -133,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
@@ -149,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
@@ -162,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
@@ -193,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
@@ -213,11 +186,21 @@ class ValidationsTest < Test::Unit::TestCase
       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'
+    should "allow multiple nil entries if :allow_nil => true" do
+      document = Doc do
+        key :name
+        validates_uniqueness_of :name, :allow_nil => :true
+      end
 
+      doc = document.new('name' => nil)
+      doc.save.should be_true
+
+      doc2 = document.new('name' => nil)
+      doc2.should_not have_error_on(:name)
+    end
+
+    should "allow entries that differ only in case by default" do
+      document = Doc do
         key :name
         validates_uniqueness_of :name
       end
@@ -231,10 +214,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
@@ -256,15 +236,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
@@ -296,16 +272,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
@@ -338,13 +310,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)