fcoury-mongomapper 0.3.5 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.4.0

data/lib/mongomapper/associations.rb

@@ -2,33 +2,12 @@ module MongoMapper
   module Associations
     module ClassMethods
       def belongs_to(association_id, options = {})
-        association = create_association(:belongs_to, association_id, options)
-
-        ref_id = "#{association_id}_id"
-        key ref_id, String
-
-        define_method("#{ref_id}=") do |value|
-          write_attribute(ref_id, value)
-        end
-
-        if options[:polymorphic]
-          ref_type = "#{association_id}_type"
-          key ref_type, String
-
-          define_method("#{ref_type}=") do |value|
-            write_attribute(ref_type, value)
-          end
-        end
-
-        define_association_methods(association)
-
+        create_association(:belongs_to, association_id, options)        
         self
       end
 
       def many(association_id, options = {})
-        association = create_association(:many, association_id, options)
-        define_association_methods(association)
-
+        create_association(:many, association_id, options)        
         self
       end
 
@@ -37,31 +16,47 @@ module MongoMapper
       end
 
       private
-      def create_association(type, name, options)
-        association = Associations::Base.new(type, name, options)
-        associations[association.name] = association
-        association
-      end
-
-      def define_association_methods(association)
-        define_method(association.name) do
-          get_proxy(association)
+        def create_association(type, name, options)
+          association = Associations::Base.new(type, name, options)
+          associations[association.name] = association
+          define_association_methods(association)
+          define_association_keys(association)
+          association
         end
 
-        define_method("#{association.name}=") do |value|
-          get_proxy(association).replace(value)
-          value
+        def define_association_methods(association)
+          define_method(association.name) do
+            get_proxy(association)
+          end
+          
+          define_method("#{association.name}=") do |value|
+            get_proxy(association).replace(value)
+            value
+          end
+        end
+        
+        def define_association_keys(association)
+          if association.many?
+            if association.polymorphic?
+              association.klass.send :key, association.type_key_name, String
+            end
+          else
+            key "#{association.name}_id", String
+            
+            if association.polymorphic?
+              key association.type_key_name, String
+            end
+          end
         end
-      end
     end
 
     module InstanceMethods
       def get_proxy(association)
-        proxy = self.instance_variable_get(association.ivar)
-        if proxy.nil?
+        unless proxy = self.instance_variable_get(association.ivar)
           proxy = association.proxy_class.new(self, association)
           self.instance_variable_set(association.ivar, proxy)
         end
+        
         proxy
       end
     end

data/lib/mongomapper/associations/base.rb

@@ -10,45 +10,47 @@ module MongoMapper
       end
 
       def klass
-        class_name.constantize
+        @klass ||= class_name.constantize
       end
 
       def class_name
         @class_name ||= begin
           if cn = options[:class_name]
             cn
-          elsif @type == :many
+          elsif many?
             name.to_s.singularize.camelize
           else
             name.to_s.camelize
           end
         end
       end
-
+      
+      def many?
+        @many_type ||= @type == :many
+      end
+      
+      def polymorphic?
+        @options[:polymorphic]
+      end
+      
+      def type_key_name
+        @type_key_name ||= many? ? '_type' : "#{name}_type"
+      end
+      
       def ivar
         @ivar ||= "@_#{name}"
       end
 
       def proxy_class
-        case @type
-          when :belongs_to
-            if @options[:polymorphic]
-              PolymorphicBelongsToProxy
-            else
-              BelongsToProxy
-            end
-          when :many
-            if self.klass.embeddable?
-              if @options[:polymorphic]
-                PolymorphicHasManyEmbeddedProxy
-              else
-                HasManyEmbeddedProxy
-              end
-            else
-              HasManyProxy
-            end
-        end
-      end
+        @proxy_class ||= begin
+          if many?
+            return HasManyProxy unless self.klass.embeddable?            
+            polymorphic? ? PolymorphicHasManyEmbeddedProxy : HasManyEmbeddedProxy
+          else
+            polymorphic? ? PolymorphicBelongsToProxy : BelongsToProxy
+          end
+        end # end begin
+      end # end proxy_class
     end
   end
 end

data/lib/mongomapper/associations/has_many_embedded_proxy.rb

@@ -9,11 +9,11 @@ module MongoMapper
       end
 
       protected
-      def find_target
-        (@_values || []).map do |e|
-          @association.klass.new(e)
+        def find_target
+          (@_values || []).map do |e|
+            @association.klass.new(e)
+          end
         end
-      end
     end
   end
 end

data/lib/mongomapper/associations/has_many_proxy.rb

@@ -12,17 +12,18 @@ module MongoMapper
           o.save
           o
         end
+        
         reload_target
       end
 
       protected
-      def find_target
-        @association.klass.find(:all, {:conditions => {self.foreign_key => @owner.id}})
-      end
+        def find_target
+          @association.klass.find(:all, {:conditions => {self.foreign_key => @owner.id}})
+        end
 
-      def foreign_key
-        @association.options[:foreign_key] || @owner.class.name.underscore.gsub("/", "_") + "_id"
-      end
+        def foreign_key
+          @association.options[:foreign_key] || @owner.class.name.underscore.gsub("/", "_") + "_id"
+        end
     end
   end
 end

data/lib/mongomapper/associations/polymorphic_belongs_to_proxy.rb

@@ -19,13 +19,13 @@ module MongoMapper
       end
 
       protected
-      def find_target
-        ref_id = @owner.__send__(:read_attribute, "#{@association.name}_id")
-        ref_type = @owner.__send__(:read_attribute, "#{@association.name}_type")
-        if ref_id && ref_type
-          ref_type.constantize.find(ref_id)
+        def find_target
+          ref_id = @owner.__send__(:read_attribute, "#{@association.name}_id")
+          ref_type = @owner.__send__(:read_attribute, "#{@association.name}_type")
+          if ref_id && ref_type
+            ref_type.constantize.find(ref_id)
+          end
         end
-      end
     end
   end
 end

data/lib/mongomapper/associations/polymorphic_has_many_embedded_proxy.rb

@@ -1,40 +1,47 @@
 module MongoMapper
   module Associations
-    class PolymorphicHasManyEmbeddedProxy < Proxy
+    class PolymorphicHasManyEmbeddedProxy < ArrayProxy      
       def replace(v)
-        @_values = v.map do |e|
-          ref_type = "#{@association.name}_type"
-          if e.kind_of?(EmbeddedDocument)  
-            e.class.send(:key, ref_type, String)
-            {ref_type => e.class.name}.merge(e.attributes)
+        @_values = v.map do |doc_or_hash|
+          if doc_or_hash.kind_of?(EmbeddedDocument)
+            doc = doc_or_hash
+            {@association.type_key_name => doc.class.name}.merge(doc.attributes)
           else
-            e
+            doc_or_hash
           end
         end
         
         @target = nil
-
         reload_target
       end
+      
+      def <<(*docs)
+        load_target if @owner.new?
+        
+        flatten_deeper(docs).each do |doc|
+          doc.send("#{@association.type_key_name}=", doc.class)
+          @target << doc
+        end
+        
+        self
+      end
+      alias_method :push, :<<
+      alias_method :concat, :<<
 
       protected
-      def find_target
-        (@_values || []).map do |e|
-          ref_type = "#{@association.name}_type"
-          class_name = e[ref_type]
-          if class_name
-            current = Kernel
-            parts = class_name.split("::")
-            parts.each do |p|
-              current = current.const_get(p)
-            end
-            klass = current
+        def find_target
+          (@_values || []).map do |hash|
+            polymorphic_class(hash).new(hash)
+          end
+        end
+        
+        def polymorphic_class(doc)
+          if class_name = doc[@association.type_key_name]
+            class_name.constantize
           else
             @association.klass
           end
-          klass.new(e)
         end
-      end
     end
   end
 end

data/lib/mongomapper/associations/proxy.rb

@@ -10,7 +10,6 @@ module MongoMapper
       def initialize(owner, association)
         @owner= owner
         @association = association
-
         reset
       end
 
@@ -38,23 +37,31 @@ module MongoMapper
       end
 
       protected
-      def method_missing(method, *args)
-        if load_target
-          if block_given?
-            @target.send(method, *args)  { |*block_args| yield(*block_args) }
-          else
-            @target.send(method, *args)
+        def method_missing(method, *args)
+          if load_target
+            if block_given?
+              @target.send(method, *args)  { |*block_args| yield(*block_args) }
+            else
+              @target.send(method, *args)
+            end
           end
         end
-      end
 
-      def load_target
-        @target ||= find_target
-      end
+        def load_target
+          @target ||= find_target
+        end
 
-      def find_target
-        raise NotImplementedError
-      end
+        def find_target
+          raise NotImplementedError
+        end
+        
+        # Array#flatten has problems with recursive arrays. Going one level
+        # deeper solves the majority of the problems.
+        def flatten_deeper(array)
+          array.collect do |element|
+            (element.respond_to?(:flatten) && !element.is_a?(Hash)) ? element.flatten : element
+          end.flatten
+        end
     end
   end
 end

data/lib/mongomapper/document.rb

@@ -11,19 +11,19 @@ module MongoMapper
         include SaveWithValidation
         include DocumentRailsCompatibility
         extend ClassMethods
-
+        
         key :_id, String
         key :created_at, Time
         key :updated_at, Time
       end
-
+      
       descendants << model
     end
 
     def self.descendants
       @descendants ||= Set.new
     end
-
+    
     module ClassMethods
       def find(*args)
         options = args.extract_options!

data/lib/mongomapper/embedded_document.rb

@@ -19,6 +19,14 @@ module MongoMapper
     end
 
     module ClassMethods
+      def inherited(subclass)
+        (@subclasses ||= []) << subclass
+      end
+
+      def subclasses
+        @subclasses || []
+      end
+
       def keys
         @keys ||= if parent = parent_model
           parent.keys.dup
@@ -27,13 +35,24 @@ module MongoMapper
         end
       end
 
-      def key(name, type, options={})
+      def key(name, type, options={})        
         key = Key.new(name, type, options)
         keys[key.name] = key
+        
+        add_to_subclasses(name, type, options)
         apply_validations_for(key)
         create_indexes_for(key)
+        
         key
       end
+      
+      def add_to_subclasses(name, type, options)
+        return if subclasses.blank?
+        
+        subclasses.each do |subclass|
+          subclass.key name, type, options
+        end
+      end
 
       def ensure_index(name_or_array, options={})
         keys_to_index = if name_or_array.is_a?(Array)
@@ -148,7 +167,7 @@ module MongoMapper
 
       def method_missing(method, *args, &block)
         attribute = method.to_s
-
+        
         if reader?(attribute)
           read_attribute(attribute)
         elsif writer?(attribute)
@@ -239,7 +258,7 @@ module MongoMapper
       def initialize_associations(attrs={})
         self.class.associations.each_pair do |name, association|
           if collection = attrs.delete(name)
-            __send__("#{association.name}=", collection)
+            send("#{association.name}=", collection)
           end
         end
       end

data/mongomapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.3.5"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-07-21}
+  s.date = %q{2009-07-27}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]

data/test/test_associations.rb

@@ -1,8 +1,7 @@
 require 'test_helper'
-require 'ruby-debug'
+
 class Address
   include MongoMapper::EmbeddedDocument
-
   key :address, String
   key :city,    String
   key :state,   String
@@ -11,19 +10,21 @@ end
 
 class Project
   include MongoMapper::Document
-
   key :name, String
-
   many :statuses
   many :addresses
 end
 
 class Status
   include MongoMapper::Document
-
   belongs_to :project
   belongs_to :target, :polymorphic => true
+  key :name, String
+end
 
+class RealPerson
+  include MongoMapper::Document
+  many :pets  
   key :name, String
 end
 
@@ -31,13 +32,11 @@ class Person
   include MongoMapper::EmbeddedDocument
   key :name, String
   key :child, Person
-  
   many :pets
 end
 
 class Pet
   include MongoMapper::EmbeddedDocument
-  
   key :name, String
   key :species, String
 end
@@ -62,7 +61,6 @@ end
 
 class Catalog
   include MongoMapper::Document
-  
   many :medias, :polymorphic => true
 end
 
@@ -91,7 +89,7 @@ module TrModels
   class Fleet
     include MongoMapper::Document
     many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
-    key :name, String
+    key :name, String    
   end
 end
 
@@ -99,31 +97,70 @@ class AssociationsTest < Test::Unit::TestCase
   def setup
     Project.collection.clear
     Status.collection.clear
+    Catalog.collection.clear
+    TrModels::Fleet.collection.clear
   end
   
-  context "Nested Polymorphic Many" do
+  context "Modularized Polymorphic Many Embedded" do
+    should "set associations correctly" do
+      fleet_attributes = { 
+        "name" => "My Fleet", 
+        "transports" => [
+          {"_type" => "TrModels::Ambulance", "license_plate" => "GGG123", "icu" => true},
+          {"_type" => "TrModels::Car", "license_plate" => "ABC123", "model" => "VW Golf", "year" => 2001}, 
+          {"_type" => "TrModels::Car", "license_plate" => "DEF123", "model" => "Honda Accord", "year" => 2008},
+        ] 
+      }
+      
+      fleet = TrModels::Fleet.new(fleet_attributes)
+      fleet.transports.size.should == 3
+      fleet.transports[0].class.should == TrModels::Ambulance
+      fleet.transports[0].license_plate.should == "GGG123"
+      fleet.transports[0].icu.should be_true
+      fleet.transports[1].class.should == TrModels::Car
+      fleet.transports[1].license_plate.should == "ABC123"
+      fleet.transports[1].model.should == "VW Golf"
+      fleet.transports[1].year.should == 2001
+      fleet.transports[2].class.should == TrModels::Car
+      fleet.transports[2].license_plate.should == "DEF123"
+      fleet.transports[2].model.should == "Honda Accord"
+      fleet.transports[2].year.should == 2008      
+      fleet.save.should be_true
+      
+      from_db = TrModels::Fleet.find(fleet.id)
+      from_db.transports.size.should == 3
+      from_db.transports[0].license_plate.should == "GGG123"
+      from_db.transports[0].icu.should be_true
+      from_db.transports[1].license_plate.should == "ABC123"
+      from_db.transports[1].model.should == "VW Golf"
+      from_db.transports[1].year.should == 2001
+      from_db.transports[2].license_plate.should == "DEF123"
+      from_db.transports[2].model.should == "Honda Accord"
+      from_db.transports[2].year.should == 2008      
+    end
+    
     should "default reader to empty array" do
       fleet = TrModels::Fleet.new
       fleet.transports.should == []
     end
-
+    
     should "allow adding to association like it was an array" do
       fleet = TrModels::Fleet.new
       fleet.transports << TrModels::Car.new
       fleet.transports.push TrModels::Bus.new
       fleet.transports.size.should == 2
     end
-
+    
     should "store the association" do
       fleet = TrModels::Fleet.new
       fleet.transports = [TrModels::Car.new("license_plate" => "DCU2013", "model" => "Honda Civic")]
       fleet.save.should be_true
-
+    
       from_db = TrModels::Fleet.find(fleet.id)
       from_db.transports.size.should == 1
       from_db.transports[0].license_plate.should == "DCU2013"
     end
-
+    
     should "store different associations" do
       fleet = TrModels::Fleet.new
       fleet.transports = [
@@ -132,7 +169,7 @@ class AssociationsTest < Test::Unit::TestCase
         TrModels::Ambulance.new("license_plate" => "HDD3030", "icu" => true)
       ]
       fleet.save.should be_true
-
+    
       from_db = TrModels::Fleet.find(fleet.id)
       from_db.transports.size.should == 3
       from_db.transports[0].license_plate.should == "ABC1223"
@@ -145,30 +182,30 @@ class AssociationsTest < Test::Unit::TestCase
     end
   end
 
-  context "Polymorphic Many" do
+  context "Polymorphic Many Embedded" do
     should "default reader to empty array" do
       catalog = Catalog.new
       catalog.medias.should == []
     end
-
+  
     should "allow adding to association like it was an array" do
       catalog = Catalog.new
       catalog.medias << Video.new
       catalog.medias.push Video.new
       catalog.medias.size.should == 2
     end
-
+  
     should "store the association" do
       catalog = Catalog.new
       catalog.medias = [Video.new("file" => "video.mpg", "length" => 3600)]
       catalog.save.should be_true
-
+  
       from_db = Catalog.find(catalog.id)
       from_db.medias.size.should == 1
       from_db.medias[0].file.should == "video.mpg"
     end
-
-    should "store different associations" do
+  
+    should "store different associations" do      
       catalog = Catalog.new
       catalog.medias = [
         Video.new("file" => "video.mpg", "length" => 3600),
@@ -176,7 +213,7 @@ class AssociationsTest < Test::Unit::TestCase
         Image.new("file" => "image.png", "width" => 800, "height" => 600)
       ]
       catalog.save.should be_true
-
+      
       from_db = Catalog.find(catalog.id)
       from_db.medias.size.should == 3
       from_db.medias[0].file.should == "video.mpg"
@@ -188,32 +225,32 @@ class AssociationsTest < Test::Unit::TestCase
       from_db.medias[2].height.should == 600
     end
   end
-
+  
   context "Polymorphic Belongs To" do
     should "default to nil" do
       status = Status.new
       status.target.should be_nil
     end
-
+  
     should "store the association" do
       status = Status.new
       project = Project.new(:name => "mongomapper")
       status.target = project
       status.save.should be_true
-
+  
       from_db = Status.find(status.id)
       from_db.target.should_not be_nil
       from_db.target_id.should == project.id
       from_db.target_type.should == "Project"
       from_db.target.name.should == "mongomapper"
     end
-
+  
     should "unset the association" do
       status = Status.new
       project = Project.new(:name => "mongomapper")
       status.target = project
       status.save.should be_true
-
+  
       from_db = Status.find(status.id)
       from_db.target = nil
       from_db.target_type.should be_nil
@@ -221,73 +258,68 @@ class AssociationsTest < Test::Unit::TestCase
       from_db.target.should be_nil
     end
   end
-
+  
   context "Belongs To" do
     should "default to nil" do
       status = Status.new
       status.project.should be_nil
     end
-
+  
     should "store the association" do
       status = Status.new
       project = Project.new(:name => "mongomapper")
       status.project = project
       status.save.should be_true
-
+  
       from_db = Status.find(status.id)
       from_db.project.should_not be_nil
       from_db.project.name.should == "mongomapper"
     end
-
+  
     should "unset the association" do
       status = Status.new
       project = Project.new(:name => "mongomapper")
       status.project = project
       status.save.should be_true
-
+  
       from_db = Status.find(status.id)
       from_db.project = nil
       from_db.project.should be_nil
     end
   end
-
-  context "Many documents" do
+  
+  context "Many documents" do    
     should "default reader to empty array" do
       project = Project.new
       project.statuses.should == []
     end
-
+  
     should "allow adding to association like it was an array" do
       project = Project.new
       project.statuses << Status.new
       project.statuses.push Status.new
       project.statuses.size.should == 2
     end
-
+  
     should "store the association" do
       project = Project.new
       project.statuses = [Status.new("name" => "ready")]
       project.save.should be_true
-
+  
       from_db = Project.find(project.id)
       from_db.statuses.size.should == 1
       from_db.statuses[0].name.should == "ready"
     end
   end
-
+  
   context "Many embedded documents" do
-    should "default reader to empty array" do
-      project = Project.new
-      project.addresses.should == []
-    end
-
     should "allow adding to association like it was an array" do
       project = Project.new
       project.addresses << Address.new
       project.addresses.push Address.new
       project.addresses.size.should == 2
     end
-
+  
     should "be embedded in document on save" do
       sb = Address.new(:city => 'South Bend', :state => 'IN')
       chi = Address.new(:city => 'Chicago', :state => 'IL')
@@ -295,7 +327,7 @@ class AssociationsTest < Test::Unit::TestCase
       project.addresses << sb
       project.addresses << chi
       project.save
-
+  
       from_db = Project.find(project.id)
       from_db.addresses.size.should == 2
       from_db.addresses[0].should == sb
@@ -321,10 +353,34 @@ class AssociationsTest < Test::Unit::TestCase
       from_db.person.child.child.name.should == 'Linda'
     end
     
+    should "allow assignment of 'many' embedded documents using a hash" do
+      person_attributes = { 
+        "name" => "Mr. Pet Lover", 
+        "pets" => [
+          {"name" => "Jimmy", "species" => "Cocker Spainel"},
+          {"name" => "Sasha", "species" => "Siberian Husky"}, 
+        ] 
+      }
+      
+      pet_lover = RealPerson.new(person_attributes)
+      pet_lover.name.should == "Mr. Pet Lover"
+      pet_lover.pets[0].name.should == "Jimmy"
+      pet_lover.pets[0].species.should == "Cocker Spainel"
+      pet_lover.pets[1].name.should == "Sasha"
+      pet_lover.pets[1].species.should == "Siberian Husky"
+      pet_lover.save.should be_true
+      
+      from_db = RealPerson.find(pet_lover.id)
+      from_db.name.should == "Mr. Pet Lover"
+      from_db.pets[0].name.should == "Jimmy"
+      from_db.pets[0].species.should == "Cocker Spainel"
+      from_db.pets[1].name.should == "Sasha"
+      from_db.pets[1].species.should == "Siberian Husky"
+    end
+    
     should "allow saving embedded documents in 'many' embedded documents" do
       @document = Class.new do
         include MongoMapper::Document
-        
         many :people
       end
       

data/test/test_document.rb

@@ -18,23 +18,6 @@ class DocumentTest < Test::Unit::TestCase
       MongoMapper::Document.descendants.should include(@document)
     end
 
-    should "find its parent model" do
-      class A < Address
-        key :new_key, String
-      end
-
-      A.parent_model.should == Address
-    end
-
-    should "inherit keys" do
-      class A < Address
-        key :new_key, String
-      end
-
-      A.keys.should include("new_key")
-      Address.keys.should_not include("new_key")
-    end
-
     should "be able to define a key" do
       key = @document.key(:name, String)
       key.name.should == 'name'
@@ -55,6 +38,13 @@ class DocumentTest < Test::Unit::TestCase
       @document.keys['age'].name.should == 'age'
       @document.keys['age'].type.should == Integer
     end
+    
+    should "allow redefining a key" do
+      @document.key(:foo, String)
+      @document.keys['foo'].type.should == String
+      @document.key(:foo, Integer)
+      @document.keys['foo'].type.should == Integer
+    end
 
     should "use default database by default" do
       @document.database.should == MongoMapper.database

data/test/test_embedded_document.rb

@@ -1,5 +1,20 @@
 require 'test_helper'
 
+class Grandparent
+  include MongoMapper::EmbeddedDocument
+  key :grandparent, String
+end
+
+class Parent < Grandparent
+  include MongoMapper::EmbeddedDocument
+  key :parent, String
+end
+
+class Child < Parent
+  include MongoMapper::EmbeddedDocument
+  key :child, String
+end
+
 class EmbeddedDocumentTest < Test::Unit::TestCase
   context "Including MongoMapper::EmbeddedDocument" do
     setup do
@@ -12,6 +27,48 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
       @klass.keys.size.should == 0
     end
   end
+  
+  context "parent_model" do
+    should "be nil if none of parents ancestors include EmbeddedDocument" do
+      parent = Class.new
+      document = Class.new(parent) do
+        include MongoMapper::EmbeddedDocument
+      end
+      document.parent_model.should be_nil
+    end
+    
+    should "find parent" do
+      document = Class.new(Address)
+      document.parent_model.should == Address
+    end
+  end
+  
+  context "keys" do    
+    should "be inherited" do
+      Grandparent.keys.keys.should == ['grandparent']
+      Parent.keys.keys.sort.should == ['grandparent', 'parent']
+      Child.keys.keys.sort.should  == ['child', 'grandparent', 'parent']
+    end
+    
+    should "propogate to subclasses if key added after class definition" do
+      Grandparent.key :_type, String
+      
+      Grandparent.keys.keys.sort.should == ['_type', 'grandparent']
+      Parent.keys.keys.sort.should      == ['_type', 'grandparent', 'parent']
+      Child.keys.keys.sort.should       == ['_type', 'child', 'grandparent', 'parent']
+    end
+  end
+  
+  context "subclasses" do
+    should "default to array" do
+      Child.subclasses.sort.should == []
+    end
+
+    should "be recorded" do
+      Grandparent.subclasses.sort.should == [Parent]
+      Parent.subclasses.sort.should      == [Child]
+    end    
+  end
 
   context "An instance of an embedded document" do
     setup do

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'pp'
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'

data/test/test_rails_compatibility.rb

@@ -44,8 +44,9 @@ class TestRailsCompatibility < Test::Unit::TestCase
 
     should "have column names" do
       Order.column_names.sort.should == ['_id', 'created_at', 'order_only', 'updated_at']
-      FirstItem.column_names.sort.should == ['first_only', 'for_all']
-      SecondItem.column_names.sort.should == ['for_all', 'second_only']
+      Item.column_names.sort.should == ['_type', 'for_all']
+      FirstItem.column_names.sort.should == ['_type', 'first_only', 'for_all']
+      SecondItem.column_names.sort.should == ['_type', 'for_all', 'second_only']
     end
   end
 

data/test/test_validations.rb

@@ -169,6 +169,12 @@ class ValidationsTest < Test::Unit::TestCase
       should "allow to update an object" do
         doc = @document.new("name" => "joe")
         doc.save
+
+        @document \
+          .stubs(:find) \
+          .with(:first, :conditions => {:name => 'joe'}, :limit => 1) \
+          .returns(doc)
+
         doc.name = "joe"
         doc.valid?.should be_true
         doc.should_not have_error_on(:name)
@@ -177,7 +183,12 @@ class ValidationsTest < Test::Unit::TestCase
       should "fail if object name is not unique" do
         doc = @document.new("name" => "joe")
         doc.save.should be_true
-        sleep 0.2 # hack to avoid race condition
+
+        @document \
+          .stubs(:find) \
+          .with(:first, :conditions => {:name => 'joe'}, :limit => 1) \
+          .returns(doc)
+
         doc2 = @document.new("name" => "joe")
         doc2.should have_error_on(:name)
       end
@@ -189,7 +200,12 @@ class ValidationsTest < Test::Unit::TestCase
         
         doc = @document.create(:name => 'John')
         doc.should_not have_error_on(:name)
-        sleep 0.2 # hack to avoid race condition
+        
+        @document \
+          .stubs(:find) \
+          .with(:first, :conditions => {:name => 'John'}, :limit => 1) \
+          .returns(doc)
+        
         second_john = @document.create(:name => 'John')
         second_john.should have_error_on(:name, 'has already been taken')
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fcoury-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -07:00
+date: 2009-07-27 00:00:00 -07:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,6 +119,7 @@ files:
 - test/test_validations.rb
 has_rdoc: false
 homepage: http://github.com/jnunemaker/mongomapper
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongomapper
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Awesome gem for modeling your domain and storing it in mongo