mongoid 1.2.3 → 1.2.4

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.2.4

data/lib/mongoid/collection.rb

@@ -16,16 +16,7 @@ module Mongoid #:nodoc
     # Example:
     #
     # <tt>collection.save({ :name => "Al" })</tt>
-    proxy(:master, Collections::Operations::WRITE)
-
-    # All read operations should be intelligently directed to either the master
-    # or the slave, depending on where the read counter is and what it's
-    # maximum was configured at.
-    #
-    # Example:
-    #
-    # <tt>collection.find({ :name => "Al" })</tt>
-    proxy(:directed, (Collections::Operations::READ - [:find]))
+    proxy(:master, Collections::Operations::PROXIED)
 
     # Determines where to send the next read query. If the slaves are not
     # defined then send to master. If the read counter is under the configured
@@ -38,14 +29,9 @@ module Mongoid #:nodoc
     # Return:
     #
     # Either a +Master+ or +Slaves+ collection.
-    def directed
-      if under_max_counter? || slaves.empty?
-        @counter = @counter + 1
-        master
-      else
-        @counter = 0
-        slaves
-      end
+    def directed(options = {})
+      enslave = options.delete(:enslave)
+      enslave ? master_or_slaves : master
     end
 
     # Find documents from the database given a selector and options.
@@ -59,7 +45,7 @@ module Mongoid #:nodoc
     #
     # <tt>collection.find({ :test => "value" })</tt>
     def find(selector = {}, options = {})
-      cursor = Mongoid::Cursor.new(self, directed.find(selector, options))
+      cursor = Mongoid::Cursor.new(@klass, self, directed(options).find(selector, options))
       if block_given?
         yield cursor; cursor.close
       else
@@ -67,27 +53,42 @@ module Mongoid #:nodoc
       end
     end
 
+    # Find the first document from the database given a selector and options.
+    #
+    # Options:
+    #
+    # selector: A +Hash+ selector that is the query.
+    # options: The options to pass to the db.
+    #
+    # Example:
+    #
+    # <tt>collection.find_one({ :test => "value" })</tt>
+    def find_one(selector = {}, options = {})
+      directed(options).find_one(selector, options)
+    end
+
     # Initialize a new Mongoid::Collection, setting up the master, slave, and
     # name attributes. Masters will be used for writes, slaves for reads.
     #
     # Example:
     #
     # <tt>Mongoid::Collection.new(masters, slaves, "test")</tt>
-    def initialize(name)
-      @name, @counter = name, 0
+    def initialize(klass, name)
+      @klass, @name = klass, name
     end
 
-    # Return the object responsible for reading documents from the database.
-    # This is usually the slave databases, but in their absence the master will
-    # handle the task.
+    # Perform a map/reduce on the documents.
     #
-    # Example:
+    # Options:
     #
-    # <tt>collection.reader</tt>
-    def slaves
-      @slaves ||= Collections::Slaves.new(Mongoid.slaves, @name)
+    # map: The map javascript funcdtion.
+    # reduce: The reduce javascript function.
+    def map_reduce(map, reduce, options = {})
+      directed(options).map_reduce(map, reduce, options)
     end
 
+    alias :mapreduce :map_reduce
+
     # Return the object responsible for writes to the database. This will
     # always return a collection associated with the Master DB.
     #
@@ -98,9 +99,20 @@ module Mongoid #:nodoc
       @master ||= Collections::Master.new(Mongoid.master, @name)
     end
 
+    # Return the object responsible for reading documents from the database.
+    # This is usually the slave databases, but in their absence the master will
+    # handle the task.
+    #
+    # Example:
+    #
+    # <tt>collection.reader</tt>
+    def slaves
+      @slaves ||= Collections::Slaves.new(Mongoid.slaves, @name)
+    end
+
     protected
-    def under_max_counter?
-      @counter < Mongoid.max_successive_reads
+    def master_or_slaves
+      slaves.empty? ? master : slaves
     end
   end
 end

data/lib/mongoid/collections/operations.rb

@@ -6,6 +6,7 @@ module Mongoid #:nodoc:
       # Mongo:Collection. This is used in delegation.
       READ = [
         :[],
+        :db,
         :count,
         :distinct,
         :find,
@@ -34,6 +35,7 @@ module Mongoid #:nodoc:
 
       # Convenience constant for getting back all collection operations.
       ALL = (READ + WRITE)
+      PROXIED = ALL - [ :find, :find_one, :map_reduce, :mapreduce ]
     end
   end
 end

data/lib/mongoid/config.rb

@@ -5,7 +5,6 @@ module Mongoid #:nodoc
 
     attr_accessor \
       :allow_dynamic_fields,
-      :max_successive_reads,
       :reconnect_time,
       :parameterize_keys,
       :persist_in_safe_mode,
@@ -14,7 +13,6 @@ module Mongoid #:nodoc
     # Defaults the configuration options to true.
     def initialize
       @allow_dynamic_fields = true
-      @max_successive_reads = 10
       @parameterize_keys = true
       @persist_in_safe_mode = true
       @raise_not_found_error = true

data/lib/mongoid/contexts/mongo.rb

@@ -79,7 +79,7 @@ module Mongoid #:nodoc:
           true
         ).collect do |docs|
           docs["group"] = docs["group"].collect do |attrs|
-            Mongoid::Factory.build(attrs)
+            Mongoid::Factory.build(@klass, attrs)
           end
           docs
         end
@@ -115,7 +115,7 @@ module Mongoid #:nodoc:
         sorting = [[:_id, :asc]] unless sorting
         opts[:sort] = sorting.collect { |option| [ option[0], option[1].invert ] }
         attributes = @klass.collection.find_one(@selector, opts)
-        attributes ? Mongoid::Factory.build(attributes) : nil
+        attributes ? Mongoid::Factory.build(@klass, attributes) : nil
       end
 
       MAX_REDUCE = "function(obj, prev) { if (prev.max == 'start') { prev.max = obj.[field]; } " +
@@ -169,7 +169,7 @@ module Mongoid #:nodoc:
       # The first document in the collection.
       def one
         attributes = @klass.collection.find_one(@selector, process_options)
-        attributes ? Mongoid::Factory.build(attributes) : nil
+        attributes ? Mongoid::Factory.build(@klass, attributes) : nil
       end
 
       alias :first :one

data/lib/mongoid/criteria.rb

@@ -94,6 +94,20 @@ module Mongoid #:nodoc:
       @context ||= determine_context
     end
 
+    # Iterate over each +Document+ in the results. This can take an optional
+    # block to pass to each argument in the results.
+    #
+    # Example:
+    #
+    # <tt>criteria.each { |doc| p doc }</tt>
+    def each(&block)
+      return each_cached(&block) if cached?
+      if block_given?
+        execute.each { |doc| yield doc }
+      end
+      self
+    end
+
     # Merges the supplied argument hash into a single criteria
     #
     # Options:
@@ -111,19 +125,6 @@ module Mongoid #:nodoc:
       end
     end
 
-    # Iterate over each +Document+ in the results. This can take an optional
-    # block to pass to each argument in the results.
-    #
-    # Example:
-    #
-    # <tt>criteria.each { |doc| p doc }</tt>
-    def each(&block)
-      if block_given?
-        execute.each { |doc| yield doc }
-      end
-      self
-    end
-
     # Create the new +Criteria+ object. This will initialize the selector
     # and options hashes, as well as the type of criteria.
     #
@@ -198,10 +199,7 @@ module Mongoid #:nodoc:
     # Example:
     #
     # <tt>Criteria.translate(Person, "4ab2bc4b8ad548971900005c")</tt>
-    #
     # <tt>Criteria.translate(Person, :conditions => { :field => "value"}, :limit => 20)</tt>
-    #
-    # Returns a new +Criteria+ object.
     def self.translate(*args)
       klass = args[0]
       params = args[1] || {}
@@ -220,10 +218,6 @@ module Mongoid #:nodoc:
     # Example:
     #
     # <tt>criteria#determine_context</tt>
-    #
-    # Returns:
-    #
-    # A enumerable or mongo context.
     def determine_context
       if @klass.embedded
         return Contexts::Enumerable.new(@selector, @options, @documents)
@@ -231,6 +225,20 @@ module Mongoid #:nodoc:
       Contexts::Mongo.new(@selector, @options, @klass)
     end
 
+    # Iterate over each +Document+ in the results and cache the collection.
+    def each_cached(&block)
+      @collection ||= execute
+      if block_given?
+        docs = []
+        @collection.each do |doc|
+          docs << doc
+          yield doc
+        end
+        @collection = docs
+      end
+      self
+    end
+
     # Filters the unused options out of the options +Hash+. Currently this
     # takes into account the "page" and "per_page" options that would be passed
     # in if using will_paginate.

data/lib/mongoid/criterion/optional.rb

@@ -2,6 +2,38 @@
 module Mongoid #:nodoc:
   module Criterion #:nodoc:
     module Optional
+      # Tells the criteria that the cursor that gets returned needs to be
+      # cached. This is so multiple iterations don't hit the database multiple
+      # times, however this is not advisable when working with large data sets
+      # as the entire results will get stored in memory.
+      #
+      # Example:
+      #
+      # <tt>criteria.cache</tt>
+      def cache
+        @options.merge!(:cache => true); self
+      end
+
+      # Will return true if the cache option has been set.
+      #
+      # Example:
+      #
+      # <tt>criteria.cached?</tt>
+      def cached?
+        @cached ||= @options.delete(:cache)
+        @cached == true
+      end
+
+      # Flags the criteria to execute against a read-only slave in the pool
+      # instead of master.
+      #
+      # Example:
+      #
+      # <tt>criteria.enslave</tt>
+      def enslave
+        @options.merge!(:enslave => true); self
+      end
+
       # Adds a criterion to the +Criteria+ that specifies additional options
       # to be passed to the Ruby driver, in the exact format for the driver.
       #

data/lib/mongoid/cursor.rb

@@ -42,7 +42,7 @@ module Mongoid #:nodoc
     # <tt>cursor.each { |doc| p doc.title }</tt>
     def each
       @cursor.each do |document|
-        yield Mongoid::Factory.build(document)
+        yield Mongoid::Factory.build(@klass, document)
       end
     end
 
@@ -55,9 +55,9 @@ module Mongoid #:nodoc
     #
     # Example:
     #
-    # <tt>Mongoid::Cursor.new(collection, cursor)</tt>
-    def initialize(collection, cursor)
-      @collection, @cursor = collection, cursor
+    # <tt>Mongoid::Cursor.new(Person, cursor)</tt>
+    def initialize(klass, collection, cursor)
+      @klass, @collection, @cursor = klass, collection, cursor
     end
 
     # Return the next document in the cursor. Will instantiate a new Mongoid
@@ -67,7 +67,7 @@ module Mongoid #:nodoc
     #
     # <tt>cursor.next_document</tt>
     def next_document
-      Mongoid::Factory.build(@cursor.next_document)
+      Mongoid::Factory.build(@klass, @cursor.next_document)
     end
 
     # Returns an array of all the documents in the cursor.
@@ -76,7 +76,7 @@ module Mongoid #:nodoc
     #
     # <tt>cursor.to_a</tt>
     def to_a
-      @cursor.to_a.collect { |attrs| Mongoid::Factory.build(attrs) }
+      @cursor.to_a.collect { |attrs| Mongoid::Factory.build(@klass, attrs) }
     end
   end
 end

data/lib/mongoid/document.rb

@@ -21,11 +21,16 @@ module Mongoid #:nodoc:
         attr_accessor :association_name, :_parent
         attr_reader :new_record
 
-        delegate :collection, :embedded, :primary_key, :to => "self.class"
+        delegate :collection, :db, :embedded, :primary_key, :to => "self.class"
       end
     end
 
     module ClassMethods
+      # Return the database associated with this class.
+      def db
+        collection.db
+      end
+
       # Returns the collection associated with this +Document+. If the
       # document is embedded, there will be no collection associated
       # with it.
@@ -33,7 +38,7 @@ module Mongoid #:nodoc:
       # Returns: <tt>Mongo::Collection</tt>
       def collection
         raise Errors::InvalidCollection.new(self) if embedded
-        self._collection ||= Mongoid::Collection.new(self.collection_name)
+        self._collection ||= Mongoid::Collection.new(self, self.collection_name)
         add_indexes; self._collection
       end
 
@@ -94,7 +99,7 @@ module Mongoid #:nodoc:
       # <tt>Person.store_in :populdation</tt>
       def store_in(name)
         self.collection_name = name.to_s
-        self._collection = Mongoid::Collection.new(name.to_s)
+        self._collection = Mongoid::Collection.new(self, name.to_s)
       end
 
       # Returns all types to query for when using this class as the base.
@@ -125,8 +130,6 @@ module Mongoid #:nodoc:
       # Example:
       #
       # <tt>name.assimilate(person, options)</tt>
-      #
-      # Returns: The child +Document+.
       def assimilate(parent, options)
         parentize(parent, options.name); notify; self
       end
@@ -157,10 +160,6 @@ module Mongoid #:nodoc:
       # Options:
       #
       # attrs: The attributes +Hash+ to set up the document with.
-      #
-      # Example:
-      #
-      # <tt>Person.new(:title => "Mr", :age => 30)</tt>
       def initialize(attrs = nil)
         @attributes = {}
         process(attrs)
@@ -272,10 +271,6 @@ module Mongoid #:nodoc:
       # child: The child +Document+ that sent the notification.
       # clear: Will clear out the child's attributes if set to true.
       #
-      # Example:
-      #
-      # <tt>person.notify_observers(self)</tt> will cause this method to execute.
-      #
       # This will also cause the observing +Document+ to notify it's parent if
       # there is any.
       def update(child, clear = false)

data/lib/mongoid/factory.rb

@@ -9,9 +9,11 @@ module Mongoid #:nodoc:
     #
     # Options:
     #
+    # klass: The class to instantiate from if _type is not present.
     # attributes: The +Document+ attributes.
-    def self.build(attributes)
-      attributes["_type"].constantize.instantiate(attributes)
+    def self.build(klass, attrs)
+      type = attrs["_type"]
+      type ? type.constantize.instantiate(attrs) : klass.instantiate(attrs)
     end
   end
 end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.3"
+  s.version = "1.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-02-08}
+  s.date = %q{2010-02-09}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"

data/spec/integration/mongoid/criteria_spec.rb

@@ -16,10 +16,6 @@ describe Mongoid::Criteria do
       @person = Person.create(:title => "Sir", :age => 100, :aliases => ["D", "Durran"], :ssn => "666666666")
     end
 
-    after do
-      Person.delete_all
-    end
-
     context "when passed id" do
 
       it "it properly excludes ids" do
@@ -46,10 +42,6 @@ describe Mongoid::Criteria do
         @person = Person.create(:title => "Sir", :age => 100, :aliases => ["D", "Durran"], :ssn => "666666666")
       end
 
-      after do
-        Person.delete_all
-      end
-
       it "executes the query again" do
         criteria = Person.all
         criteria.size.should == 1
@@ -66,10 +58,6 @@ describe Mongoid::Criteria do
       end
     end
 
-    after do
-      Person.delete_all
-    end
-
     it "provides max for the field provided" do
       Person.max(:age).should == 90.0
     end
@@ -84,10 +72,6 @@ describe Mongoid::Criteria do
       end
     end
 
-    after do
-      Person.delete_all
-    end
-
     it "provides min for the field provided" do
       Person.min(:age).should == 10.0
     end
@@ -102,10 +86,6 @@ describe Mongoid::Criteria do
       end
     end
 
-    after do
-      Person.delete_all
-    end
-
     it "provides sum for the field provided" do
       Person.where(:age.gt => 3).sum(:age).should == 50.0
     end
@@ -118,10 +98,6 @@ describe Mongoid::Criteria do
       @person = Person.create(:title => "Sir", :age => 33, :aliases => ["D", "Durran"])
     end
 
-    after do
-      Person.delete_all
-    end
-
     context "with complex criterion" do
 
       context "#all" do
@@ -208,4 +184,20 @@ describe Mongoid::Criteria do
 
   end
 
+  context "when caching" do
+
+    before do
+      10.times do |n|
+        Person.create(:title => "Sir", :age => (n * 10), :aliases => ["D", "Durran"], :ssn => "#{n}")
+      end
+    end
+
+    it "iterates over the cursor only once" do
+      criteria = Person.where(:title => "Sir").cache
+      criteria.collect.size.should == 10
+      # Do it again!
+      criteria.collect.size.should == 10
+    end
+  end
+
 end

data/spec/integration/mongoid/document_spec.rb

@@ -6,6 +6,13 @@ describe Mongoid::Document do
     Person.delete_all
   end
 
+  describe "#db" do
+
+    it "returns the mongo database" do
+      Person.db.should == Mongoid.master
+    end
+  end
+
   context "when document contains a hash field" do
 
     before do

data/spec/unit/mongoid/collection_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Collection do
   end
 
   let(:collection) do
-    Mongoid::Collection.new("people")
+    Mongoid::Collection.new(Person, "people")
   end
 
   before do
@@ -40,73 +40,101 @@ describe Mongoid::Collection do
     end
   end
 
-  describe "#directed" do
+  describe "#find" do
+
+    before do
+      @cursor = stub.quacks_like(Mongoid::Cursor.allocate)
+      Mongoid::Cursor.expects(:new).with(Person, collection, @mongo_cursor).returns(@cursor)
+    end
 
-    context "when the counter is less than the maximum" do
+    context "when no block supplied" do
 
       before do
-        collection.instance_variable_set(:@counter, 0)
+        master.expects(:find).with({ :test => "value" }, {}).returns(@mongo_cursor)
       end
 
-      it "delegates to the master" do
-        collection.directed.should == master
+      it "finds return a cursor" do
+        collection.find({ :test => "value"}).should == @cursor
+      end
+
+    end
+
+    context "when a block is supplied" do
+
+      before do
+        master.expects(:find).with({ :test => "value" }, {}).returns(@mongo_cursor)
       end
 
-      it "increments the counter" do
-        collection.directed
-        collection.counter.should == 1
+      it "yields to the cursor and closes it" do
+        @cursor.expects(:close).returns(true)
+        collection.find({ :test => "value" }) do |cur|
+          cur.should == @cursor
+        end
       end
     end
 
-    context "when the counter is at the max" do
+    context "when an enslave option exists" do
 
       before do
+        @options = { :enslave => true }
         slaves.expects(:empty?).returns(false)
-        collection.instance_variable_set(:@counter, 10)
+        slaves.expects(:find).with({ :test => "value" }, {}).returns(@mongo_cursor)
       end
 
-      it "delegates to the slave" do
-        collection.directed.should == slaves
+      it "sends the query to the slave pool" do
+        collection.find({ :test => "value"}, @options).should == @cursor
       end
 
-      it "resets the counter" do
-        collection.directed
-        collection.counter.should == 0
+      it "deletes the enslave option" do
+        collection.find({ :test => "value"}, @options)
+        @options[:enslave].should be_nil
       end
     end
 
-    context "when the slave does not exist" do
+    context "when an enslave option does not exist" do
 
       before do
-        collection.instance_variable_set(:@counter, 10)
-        slaves.expects(:empty?).returns(true)
+        master.expects(:find).with({ :test => "value" }, {}).returns(@mongo_cursor)
       end
 
-      it "delegates to the master" do
-        collection.directed.should == master
+      it "sends the query to the master" do
+        collection.find({ :test => "value"}).should == @cursor
       end
     end
   end
 
-  describe "#find" do
+  describe "#find_one" do
 
     before do
-      @cursor = stub.quacks_like(Mongoid::Cursor.allocate)
-      master.expects(:find).with({ :test => "value" }, {}).returns(@mongo_cursor)
-      Mongoid::Cursor.expects(:new).with(collection, @mongo_cursor).returns(@cursor)
+      @person = stub
     end
 
-    it "finds are returns a cursor" do
-      collection.find({ :test => "value"}).should == @cursor
+    context "when an enslave option exists" do
+
+      before do
+        @options = { :enslave => true }
+        slaves.expects(:empty?).returns(false)
+        slaves.expects(:find_one).with({ :test => "value" }, {}).returns(@person)
+      end
+
+      it "sends the query to the slave pool" do
+        collection.find_one({ :test => "value"}, @options).should == @person
+      end
+
+      it "deletes the enslave option" do
+        collection.find_one({ :test => "value"}, @options)
+        @options[:enslave].should be_nil
+      end
     end
 
-    context "when a block is supplied" do
+    context "when an enslave option does not exist" do
 
-      it "yields to the cursor and closes it" do
-        @cursor.expects(:close).returns(true)
-        collection.find({ :test => "value" }) do |cur|
-          cur.should == @cursor
-        end
+      before do
+        master.expects(:find_one).with({ :test => "value" }, {}).returns(@person)
+      end
+
+      it "sends the query to the master" do
+        collection.find_one({ :test => "value"}).should == @person
       end
     end
   end

data/spec/unit/mongoid/contexts/mongo_spec.rb

@@ -337,7 +337,9 @@ describe Mongoid::Contexts::Mongo do
       Person.expects(:collection).returns(@collection)
       @criteria = Person.where(:_id => "1").skip(60).limit(20)
       @context = Mongoid::Contexts::Mongo.new(@criteria.selector, @criteria.options, Person)
-      @collection.expects(:find).with({:_type => { "$in" => ["Doctor", "Person"] }, :_id => "1"}, :skip => 60, :limit => 20).returns([])
+      @collection.expects(:find).with(
+        {:_type => { "$in" => ["Doctor", "Person"] }, :_id => "1"}, :skip => 60, :limit => 20
+      ).returns([])
       @results = @context.paginate
     end
 

data/spec/unit/mongoid/criteria_spec.rb

@@ -316,6 +316,30 @@ describe Mongoid::Criteria do
 
     end
 
+    context "when caching" do
+
+      before do
+        Person.expects(:collection).returns(@collection)
+        @collection.expects(:find).with({ :_type => { "$in" => ["Doctor", "Person"] }, :title => "Sir" }, {}).returns(@cursor)
+        @cursor.expects(:each).yields(@person)
+        @criteria.cache
+        @criteria.each do |doc|
+          doc.should == @person
+        end
+      end
+
+      it "caches the results of the cursor iteration" do
+        @criteria.each do |doc|
+          doc.should == @person
+        end
+        # Do it again for sanity's sake.
+        @criteria.each do |doc|
+          doc.should == @person
+        end
+      end
+
+    end
+
   end
 
   describe "#first" do

data/spec/unit/mongoid/criterion/optional_spec.rb

@@ -7,6 +7,61 @@ describe Mongoid::Criterion::Optional do
     @canvas_criteria = Mongoid::Criteria.new(Canvas)
   end
 
+  describe "#cache" do
+
+    it "sets the cache option on the criteria" do
+      @criteria.cache
+      @criteria.options[:cache].should be_true
+    end
+
+    it "returns self" do
+      @criteria.cache.should == @criteria
+    end
+  end
+
+  describe "#cached?" do
+
+    context "when the criteria has a cache option" do
+
+      before do
+        @criteria.cache
+      end
+
+      it "returns true" do
+        @criteria.cached?.should be_true
+      end
+
+      it "removes cache from the options" do
+        @criteria.cached?
+        @criteria.options[:cache].should be_nil
+      end
+
+      it "sets the cache instance variable" do
+        @criteria.cached?
+        @criteria.instance_variable_get(:@cached).should be_true
+      end
+    end
+
+    context "when the criteria has no cache option" do
+
+      it "returns false" do
+        @criteria.cached?.should be_false
+      end
+    end
+  end
+
+  describe "#enslave" do
+
+    it "sets the enslaved option on the criteria" do
+      @criteria.enslave
+      @criteria.options[:enslave].should be_true
+    end
+
+    it "returns self" do
+      @criteria.enslave.should == @criteria
+    end
+  end
+
   describe "#extras" do
 
     context "filtering" do

data/spec/unit/mongoid/cursor_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Cursor do
   end
 
   let(:cursor) do
-    Mongoid::Cursor.new(collection, proxy)
+    Mongoid::Cursor.new(Person, collection, proxy)
   end
 
   (Mongoid::Cursor::OPERATIONS - [ :timeout ]).each do |name|

data/spec/unit/mongoid/document_spec.rb

@@ -6,8 +6,8 @@ describe Mongoid::Document do
     @database = mock
     @collection = stub(:name => "people")
     @canvas_collection = stub(:name => "canvases")
-    Mongoid::Collection.stubs(:new).with("people").returns(@collection)
-    Mongoid::Collection.stubs(:new).with("canvases").returns(@canvas_collection)
+    Mongoid::Collection.stubs(:new).with(Person, "people").returns(@collection)
+    Mongoid::Collection.stubs(:new).with(Canvas, "canvases").returns(@canvas_collection)
     @collection.stubs(:create_index).with(:_type, false)
     @canvas_collection.stubs(:create_index).with(:_type, false)
   end
@@ -99,6 +99,18 @@ describe Mongoid::Document do
 
   end
 
+  describe ".db" do
+
+    before do
+      @db = stub
+      @collection.expects(:db).returns(@db)
+    end
+
+    it "returns the database from the collection" do
+      Person.db.should == @db
+    end
+  end
+
   describe "#clone" do
 
     before do
@@ -552,7 +564,7 @@ describe Mongoid::Document do
     context "on a parent class" do
 
       it "sets the collection name and collection for the document" do
-        Mongoid::Collection.expects(:new).with("population").returns(@collection)
+        Mongoid::Collection.expects(:new).with(Patient, "population").returns(@collection)
         Patient.store_in :population
         Patient.collection_name.should == "population"
       end
@@ -562,11 +574,12 @@ describe Mongoid::Document do
     context "on a subclass" do
 
       after do
+        Mongoid::Collection.expects(:new).with(Firefox, "canvases")
         Firefox.store_in :canvases
       end
 
       it "changes the collection name for the entire hierarchy" do
-        Mongoid::Collection.expects(:new).with("browsers").returns(@collection)
+        Mongoid::Collection.expects(:new).with(Firefox, "browsers").returns(@collection)
         Firefox.store_in :browsers
         Canvas.collection_name.should == "browsers"
       end

data/spec/unit/mongoid/factory_spec.rb

@@ -4,13 +4,28 @@ describe Mongoid::Factory do
 
   describe ".build" do
 
-    before do
-      @attributes = { "_type" => "Person", "title" => "Sir" }
+    context "when the _type attribute is present" do
+
+      before do
+        @attributes = { "_type" => "Person", "title" => "Sir" }
+      end
+
+      it "instantiates based on the type" do
+        person = Mongoid::Factory.build(Person, @attributes)
+        person.title.should == "Sir"
+      end
     end
 
-    it "instantiates based on the type" do
-      person = Mongoid::Factory.build(@attributes)
-      person.title.should == "Sir"
+    context "when _type is not preset" do
+
+      before do
+        @attributes = { "title" => "Sir" }
+      end
+
+      it "instantiates based on the type" do
+        person = Mongoid::Factory.build(Person, @attributes)
+        person.title.should == "Sir"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -05:00
+date: 2010-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency