djsun-mongomapper 0.3.3 → 0.3.5

data/History

@@ -1,6 +1,12 @@
-0.3.4 (master)
+0.3.5 8/29/2009
+  * updated to 0.14 of the ruby driver
+  * _type key gets set automatically at initialize time if defined and blank
+
+0.3.4 8/28/2009
   * BACKWORDS COMPATIBILITY BREAK: Timestamps are now optional. To use them add timestamps! to your model.
   * BACKWORDS COMPATIBILITY BREAK: Associations keys are no longer created automatically when you use belongs_to and many. Too much was hidden from the developer. You now have to declare them like key :creator_id, String and such.
+  * to_json now includes dynamic keys and embedded stuff by default
+  * added polymorphic many with :as option (dcu)
   
 0.3.3 8/16/2009
   * BACKWORDS COMPATIBILITY BREAK: _id is now once again a string rather than an object id and will stay that way.

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.rubyforge_project = "mongomapper"
     
     gem.add_dependency('activesupport')
-    gem.add_dependency('mongodb-mongo', '0.11.1')
+    gem.add_dependency('mongodb-mongo', '0.14')
     gem.add_dependency('jnunemaker-validatable', '1.7.2')
     
     gem.add_development_dependency('mocha', '0.9.4')

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.5

data/bin/mmconsole

@@ -11,7 +11,6 @@ IRB.conf[:MAIN_CONTEXT] = irb.context
 
 irb.context.evaluate("require 'irb/completion'", 0)
 irb.context.evaluate(%@
-include XGen::Mongo::Driver
 include MongoMapper
 
 MongoMapper.database = "mmtest"

data/lib/mongomapper.rb

@@ -2,10 +2,10 @@ require 'pathname'
 require 'rubygems'
 
 gem 'activesupport'
-gem 'mongodb-mongo', '0.11.1'
+gem 'mongodb-mongo', '0.14'
 gem 'jnunemaker-validatable', '1.7.2'
 
-require 'activesupport'
+# require 'activesupport'
 require 'mongo'
 require 'validatable'
 
@@ -25,6 +25,7 @@ require dir + 'associations/many_proxy'
 require dir + 'associations/many_polymorphic_proxy'
 require dir + 'associations/many_embedded_proxy'
 require dir + 'associations/many_embedded_polymorphic_proxy'
+require dir + 'associations/many_documents_as_proxy'
 
 require dir + 'callbacks'
 require dir + 'finder_options'
@@ -53,7 +54,7 @@ module MongoMapper
   end
   
   def self.connection
-    @@connection ||= XGen::Mongo::Driver::Mongo.new
+    @@connection ||= Mongo::Connection.new
   end
 
   def self.connection=(new_connection)

data/lib/mongomapper/associations/base.rb

@@ -6,7 +6,7 @@ module MongoMapper
       def initialize(type, name, options = {})
         @type, @name, @options = type, name, options
       end
-      
+
       def class_name
         @class_name ||= begin
           if cn = options[:class_name]
@@ -18,35 +18,43 @@ module MongoMapper
           end
         end
       end
-      
+
       def klass
         @klass ||= class_name.constantize
       end
-      
+
       def many?
         @many_type ||= @type == :many
       end
-      
+
       def belongs_to?
         @belongs_to_type ||= @type == :belongs_to
       end
-      
+
       def polymorphic?
         !!@options[:polymorphic]
       end
-      
+
+      def as?
+        !!@options[:as]
+      end
+
       def type_key_name
-        @type_key_name ||= many? ? '_type' : "#{name}_type"
+        @type_key_name ||= many? ? '_type' : "#{as}_type"
+      end
+
+      def as
+        @options[:as] || self.name
       end
-      
+
       def foreign_key
         @options[:foreign_key] || "#{name}_id"
       end
-      
+
       def ivar
         @ivar ||= "@_#{name}"
       end
-      
+
       def embeddable?
         many? && klass.embeddable?
       end
@@ -57,7 +65,13 @@ module MongoMapper
             if self.klass.embeddable?
               polymorphic? ? ManyEmbeddedPolymorphicProxy : ManyEmbeddedProxy
             else
-              polymorphic? ? ManyPolymorphicProxy : ManyProxy
+              if polymorphic?
+                ManyPolymorphicProxy
+              elsif as?
+                ManyDocumentsAsProxy
+              else
+                ManyProxy
+              end
             end
           else
             polymorphic? ? BelongsToPolymorphicProxy : BelongsToProxy

data/lib/mongomapper/associations/belongs_to_proxy.rb

@@ -6,12 +6,12 @@ module MongoMapper
           doc.save if doc.new?
           id = doc.id
         end
-        
+
         @owner.send("#{@association.foreign_key}=", id)
         reset
       end
 
-      protected        
+      protected
         def find_target
           if association_id = @owner.send(@association.foreign_key)
             @association.klass.find_by_id(association_id)

data/lib/mongomapper/associations/many_documents_as_proxy.rb

@@ -0,0 +1,27 @@
+module MongoMapper
+  module Associations
+    class ManyDocumentsAsProxy < ManyDocumentsProxy
+      protected
+        def scoped_conditions
+          {as_type_name => @owner.class.name, as_id_name => @owner.id}
+        end
+
+        def apply_scope(doc)
+          ensure_owner_saved
+
+          doc.send("#{as_type_name}=", @owner.class.name)
+          doc.send("#{as_id_name}=", @owner.id)
+
+          doc
+        end
+
+        def as_type_name
+          @as_type_name ||= @association.options[:as].to_s + "_type"
+        end
+
+        def as_id_name
+          @as_id_name ||= @association.options[:as].to_s + "_id"
+        end
+    end
+  end
+end

data/lib/mongomapper/document.rb

@@ -59,13 +59,13 @@ module MongoMapper
 
       def find_by_id(id)
         criteria = FinderOptions.to_mongo_criteria(:_id => id)
-        if doc = collection.find_first(criteria)
+        if doc = collection.find_one(criteria)
           new(doc)
         end
       end
 
       def count(conditions={})
-        collection.count(FinderOptions.to_mongo_criteria(conditions))
+        collection.find(FinderOptions.to_mongo_criteria(conditions)).count
       end
 
       def create(*docs)
@@ -320,7 +320,7 @@ module MongoMapper
       
       def assign_id
         if read_attribute(:_id).blank?
-          write_attribute(:_id, XGen::Mongo::Driver::ObjectID.new.to_s)
+          write_attribute(:_id, Mongo::ObjectID.new.to_s)
         end
       end
 

data/lib/mongomapper/embedded_document.rb

@@ -84,7 +84,7 @@ module MongoMapper
 
     private
       def accessors_module
-        if const_defined?('MongoMapperKeys') && constants.include?( 'MongoMapperKeys' )
+        if const_defined?('MongoMapperKeys')
           const_get 'MongoMapperKeys'
         else 
           const_set 'MongoMapperKeys', Module.new
@@ -94,7 +94,7 @@ module MongoMapper
       def create_accessors_for(key)
         accessors_module.module_eval <<-end_eval
           def #{key.name}
-            read_attribute( :'#{key.name}' )
+            read_attribute(:'#{key.name}')
           end
 
           def #{key.name}_before_typecast
@@ -160,10 +160,14 @@ module MongoMapper
           end
 
           self.attributes = attrs
+          
+          if respond_to?(:_type=) && self['_type'].blank?
+            self._type = self.class.name
+          end
         end
 
         if self.class.embeddable? && read_attribute(:_id).blank?
-          write_attribute :_id, XGen::Mongo::Driver::ObjectID.new.to_s
+          write_attribute :_id, Mongo::ObjectID.new.to_s
         end
       end
 

data/lib/mongomapper/serialization.rb

@@ -10,7 +10,7 @@ module MongoMapper #:nodoc:
       end
 
       def serializable_key_names
-        key_names = @record.class.keys.keys
+        key_names = @record.attributes.keys
 
         if options[:only]
           options.delete(:except)

data/mongomapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.3.3"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-08-16}
+  s.date = %q{2009-08-29}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "lib/mongomapper/associations/base.rb",
      "lib/mongomapper/associations/belongs_to_polymorphic_proxy.rb",
      "lib/mongomapper/associations/belongs_to_proxy.rb",
+     "lib/mongomapper/associations/many_documents_as_proxy.rb",
      "lib/mongomapper/associations/many_documents_proxy.rb",
      "lib/mongomapper/associations/many_embedded_polymorphic_proxy.rb",
      "lib/mongomapper/associations/many_embedded_proxy.rb",
@@ -55,6 +56,7 @@ Gem::Specification.new do |s|
      "test/NOTE_ON_TESTING",
      "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
+     "test/functional/associations/test_many_documents_as_proxy.rb",
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "test/functional/associations/test_many_embedded_proxy.rb",
      "test/functional/associations/test_many_polymorphic_proxy.rb",
@@ -89,6 +91,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
      "test/functional/associations/test_belongs_to_proxy.rb",
+     "test/functional/associations/test_many_documents_as_proxy.rb",
      "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
      "test/functional/associations/test_many_embedded_proxy.rb",
      "test/functional/associations/test_many_polymorphic_proxy.rb",
@@ -121,20 +124,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<mongodb-mongo>, ["= 0.11.1"])
+      s.add_runtime_dependency(%q<mongodb-mongo>, ["= 0.14"])
       s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.2"])
       s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<mongodb-mongo>, ["= 0.11.1"])
+      s.add_dependency(%q<mongodb-mongo>, ["= 0.14"])
       s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.2"])
       s.add_dependency(%q<mocha>, ["= 0.9.4"])
       s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<mongodb-mongo>, ["= 0.11.1"])
+    s.add_dependency(%q<mongodb-mongo>, ["= 0.14"])
     s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.2"])
     s.add_dependency(%q<mocha>, ["= 0.9.4"])
     s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -0,0 +1,253 @@
+require 'test_helper'
+require 'models'
+
+class ManyDocumentsAsProxyTest < Test::Unit::TestCase
+  def setup
+    clear_all_collections
+  end
+
+  should "default reader to empty array" do
+    Post.new.comments.should == []
+  end
+
+  should "add type and id key to polymorphic class base" do
+    PostComment.keys.keys.should include('commentable_type')
+    PostComment.keys.keys.should include('commentable_id')
+  end
+
+  should "allow adding to association like it was an array" do
+    post = Post.new
+    post.comments << PostComment.new(:body => 'foo bar')
+    post.comments << PostComment.new(:body => 'baz')
+    post.comments.concat PostComment.new(:body => 'baz')
+
+    post.comments.size.should == 3
+  end
+
+  should "be able to replace the association" do
+    post = Post.new
+
+    lambda {
+      post.comments = [
+        PostComment.new(:body => 'foo'),
+        PostComment.new(:body => 'bar'),
+        PostComment.new(:body => 'baz')
+      ]
+    }.should change { PostComment.count }.by(3)
+
+    from_db = Post.find(post.id)
+    from_db.comments.size.should == 3
+    from_db.comments[0].body.should == 'foo'
+    from_db.comments[1].body.should == 'bar'
+    from_db.comments[2].body.should == 'baz'
+  end
+
+  context "build" do
+    should "assign foreign key" do
+      post = Post.new
+      comment = post.comments.build
+      comment.commentable_id.should == post.id
+    end
+
+    should "assign _type" do
+      post = Post.new
+      comment = post.comments.build
+      comment.commentable_type.should == "Post"
+    end
+
+    should "allow assigning attributes" do
+      post = Post.new
+      comment = post.comments.build(:body => 'foo bar')
+      comment.body.should == 'foo bar'
+    end
+  end
+
+  context "create" do
+    should "assign foreign key" do
+      post = Post.new
+      comment = post.comments.create
+      comment.commentable_id.should == post.id
+    end
+
+    should "assign _type" do
+      post = Post.new
+      comment = post.comments.create
+      comment.commentable_type.should == "Post"
+    end
+
+    should "save record" do
+      post = Post.new
+      lambda {
+        post.comments.create(:body => 'baz')
+      }.should change { PostComment.count }
+    end
+
+    should "allow passing attributes" do
+      post = Post.create
+      comment = post.comments.create(:body => 'foo bar')
+      comment.body.should == 'foo bar'
+    end
+  end
+
+  context "count" do
+    should "work scoped to association" do
+      post = Post.create
+      3.times { post.comments.create(:body => 'foo bar') }
+
+      other_post = Post.create
+      2.times { other_post.comments.create(:body => 'baz') }
+
+      post.comments.count.should == 3
+      other_post.comments.count.should == 2
+    end
+
+    should "work with conditions" do
+      post = Post.create
+      post.comments.create(:body => 'foo bar')
+      post.comments.create(:body => 'baz')
+      post.comments.create(:body => 'foo bar')
+
+      post.comments.count(:body => 'foo bar').should == 2
+    end
+  end
+
+  context "Finding scoped to association" do
+    setup do
+      @post = Post.new
+
+      @comment1 = PostComment.create(:body => 'comment1')
+      @comment2 = PostComment.create(:body => 'comment2')
+      @comment3 = PostComment.create(:body => 'comment3')
+      @post.comments = [@comment1, @comment2]
+      @post.save
+
+      @post2 = Post.create(:body => "post #2")
+      @comment4 = PostComment.create(:body => 'comment4')
+      @comment5 = PostComment.create(:body => 'comment5')
+      @comment6 = PostComment.create(:body => 'comment6')
+      @post2.comments = [@comment4, @comment5, @comment6]
+      @post2.save
+    end
+
+    context "with :all" do
+      should "work" do
+        @post.comments.find(:all).should include(@comment1)
+        @post.comments.find(:all).should include(@comment2)
+      end
+
+      should "work with conditions" do
+        comments = @post.comments.find(:all, :conditions => {:body => 'comment1'})
+        comments.should == [@comment1]
+      end
+
+      should "work with order" do
+        comments = @post.comments.find(:all, :order => 'body desc')
+        comments.should == [@comment2, @comment1]
+      end
+    end
+
+    context "with #all" do
+      should "work" do
+        @post.comments.all.should == [@comment1, @comment2]
+      end
+
+      should "work with conditions" do
+        comments = @post.comments.all(:conditions => {:body => 'comment1'})
+        comments.should == [@comment1]
+      end
+
+      should "work with order" do
+        comments = @post.comments.all(:order => '$natural desc')
+        comments.should == [@comment2, @comment1]
+      end
+    end
+
+    context "with :first" do
+      should "work" do
+        lambda {@post.comments.find(:first)}.should_not raise_error
+      end
+
+      should "work with conditions" do
+        comment = @post.comments.find(:first, :conditions => {:body => 'comment2'})
+        comment.body.should == 'comment2'
+      end
+    end
+
+    context "with #first" do
+      should "work" do
+        @post.comments.first.should == @comment1
+      end
+
+      should "work with conditions" do
+        comment = @post.comments.first(:conditions => {:body => 'comment2'}, :order => 'body desc')
+        comment.should == @comment2
+      end
+    end
+
+    context "with :last" do
+      should "work" do
+        @post.comments.find(:last, :order => 'created_at asc').should == @comment2
+      end
+
+      should "work with conditions" do
+        post = @post.comments.find(:last, :conditions => {:body => 'comment1'})
+        post.body.should == 'comment1'
+      end
+    end
+
+    context "with #last" do
+      should "work" do
+        @post.comments.last.should == @comment2
+      end
+
+      should "work with conditions" do
+        comment = @post.comments.last(:conditions => {:body => 'comment1'})
+        comment.should == @comment1
+      end
+    end
+
+    context "with one id" do
+      should "work for id in association" do
+        @post.comments.find(@comment2.id).should == @comment2
+      end
+
+      should "not work for id not in association" do
+        lambda {
+          @post.comments.find(@comment5.id)
+        }.should raise_error(MongoMapper::DocumentNotFound)
+      end
+    end
+
+    context "with multiple ids" do
+      should "work for ids in association" do
+        posts = @post.comments.find(@comment1.id, @comment2.id)
+        posts.should == [@comment1, @comment2]
+      end
+
+      should "not work for ids not in association" do
+        lambda {
+          @post.comments.find(@comment1.id, @comment2.id, @comment4.id)
+        }.should raise_error(MongoMapper::DocumentNotFound)
+      end
+    end
+
+    context "with #paginate" do
+      setup do
+        @comments = @post2.comments.paginate(:per_page => 2, :page => 1, :order => 'created_at asc')
+      end
+
+      should "return total pages" do
+        @comments.total_pages.should == 2
+      end
+
+      should "return total entries" do
+        @comments.total_entries.should == 3
+      end
+
+      should "return the subject" do
+        @comments.should include(@comment4)
+        @comments.should include(@comment5)
+      end
+    end
+  end
+end

data/test/functional/test_document.rb

@@ -26,7 +26,7 @@ class DocumentTest < Test::Unit::TestCase
   
   context "Loading a document from the database with keys that are not defined" do
     setup do
-      @id = XGen::Mongo::Driver::ObjectID.new.to_s
+      @id = Mongo::ObjectID.new.to_s
       @document.collection.insert({
         :_id            => @id,
         :first_name     => 'John', 

data/test/models.rb

@@ -1,6 +1,30 @@
+class Post
+  include MongoMapper::Document
+
+  key :title, String
+  key :body, String
+
+  has_many :comments, :as => :commentable, :class_name => 'PostComment'
+
+  timestamps!
+end
+
+class PostComment
+  include MongoMapper::Document
+
+  key :username, String, :default => 'Anonymous'
+  key :body, String
+
+  key :commentable_id, String
+  key :commentable_type, String
+  belongs_to :commentable, :polymorphic => true
+
+  timestamps!
+end
+
 class Address
   include MongoMapper::EmbeddedDocument
-  
+
   key :address, String
   key :city,    String
   key :state,   String
@@ -9,29 +33,35 @@ end
 
 class Message
   include MongoMapper::Document
-  
+
   key :body, String
   key :position, Integer
   key :_type, String
   key :room_id, String
-  
+
   belongs_to :room
 end
 
+class Answer
+  include MongoMapper::Document
+
+  key :body, String
+end
+
 class Enter < Message; end
 class Exit < Message;  end
 class Chat < Message;  end
 
 class Room
   include MongoMapper::Document
-  
+
   key :name, String
   many :messages, :polymorphic => true
 end
 
 class Project
   include MongoMapper::Document
-  
+
   key :name, String
   many :statuses
   many :addresses
@@ -39,13 +69,13 @@ end
 
 class Status
   include MongoMapper::Document
-  
+
   key :project_id, String
   key :target_id, String
   key :target_type, String
   key :name, String
   key :position, Integer
-  
+
   belongs_to :project
   belongs_to :target, :polymorphic => true
 end
@@ -63,23 +93,23 @@ end
 
 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
 
 class Media
   include MongoMapper::EmbeddedDocument
-  
+
   key :_type, String
   key :file, String
 end
@@ -99,40 +129,40 @@ end
 
 class Catalog
   include MongoMapper::Document
-  
+
   many :medias, :polymorphic => true
 end
 
 module TrModels
   class Transport
     include MongoMapper::EmbeddedDocument
-    
+
     key :_type, String
     key :license_plate, String
   end
 
   class Car < TrModels::Transport
     include MongoMapper::EmbeddedDocument
-    
+
     key :model, String
     key :year, Integer
   end
 
   class Bus < TrModels::Transport
     include MongoMapper::EmbeddedDocument
-    
+
     key :max_passengers, Integer
   end
 
   class Ambulance < TrModels::Transport
     include MongoMapper::EmbeddedDocument
-    
+
     key :icu, Boolean
   end
 
   class Fleet
     include MongoMapper::Document
-    
+
     many :transports, :polymorphic => true, :class_name => "TrModels::Transport"
     key :name, String
   end

data/test/unit/serializers/test_json_serializer.rb

@@ -1,6 +1,11 @@
 require 'test_helper'
 
 class JsonSerializationTest < Test::Unit::TestCase
+  class Tag
+    include MongoMapper::EmbeddedDocument
+    key :name, String
+  end
+  
   class Contact
     include MongoMapper::Document
     key :name, String
@@ -8,6 +13,8 @@ class JsonSerializationTest < Test::Unit::TestCase
     key :created_at, Time
     key :awesome, Boolean
     key :preferences, Hash
+    
+    many :tags, :class_name => 'JsonSerializationTest::Tag'
   end
   
   def setup
@@ -136,12 +143,20 @@ class JsonSerializationTest < Test::Unit::TestCase
     end
 
     should "allow attribute filtering with only" do
-      assert_equal %([{"name":"David"},{"name":"Mary"}]), @contacts.to_json(:only => :name)
+      json = @contacts.to_json(:only => :name)
+      assert_match %r{\{"name":"David"\}}, json
+      assert_match %r{\{"name":"Mary"\}}, json
     end
     
     should "allow attribute filtering with except" do
       json = @contacts.to_json(:except => [:name, :preferences, :awesome, :created_at, :updated_at])
-      assert_equal %([{"id":null,"age":39},{"id":null,"age":14}]), json
+      assert_match %r{"age":39},          json
+      assert_match %r{"age":14},          json
+      assert_no_match %r{"name":},        json
+      assert_no_match %r{"preferences":}, json
+      assert_no_match %r{"awesome":},     json
+      assert_no_match %r{"created_at":},  json
+      assert_no_match %r{"updated_at":},  json
     end
   end
   
@@ -150,8 +165,25 @@ class JsonSerializationTest < Test::Unit::TestCase
       1 => Contact.new(:name => 'David', :age => 39),
       2 => Contact.new(:name => 'Mary', :age => 14)
     }
-
-    assert_equal %({"1":{"name":"David"}}), contacts.to_json(:only => [1, :name])
+    json = contacts.to_json(:only => [1, :name])
+    assert_match %r{"1":},               json
+    assert_match %r{\{"name":"David"\}}, json
+    assert_no_match %r{"2":},            json
+  end
+  
+  should "include embedded attributes" do
+    contact = Contact.new(:name => 'John', :age => 27)
+    contact.tags = [Tag.new(:name => 'awesome'), Tag.new(:name => 'ruby')]
+    json = contact.to_json
+    assert_match %r{"tags":}, json
+    assert_match %r{"name":"awesome"}, json
+    assert_match %r{"name":"ruby"}, json
   end
   
+  should "include dynamic attributes" do
+    contact = Contact.new(:name => 'John', :age => 27, :foo => 'bar')
+    contact['smell'] = 'stinky'
+    json = contact.to_json
+    assert_match %r{"smell":"stinky"}, json
+  end
 end

data/test/unit/test_document.rb

@@ -18,11 +18,11 @@ class DocumentTest < Test::Unit::TestCase
     end
 
     should "have a connection" do
-      @document.connection.should be_instance_of(XGen::Mongo::Driver::Mongo)
+      @document.connection.should be_instance_of(Mongo::Connection)
     end
 
     should "allow setting different connection without affecting the default" do
-      conn = XGen::Mongo::Driver::Mongo.new
+      conn = Mongo::Connection.new
       @document.connection conn
       @document.connection.should == conn
       @document.connection.should_not == MongoMapper.connection
@@ -43,13 +43,13 @@ class DocumentTest < Test::Unit::TestCase
         include MongoMapper::Document
       end
       
-      Item.collection.should be_instance_of(XGen::Mongo::Driver::Collection)
+      Item.collection.should be_instance_of(Mongo::Collection)
       Item.collection.name.should == 'items'
     end
 
     should "allow setting the collection name" do
       @document.collection('foobar')
-      @document.collection.should be_instance_of(XGen::Mongo::Driver::Collection)
+      @document.collection.should be_instance_of(Mongo::Collection)
       @document.collection.name.should == 'foobar'
     end
   end # Document class

data/test/unit/test_embedded_document.rb

@@ -282,6 +282,27 @@ class EmbeddedDocumentTest < Test::Unit::TestCase
         }.should_not raise_error
       end
     end
+    
+    context "initialized when _type key present" do
+      setup do
+        ::FooBar = Class.new do
+          include MongoMapper::EmbeddedDocument
+          key :_type, String
+        end
+      end
+      
+      teardown do
+        Object.send(:remove_const, :FooBar)
+      end
+
+      should "set _type to class name" do
+        FooBar.new._type.should == 'FooBar'
+      end
+      
+      should "not change _type if already set" do
+        FooBar.new(:_type => 'Foo')._type.should == 'Foo'
+      end
+    end
 
     context "mass assigning keys" do
       should "update values for keys provided" do

data/test/unit/test_mongomapper.rb

@@ -4,19 +4,19 @@ class Address; end
 
 class MongoMapperTest < Test::Unit::TestCase  
   should "be able to write and read connection" do
-    conn = XGen::Mongo::Driver::Mongo.new
+    conn = Mongo::Connection.new
     MongoMapper.connection = conn
     MongoMapper.connection.should == conn
   end
   
   should "default connection to new mongo ruby driver" do
     MongoMapper.connection = nil
-    MongoMapper.connection.should be_instance_of(XGen::Mongo::Driver::Mongo)
+    MongoMapper.connection.should be_instance_of(Mongo::Connection)
   end
   
   should "be able to write and read default database" do
     MongoMapper.database = DefaultDatabase
-    MongoMapper.database.should be_instance_of(XGen::Mongo::Driver::DB)
+    MongoMapper.database.should be_instance_of(Mongo::DB)
     MongoMapper.database.name.should == DefaultDatabase
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: djsun-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-16 00:00:00 -07:00
+date: 2009-08-29 00:00:00 -07:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.11.1
+        version: "0.14"
     version: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-validatable
@@ -84,6 +84,7 @@ files:
 - lib/mongomapper/associations/base.rb
 - lib/mongomapper/associations/belongs_to_polymorphic_proxy.rb
 - lib/mongomapper/associations/belongs_to_proxy.rb
+- lib/mongomapper/associations/many_documents_as_proxy.rb
 - lib/mongomapper/associations/many_documents_proxy.rb
 - lib/mongomapper/associations/many_embedded_polymorphic_proxy.rb
 - lib/mongomapper/associations/many_embedded_proxy.rb
@@ -109,6 +110,7 @@ files:
 - test/NOTE_ON_TESTING
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
+- test/functional/associations/test_many_documents_as_proxy.rb
 - test/functional/associations/test_many_embedded_polymorphic_proxy.rb
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb
@@ -135,7 +137,6 @@ files:
 - test/unit/test_validations.rb
 has_rdoc: false
 homepage: http://github.com/jnunemaker/mongomapper
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -156,13 +157,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongomapper
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Awesome gem for modeling your domain and storing it in mongo
 test_files: 
 - test/functional/associations/test_belongs_to_polymorphic_proxy.rb
 - test/functional/associations/test_belongs_to_proxy.rb
+- test/functional/associations/test_many_documents_as_proxy.rb
 - test/functional/associations/test_many_embedded_polymorphic_proxy.rb
 - test/functional/associations/test_many_embedded_proxy.rb
 - test/functional/associations/test_many_polymorphic_proxy.rb