mongoid 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/mongoid.rb

@@ -76,10 +76,10 @@ module Mongoid #:nodoc
       :raise_not_found_error,
       :raise_not_found_error=, :to => :config
 
-    protected
     def config
-      Config.instance
+      yield Config.instance if block_given?; Config.instance
     end
+
   end
 
 end

data/lib/mongoid/associations/has_many.rb

@@ -74,9 +74,9 @@ module Mongoid #:nodoc:
       # essentially a proxy to an array itself.
       def initialize(document, options)
         @parent, @association_name, @klass, @options = document, options.name, options.klass, options
-        attributes = document.attributes[@association_name]
+        attributes = document.raw_attributes[@association_name]
         @documents = attributes ? attributes.collect do |attrs|
-          type = attrs[:_type]
+          type = attrs["_type"]
           child = type ? type.constantize.instantiate(attrs) : @klass.instantiate(attrs)
           child.parentize(@parent, @association_name)
           child

data/lib/mongoid/associations/has_one.rb

@@ -20,8 +20,9 @@ module Mongoid #:nodoc:
       # options: The association options.
       def initialize(document, attributes, options)
         @parent, @options, @association_name = document, options, options.name
-        klass = attributes[:_type] ? attributes[:_type].constantize : nil
-        @document = attributes.assimilate(@parent, @options, klass)
+        attrs = attributes.stringify_keys
+        klass = attrs["_type"] ? attrs["_type"].constantize : nil
+        @document = attrs.assimilate(@parent, @options, klass)
       end
 
       # Delegate all missing methods over to the +Document+.
@@ -61,7 +62,7 @@ module Mongoid #:nodoc:
         # document: The parent +Document+
         # options: The association options.
         def instantiate(document, options)
-          attributes = document.attributes[options.name]
+          attributes = document.raw_attributes[options.name]
           return nil if attributes.blank?
           new(document, attributes, options)
         end

data/lib/mongoid/associations/has_one_related.rb

@@ -2,6 +2,7 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
     class HasOneRelated #:nodoc:
+      include Proxy
 
       delegate :==, :nil?, :to => :document
       attr_reader :klass, :document

data/lib/mongoid/associations/options.rb

@@ -29,7 +29,7 @@ module Mongoid #:nodoc:
 
       # Returns the association name of the options.
       def name
-        @attributes[:name]
+        @attributes[:name].to_s
       end
 
       # Returns the parent foreign key association name.

data/lib/mongoid/attributes.rb

@@ -38,8 +38,8 @@ module Mongoid #:nodoc:
       # field exists for them on the +Document+. This will be limited to only the
       # attributes provided in the suppied +Hash+ so that no extra nil values get
       # put into the document's attributes.
-      def process(attrs = {})
-        attrs.each_pair do |key, value|
+      def process(attrs = nil)
+        (attrs || {}).each_pair do |key, value|
           if Mongoid.allow_dynamic_fields && !respond_to?("#{key}=")
             @attributes[key.to_s] = value
           else

data/lib/mongoid/criteria.rb

@@ -210,8 +210,9 @@ module Mongoid #:nodoc:
     # <tt>criteria.id("4ab2bc4b8ad548971900005c")</tt>
     #
     # Returns: <tt>self</tt>
-    def id(object_id)
-      @selector[:_id] = object_id; self
+    def id(*args)
+      (args.flatten.size > 1) ? self.in(:_id => args.flatten) : (@selector[:_id] = *args)
+      self
     end
 
     # Create the new +Criteria+ object. This will initialize the selector
@@ -410,12 +411,8 @@ module Mongoid #:nodoc:
     def self.translate(*args)
       klass = args[0]
       params = args[1] || {}
-      if params.is_a?(String)
-        document = new(klass).id(params).one
-        if Mongoid.raise_not_found_error
-          raise Errors::DocumentNotFound.new(klass, params) unless document
-        end
-        return document
+      unless params.is_a?(Hash)
+        return id_criteria(klass, params)
       end
       return new(klass).where(params.delete(:conditions) || {}).extras(params)
     end
@@ -472,5 +469,16 @@ module Mongoid #:nodoc:
       attributes.each { |key, value| @selector[key] = { operator => value } }; self
     end
 
+    class << self
+      # Return a criteria or single document based on an id search.
+      def id_criteria(klass, params)
+        criteria = new(klass).id(params)
+        result = params.is_a?(String) ? criteria.one : criteria.entries
+        if Mongoid.raise_not_found_error
+          raise Errors::DocumentNotFound.new(klass, params) if result.blank?
+        end
+        return result
+      end
+    end
   end
 end

data/lib/mongoid/document.rb

@@ -58,10 +58,11 @@ module Mongoid #:nodoc:
       # Example:
       #
       # <tt>Person.instantiate(:title => "Sir", :age => 30)</tt>
-      def instantiate(attrs = {}, allocating = false)
-        if attrs["_id"] || allocating
+      def instantiate(attrs = nil, allocating = false)
+        attributes = attrs || {}
+        if attributes["_id"] || allocating
           document = allocate
-          document.instance_variable_set(:@attributes, attrs)
+          document.instance_variable_set(:@attributes, attributes)
           return document
         else
           return new(attrs)
@@ -160,7 +161,7 @@ module Mongoid #:nodoc:
       # Example:
       #
       # <tt>Person.new(:title => "Mr", :age => 30)</tt>
-      def initialize(attrs = {})
+      def initialize(attrs = nil)
         @attributes = {}
         process(attrs)
         @attributes = attributes_with_defaults(@attributes)
@@ -172,7 +173,7 @@ module Mongoid #:nodoc:
       # apply default values to attributes - calling procs as required
       def attributes_with_defaults(attributes = {})
         default_values = defaults.merge(attributes)
-        default_values.each do |key, val|
+        default_values.each_pair do |key, val|
           default_values[key] = val.call if val.respond_to?(:call)
         end
       end
@@ -237,7 +238,7 @@ module Mongoid #:nodoc:
       # memoized association and notify the parent of the change.
       def remove(child)
         name = child.association_name
-        reset(name) { @attributes.remove(name, child.attributes) }
+        reset(name) { @attributes.remove(name, child.raw_attributes) }
         notify
       end
 

data/lib/mongoid/errors.rb

@@ -5,11 +5,11 @@ module Mongoid #:nodoc
     # Raised when querying the database for a document by a specific id which
     # does not exist.
     class DocumentNotFound < RuntimeError
-      def initialize(klass, identifier)
-        @klass, @identifier = klass, identifier
+      def initialize(klass, ids)
+        @klass, @identifier = klass, ids.is_a?(Array) ? ids.join(", ") : ids
       end
       def message
-        "Document not found for class #{@klass} and id #{@identifier}"
+        "Document not found for class #{@klass} and id(s) #{@identifier}"
       end
     end
 

data/lib/mongoid/extensions/hash/assimilation.rb

@@ -20,7 +20,7 @@ module Mongoid #:nodoc:
         def assimilate(parent, options, type = nil)
           klass = type ? type : options.klass
           child = klass.instantiate(:_parent => parent)
-          child.write_attributes(self.merge(:_type => klass.name))
+          child.write_attributes(self.merge("_type" => klass.name))
           child.identify
           child.assimilate(parent, options)
         end

data/mongoid.gemspec

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

data/spec/integration/mongoid/associations_spec.rb

@@ -94,12 +94,75 @@ describe Mongoid::Associations do
 
       before do
         @extra_post = Post.create(:title => "Orphan")
+        @from_db = Person.find(@person.id)
       end
 
-      it "returns only those objects scoped to the parent" do
-        from_db = Person.find(@person.id)
-        Post.all.size.should == 2
-        from_db.posts.all.size.should == 1
+      context "finding all" do
+
+        it "returns only those objects scoped to the parent" do
+          Post.all.size.should == 2
+          @from_db.posts.all.size.should == 1
+        end
+
+      end
+
+      context "finding with conditions" do
+
+        context "finding all" do
+
+          it "returns only those objects scoped to the parent" do
+            posts = @from_db.posts.find(:all, :conditions => { :title => "Testing" })
+            posts.size.should == 1
+          end
+
+        end
+
+        context "finding first" do
+
+          it "returns only those objects scoped to the parent" do
+            post = @from_db.posts.find(:first, :conditions => { :title => "Testing" })
+            post.should == @post
+          end
+
+        end
+
+        context "finding last" do
+
+          it "returns only those objects scoped to the parent" do
+            post = @from_db.posts.find(:last, :conditions => { :title => "Testing" })
+            post.should == @post
+          end
+
+        end
+
+        context "using a named scope" do
+
+          before do
+            @post.created_at = 15.days.ago
+            @post.save
+          end
+
+          it "returns only those scoped to the parent plus the named scope" do
+            posts = @from_db.posts.recent
+            posts.size.should == 1
+          end
+
+        end
+
+        context "using a criteria class method" do
+
+          before do
+            @post.created_at = 45.days.ago
+            @post.save
+          end
+
+          it "returns only those scoped to the parent plus the named scope" do
+            posts = @from_db.posts.old
+            posts.size.should == 1
+          end
+
+        end
+
       end
 
     end

data/spec/integration/mongoid/commands_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Commands do
 
   before do
-    @person = Person.new(:title => "Sir")
+    @person = Person.new(:title => "Sir", :ssn => "6969696")
   end
 
   after do
@@ -13,7 +13,7 @@ describe Mongoid::Commands do
   describe ".create" do
 
     it "saves and returns the document" do
-      person = Person.create(:title => "Sensei")
+      person = Person.create(:title => "Sensei", :ssn => "666-66-6666")
       person.should be_a_kind_of(Person)
       person.should_not be_a_new_record
     end

data/spec/integration/mongoid/finders_spec.rb

@@ -5,7 +5,11 @@ describe Mongoid::Finders do
   describe "#find" do
 
     before do
+      @documents = []
       @document = Person.create(:title => "Mrs.", :ssn => "another")
+      3.times do |n|
+        @documents << Person.create(:title => "Mr.", :ssn => "#{n}22")
+      end
     end
 
     after do
@@ -32,6 +36,27 @@ describe Mongoid::Finders do
 
     end
 
+    context "with an array of ids as args" do
+
+      context "when the documents are found" do
+
+        it "returns an array of the documents" do
+          @people = Person.find(@documents.map(&:id))
+          @people.should == @documents
+        end
+
+      end
+
+      context "when no documents found" do
+
+        it "raises an error" do
+          lambda { Person.find(["11", "21", "31"]) }.should raise_error
+        end
+
+      end
+
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -218,6 +218,14 @@ class Post
   include Mongoid::Timestamps
   field :title
   belongs_to_related :person
+
+  named_scope :recent, where(:created_at => { "$lt" => Time.now, "$gt" => 30.days.ago })
+
+  class << self
+    def old
+      where(:created_at => { "$lt" => 30.days.ago })
+    end
+  end
 end
 
 class Game

data/spec/unit/mongoid/associations/has_many_spec.rb

@@ -3,16 +3,19 @@ require "spec_helper"
 describe Mongoid::Associations::HasMany do
 
   before do
-    @attributes = { :addresses => [
-      { :_id => "street-1", :street => "Street 1", :state => "CA" },
-      { :_id => "street-2", :street => "Street 2" } ] }
-    @document = stub(:attributes => @attributes, :add_observer => true, :update => true)
+    @attributes = { "addresses" => [
+      { "_id" => "street-1", "street" => "Street 1", "state" => "CA" },
+      { "_id" => "street-2", "street" => "Street 2" } ] }
+    @document = stub(:raw_attributes => @attributes, :add_observer => true, :update => true)
   end
 
   describe "#[]" do
 
     before do
-      @association = Mongoid::Associations::HasMany.new(@document, Mongoid::Associations::Options.new(:name => :addresses))
+      @association = Mongoid::Associations::HasMany.new(
+        @document,
+        Mongoid::Associations::Options.new(:name => :addresses)
+      )
     end
 
     context "when the index is present in the association" do
@@ -257,7 +260,7 @@ describe Mongoid::Associations::HasMany do
   describe "#initialize" do
 
     before do
-      @canvas = stub(:attributes => { :shapes => [{ :_type => "Circle", :radius => 5 }] }, :update => true)
+      @canvas = stub(:raw_attributes => { "shapes" => [{ "_type" => "Circle", "radius" => 5 }] }, :update => true)
       @association = Mongoid::Associations::HasMany.new(
         @canvas,
         Mongoid::Associations::Options.new(:name => :shapes)

data/spec/unit/mongoid/associations/has_one_related_spec.rb

@@ -55,6 +55,21 @@ describe Mongoid::Associations::HasOneRelated do
 
   end
 
+  describe "#id" do
+
+    before do
+      @parent = stub(:id => "5", :class => Person)
+      @game = Game.new
+      Game.expects(:first).returns(@game)
+      @association = Mongoid::Associations::HasOneRelated.new(@parent, options)
+    end
+
+    it "delegates to the proxied document" do
+      @association.id.should == @game.id
+    end
+
+  end
+
   describe ".initialize" do
 
     before do

data/spec/unit/mongoid/associations/has_one_spec.rb

@@ -3,11 +3,11 @@ require "spec_helper"
 describe Mongoid::Associations::HasOne do
 
   before do
-    @attributes = { :mixed_drink => {
-      :name => "Jack and Coke", :_type => "MixedDrink" },
-      :writer => { :speed => 50, :_type => "HtmlWriter" }
+    @attributes = { "mixed_drink" => {
+      "name" => "Jack and Coke", "_type" => "MixedDrink" },
+      "writer" => { "speed" => 50, "_type" => "HtmlWriter" }
     }
-    @document = stub(:attributes => @attributes, :update => true)
+    @document = stub(:raw_attributes => @attributes, :update => true)
   end
 
   describe "#build_*" do
@@ -17,7 +17,7 @@ describe Mongoid::Associations::HasOne do
       before do
         @association = Mongoid::Associations::HasOne.new(
           @document,
-          @attributes[:mixed_drink],
+          @attributes["mixed_drink"],
           Mongoid::Associations::Options.new(:name => :mixed_drink)
         )
       end
@@ -34,7 +34,7 @@ describe Mongoid::Associations::HasOne do
       before do
         @association = Mongoid::Associations::HasOne.new(
           @document,
-          @attributes[:writer],
+          @attributes["writer"],
           Mongoid::Associations::Options.new(:name => :writer)
         )
       end
@@ -84,7 +84,7 @@ describe Mongoid::Associations::HasOne do
     context "when attributes are empty" do
 
       before do
-        @document = stub(:attributes => { :name => {} })
+        @document = stub(:raw_attributes => { "name" => {} })
         @association = Mongoid::Associations::HasOne.instantiate(
           @document,
           Mongoid::Associations::Options.new(:name => :name)
@@ -100,12 +100,12 @@ describe Mongoid::Associations::HasOne do
     context "when attributes exist" do
 
       before do
-        @document = stub(:attributes => { :name => { :first_name => "Test" } })
+        @document = stub(:raw_attributes => { "name" => { "first_name" => "Test" } })
         @options = Mongoid::Associations::Options.new(:name => :name)
       end
 
       it "delegates to new" do
-        Mongoid::Associations::HasOne.expects(:new).with(@document, { :first_name => "Test" }, @options)
+        Mongoid::Associations::HasOne.expects(:new).with(@document, { "first_name" => "Test" }, @options)
         Mongoid::Associations::HasOne.instantiate(@document, @options)
       end
 
@@ -118,7 +118,7 @@ describe Mongoid::Associations::HasOne do
     before do
       @association = Mongoid::Associations::HasOne.new(
         @document,
-        @attributes[:mixed_drink],
+        @attributes["mixed_drink"],
         Mongoid::Associations::Options.new(:name => :mixed_drink)
       )
     end
@@ -149,7 +149,7 @@ describe Mongoid::Associations::HasOne do
       before do
         @association = Mongoid::Associations::HasOne.new(
           @document,
-          @attributes[:mixed_drink],
+          @attributes["mixed_drink"],
           Mongoid::Associations::Options.new(:name => :mixed_drink)
         )
       end
@@ -221,7 +221,7 @@ describe Mongoid::Associations::HasOne do
     context "when the document is not nil" do
 
       before do
-        @document = stub(:attributes => { :name => { :first_name => "Test" } }, :update => true)
+        @document = stub(:raw_attributes => { "name" => { "first_name" => "Test" } }, :update => true)
         @options = Mongoid::Associations::Options.new(:name => :name)
         @association = Mongoid::Associations::HasOne.instantiate(@document, @options)
       end

data/spec/unit/mongoid/associations/options_spec.rb

@@ -10,7 +10,7 @@ describe Mongoid::Associations::Options do
     end
 
     it "returns the association name" do
-      @options.name.should == :addresses
+      @options.name.should == "addresses"
     end
 
   end

data/spec/unit/mongoid/criteria_spec.rb

@@ -497,7 +497,12 @@ describe Mongoid::Criteria do
       end
 
       it "calls group on the collection with the aggregate js" do
-        @collection.expects(:group).with([:field1], {:_type => { "$in" => ["Doctor", "Person"] }}, {:group => []}, @reduce, true).returns(@grouping)
+        @collection.expects(:group).with(
+          [ :field1 ],
+          { :_type =>
+            { "$in" => ["Doctor", "Person"] }},
+          {:group => []}, @reduce, true
+        ).returns(@grouping)
         @criteria.only(:field1).group
       end
 
@@ -512,7 +517,11 @@ describe Mongoid::Criteria do
       end
 
       it "calls group on the collection with the aggregate js" do
-        @collection.expects(:group).with([:field1], {:_type => { "$in" => ["Doctor", "Person"] }}, {:group => []}, @reduce, true).returns(@grouping)
+        @collection.expects(:group).with(
+          [ :field1 ],
+          { :_type =>
+            { "$in" => ["Doctor", "Person"] }
+          }, { :group => []}, @reduce, true).returns(@grouping)
         @criteria.only(:field1).group
       end
 
@@ -522,15 +531,34 @@ describe Mongoid::Criteria do
 
   describe "#id" do
 
-    it "adds the _id query to the selector" do
-      id = Mongo::ObjectID.new.to_s
-      @criteria.id(id)
-      @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :_id => id }
+    context "when passing a single id" do
+
+      it "adds the _id query to the selector" do
+        id = Mongo::ObjectID.new.to_s
+        @criteria.id(id)
+        @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :_id => id }
+      end
+
+      it "returns self" do
+        id = Mongo::ObjectID.new.to_s
+        @criteria.id(id.to_s).should == @criteria
+      end
+
     end
 
-    it "returns self" do
-      id = Mongo::ObjectID.new.to_s
-      @criteria.id(id.to_s).should == @criteria
+    context "when passing in an array of ids" do
+
+      before do
+        @ids = []
+        3.times { @ids << Mongo::ObjectID.new.to_s }
+      end
+
+      it "adds the _id query to the selector" do
+        @criteria.id(@ids)
+        @criteria.selector.should ==
+          { :_type => { "$in" => ["Doctor", "Person"] }, :_id => { "$in" => @ids } }
+      end
+
     end
 
   end
@@ -539,7 +567,12 @@ describe Mongoid::Criteria do
 
     it "adds the $in clause to the selector" do
       @criteria.in(:title => ["title1", "title2"], :text => ["test"])
-      @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :title => { "$in" => ["title1", "title2"] }, :text => { "$in" => ["test"] } }
+      @criteria.selector.should ==
+        { :_type =>
+          { "$in" =>
+            ["Doctor", "Person"]
+          }, :title => { "$in" => ["title1", "title2"] }, :text => { "$in" => ["test"] }
+        }
     end
 
     it "returns self" do
@@ -969,7 +1002,11 @@ describe Mongoid::Criteria do
       @collection = mock
       Person.expects(:collection).returns(@collection)
       @criteria = Person.where(:_id => "1").skip(60).limit(20)
-      @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 = @criteria.paginate
     end
 
@@ -1112,6 +1149,7 @@ describe Mongoid::Criteria do
 
       it "creates a criteria for a string" do
         @criteria.expects(:one).returns(@document)
+        @document.expects(:blank? => false)
         Mongoid::Criteria.translate(Person, @id)
       end
 
@@ -1128,6 +1166,53 @@ describe Mongoid::Criteria do
 
     context "multiple arguments" do
 
+      context "when an array of ids" do
+
+        before do
+          @ids = []
+          @documents = []
+          3.times do
+            @ids << Mongo::ObjectID.new.to_s
+            @documents << stub
+          end
+          @collection = stub
+          Person.expects(:collection).returns(@collection)
+        end
+
+        context "when documents are found" do
+
+          it "returns an ids criteria" do
+            @collection.expects(:find).with(
+              { :_type =>
+                { "$in" =>
+                  ["Doctor", "Person"]
+                },
+                :_id =>
+                { "$in" => @ids }
+            }, {}).returns([{ "_id" => "4", "title" => "Sir", "_type" => "Person" }])
+            @criteria = Mongoid::Criteria.translate(Person, @ids)
+          end
+
+        end
+
+        context "when documents are not found" do
+
+          it "returns an ids criteria" do
+            @collection.expects(:find).with(
+              { :_type =>
+                { "$in" =>
+                  ["Doctor", "Person"]
+                },
+                :_id =>
+                { "$in" => @ids }
+            }, {}).returns([])
+            lambda { Mongoid::Criteria.translate(Person, @ids) }.should raise_error
+          end
+
+        end
+
+      end
+
       context "when Person, :conditions => {}" do
 
         before do
@@ -1200,7 +1285,8 @@ describe Mongoid::Criteria do
 
         it "adds the clause to the selector" do
           @criteria.where(:title => "Title", :text => "Text")
-          @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :title => "Title", :text => "Text" }
+          @criteria.selector.should ==
+            { :_type => { "$in" => ["Doctor", "Person"] }, :title => "Title", :text => "Text" }
         end
 
       end
@@ -1211,7 +1297,8 @@ describe Mongoid::Criteria do
 
           it "returns those matching an all clause" do
             @criteria.where(:title.all => ["Sir"])
-            @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :title => { "$all" => ["Sir"] } }
+            @criteria.selector.should ==
+              { :_type => { "$in" => ["Doctor", "Person"] }, :title => { "$all" => ["Sir"] } }
           end
 
         end
@@ -1220,7 +1307,8 @@ describe Mongoid::Criteria do
 
           it "returns those matching an exists clause" do
             @criteria.where(:title.exists => true)
-            @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :title => { "$exists" => true } }
+            @criteria.selector.should ==
+              { :_type => { "$in" => ["Doctor", "Person"] }, :title => { "$exists" => true } }
           end
 
         end
@@ -1229,7 +1317,8 @@ describe Mongoid::Criteria do
 
           it "returns those matching a gt clause" do
             @criteria.where(:age.gt => 30)
-            @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :age => { "$gt" => 30 } }
+            @criteria.selector.should ==
+              { :_type => { "$in" => ["Doctor", "Person"] }, :age => { "$gt" => 30 } }
           end
 
         end
@@ -1238,7 +1327,8 @@ describe Mongoid::Criteria do
 
           it "returns those matching a gte clause" do
             @criteria.where(:age.gte => 33)
-            @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :age => { "$gte" => 33 } }
+            @criteria.selector.should ==
+              { :_type => { "$in" => ["Doctor", "Person"] }, :age => { "$gte" => 33 } }
           end
 
         end
@@ -1247,7 +1337,8 @@ describe Mongoid::Criteria do
 
           it "returns those matching an in clause" do
             @criteria.where(:title.in => ["Sir", "Madam"])
-            @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :title => { "$in" => ["Sir", "Madam"] } }
+            @criteria.selector.should ==
+              { :_type => { "$in" => ["Doctor", "Person"] }, :title => { "$in" => ["Sir", "Madam"] } }
           end
 
         end
@@ -1256,7 +1347,8 @@ describe Mongoid::Criteria do
 
           it "returns those matching a lt clause" do
             @criteria.where(:age.lt => 34)
-            @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :age => { "$lt" => 34 } }
+            @criteria.selector.should ==
+              { :_type => { "$in" => ["Doctor", "Person"] }, :age => { "$lt" => 34 } }
           end
 
         end
@@ -1265,7 +1357,8 @@ describe Mongoid::Criteria do
 
           it "returns those matching a lte clause" do
             @criteria.where(:age.lte => 33)
-            @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :age => { "$lte" => 33 } }
+            @criteria.selector.should ==
+              { :_type => { "$in" => ["Doctor", "Person"] }, :age => { "$lte" => 33 } }
           end
 
         end
@@ -1274,7 +1367,8 @@ describe Mongoid::Criteria do
 
           it "returns those matching a ne clause" do
             @criteria.where(:age.ne => 50)
-            @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :age => { "$ne" => 50 } }
+            @criteria.selector.should ==
+              { :_type => { "$in" => ["Doctor", "Person"] }, :age => { "$ne" => 50 } }
           end
 
         end
@@ -1283,7 +1377,8 @@ describe Mongoid::Criteria do
 
           it "returns those matching a nin clause" do
             @criteria.where(:title.nin => ["Esquire", "Congressman"])
-            @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :title => { "$nin" => ["Esquire", "Congressman"] } }
+            @criteria.selector.should ==
+              { :_type => { "$in" => ["Doctor", "Person"] }, :title => { "$nin" => ["Esquire", "Congressman"] } }
           end
 
         end
@@ -1292,7 +1387,8 @@ describe Mongoid::Criteria do
 
           it "returns those matching a size clause" do
             @criteria.where(:aliases.size => 2)
-            @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, :aliases => { "$size" => 2 } }
+            @criteria.selector.should ==
+              { :_type => { "$in" => ["Doctor", "Person"] }, :aliases => { "$size" => 2 } }
           end
 
         end
@@ -1305,7 +1401,8 @@ describe Mongoid::Criteria do
 
       it "adds the $where clause to the selector" do
         @criteria.where("this.date < new Date()")
-        @criteria.selector.should == { :_type => { "$in" => ["Doctor", "Person"] }, "$where" => "this.date < new Date()" }
+        @criteria.selector.should ==
+          { :_type => { "$in" => ["Doctor", "Person"] }, "$where" => "this.date < new Date()" }
       end
 
     end

data/spec/unit/mongoid/document_spec.rb

@@ -223,68 +223,7 @@ describe Mongoid::Document do
 
   end
 
-  describe ".instantiate" do
-
-    before do
-      @attributes = { :_id => "1", :_type => "Person", :title => "Sir", :age => 30 }
-      @person = Person.new(@attributes)
-    end
-
-    it "sets the attributes directly" do
-      Person.instantiate(@attributes).should == @person
-    end
-
-  end
-
-  describe ".key" do
-
-    context "when key is single field" do
-
-      before do
-        Address.key :street
-        @address = Address.new(:street => "Testing Street Name")
-        @address.expects(:collection).returns(@collection)
-        @collection.expects(:save)
-      end
-
-      it "adds the callback for primary key generation" do
-        @address.save
-        @address.id.should == "testing-street-name"
-      end
-
-    end
-
-    context "when key is composite" do
-
-      before do
-        Address.key :street, :post_code
-        @address = Address.new(:street => "Testing Street Name", :post_code => "94123")
-        @address.expects(:collection).returns(@collection)
-        @collection.expects(:save)
-      end
-
-      it "combines all fields" do
-        @address.save
-        @address.id.should == "testing-street-name-94123"
-      end
-
-    end
-
-    context "when key is on a subclass" do
-
-      before do
-        Firefox.key :name
-      end
-
-      it "sets the key for the entire hierarchy" do
-        Canvas.primary_key.should == [:name]
-      end
-
-    end
-
-  end
-
-  describe "#new" do
+  describe ".initialize" do
 
     context "when passed a block" do
 
@@ -310,6 +249,20 @@ describe Mongoid::Document do
 
     end
 
+    context "with nil attributes" do
+
+      before do
+        @person = Person.new(nil)
+      end
+
+      it "sets default attributes" do
+        @person.attributes.empty?.should be_false
+        @person.age.should == 100
+        @person.blood_alcohol_content.should == 0.0
+      end
+
+    end
+
     context "with attributes" do
 
       before do
@@ -363,6 +316,83 @@ describe Mongoid::Document do
 
   end
 
+  describe ".instantiate" do
+
+    context "when attributes have an id" do
+
+      before do
+        @attributes = { "_id" => "1", "_type" => "Person", "title" => "Sir", "age" => 30 }
+      end
+
+      it "sets the attributes directly" do
+        person = Person.instantiate(@attributes)
+        person._id.should == "1"
+        person._type.should == "Person"
+        person.title.should == "Sir"
+        person.age.should == 30
+      end
+
+    end
+
+    context "with nil attributes" do
+
+      it "sets the attributes directly" do
+        person = Person.instantiate(nil)
+        person.id.should_not be_nil
+      end
+
+    end
+
+  end
+
+  describe ".key" do
+
+    context "when key is single field" do
+
+      before do
+        Address.key :street
+        @address = Address.new(:street => "Testing Street Name")
+        @address.expects(:collection).returns(@collection)
+        @collection.expects(:save)
+      end
+
+      it "adds the callback for primary key generation" do
+        @address.save
+        @address.id.should == "testing-street-name"
+      end
+
+    end
+
+    context "when key is composite" do
+
+      before do
+        Address.key :street, :post_code
+        @address = Address.new(:street => "Testing Street Name", :post_code => "94123")
+        @address.expects(:collection).returns(@collection)
+        @collection.expects(:save)
+      end
+
+      it "combines all fields" do
+        @address.save
+        @address.id.should == "testing-street-name-94123"
+      end
+
+    end
+
+    context "when key is on a subclass" do
+
+      before do
+        Firefox.key :name
+      end
+
+      it "sets the key for the entire hierarchy" do
+        Canvas.primary_key.should == [:name]
+      end
+
+    end
+
+  end
+
   describe "#new_record?" do
 
     context "when the object has been saved" do

data/spec/unit/mongoid/finders_spec.rb

@@ -95,6 +95,19 @@ describe Mongoid::Finders do
 
     end
 
+    context "when an array of ids is passed in" do
+
+      before do
+        @ids = []
+        3.times { @ids << Mongo::ObjectID.new.to_s }
+      end
+
+      it "delegates to the criteria" do
+
+      end
+
+    end
+
     context "when nil passed in" do
 
       it "raises an error" do

data/spec/unit/mongoid_spec.rb

@@ -2,16 +2,34 @@ require "spec_helper"
 
 describe Mongoid do
 
-  describe ".method_missing" do
+  describe ".config" do
+
+    context "when no block supplied" do
+
+      it "returns the config singleton" do
+        Mongoid.config.should == Mongoid::Config.instance
+      end
 
-    before do
-      @config = mock
-      Mongoid::Config.expects(:instance).returns(@config)
     end
 
-    it "delegates all calls to the config singleton" do
-      @config.expects(:raise_not_found_error=).with(false)
-      Mongoid.raise_not_found_error = false
+    context "when a block is supplied" do
+
+      before do
+        Mongoid.config do |config|
+          config.allow_dynamic_fields = false
+        end
+      end
+
+      after do
+        Mongoid.config do |config|
+          config.allow_dynamic_fields = true
+        end
+      end
+
+      it "sets the values on the config instance" do
+        Mongoid.allow_dynamic_fields.should be_false
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 -05:00
+date: 2010-01-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency