djsun-mongo_mapper 0.5.5.3 → 0.5.6.1

data/lib/mongo_mapper/embedded_document.rb

@@ -220,7 +220,6 @@ module MongoMapper
         attrs = HashWithIndifferentAccess.new
         
         embedded_keys.each do |key|
-          puts key.inspect
           attrs[key.name] = read_attribute(key.name).try(:attributes)
         end
         

data/lib/mongo_mapper/finder_options.rb

@@ -1,54 +1,14 @@
 module MongoMapper
   class FinderOptions
-    attr_reader :options
-    
-    def self.to_mongo_criteria(conditions, parent_key=nil)
-      criteria = {}
-      conditions.each_pair do |field, value|
-        field = field_normalized(field)
-        case value
-          when Array
-            operator_present = field.to_s =~ /^\$/            
-            criteria[field] = if operator_present
-                                value
-                              else
-                                {'$in' => value}
-                              end
-          when Hash
-            criteria[field] = to_mongo_criteria(value, field)
-          else            
-            criteria[field] = value
-        end
-      end
-      
-      criteria
-    end
-        
-    def self.to_mongo_options(options)
-      options = options.dup
-      {
-        :fields => to_mongo_fields(options.delete(:fields) || options.delete(:select)),
-        :skip   => (options.delete(:skip) || options.delete(:offset) || 0).to_i,
-        :limit  => (options.delete(:limit) || 0).to_i,
-        :sort   => options.delete(:sort) || to_mongo_sort(options.delete(:order))
-      }
-    end
-    
-    def self.field_normalized(field)
-      if field.to_s == 'id'
-        :_id
-      else
-        field
-      end
-    end
-    
     OptionKeys = [:fields, :select, :skip, :offset, :limit, :sort, :order]
     
-    def initialize(options)
+    attr_reader :model, :options
+    
+    def initialize(model, options)
       raise ArgumentError, "FinderOptions must be a hash" unless options.is_a?(Hash)
+      options.symbolize_keys!
       
-      options = options.symbolize_keys
-      @options, @conditions = {}, options.delete(:conditions) || {}
+      @model, @options, @conditions = model, {}, options.delete(:conditions) || {}
       
       options.each_pair do |key, value|
         if OptionKeys.include?(key)
@@ -60,11 +20,11 @@ module MongoMapper
     end
     
     def criteria
-      self.class.to_mongo_criteria(@conditions)
+      to_mongo_criteria(model, @conditions)
     end
     
     def options
-      self.class.to_mongo_options(@options)
+      to_mongo_options(model, @options)
     end
     
     def to_a
@@ -72,7 +32,56 @@ module MongoMapper
     end
     
     private
-      def self.to_mongo_fields(fields)
+      def to_mongo_criteria(model, conditions, parent_key=nil)
+        criteria = {}
+        add_sci_scope(model, criteria)
+
+        conditions.each_pair do |field, value|
+          field = field_normalized(field)
+          case value
+            when Array
+              operator_present = field.to_s =~ /^\$/            
+              criteria[field] = if operator_present
+                                  value
+                                else
+                                  {'$in' => value}
+                                end
+            when Hash
+              criteria[field] = to_mongo_criteria(model, value, field)
+            else            
+              criteria[field] = value
+          end
+        end
+
+        criteria
+      end
+      
+      def field_normalized(field)
+        if field.to_s == 'id'
+          :_id
+        else
+          field
+        end
+      end
+
+      # adds _type single collection inheritance scope for models that need it
+      def add_sci_scope(model, criteria)
+        if model.single_collection_inherited?
+          criteria[:_type] = model.to_s
+        end
+      end
+
+      def to_mongo_options(model, options)
+        options = options.dup
+        {
+          :fields => to_mongo_fields(options.delete(:fields) || options.delete(:select)),
+          :skip   => (options.delete(:skip) || options.delete(:offset) || 0).to_i,
+          :limit  => (options.delete(:limit) || 0).to_i,
+          :sort   => options.delete(:sort) || to_mongo_sort(options.delete(:order))
+        }
+      end
+      
+      def to_mongo_fields(fields)
         return if fields.blank?
       
         if fields.is_a?(String)
@@ -82,13 +91,13 @@ module MongoMapper
         end
       end
     
-      def self.to_mongo_sort(sort)
+      def to_mongo_sort(sort)
         return if sort.blank?
         pieces = sort.split(',')
         pieces.map { |s| to_mongo_sort_piece(s) }
       end
     
-      def self.to_mongo_sort_piece(str)
+      def to_mongo_sort_piece(str)
         field, direction = str.strip.split(' ')
         direction ||= 'ASC'
         direction = direction.upcase == 'ASC' ? 1 : -1

data/lib/mongo_mapper/serialization.rb

@@ -51,5 +51,4 @@ module MongoMapper #:nodoc:
   end
 end
 
-dir = Pathname(__FILE__).dirname.expand_path + 'serializers'
-require dir + 'json_serializer'
+require 'mongo_mapper/serializers/json_serializer'

data/lib/mongo_mapper/validations.rb

@@ -18,7 +18,9 @@ module MongoMapper
       option :scope
       
       def valid?(instance)
-        doc = instance.class.find(:first, :conditions => {self.attribute => instance[attribute]}.merge(scope_conditions(instance)), :limit => 1)
+        value = instance[attribute]
+        return true if allow_blank && value.blank?
+        doc = instance.class.first({self.attribute => value}.merge(scope_conditions(instance)))
         doc.nil? || instance.id == doc.id
       end
 

data/mongo_mapper.gemspec

@@ -1,16 +1,17 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_mapper}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2009-10-22}
   s.default_executable = %q{mmconsole}
+  s.description = %q{Awesome gem for modeling your domain and storing it in mongo}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
   s.extra_rdoc_files = [
@@ -94,7 +95,6 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jnunemaker/mongomapper}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{mongomapper}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
   s.test_files = [
@@ -143,7 +143,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
       s.add_runtime_dependency(%q<mongo>, ["= 0.15.1"])
-      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
+      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
       s.add_development_dependency(%q<timecop>, ["= 0.3.1"])
@@ -151,7 +151,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activesupport>, [">= 2.3"])
       s.add_dependency(%q<mongo>, ["= 0.15.1"])
-      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
+      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.2"])
       s.add_dependency(%q<timecop>, ["= 0.3.1"])
@@ -160,10 +160,11 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>, [">= 2.3"])
     s.add_dependency(%q<mongo>, ["= 0.15.1"])
-    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.4"])
+    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.8.0"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.2"])
     s.add_dependency(%q<timecop>, ["= 0.3.1"])
     s.add_dependency(%q<mocha>, ["= 0.9.4"])
   end
 end
+

data/specs.watchr

@@ -4,7 +4,7 @@ def run(cmd)
 end
 
 def run_test_file(file)
-  run "ruby -Itest #{file}"
+  run %Q(ruby -I"lib:test" -rubygems #{file})
 end
 
 def run_all_tests
@@ -12,7 +12,7 @@ def run_all_tests
 end
 
 def related_test_files(path)
-  Dir['test/**/*.rb'].select { |file| file =~ /#{File.basename(path)}/ }
+  Dir['test/**/*.rb'].select { |file| file =~ /test_#{File.basename(path)}/ }
 end
 
 watch('test/test_helper\.rb') { run_all_tests }

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -137,7 +137,7 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
       end
 
       should "work with conditions" do
-        comments = @post.comments.find(:all, :conditions => {:body => 'comment1'})
+        comments = @post.comments.find(:all, :body => 'comment1')
         comments.should == [@comment1]
       end
 
@@ -154,7 +154,7 @@ class ManyDocumentsAsProxyTest < Test::Unit::TestCase
       end
 
       should "work with conditions" do
-        comments = @post.comments.all(:conditions => {:body => 'comment1'})
+        comments = @post.comments.all(:body => 'comment1')
         comments.should == [@comment1]
       end
 

data/test/functional/associations/test_many_polymorphic_proxy.rb

@@ -181,7 +181,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        messages = @lounge.messages.find(:all, :conditions => {:body => 'Loungin!'}, :order => "position")
+        messages = @lounge.messages.find(:all, :body => 'Loungin!', :order => "position")
         messages.should == [@lm1]
       end
       
@@ -197,7 +197,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        messages = @lounge.messages.all(:conditions => {:body => 'Loungin!'}, :order => "position")
+        messages = @lounge.messages.all(:body => 'Loungin!', :order => "position")
         messages.should == [@lm1]
       end
       
@@ -213,7 +213,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        message = @lounge.messages.find(:first, :conditions => {:body => 'I love loungin!'}, :order => "position asc")
+        message = @lounge.messages.find(:first, :body => 'I love loungin!', :order => "position asc")
         message.should == @lm2
       end
     end
@@ -224,7 +224,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        message = @lounge.messages.first(:conditions => {:body => 'I love loungin!'}, :order => "position asc")
+        message = @lounge.messages.first(:body => 'I love loungin!', :order => "position asc")
         message.should == @lm2
       end
     end
@@ -235,7 +235,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        message = @lounge.messages.find(:last, :conditions => {:body => 'Loungin!'}, :order => "position asc")
+        message = @lounge.messages.find(:last, :body => 'Loungin!', :order => "position asc")
         message.should == @lm1
       end
     end
@@ -246,7 +246,7 @@ class ManyPolymorphicProxyTest < Test::Unit::TestCase
       end
       
       should "work with conditions" do
-        message = @lounge.messages.last(:conditions => {:body => 'Loungin!'}, :order => "position asc")
+        message = @lounge.messages.last(:body => 'Loungin!', :order => "position asc")
         message.should == @lm1
       end
     end

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

data/test/functional/test_document.rb

@@ -24,7 +24,7 @@ class DocumentTest < Test::Unit::TestCase
       doc.using_custom_id?.should be_false
     end
   end
-  
+
   context "Saving a document with a blank binary value" do
     setup do
       @document.key :file, Binary
@@ -41,9 +41,9 @@ class DocumentTest < Test::Unit::TestCase
       @id = Mongo::ObjectID.new.to_s
       @document.collection.insert({
         :_id            => @id,
-        :first_name     => 'John', 
-        :last_name      => 'Nunemaker', 
-        :age            => 27, 
+        :first_name     => 'John',
+        :last_name      => 'Nunemaker',
+        :age            => 27,
         :favorite_color => 'red',
         :skills         => ['ruby', 'rails', 'javascript', 'xhtml', 'css']
       })
@@ -58,7 +58,7 @@ class DocumentTest < Test::Unit::TestCase
       doc.skills.should == ['ruby', 'rails', 'javascript', 'xhtml', 'css']
     end
   end
-  
+
   context "Document Class Methods" do
     context "Using key with type Array" do
       setup do
@@ -141,7 +141,7 @@ class DocumentTest < Test::Unit::TestCase
         doc.foo['baz'].should == 'bar'
       end
     end
-    
+
     context "Using key with custom type with default" do
       setup do
         @document.key :window, WindowSize, :default => WindowSize.new(600, 480)
@@ -150,19 +150,19 @@ class DocumentTest < Test::Unit::TestCase
       should "default to default" do
         doc = @document.new
         doc.window.should == WindowSize.new(600, 480)
-        
+
       end
-      
+
       should "save and load from mongo" do
         doc = @document.new
         doc.save
-        
+
         from_db = @document.find(doc.id)
         from_db.window.should == WindowSize.new(600, 480)
       end
     end
-    
-    
+
+
     context "Creating a single document" do
       setup do
         @doc_instance = @document.create({:first_name => 'John', :last_name => 'Nunemaker', :age => '27'})
@@ -299,7 +299,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
 
@@ -311,31 +313,31 @@ class DocumentTest < Test::Unit::TestCase
         should "work as array" do
           @document.find([@doc1.id, @doc2.id]).should == [@doc1, @doc2]
         end
-        
+
         should "return array if array only has one element" do
           @document.find([@doc1.id]).should == [@doc1]
         end
       end
-      
+
       should "be able to find using condition auto-detection" do
         @document.first(:first_name => 'John').should == @doc1
         @document.all(:last_name => 'Nunemaker', :order => 'age desc').should == [@doc1, @doc3]
       end
-      
+
       context "with :all" do
         should "find all documents" do
           @document.find(:all, :order => 'first_name').should == [@doc1, @doc3, @doc2]
         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
 
@@ -348,7 +350,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
 
@@ -361,13 +363,13 @@ 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
           lambda { @document.last() }.should raise_error
         end
-      end      
+      end
 
       context "with :find_by" do
         should "find document based on argument" do
@@ -669,11 +671,11 @@ class DocumentTest < Test::Unit::TestCase
             @thing.properties << @property3
           end
 
-          should_eventually "destroy the thing" do
+          should "not execute on a belongs_to association" do
             Thing.count.should == 1
             @property1.destroy
-            Thing.count.should == 0
-            @property1.thing.should be_frozen
+            Thing.count.should == 1
+            @property1.should be_frozen
           end
         end
       end
@@ -722,14 +724,14 @@ class DocumentTest < Test::Unit::TestCase
       should "allow creating index for a key" do
         @document.ensure_index :first_name
         MongoMapper.ensure_indexes!
-        
-        @document.should have_index('first_name_1')        
+
+        @document.should have_index('first_name_1')
       end
 
       should "allow creating unique index for a key" do
         @document.ensure_index :first_name, :unique => true
         MongoMapper.ensure_indexes!
-        
+
         @document.should have_index('first_name_1')
       end
 
@@ -737,13 +739,19 @@ class DocumentTest < Test::Unit::TestCase
         @document.ensure_index [[:first_name, 1], [:last_name, -1]]
         MongoMapper.ensure_indexes!
         
-        @document.should have_index('last_name_-1_first_name_1')        
+        # 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|
+          keys = index[1]
+          keys.include?(['first_name', 1]) && keys.include?(['last_name', -1])
+        end.should_not be_nil
       end
 
       should "work with :index shortcut when defining key" do
         @document.key :father, String, :index => true
         MongoMapper.ensure_indexes!
-        
+
         @document.should have_index('father_1')
       end
     end
@@ -794,7 +802,7 @@ class DocumentTest < Test::Unit::TestCase
       from_db = RealPerson.find(person.id)
       from_db.name.should == "David"
     end
-    
+
     context "with key of type date" do
       should "save the date value as a Time object" do
         doc = @document.new(:first_name => 'John', :age => '27', :date => "12/01/2009")
@@ -891,16 +899,16 @@ class DocumentTest < Test::Unit::TestCase
       from_db.age.should == 30
     end
   end
-  
+
   context "update_attributes" do
     setup do
       @document.key :foo, String, :required => true
     end
-    
+
     should "return true if document valid" do
       @document.new.update_attributes(:foo => 'bar').should be_true
     end
-    
+
     should "return false if document not valid" do
       @document.new.update_attributes({}).should be_false
     end
@@ -941,63 +949,158 @@ class DocumentTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "Single collection inheritance" do
     setup do
       class ::DocParent
         include MongoMapper::Document
         key :_type, String
+        key :name, String
       end
-      
-      class ::DocChild < ::DocParent; end
       DocParent.collection.clear
       
+      class ::DocDaughter < ::DocParent; end
+      class ::DocSon < ::DocParent; end
+      class ::DocGrandSon < ::DocSon; end
+      
       @parent = DocParent.new({:name => "Daddy Warbucks"})
-      @child = DocChild.new({:name => "Little Orphan Annie"})
+      @daughter = DocDaughter.new({:name => "Little Orphan Annie"})
     end
 
     teardown do
-      Object.send :remove_const, 'DocParent' if defined?(::DocParent)
-      Object.send :remove_const, 'DocChild' if defined?(::DocChild)
+      Object.send :remove_const, 'DocParent'   if defined?(::DocParent)
+      Object.send :remove_const, 'DocDaughter' if defined?(::DocDaughter)
+      Object.send :remove_const, 'DocSon'      if defined?(::DocSon)
+      Object.send :remove_const, 'DocGrandSon' if defined?(::DocGrandSon)
     end
 
     should "use the same collection in the subclass" do
-      DocChild.collection.name.should == DocParent.collection.name
+      DocDaughter.collection.name.should == DocParent.collection.name
     end
 
     should "assign the class name into the _type property" do
       @parent._type.should == 'DocParent'
-      @child._type.should == 'DocChild'
+      @daughter._type.should == 'DocDaughter'
     end
 
     should "load the document with the assigned type" do
       @parent.save
-      @child.save
-
+      @daughter.save
+            
       collection = DocParent.find(:all)
       collection.size.should == 2
       collection.first.should be_kind_of(DocParent)
       collection.first.name.should == "Daddy Warbucks"
-      collection.last.should be_kind_of(DocChild)
+      collection.last.should be_kind_of(DocDaughter)
       collection.last.name.should == "Little Orphan Annie"
     end
-    
+
     should "gracefully handle when the type can't be constantized" do
       doc = DocParent.new(:name => 'Nunes')
       doc._type = 'FoobarBaz'
       doc.save
-      
+
       collection = DocParent.all
       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 "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)
+    end
   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)
@@ -1012,11 +1115,11 @@ class DocumentTest < Test::Unit::TestCase
       old_created_at = doc.created_at
       old_updated_at = doc.updated_at
       doc.first_name = 'Johnny'
-      
+
       Timecop.freeze(Time.now + 5.seconds) do
         doc.save
       end
-      
+
       doc.created_at.should == old_created_at
       doc.updated_at.should_not == old_updated_at
     end
@@ -1025,7 +1128,7 @@ class DocumentTest < Test::Unit::TestCase
       doc = @document.create(:first_name => 'John', :age => 27)
       old_created_at = doc.created_at
       old_updated_at = doc.updated_at
-      
+
       Timecop.freeze(Time.now + 5.seconds) do
         @document.update(doc._id, { :first_name => 'Johnny' })
       end