mongoid 0.10.3 → 0.10.4

data/HISTORY

@@ -0,0 +1,18 @@
+=== 0.10.4
+
+- Documents no longer inherit from Mongoid::Document.
+  Please include Mongoid::Document in all your models now.
+
+- Config module added, you can now set one option:
+  Mongoid.raise_not_found_error = (true|false)
+
+  - When set to false, a Mongoid::Errors::DocumentNotFound
+    will NOT get thrown when performing a Document.find(id)
+    that does not return a document from the database.
+    This defaults to true.
+
+- Mongoid::Document.collection_name macro added. You can
+  now set the name of the database collection to persist to.
+
+- Mongoid::Criteria#select becomes Mongoid::Criteria#only
+

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.10.4

data/lib/mongoid.rb

@@ -41,6 +41,7 @@ require "mongoid/associations"
 require "mongoid/associations/options"
 require "mongoid/attributes"
 require "mongoid/commands"
+require "mongoid/config"
 require "mongoid/complex_criterion"
 require "mongoid/criteria"
 require "mongoid/dynamic_finder"
@@ -52,17 +53,13 @@ require "mongoid/timestamps"
 require "mongoid/versioning"
 require "mongoid/document"
 
-module Mongoid
+module Mongoid #:nodoc
 
-  # Sets the Mongo::DB to be used.
-  def self.database=(db)
-    raise Errors::InvalidDatabase.new("Database should be a Mongo::DB, not #{db.class.name}") unless db.kind_of?(Mongo::DB)
-    @database = db
-  end
-
-  # Returns the Mongo::DB to use or raise an error if none was set.
-  def self.database
-    @database || (raise Errors::InvalidDatabase.new("No database has been set, please use Mongoid.database="))
+  class << self
+    #direct all calls to the configuration
+    def method_missing(name, *args)
+      Config.instance.send(name, *args)
+    end
   end
 
 end

data/lib/mongoid/associations/has_many.rb

@@ -18,10 +18,12 @@ module Mongoid #:nodoc:
 
       # Clears the association, and notifies the parents of the removal.
       def clear
-        object = @documents.first
-        object.changed(true)
-        object.notify_observers(object, true)
-        @documents.clear
+        unless @documents.empty?
+          object = @documents.first
+          object.changed(true)
+          object.notify_observers(object, true)
+          @documents.clear
+        end
       end
 
       # Appends the object to the +Array+, setting its parent in

data/lib/mongoid/config.rb

@@ -0,0 +1,25 @@
+module Mongoid #:nodoc
+  class Config #:nodoc
+    include Singleton
+
+    attr_accessor :raise_not_found_error
+
+    def initialize
+      @raise_not_found_error = true
+    end
+
+    # Sets the Mongo::DB to be used.
+    def database=(db)
+      raise Errors::InvalidDatabase.new(
+          "Database should be a Mongo::DB, not #{db.class.name}"
+        ) unless db.kind_of?(Mongo::DB)
+      @database = db
+    end
+
+    # Returns the Mongo::DB to use or raise an error if none was set.
+    def database
+      @database || (raise Errors::InvalidDatabase.new("No database has been set, please use Mongoid.database="))
+    end
+
+  end
+end

data/lib/mongoid/criteria.rb

@@ -11,7 +11,7 @@ module Mongoid #:nodoc:
   #
   # <tt>criteria = Criteria.new</tt>
   #
-  # <tt>criteria.select(:field => "value").only(:field).skip(20).limit(20)</tt>
+  # <tt>criteria.only(:field).where(:field => "value").skip(20).limit(20)</tt>
   #
   # <tt>criteria.execute</tt>
   class Criteria
@@ -341,6 +341,25 @@ module Mongoid #:nodoc:
       attributes ? @klass.instantiate(attributes) : nil
     end
 
+    alias :first :one
+
+    # Adds a criterion to the +Criteria+ that specifies the fields that will
+    # get returned from the Document. Used mainly for list views that do not
+    # require all fields to be present. This is similar to SQL "SELECT" values.
+    #
+    # Options:
+    #
+    # args: A list of field names to retrict the returned fields to.
+    #
+    # Example:
+    #
+    # <tt>criteria.only(:field1, :field2, :field3)</tt>
+    #
+    # Returns: <tt>self</tt>
+    def only(*args)
+      @options[:fields] = args.flatten if args.any?; self
+    end
+
     # Adds a criterion to the +Criteria+ that specifies the sort order of
     # the returned documents in the database. Similar to a SQL "ORDER BY".
     #
@@ -381,23 +400,6 @@ module Mongoid #:nodoc:
       (@options[:limit] || 20).to_i
     end
 
-    # Adds a criterion to the +Criteria+ that specifies the fields that will
-    # get returned from the Document. Used mainly for list views that do not
-    # require all fields to be present. This is similar to SQL "SELECT" values.
-    #
-    # Options:
-    #
-    # args: A list of field names to retrict the returned fields to.
-    #
-    # Example:
-    #
-    # <tt>criteria.select(:field1, :field2, :field3)</tt>
-    #
-    # Returns: <tt>self</tt>
-    def select(*args)
-      @options[:fields] = args.flatten if args.any?; self
-    end
-
     # Adds a criterion to the +Criteria+ that specifies how many results to skip
     # when returning Documents. This is mostly used in conjunction with
     # <tt>limit()</tt> to handle paginated results, and is similar to the
@@ -440,7 +442,10 @@ module Mongoid #:nodoc:
       params = args[1] || {}
       if params.is_a?(String)
         document = new(klass).id(params).one
-        return document ? document : (raise Errors::DocumentNotFound.new(klass, params))
+        if Mongoid.raise_not_found_error
+          raise Errors::DocumentNotFound.new(klass, params) unless document
+        end
+        return document
       end
       return new(klass).where(params.delete(:conditions) || {}).extras(params)
     end

data/lib/mongoid/document.rb

@@ -1,20 +1,26 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
-  class Document
-    include ActiveSupport::Callbacks
-    include Associations, Attributes, Commands, Observable, Validatable
-    extend Finders
+  module Document
+    def self.included(base)
+      base.class_eval do
+        include ActiveSupport::Callbacks
+        include Associations, Attributes, Commands, Observable, Validatable
+        include InstanceMethods
 
-    attr_accessor :association_name, :parent
-    attr_reader :attributes, :new_record
+        extend ClassMethods
+        extend Finders
 
-    delegate :collection, :defaults, :embedded?, :fields, :primary_key, :to => :klass
+        attr_accessor :association_name, :parent
+        attr_reader :attributes, :new_record
 
-    define_callbacks :before_create, :before_destroy, :before_save, :before_update, :before_validation
-    define_callbacks :after_create, :after_destroy, :after_save, :after_update, :after_validation
+        delegate :collection, :defaults, :embedded?, :fields, :primary_key, :to => :klass
 
-    class << self
+        define_callbacks :before_create, :before_destroy, :before_save, :before_update, :before_validation
+        define_callbacks :after_create, :after_destroy, :after_save, :after_update, :after_validation
+      end
+    end
 
+    module ClassMethods
       # Returns the collection associated with this +Document+. If the
       # document is embedded, there will be no collection associated
       # with it.
@@ -26,6 +32,11 @@ module Mongoid #:nodoc:
         @collection ||= Mongoid.database.collection(@collection_name)
       end
 
+      # Set the collection name for the +Document+.
+      def collection_name(name)
+        @collection_name = name
+      end
+
       # Returns a hash of all the default values
       def defaults
         @defaults
@@ -122,186 +133,191 @@ module Mongoid #:nodoc:
 
     end
 
-    # Performs equality checking on the attributes. For now we chack against
-    # all attributes excluding timestamps on the object.
-    def ==(other)
-      return false unless other.is_a?(Document)
-      @attributes.except(:modified_at).except(:created_at) ==
-        other.attributes.except(:modified_at).except(:created_at)
-    end
+    module InstanceMethods
+      # Performs equality checking on the attributes. For now we chack against
+      # all attributes excluding timestamps on the object.
+      def ==(other)
+        return false unless other.is_a?(Document)
+        @attributes.except(:modified_at).except(:created_at) ==
+          other.attributes.except(:modified_at).except(:created_at)
+      end
 
-    # Introduces a child object into the +Document+ object graph. This will
-    # set up the relationships between the parent and child and update the
-    # attributes of the parent +Document+.
-    #
-    # Options:
-    #
-    # parent: The +Document+ to assimilate with.
-    # options: The association +Options+ for the child.
-    #
-    # Example:
-    #
-    # <tt>name.assimilate(person, options)</tt>
-    #
-    # Returns: The child +Document+.
-    def assimilate(parent, options)
-      parentize(parent, options.name); notify; self
-    end
+      # Introduces a child object into the +Document+ object graph. This will
+      # set up the relationships between the parent and child and update the
+      # attributes of the parent +Document+.
+      #
+      # Options:
+      #
+      # parent: The +Document+ to assimilate with.
+      # options: The association +Options+ for the child.
+      #
+      # Example:
+      #
+      # <tt>name.assimilate(person, options)</tt>
+      #
+      # Returns: The child +Document+.
+      def assimilate(parent, options)
+        parentize(parent, options.name); notify; self
+      end
 
-    # Clone the current +Document+. This will return all attributes with the
-    # exception of the document's id and versions.
-    def clone
-      self.class.instantiate(@attributes.except(:_id).except(:versions).dup, true)
-    end
+      # Clone the current +Document+. This will return all attributes with the
+      # exception of the document's id and versions.
+      def clone
+        self.class.instantiate(@attributes.except(:_id).except(:versions).dup, true)
+      end
 
-    # Get the id associated with this object. This will pull the _id value out
-    # of the attributes +Hash+.
-    def id
-      @attributes[:_id]
-    end
+      # Get the id associated with this object. This will pull the _id value out
+      # of the attributes +Hash+.
+      def id
+        @attributes[:_id]
+      end
 
-    # Set the id
-    def id=(new_id)
-      @attributes[:_id] = new_id
-    end
+      # Set the id
+      def id=(new_id)
+        @attributes[:_id] = new_id
+      end
 
-    alias :_id :id
-    alias :_id= :id=
-
-    # Instantiate a new +Document+, setting the Document's attributes if
-    # given. If no attributes are provided, they will be initialized with
-    # an empty +Hash+.
-    #
-    # If a primary key is defined, the document's id will be set to that key,
-    # otherwise it will be set to a fresh +Mongo::ObjectID+ string.
-    #
-    # Options:
-    #
-    # attrs: The attributes +Hash+ to set up the document with.
-    #
-    # Example:
-    #
-    # <tt>Person.new(:title => "Mr", :age => 30)</tt>
-    def initialize(attrs = {})
-      @attributes = {}.with_indifferent_access
-      process(defaults.merge(attrs))
-      @new_record = true if id.nil?
-      document = yield self if block_given?
-      generate_key; document
-    end
+      alias :_id :id
+      alias :_id= :id=
 
-    # Returns the class name plus its attributes.
-    def inspect
-      attrs = fields.map { |name, field| "#{name}: #{@attributes[name] || 'nil'}" } * ", "
-      "#<#{self.class.name} _id: #{id}, #{attrs}>"
-    end
+      # Instantiate a new +Document+, setting the Document's attributes if
+      # given. If no attributes are provided, they will be initialized with
+      # an empty +Hash+.
+      #
+      # If a primary key is defined, the document's id will be set to that key,
+      # otherwise it will be set to a fresh +Mongo::ObjectID+ string.
+      #
+      # Options:
+      #
+      # attrs: The attributes +Hash+ to set up the document with.
+      #
+      # Example:
+      #
+      # <tt>Person.new(:title => "Mr", :age => 30)</tt>
+      def initialize(attrs = {})
+        @attributes = {}.with_indifferent_access
+        process(defaults.merge(attrs))
+        @new_record = true if id.nil?
+        document = yield self if block_given?
+        generate_key; document
+      end
 
-    # Returns true is the +Document+ has not been persisted to the database,
-    # false if it has. This is determined by the instance variable @new_record
-    # and NOT if the object has an id.
-    def new_record?
-      @new_record == true
-    end
+      # Returns the class name plus its attributes.
+      def inspect
+        attrs = fields.map { |name, field| "#{name}: #{@attributes[name] || 'nil'}" } * ", "
+        "#<#{self.class.name} _id: #{id}, #{attrs}>"
+      end
 
-    # Sets the new_record boolean - used after document is saved.
-    def new_record=(saved)
-      @new_record = saved
-    end
+      # Returns true is the +Document+ has not been persisted to the database,
+      # false if it has. This is determined by the instance variable @new_record
+      # and NOT if the object has an id.
+      def new_record?
+        @new_record == true
+      end
 
-    # Set the changed state of the +Document+ then notify observers that it has changed.
-    #
-    # Example:
-    #
-    # <tt>person.notify</tt>
-    def notify
-      changed(true)
-      notify_observers(self)
-    end
+      # Sets the new_record boolean - used after document is saved.
+      def new_record=(saved)
+        @new_record = saved
+      end
 
-    # Sets up a child/parent association. This is used for newly created
-    # objects so they can be properly added to the graph and have the parent
-    # observers set up properly.
-    #
-    # Options:
-    #
-    # abject: The parent object that needs to be set for the child.
-    # association_name: The name of the association for the child.
-    #
-    # Example:
-    #
-    # <tt>address.parentize(person, :addresses)</tt>
-    def parentize(object, association_name)
-      self.parent = object
-      self.association_name = association_name
-      add_observer(object)
-    end
+      # Set the changed state of the +Document+ then notify observers that it has changed.
+      #
+      # Example:
+      #
+      # <tt>person.notify</tt>
+      def notify
+        changed(true)
+        notify_observers(self)
+      end
 
-    # Reloads the +Document+ attributes from the database.
-    def reload
-      @attributes = collection.find_one(:_id => id).with_indifferent_access
-    end
+      # Sets up a child/parent association. This is used for newly created
+      # objects so they can be properly added to the graph and have the parent
+      # observers set up properly.
+      #
+      # Options:
+      #
+      # abject: The parent object that needs to be set for the child.
+      # association_name: The name of the association for the child.
+      #
+      # Example:
+      #
+      # <tt>address.parentize(person, :addresses)</tt>
+      def parentize(object, association_name)
+        self.parent = object
+        self.association_name = association_name
+        add_observer(object)
+      end
 
-    # Return the root +Document+ in the object graph. If the current +Document+
-    # is the root object in the graph it will return self.
-    def root
-      object = self
-      while (object.parent) do object = object.parent; end
-      object || self
-    end
+      # Reloads the +Document+ attributes from the database.
+      def reload
+        @attributes = collection.find_one(:_id => id).with_indifferent_access
+      end
 
-    # Return an array with this +Document+ only in it.
-    def to_a
-      [ self ]
-    end
+      # Return the root +Document+ in the object graph. If the current +Document+
+      # is the root object in the graph it will return self.
+      def root
+        object = self
+        while (object.parent) do object = object.parent; end
+        object || self
+      end
 
-    # Returns the id of the Document, used in Rails compatibility.
-    def to_param
-      id
-    end
+      # Return an array with this +Document+ only in it.
+      def to_a
+        [ self ]
+      end
 
-    # Observe a notify call from a child +Document+. This will either update
-    # existing attributes on the +Document+ or clear them out for the child if
-    # the clear boolean is provided.
-    #
-    # Options:
-    #
-    # 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)
-      name = child.association_name
-      clear ? @attributes.delete(name) : @attributes.insert(name, child.attributes)
-      notify
-    end
+      # Returns the id of the Document, used in Rails compatibility.
+      def to_param
+        id
+      end
 
-    # Needs to run the appropriate callbacks the delegate up to the validatable
-    # gem.
-    def valid?
-      run_callbacks(:before_validation)
-      result = super
-      run_callbacks(:after_validation)
-      result
-    end
+      # Observe a notify call from a child +Document+. This will either update
+      # existing attributes on the +Document+ or clear them out for the child if
+      # the clear boolean is provided.
+      #
+      # Options:
+      #
+      # 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)
+        name = child.association_name
+        clear ? @attributes.delete(name) : @attributes.insert(name, child.attributes)
+        notify
+      end
 
-    protected
-    def generate_key
-      if primary_key
-        values = primary_key.collect { |key| @attributes[key] }
-        @attributes[:_id] = values.join(" ").parameterize.to_s
-      else
-        @attributes[:_id] = Mongo::ObjectID.new.to_s unless id
+      # Needs to run the appropriate callbacks the delegate up to the validatable
+      # gem.
+      def valid?
+        run_callbacks(:before_validation)
+        result = super
+        run_callbacks(:after_validation)
+        result
+      end
+
+      protected
+      def generate_key
+        if primary_key
+          values = primary_key.collect { |key| @attributes[key] }
+          @attributes[:_id] = values.join(" ").parameterize.to_s
+        else
+          @attributes[:_id] = Mongo::ObjectID.new.to_s unless id
+        end
+      end
+
+      # Convenience method to get the document's class
+      def klass
+        self.class
       end
-    end
 
-    # Convenience method to get the document's class
-    def klass
-      self.class
     end
+
   end
+
 end

data/lib/mongoid/finders.rb

@@ -120,11 +120,28 @@ module Mongoid #:nodoc:
     #
     # Example:
     #
-    # <tt>Person.select(:field1, :field2, :field3)</tt>
+    # <tt>Person.only(:field1, :field2, :field3)</tt>
     #
     # Returns: <tt>Criteria</tt>
-    def select(*args)
-      Criteria.new(self).select(*args)
+    def only(*args)
+      Criteria.new(self).only(*args)
+    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:
+    #
+    # selector: A where criteria to initialize.
+    #
+    # Example:
+    #
+    # <tt>Person.where(:field1 => "Value")</tt>
+    #
+    # Returns: <tt>Criteria</tt>
+    def where(selector = nil)
+      Criteria.new(self).where(selector)
     end
 
   end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.10.3"
+  s.version = "0.10.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-12-26}
+  s.date = %q{2009-12-28}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      ".watchr",
+     "HISTORY",
      "MIT_LICENSE",
      "README.textile",
      "Rakefile",
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/commands/destroy_all.rb",
      "lib/mongoid/commands/save.rb",
      "lib/mongoid/complex_criterion.rb",
+     "lib/mongoid/config.rb",
      "lib/mongoid/criteria.rb",
      "lib/mongoid/document.rb",
      "lib/mongoid/dynamic_finder.rb",
@@ -92,6 +94,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/destroy_spec.rb",
      "spec/unit/mongoid/commands/save_spec.rb",
      "spec/unit/mongoid/commands_spec.rb",
+     "spec/unit/mongoid/config_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/dynamic_finder_spec.rb",
@@ -147,6 +150,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/commands/destroy_spec.rb",
      "spec/unit/mongoid/commands/save_spec.rb",
      "spec/unit/mongoid/commands_spec.rb",
+     "spec/unit/mongoid/config_spec.rb",
      "spec/unit/mongoid/criteria_spec.rb",
      "spec/unit/mongoid/document_spec.rb",
      "spec/unit/mongoid/dynamic_finder_spec.rb",

data/spec/integration/mongoid/criteria_spec.rb

@@ -70,14 +70,6 @@ describe Mongoid::Criteria do
 
       end
 
-      context "#mod" do
-
-        it "returns those matching a mod clause" do
-          Person.criteria.where(:age.lte => 33).should == [@person]
-        end
-
-      end
-
       context "#ne" do
 
         it "returns those matching a ne clause" do

data/spec/integration/mongoid/document_spec.rb

@@ -159,13 +159,13 @@ describe Mongoid::Document do
   describe "#group" do
 
     before do
-      30.times do |num|
+      5.times do |num|
         Person.create(:title => "Sir", :age => num)
       end
     end
 
     it "returns grouped documents" do
-      grouped = Person.select(:title).group
+      grouped = Person.only(:title).group
       people = grouped.first["group"]
       person = people.first
       person.should be_a_kind_of(Person)

data/spec/spec_helper.rb

@@ -13,14 +13,15 @@ Mongoid.database = connection.db("mongoid_test")
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
-  Mocha::Configuration.prevent(:stubbing_non_existent_method)
 end
 
-class MixedDrink < Mongoid::Document
+class MixedDrink
+  include Mongoid::Document
   field :name
 end
 
-class Person < Mongoid::Document
+class Person
+  include Mongoid::Document
   include Mongoid::Timestamps
 
   field :title
@@ -73,50 +74,61 @@ class Person < Mongoid::Document
 
 end
 
+class Admin < Person
+  field :code
+end
+
 class Employer
   def id
     "1"
   end
 end
 
-class CountryCode < Mongoid::Document
+class CountryCode
+  include Mongoid::Document
   field :code, :type => Integer
   key :code
   belongs_to :phone_number, :inverse_of => :country_codes
 end
 
-class Phone < Mongoid::Document
+class Phone
+  include Mongoid::Document
   field :number
   key :number
   belongs_to :person, :inverse_of => :phone_numbers
   has_one :country_code
 end
 
-class Animal < Mongoid::Document
+class Animal
+  include Mongoid::Document
   field :name
   key :name
   belongs_to :person, :inverse_of => :pet
 end
 
-class PetOwner < Mongoid::Document
+class PetOwner
+  include Mongoid::Document
   field :title
   has_one :pet
   has_one :address
 end
 
-class Pet < Mongoid::Document
+class Pet
+  include Mongoid::Document
   field :name
   field :weight, :type => Float, :default => 0.0
   has_many :vet_visits
   belongs_to :pet_owner, :inverse_of => :pet
 end
 
-class VetVisit < Mongoid::Document
+class VetVisit
+  include Mongoid::Document
   field :date, :type => Date
   belongs_to :pet, :inverse_of => :vet_visits
 end
 
-class Address < Mongoid::Document
+class Address
+  include Mongoid::Document
   field :street
   field :city
   field :state
@@ -125,14 +137,16 @@ class Address < Mongoid::Document
   belongs_to :addressable, :inverse_of => :addresses
 end
 
-class Name < Mongoid::Document
+class Name
+  include Mongoid::Document
   field :first_name
   field :last_name
   key :first_name, :last_name
   belongs_to :person, :inverse_of => :name
 end
 
-class Comment < Mongoid::Document
+class Comment
+  include Mongoid::Document
   include Mongoid::Versioning
   include Mongoid::Timestamps
   field :text
@@ -140,19 +154,26 @@ class Comment < Mongoid::Document
   validates_presence_of :text
 end
 
-class Post < Mongoid::Document
+class Post
+  include Mongoid::Document
   include Mongoid::Versioning
   include Mongoid::Timestamps
   field :title
   belongs_to_related :person
 end
 
-class Game < Mongoid::Document
+class Game
+  include Mongoid::Document
   field :high_score, :default => 500
   field :score, :type => Integer, :default => 0
   belongs_to_related :person
 end
 
+class Patient
+  include Mongoid::Document
+  collection_name "population"
+end
+
 if RUBY_VERSION == '1.8.6'
   class Array
     alias :count :size

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

@@ -104,7 +104,10 @@ describe Mongoid::Associations::HasMany do
   describe "#concat" 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)
+      )
       @address = Address.new
     end
 
@@ -116,6 +119,24 @@ describe Mongoid::Associations::HasMany do
 
   end
 
+  describe "#clear" do
+
+    before do
+      @association = Mongoid::Associations::HasMany.new(
+        @document,
+        Mongoid::Associations::Options.new(:name => :addresses)
+      )
+      @address = Address.new
+      @association << @address
+    end
+
+    it "clears out the association" do
+      @association.clear
+      @association.size.should == 0
+    end
+
+  end
+
   describe "#find" do
 
     before do

data/spec/unit/mongoid/config_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+
+describe Mongoid::Config do
+
+  after :all do
+    config.raise_not_found_error = true
+  end
+
+  let(:config) { Mongoid::Config.instance }
+
+  describe ".database=" do
+
+    context "when object provided is not a Mongo::DB" do
+
+      it "raises an error" do
+        lambda { config.database = "Test" }.should raise_error
+      end
+
+    end
+
+  end
+
+  describe ".raise_not_found_error=" do
+
+    context "when setting to true" do
+
+      before do
+        config.raise_not_found_error = true
+      end
+
+      it "sets the value" do
+        config.raise_not_found_error.should == true
+      end
+
+    end
+
+    context "when setting to false" do
+
+      before do
+        config.raise_not_found_error = false
+      end
+
+      it "sets the value" do
+        config.raise_not_found_error.should == false
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/criteria_spec.rb

@@ -43,7 +43,7 @@ describe Mongoid::Criteria do
 
       it "calls group on the collection with the aggregate js" do
         @collection.expects(:group).with([:field1], {}, {:count => 0}, @reduce)
-        @criteria.select(:field1).aggregate
+        @criteria.only(:field1).aggregate
       end
 
     end
@@ -58,7 +58,7 @@ describe Mongoid::Criteria do
 
       it "calls group on the collection with the aggregate js" do
         @collection.expects(:group).with([:field1], {}, {:count => 0}, @reduce)
-        @criteria.select(:field1).aggregate(Person)
+        @criteria.only(:field1).aggregate(Person)
       end
 
     end
@@ -239,7 +239,37 @@ describe Mongoid::Criteria do
 
   end
 
-  describe "#each_index" do
+  describe "#first" do
+
+    context "when documents exist" do
+
+      before do
+        @collection = mock
+        Person.expects(:collection).returns(@collection)
+        @collection.expects(:find_one).with(@criteria.selector, @criteria.options).returns({ :title => "Sir" })
+      end
+
+      it "calls find on the collection with the selector and options" do
+        criteria = Mongoid::Criteria.new(Person)
+        criteria.first.should be_a_kind_of(Person)
+      end
+
+    end
+
+    context "when no documents exist" do
+
+      before do
+        @collection = mock
+        Person.expects(:collection).returns(@collection)
+        @collection.expects(:find_one).with(@criteria.selector, @criteria.options).returns(nil)
+      end
+
+      it "returns nil" do
+        criteria = Mongoid::Criteria.new(Person)
+        criteria.first.should be_nil
+      end
+
+    end
 
   end
 
@@ -319,7 +349,7 @@ describe Mongoid::Criteria do
 
       it "calls group on the collection with the aggregate js" do
         @collection.expects(:group).with([:field1], {}, {:group => []}, @reduce).returns(@grouping)
-        @criteria.select(:field1).group
+        @criteria.only(:field1).group
       end
 
     end
@@ -334,7 +364,7 @@ describe Mongoid::Criteria do
 
       it "calls group on the collection with the aggregate js" do
         @collection.expects(:group).with([:field1], {}, {:group => []}, @reduce).returns(@grouping)
-        @criteria.select(:field1).group
+        @criteria.only(:field1).group
       end
 
     end
@@ -699,7 +729,7 @@ describe Mongoid::Criteria do
     before do
       @collection = mock
       Person.expects(:collection).returns(@collection)
-      @criteria = Person.select.where(:_id => "1").skip(60).limit(20)
+      @criteria = Person.where(:_id => "1").skip(60).limit(20)
       @collection.expects(:find).with({:_id => "1"}, :skip => 60, :limit => 20).returns([])
       @results = @criteria.paginate
     end
@@ -739,17 +769,17 @@ describe Mongoid::Criteria do
 
   end
 
-  describe "#select" do
+  describe "#only" do
 
     context "when args are provided" do
 
       it "adds the options for limiting by fields" do
-        @criteria.select(:title, :text)
+        @criteria.only(:title, :text)
         @criteria.options.should == { :fields => [ :title, :text ] }
       end
 
       it "returns self" do
-        @criteria.select.should == @criteria
+        @criteria.only.should == @criteria
       end
 
     end
@@ -757,7 +787,7 @@ describe Mongoid::Criteria do
     context "when no args provided" do
 
       it "does not add the field option" do
-        @criteria.select
+        @criteria.only
         @criteria.options[:fields].should be_nil
       end
 
@@ -898,12 +928,96 @@ describe Mongoid::Criteria do
 
       end
 
-      context "with complex hash keys" do
+      context "with complex criterion" do
+
+        context "#all" do
+
+          it "returns those matching an all clause" do
+            @criteria.where(:title.all => ["Sir"])
+            @criteria.selector.should == { :title => { "$all" => ["Sir"] } }
+          end
+
+        end
+
+        context "#exists" do
+
+          it "returns those matching an exists clause" do
+            @criteria.where(:title.exists => true)
+            @criteria.selector.should == { :title => { "$exists" => true } }
+          end
+
+        end
+
+        context "#gt" do
+
+          it "returns those matching a gt clause" do
+            @criteria.where(:age.gt => 30)
+            @criteria.selector.should == { :age => { "$gt" => 30 } }
+          end
+
+        end
+
+        context "#gte" do
+
+          it "returns those matching a gte clause" do
+            @criteria.where(:age.gte => 33)
+            @criteria.selector.should == { :age => { "$gte" => 33 } }
+          end
+
+        end
+
+        context "#in" do
+
+          it "returns those matching an in clause" do
+            @criteria.where(:title.in => ["Sir", "Madam"])
+            @criteria.selector.should == { :title => { "$in" => ["Sir", "Madam"] } }
+          end
+
+        end
+
+        context "#lt" do
+
+          it "returns those matching a lt clause" do
+            @criteria.where(:age.lt => 34)
+            @criteria.selector.should == { :age => { "$lt" => 34 } }
+          end
+
+        end
+
+        context "#lte" do
+
+          it "returns those matching a lte clause" do
+            @criteria.where(:age.lte => 33)
+            @criteria.selector.should == { :age => { "$lte" => 33 } }
+          end
+
+        end
+
+        context "#ne" do
+
+          it "returns those matching a ne clause" do
+            @criteria.where(:age.ne => 50)
+            @criteria.selector.should == { :age => { "$ne" => 50 } }
+          end
+
+        end
+
+        context "#nin" do
+
+          it "returns those matching a nin clause" do
+            @criteria.where(:title.nin => ["Esquire", "Congressman"])
+            @criteria.selector.should == { :title => { "$nin" => ["Esquire", "Congressman"] } }
+          end
+
+        end
+
+        context "#size" do
+
+          it "returns those matching a size clause" do
+            @criteria.where(:aliases.size => 2)
+            @criteria.selector.should == { :aliases => { "$size" => 2 } }
+          end
 
-        it "adds the correct clause to the selector" do
-          dob = 40.years.ago
-          @criteria.where(:age.gt => 40, :title => "Title", :dob.lt => dob)
-          @criteria.selector.should == {:age => {"$gt" => 40}, :title => "Title", :dob => {"$lt" => dob}}
         end
 
       end

data/spec/unit/mongoid/document_spec.rb

@@ -109,6 +109,19 @@ describe Mongoid::Document do
 
   end
 
+  describe ".collection_name" do
+
+    before do
+      @coll = stub(:name => "population")
+    end
+
+    it "sets the collection name on the document class" do
+      Mongoid.database.expects(:collection).with("population").returns(@coll)
+      Patient.collection.should == @coll
+    end
+
+  end
+
   describe ".defaults" do
 
     it "returns a hash of all the default values" do

data/spec/unit/mongoid/finders_spec.rb

@@ -278,13 +278,22 @@ describe Mongoid::Finders do
 
   end
 
-  describe ".select" do
+  describe ".only" do
 
     it "returns a new criteria with select conditions added" do
-      criteria = Person.select(:title, :age)
+      criteria = Person.only(:title, :age)
       criteria.options.should == { :fields => [ :title, :age ] }
     end
 
   end
 
+  describe ".where" do
+
+    it "returns a new criteria with select conditions added" do
+      criteria = Person.where(:title => "Sir")
+      criteria.selector.should == { :title => "Sir" }
+    end
+
+  end
+
 end

data/spec/unit/mongoid_spec.rb

@@ -2,14 +2,16 @@ require "spec_helper"
 
 describe Mongoid do
 
-  describe ".database=" do
+  describe ".method_missing" do
 
-    context "when object provided is not a Mongo::DB" do
-
-      it "raises an error" do
-        lambda { Mongoid.database = "Test" }.should raise_error
-      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
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 -05:00
+date: 2009-12-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .watchr
+- HISTORY
 - MIT_LICENSE
 - README.textile
 - Rakefile
@@ -116,6 +117,7 @@ files:
 - lib/mongoid/commands/destroy_all.rb
 - lib/mongoid/commands/save.rb
 - lib/mongoid/complex_criterion.rb
+- lib/mongoid/config.rb
 - lib/mongoid/criteria.rb
 - lib/mongoid/document.rb
 - lib/mongoid/dynamic_finder.rb
@@ -168,6 +170,7 @@ files:
 - spec/unit/mongoid/commands/destroy_spec.rb
 - spec/unit/mongoid/commands/save_spec.rb
 - spec/unit/mongoid/commands_spec.rb
+- spec/unit/mongoid/config_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/dynamic_finder_spec.rb
@@ -245,6 +248,7 @@ test_files:
 - spec/unit/mongoid/commands/destroy_spec.rb
 - spec/unit/mongoid/commands/save_spec.rb
 - spec/unit/mongoid/commands_spec.rb
+- spec/unit/mongoid/config_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/dynamic_finder_spec.rb