mongoid 0.8.2 → 0.8.3

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.3

data/lib/mongoid.rb

@@ -24,7 +24,7 @@ gem "activesupport", "2.3.4"
 gem "mongo", "0.17"
 gem "mongo_ext", "0.17"
 gem "durran-validatable", "1.8.2"
-gem "will_paginate", "2.3.11"
+gem "leshill-will_paginate", "2.3.11"
 
 require "delegate"
 require "observer"
@@ -42,6 +42,7 @@ require "mongoid/commands"
 require "mongoid/criteria"
 require "mongoid/extensions"
 require "mongoid/field"
+require "mongoid/finders"
 require "mongoid/timestamps"
 require "mongoid/versioning"
 require "mongoid/document"
@@ -59,6 +60,18 @@ module Mongoid
   # Raised when a persisence method ending in ! fails validation.
   class ValidationsError < RuntimeError; end
 
+  # A common case of errors is to instantiate a child document without a
+  # reference to a parent, which will result in trying to save on a nil
+  # collection. This error is raised to help debug the issue.
+  class MissingParentError < RuntimeError
+    def initialize(doc)
+      @document = doc
+    end
+    def message
+      "Attempted to save embedded document #{@document.class.name}, but there was no associated parent"
+    end
+  end
+
   # Connect to the database name supplied. This should be run
   # for initial setup, potentially in a rails initializer.
   def self.connect_to(name)

data/lib/mongoid/attributes.rb

@@ -1,7 +1,9 @@
 module Mongoid #:nodoc:
   module Attributes #:nodoc:
     # Process the provided attributes casting them to their proper values if a
-    # field exists for them on the +Document+.
+    # 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|
         send("#{key}=", value)

data/lib/mongoid/commands/save.rb

@@ -13,7 +13,12 @@ module Mongoid #:nodoc:
         return false unless Validate.execute(doc)
         doc.run_callbacks :before_save
         parent = doc.parent
-        parent ? Save.execute(parent) : doc.collection.save(doc.attributes)
+        if parent
+          Save.execute(parent)
+        else
+          collection = doc.collection
+          collection ? collection.save(doc.attributes) : raise(MissingParentError.new(doc))
+        end
         doc.run_callbacks :after_save
         return doc
       end

data/lib/mongoid/criteria.rb

@@ -270,6 +270,22 @@ module Mongoid #:nodoc:
       end
     end
 
+    # Executes the +Criteria+ and paginates the results.
+    #
+    # Options:
+    #
+    # klass: Optional class name to execute the criteria on.
+    #
+    # Example:
+    #
+    # <tt>criteria.paginate(Person)</tt>
+    def paginate(klass = nil)
+      results = execute(klass)
+      WillPaginate::Collection.create(page, per_page, count) do |pager|
+        pager.replace(results)
+      end
+    end
+
     # Returns the number of results per page or the default of 20.
     def per_page
       (@options[:limit] || 20).to_i

data/lib/mongoid/document.rb

@@ -2,6 +2,7 @@ module Mongoid #:nodoc:
   class Document
     include ActiveSupport::Callbacks
     include Associations, Attributes, Commands, Observable, Validatable
+    extend Finders
 
     attr_accessor :association_name, :parent
     attr_reader :attributes, :new_record
@@ -20,17 +21,6 @@ module Mongoid #:nodoc:
 
     class << self
 
-      # Find +Documents+ given the conditions.
-      #
-      # Options:
-      #
-      # args: A +Hash+ with a conditions key and other options
-      #
-      # <tt>Person.all(:conditions => { :attribute => "value" })</tt>
-      def all(*args)
-        find(:all, *args)
-      end
-
       # Returns the collection associated with this +Document+. If the
       # document is embedded, there will be no collection associated
       # with it.
@@ -42,14 +32,6 @@ module Mongoid #:nodoc:
         @collection ||= Mongoid.database.collection(@collection_name)
       end
 
-      # Returns a count of matching records in the database based on the
-      # provided arguments.
-      #
-      # <tt>Person.count(:first, :conditions => { :attribute => "value" })</tt>
-      def count(*args)
-        Criteria.translate(*args).count(self)
-      end
-
       # Returns a hash of all the default values
       def defaults
         @defaults
@@ -86,39 +68,6 @@ module Mongoid #:nodoc:
         @fields
       end
 
-      # Find a +Document+ in several different ways.
-      #
-      # If a +String+ is provided, it will be assumed that it is a
-      # representation of a Mongo::ObjectID and will attempt to find a single
-      # +Document+ based on that id. If a +Symbol+ and +Hash+ is provided then
-      # it will attempt to find either a single +Document+ or multiples based
-      # on the conditions provided and the first parameter.
-      #
-      # <tt>Person.find(:first, :conditions => { :attribute => "value" })</tt>
-      #
-      # <tt>Person.find(:all, :conditions => { :attribute => "value" })</tt>
-      #
-      # <tt>Person.find(Mongo::ObjectID.new.to_s)</tt>
-      def find(*args)
-        Criteria.translate(*args).execute(self)
-      end
-
-      # Find a +Document+ by its id.
-      def find_by_id(id)
-        find(id)
-      end
-
-      # Find the first +Document+ given the conditions.
-      #
-      # Options:
-      #
-      # args: A +Hash+ with a conditions key and other options
-      #
-      # <tt>Person.first(:conditions => { :attribute => "value" })</tt>
-      def first(*args)
-        find(:first, *args)
-      end
-
       # Adds an index on the field specified. Options can be :unique => true or
       # :unique => false. It will default to the latter.
       def index(name, options = { :unique => false })
@@ -157,44 +106,6 @@ module Mongoid #:nodoc:
         @primary_key
       end
 
-      # Find all documents in paginated fashion given the supplied arguments.
-      # If no parameters are passed just default to offset 0 and limit 20.
-      #
-      # Options:
-      #
-      # params: A +Hash+ of params to pass to the Criteria API.
-      #
-      # Example:
-      #
-      # <tt>Person.paginate(:conditions => { :field => "Test" }, :page => 1,
-      # :per_page => 20)</tt>
-      #
-      # Returns paginated array of docs.
-      def paginate(params = {})
-        criteria = Criteria.translate(:all, params)
-        results = criteria.execute(self)
-        WillPaginate::Collection.create(criteria.page, criteria.per_page, criteria.count) do |pager|
-          pager.replace(results)
-        end
-      end
-
-      # Entry point for creating a new criteria from a Document. This will
-      # instantiate a new +Criteria+ object with the supplied select criterion
-      # already added to it.
-      #
-      # Options:
-      #
-      # args: A list of field names to retrict the returned fields to.
-      #
-      # Example:
-      #
-      # <tt>Person.select(:field1, :field2, :field3)</tt>
-      #
-      # Returns: <tt>Criteria</tt>
-      def select(*args)
-        Criteria.new(:all, self).select(*args)
-      end
-
     end
 
     # Performs equality checking on the attributes.

data/lib/mongoid/extensions.rb

@@ -2,6 +2,7 @@ require "mongoid/extensions/array/conversions"
 require "mongoid/extensions/array/parentization"
 require "mongoid/extensions/boolean/conversions"
 require "mongoid/extensions/date/conversions"
+require "mongoid/extensions/datetime/conversions"
 require "mongoid/extensions/float/conversions"
 require "mongoid/extensions/hash/accessors"
 require "mongoid/extensions/hash/conversions"
@@ -25,6 +26,10 @@ class Date #:nodoc
   extend Mongoid::Extensions::Date::Conversions
 end
 
+class DateTime #:nodoc
+  extend Mongoid::Extensions::DateTime::Conversions
+end
+
 class Float #:nodoc
   extend Mongoid::Extensions::Float::Conversions
 end

data/lib/mongoid/extensions/datetime/conversions.rb

@@ -0,0 +1,16 @@
+module Mongoid #:nodoc:
+  module Extensions #:nodoc:
+    module DateTime #:nodoc:
+      module Conversions #:nodoc:
+        def set(value)
+          return nil if value.blank?
+          ::DateTime.parse(value.to_s).utc
+        end
+        def get(value)
+          return nil if value.blank?
+          ::Time.zone ? ::Time.parse(value.to_s).getlocal.to_datetime : value.to_datetime
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/finders.rb

@@ -0,0 +1,90 @@
+module Mongoid #:nodoc:
+  module Finders #:nodoc:
+    # Find +Documents+ given the conditions.
+    #
+    # Options:
+    #
+    # args: A +Hash+ with a conditions key and other options
+    #
+    # <tt>Person.all(:conditions => { :attribute => "value" })</tt>
+    def all(*args)
+      find(:all, *args)
+    end
+
+    # Returns a count of matching records in the database based on the
+    # provided arguments.
+    #
+    # <tt>Person.count(:first, :conditions => { :attribute => "value" })</tt>
+    def count(*args)
+      Criteria.translate(*args).count(self)
+    end
+
+    # Find a +Document+ in several different ways.
+    #
+    # If a +String+ is provided, it will be assumed that it is a
+    # representation of a Mongo::ObjectID and will attempt to find a single
+    # +Document+ based on that id. If a +Symbol+ and +Hash+ is provided then
+    # it will attempt to find either a single +Document+ or multiples based
+    # on the conditions provided and the first parameter.
+    #
+    # <tt>Person.find(:first, :conditions => { :attribute => "value" })</tt>
+    #
+    # <tt>Person.find(:all, :conditions => { :attribute => "value" })</tt>
+    #
+    # <tt>Person.find(Mongo::ObjectID.new.to_s)</tt>
+    def find(*args)
+      Criteria.translate(*args).execute(self)
+    end
+
+    # Find a +Document+ by its id.
+    def find_by_id(id)
+      find(id)
+    end
+
+    # Find the first +Document+ given the conditions.
+    #
+    # Options:
+    #
+    # args: A +Hash+ with a conditions key and other options
+    #
+    # <tt>Person.first(:conditions => { :attribute => "value" })</tt>
+    def first(*args)
+      find(:first, *args)
+    end
+
+    # Find all documents in paginated fashion given the supplied arguments.
+    # If no parameters are passed just default to offset 0 and limit 20.
+    #
+    # Options:
+    #
+    # params: A +Hash+ of params to pass to the Criteria API.
+    #
+    # Example:
+    #
+    # <tt>Person.paginate(:conditions => { :field => "Test" }, :page => 1,
+    # :per_page => 20)</tt>
+    #
+    # Returns paginated array of docs.
+    def paginate(params = {})
+      Criteria.translate(:all, params).paginate(self)
+    end
+
+    # Entry point for creating a new criteria from a Document. This will
+    # instantiate a new +Criteria+ object with the supplied select criterion
+    # already added to it.
+    #
+    # Options:
+    #
+    # args: A list of field names to retrict the returned fields to.
+    #
+    # Example:
+    #
+    # <tt>Person.select(:field1, :field2, :field3)</tt>
+    #
+    # Returns: <tt>Criteria</tt>
+    def select(*args)
+      Criteria.new(:all, self).select(*args)
+    end
+
+  end
+end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2009-11-19}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/array/parentization.rb",
      "lib/mongoid/extensions/boolean/conversions.rb",
      "lib/mongoid/extensions/date/conversions.rb",
+     "lib/mongoid/extensions/datetime/conversions.rb",
      "lib/mongoid/extensions/float/conversions.rb",
      "lib/mongoid/extensions/hash/accessors.rb",
      "lib/mongoid/extensions/hash/conversions.rb",
@@ -56,6 +57,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/symbol/inflections.rb",
      "lib/mongoid/extensions/time/conversions.rb",
      "lib/mongoid/field.rb",
+     "lib/mongoid/finders.rb",
      "lib/mongoid/timestamps.rb",
      "lib/mongoid/versioning.rb",
      "mongoid.gemspec",
@@ -85,6 +87,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
      "spec/unit/mongoid/extensions/boolean/conversions_spec.rb",
      "spec/unit/mongoid/extensions/date/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/datetime/conversions_spec.rb",
      "spec/unit/mongoid/extensions/float/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
@@ -95,6 +98,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
      "spec/unit/mongoid/extensions/time/conversions_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
+     "spec/unit/mongoid/finders_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb"
   ]
@@ -128,6 +132,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/array/parentization_spec.rb",
      "spec/unit/mongoid/extensions/boolean/conversions_spec.rb",
      "spec/unit/mongoid/extensions/date/conversions_spec.rb",
+     "spec/unit/mongoid/extensions/datetime/conversions_spec.rb",
      "spec/unit/mongoid/extensions/float/conversions_spec.rb",
      "spec/unit/mongoid/extensions/hash/accessors_spec.rb",
      "spec/unit/mongoid/extensions/hash/conversions_spec.rb",
@@ -138,6 +143,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
      "spec/unit/mongoid/extensions/time/conversions_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
+     "spec/unit/mongoid/finders_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb"
   ]

data/spec/unit/mongoid/associations_spec.rb

@@ -56,7 +56,7 @@ describe Mongoid::Associations do
 
   end
 
-  describe "#belongs_to" do
+  describe ".belongs_to" do
 
     it "creates a reader for the association" do
       address = Address.new
@@ -93,7 +93,7 @@ describe Mongoid::Associations do
 
   end
 
-  describe "#has_many" do
+  describe ".has_many" do
 
     it "adds a new Association to the collection" do
       person = Person.new
@@ -160,7 +160,7 @@ describe Mongoid::Associations do
 
   end
 
-  describe "#has_one" do
+  describe ".has_one" do
 
     it "adds a new Association to the collection" do
       person = Person.new

data/spec/unit/mongoid/commands/save_spec.rb

@@ -72,4 +72,20 @@ describe Mongoid::Commands::Save do
 
   end
 
+  context "when the document is embedded" do
+
+    before do
+      @child_name = Name.new(:first_name => "Testy")
+    end
+
+    context "when parent reference does not exist" do
+
+      it "raises an error" do
+        lambda { @child_name.save }.should raise_error
+      end
+
+    end
+
+  end
+
 end

data/spec/unit/mongoid/commands_spec.rb

@@ -127,7 +127,7 @@ describe Mongoid::Commands do
 
   context "class methods" do
 
-    describe "#create" do
+    describe ".create" do
 
       it "delegates to the Create command" do
         Mongoid::Commands::Create.expects(:execute)
@@ -141,7 +141,7 @@ describe Mongoid::Commands do
 
     end
 
-    describe "#create!" do
+    describe ".create!" do
 
       it "delegates to the Create command" do
         Mongoid::Commands::Create.expects(:execute).returns(Person.new)
@@ -165,7 +165,7 @@ describe Mongoid::Commands do
 
     end
 
-    describe "#delete_all" do
+    describe ".delete_all" do
 
       it "delegates to the DeleteAll command" do
         Mongoid::Commands::DeleteAll.expects(:execute).with(Person, {})
@@ -174,7 +174,7 @@ describe Mongoid::Commands do
 
     end
 
-    describe "#destroy_all" do
+    describe ".destroy_all" do
 
       it "delegates to the DestroyAll command" do
         Mongoid::Commands::DestroyAll.expects(:execute).with(Person, {})

data/spec/unit/mongoid/criteria_spec.rb

@@ -441,6 +441,23 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#paginate" do
+
+    before do
+      @collection = mock
+      Person.expects(:collection).returns(@collection)
+      @criteria = Person.select.where(:_id => "1").skip(60).limit(20)
+      @collection.expects(:find).with({:_id => "1"}, :skip => 60, :limit => 20).returns([])
+      @results = @criteria.paginate
+    end
+
+    it "executes and paginates the results" do
+      @results.current_page.should == 4
+      @results.per_page.should == 20
+    end
+
+  end
+
   describe "#per_page" do
 
     context "when the per_page option exists" do
@@ -521,7 +538,7 @@ describe Mongoid::Criteria do
 
   end
 
-  describe "#translate" do
+  describe ".translate" do
 
     context "with a single argument" do
 

data/spec/unit/mongoid/document_spec.rb

@@ -56,35 +56,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#all" do
-
-    before do
-      @cursor = stub(:count => 100)
-      @people = []
-    end
-
-    context "when a selector is provided" do
-
-      it "finds from the collection and instantiate objects for each returned" do
-        @collection.expects(:find).with({ :test => "Test" }, {}).returns(@cursor)
-        @cursor.expects(:collect).returns(@people)
-        Person.all(:conditions => {:test => "Test"})
-      end
-
-    end
-
-    context "when a selector is not provided" do
-
-      it "finds from the collection and instantiate objects for each returned" do
-        @collection.expects(:find).with(nil, {}).returns(@cursor)
-        @cursor.expects(:collect).returns(@people)
-        Person.all
-      end
-
-    end
-
-  end
-
   describe "#clone" do
 
     before do
@@ -99,7 +70,7 @@ describe Mongoid::Document do
 
   end
 
-  describe "#collection" do
+  describe ".collection" do
 
     before do
       @person = Person.new
@@ -123,31 +94,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#count" do
-
-    before do
-      @params = { :conditions => { :title => "Sir" } }
-      @criteria = mock
-    end
-
-    it "delegates to the criteria api" do
-      Mongoid::Criteria.expects(:translate).with(@params).returns(@criteria)
-      @criteria.expects(:count).with(Person).returns(10)
-      Person.count(@params).should == 10
-    end
-
-    context "when no options provided" do
-
-      it "adds in the default parameters" do
-        Mongoid::Criteria.expects(:translate).with(nil).returns(@criteria)
-        @criteria.expects(:count).with(Person).returns(10)
-        Person.count.should == 10
-      end
-
-    end
-
-  end
-
   describe ".defaults" do
 
     it "returns a hash of all the default values" do
@@ -210,7 +156,7 @@ describe Mongoid::Document do
 
   end
 
-  describe "#field" do
+  describe ".field" do
 
     context "with no options" do
 
@@ -248,107 +194,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#find" do
-
-    before do
-      @attributes = {}
-      @criteria = mock
-    end
-
-    context "when an id is passed in" do
-
-      before do
-        @id = Mongo::ObjectID.new.to_s
-      end
-
-      it "delegates to criteria" do
-        Mongoid::Criteria.expects(:translate).with(@id.to_s).returns(@criteria)
-        @criteria.expects(:execute).with(Person).returns(@attributes)
-        Person.find(@id.to_s)
-      end
-
-    end
-
-    context "when finding first" do
-
-      it "delegates to criteria" do
-        Mongoid::Criteria.expects(:translate).with(:first, :conditions => { :test => "Test" }).returns(@criteria)
-        @criteria.expects(:execute).with(Person).returns(@attributes)
-        Person.find(:first, :conditions => { :test => "Test" })
-      end
-
-    end
-
-    context "when finding all" do
-
-      before do
-        @cursor = stub(:count => 100)
-        @people = []
-      end
-
-      it "delegates to find_all" do
-        @collection.expects(:find).with({:test => "Test"}, {}).returns(@cursor)
-        @cursor.expects(:collect).returns(@people)
-        Person.find(:all, :conditions => { :test => "Test" })
-      end
-
-    end
-
-    context "when sorting" do
-
-      before do
-        @cursor = stub(:count => 50)
-        @people = []
-      end
-
-      it "adds the sort parameters for the collection call" do
-        @collection.expects(:find).with({ :test => "Test" }, { :sort => { :test => -1 }}).returns(@cursor)
-        @cursor.expects(:collect).returns(@people)
-        Person.find(:all, :conditions => { :test => "Test" }, :sort => { :test => -1 })
-      end
-    end
-
-  end
-
-  describe "#find_by_id" do
-
-    before do
-      @criteria = stub_everything
-    end
-
-    it "delegates to find with an id parameter" do
-      Mongoid::Criteria.expects(:translate).with("1").returns(@criteria)
-      Person.find_by_id("1")
-    end
-
-  end
-
-  describe "#first" do
-
-    before do
-      @attributes = { "age" => 100 }
-    end
-
-    context "when a selector is provided" do
-
-      it "finds the first document from the collection and instantiates it" do
-        @collection.expects(:find_one).with({ :test => "Test" }, {}).returns(@attributes)
-        Person.first(:conditions => {:test => "Test"}).attributes.except(:_id).should == @attributes
-      end
-
-    end
-
-    context "when a selector is not provided" do
-
-      it "finds the first document from the collection and instantiates it" do
-        @collection.expects(:find_one).with(nil, {}).returns(@attributes)
-        Person.first.attributes.except(:_id).should == @attributes
-      end
-
-    end
-
-  end
-
   describe "#_id" do
 
     before do
@@ -361,7 +206,7 @@ describe Mongoid::Document do
 
   end
 
-  describe "#index" do
+  describe ".index" do
 
     context "when unique options are not provided" do
 
@@ -383,7 +228,7 @@ describe Mongoid::Document do
 
   end
 
-  describe "#instantiate" do
+  describe ".instantiate" do
 
     context "when document is new" do
 
@@ -413,7 +258,7 @@ describe Mongoid::Document do
 
   end
 
-  describe "#key" do
+  describe ".key" do
 
     context "when key is single field" do
 
@@ -449,19 +294,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#last" do
-
-    before do
-      @attributes = { :_id => 1, :title => "Sir" }
-      @collection.expects(:find_one).with({}, :sort => [[:_id, :asc]]).returns(@attributes)
-    end
-
-    it "finds the last document by the id" do
-      Person.last.should == Person.instantiate(@attributes)
-    end
-
-  end
-
   describe "#new" do
 
     context "with no attributes" do
@@ -547,42 +379,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#paginate" do
-
-    before do
-      @criteria = stub(:page => 1, :per_page => "20", :count => 100)
-    end
-
-    context "when pagination parameters are passed" do
-
-      before do
-        @params = { :conditions => { :test => "Test" }, :page => 2, :per_page => 20 }
-      end
-
-      it "delegates to will paginate with the results" do
-        Mongoid::Criteria.expects(:translate).with(:all, @params).returns(@criteria)
-        @criteria.expects(:execute).with(Person).returns([])
-        Person.paginate(@params)
-      end
-
-    end
-
-    context "when pagination parameters are not passed" do
-
-      before do
-        @params = { :conditions => { :test => "Test" }}
-      end
-
-      it "delegates to will paginate with default values" do
-        Mongoid::Criteria.expects(:translate).with(:all, @params).returns(@criteria)
-        @criteria.expects(:execute).with(Person).returns([])
-        Person.paginate(:conditions => { :test => "Test" })
-      end
-
-    end
-
-  end
-
   describe "#parent" do
 
     before do
@@ -692,15 +488,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#select" do
-
-    it "returns a new criteria with select conditions added" do
-      criteria = Person.select(:title, :age)
-      criteria.options.should == { :fields => [ :title, :age ] }
-    end
-
-  end
-
   describe "#to_param" do
 
     it "returns the id" do

data/spec/unit/mongoid/extensions/datetime/conversions_spec.rb

@@ -0,0 +1,65 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../../../spec_helper.rb"))
+
+describe Mongoid::Extensions::DateTime::Conversions do
+
+  describe "#set" do
+
+    before do
+      @date_time = DateTime.civil(2005, 11, 19).new_offset(1800)
+    end
+
+    context "when value is a string" do
+
+      it "converts to a utc time" do
+        DateTime.set(@date_time.to_s).utc_offset.should == 0
+      end
+
+    end
+
+    context "when value is a date_time" do
+
+      it "converts to a utc time" do
+        DateTime.set(@date_time).utc_offset.should == 0
+      end
+
+    end
+
+    context "when value is nil" do
+
+      it "returns nil" do
+        DateTime.set(nil).should be_nil
+      end
+
+    end
+
+  end
+
+  describe "#get" do
+
+    before do
+      @time = Time.now.utc
+    end
+
+    context "when time is provided" do
+
+      it "returns a DateTime" do
+        DateTime.get(@time.dup).should be_a_kind_of(DateTime)
+      end
+
+      it "returns the local date_time" do
+        DateTime.get(@time.dup).utc_offset.should == @time.utc_offset
+      end
+
+    end
+
+    context "when time is nil" do
+
+      it "returns nil" do
+        DateTime.get(nil).should be_nil
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/finders_spec.rb

@@ -0,0 +1,230 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.rb"))
+
+describe Mongoid::Finders do
+
+  before do
+    @collection = stub(:name => "people")
+    @database = stub(:collection => @collection)
+    Mongoid.stubs(:database).returns(@database)
+  end
+
+  after do
+    Person.instance_variable_set(:@collection, nil)
+    @database = nil
+    @collection = nil
+  end
+
+  describe ".all" do
+
+    before do
+      @cursor = stub(:count => 100)
+      @people = []
+    end
+
+    context "when a selector is provided" do
+
+      it "finds from the collection and instantiate objects for each returned" do
+        @collection.expects(:find).with({ :test => "Test" }, {}).returns(@cursor)
+        @cursor.expects(:collect).returns(@people)
+        Person.all(:conditions => {:test => "Test"})
+      end
+
+    end
+
+    context "when a selector is not provided" do
+
+      it "finds from the collection and instantiate objects for each returned" do
+        @collection.expects(:find).with(nil, {}).returns(@cursor)
+        @cursor.expects(:collect).returns(@people)
+        Person.all
+      end
+
+    end
+
+  end
+
+  describe ".count" do
+
+    before do
+      @params = { :conditions => { :title => "Sir" } }
+      @criteria = mock
+    end
+
+    it "delegates to the criteria api" do
+      Mongoid::Criteria.expects(:translate).with(@params).returns(@criteria)
+      @criteria.expects(:count).with(Person).returns(10)
+      Person.count(@params).should == 10
+    end
+
+    context "when no options provided" do
+
+      it "adds in the default parameters" do
+        Mongoid::Criteria.expects(:translate).with(nil).returns(@criteria)
+        @criteria.expects(:count).with(Person).returns(10)
+        Person.count.should == 10
+      end
+
+    end
+
+  end
+
+  describe ".find" do
+
+    before do
+      @attributes = {}
+      @criteria = mock
+    end
+
+    context "when an id is passed in" do
+
+      before do
+        @id = Mongo::ObjectID.new.to_s
+      end
+
+      it "delegates to criteria" do
+        Mongoid::Criteria.expects(:translate).with(@id.to_s).returns(@criteria)
+        @criteria.expects(:execute).with(Person).returns(@attributes)
+        Person.find(@id.to_s)
+      end
+
+    end
+
+    context "when finding first" do
+
+      it "delegates to criteria" do
+        Mongoid::Criteria.expects(:translate).with(:first, :conditions => { :test => "Test" }).returns(@criteria)
+        @criteria.expects(:execute).with(Person).returns(@attributes)
+        Person.find(:first, :conditions => { :test => "Test" })
+      end
+
+    end
+
+    context "when finding all" do
+
+      before do
+        @cursor = stub(:count => 100)
+        @people = []
+      end
+
+      it "delegates to find_all" do
+        @collection.expects(:find).with({:test => "Test"}, {}).returns(@cursor)
+        @cursor.expects(:collect).returns(@people)
+        Person.find(:all, :conditions => { :test => "Test" })
+      end
+
+    end
+
+    context "when sorting" do
+
+      before do
+        @cursor = stub(:count => 50)
+        @people = []
+      end
+
+      it "adds the sort parameters for the collection call" do
+        @collection.expects(:find).with({ :test => "Test" }, { :sort => { :test => -1 }}).returns(@cursor)
+        @cursor.expects(:collect).returns(@people)
+        Person.find(:all, :conditions => { :test => "Test" }, :sort => { :test => -1 })
+      end
+    end
+
+  end
+
+  describe ".find_by_id" do
+
+    before do
+      @criteria = stub_everything
+    end
+
+    it "delegates to find with an id parameter" do
+      Mongoid::Criteria.expects(:translate).with("1").returns(@criteria)
+      Person.find_by_id("1")
+    end
+
+  end
+
+  describe "#first" do
+
+    before do
+      @attributes = { "age" => 100 }
+    end
+
+    context "when a selector is provided" do
+
+      it "finds the first document from the collection and instantiates it" do
+        @collection.expects(:find_one).with({ :test => "Test" }, {}).returns(@attributes)
+        Person.first(:conditions => {:test => "Test"}).attributes.except(:_id).should == @attributes
+      end
+
+    end
+
+    context "when a selector is not provided" do
+
+      it "finds the first document from the collection and instantiates it" do
+        @collection.expects(:find_one).with(nil, {}).returns(@attributes)
+        Person.first.attributes.except(:_id).should == @attributes
+      end
+
+    end
+
+  end
+
+  describe ".last" do
+
+    before do
+      @attributes = { :_id => 1, :title => "Sir" }
+      @collection.expects(:find_one).with({}, :sort => [[:_id, :asc]]).returns(@attributes)
+    end
+
+    it "finds the last document by the id" do
+      Person.last.should == Person.instantiate(@attributes)
+    end
+
+  end
+
+  describe ".paginate" do
+
+    before do
+      @criteria = stub(:page => 1, :per_page => "20", :count => 100)
+    end
+
+    context "when pagination parameters are passed" do
+
+      before do
+        @params = { :conditions => { :test => "Test" }, :page => 2, :per_page => 20 }
+      end
+
+      it "delegates to will paginate with the results" do
+        Mongoid::Criteria.expects(:translate).with(:all, @params).returns(@criteria)
+        @criteria.expects(:paginate).with(Person).returns([])
+        Person.paginate(@params)
+      end
+
+    end
+
+    context "when pagination parameters are not passed" do
+
+      before do
+        @params = { :conditions => { :test => "Test" }}
+      end
+
+      it "delegates to will paginate with default values" do
+        Mongoid::Criteria.expects(:translate).with(:all, @params).returns(@criteria)
+        @criteria.expects(:paginate).with(Person).returns([])
+        Person.paginate(:conditions => { :test => "Test" })
+      end
+
+    end
+
+  end
+
+  describe ".select" do
+
+    it "returns a new criteria with select conditions added" do
+      criteria = Person.select(:title, :age)
+      criteria.options.should == { :fields => [ :title, :age ] }
+    end
+
+  end
+
+end

data/spec/unit/mongoid/timestamps_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "/../../spec_helper.r
 
 describe Mongoid::Timestamps do
 
-  describe "#included" do
+  describe ".included" do
 
     before do
       @person = Person.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 -05:00
+date: 2009-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,7 @@ files:
 - lib/mongoid/extensions/array/parentization.rb
 - lib/mongoid/extensions/boolean/conversions.rb
 - lib/mongoid/extensions/date/conversions.rb
+- lib/mongoid/extensions/datetime/conversions.rb
 - lib/mongoid/extensions/float/conversions.rb
 - lib/mongoid/extensions/hash/accessors.rb
 - lib/mongoid/extensions/hash/conversions.rb
@@ -112,6 +113,7 @@ files:
 - lib/mongoid/extensions/symbol/inflections.rb
 - lib/mongoid/extensions/time/conversions.rb
 - lib/mongoid/field.rb
+- lib/mongoid/finders.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/versioning.rb
 - mongoid.gemspec
@@ -141,6 +143,7 @@ files:
 - spec/unit/mongoid/extensions/array/parentization_spec.rb
 - spec/unit/mongoid/extensions/boolean/conversions_spec.rb
 - spec/unit/mongoid/extensions/date/conversions_spec.rb
+- spec/unit/mongoid/extensions/datetime/conversions_spec.rb
 - spec/unit/mongoid/extensions/float/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/accessors_spec.rb
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
@@ -151,6 +154,7 @@ files:
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
 - spec/unit/mongoid/extensions/time/conversions_spec.rb
 - spec/unit/mongoid/field_spec.rb
+- spec/unit/mongoid/finders_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb
 has_rdoc: true
@@ -206,6 +210,7 @@ test_files:
 - spec/unit/mongoid/extensions/array/parentization_spec.rb
 - spec/unit/mongoid/extensions/boolean/conversions_spec.rb
 - spec/unit/mongoid/extensions/date/conversions_spec.rb
+- spec/unit/mongoid/extensions/datetime/conversions_spec.rb
 - spec/unit/mongoid/extensions/float/conversions_spec.rb
 - spec/unit/mongoid/extensions/hash/accessors_spec.rb
 - spec/unit/mongoid/extensions/hash/conversions_spec.rb
@@ -216,5 +221,6 @@ test_files:
 - spec/unit/mongoid/extensions/symbol/inflections_spec.rb
 - spec/unit/mongoid/extensions/time/conversions_spec.rb
 - spec/unit/mongoid/field_spec.rb
+- spec/unit/mongoid/finders_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb