mongoid 2.0.0.beta.5 → 2.0.0.beta.7

data/lib/mongoid/callbacks.rb

@@ -11,7 +11,11 @@ module Mongoid #:nodoc:
         :destroy,
         :save,
         :update,
-        :validate
+        :validation
+    end
+
+    def valid?(*) #nodoc
+      _run_validation_callbacks { super }
     end
   end
 end

data/lib/mongoid/collections.rb

@@ -7,7 +7,8 @@ module Mongoid #:nodoc
     included do
       cattr_accessor :_collection, :collection_name
       self.collection_name = self.name.collectionize
-      delegate :collection, :to => "self.class"
+
+      delegate :collection, :db, :to => "self.class"
     end
 
     module ClassMethods #:nodoc:
@@ -22,6 +23,35 @@ module Mongoid #:nodoc
         add_indexes; self._collection
       end
 
+      # Return the database associated with this collection.
+      #
+      # Example:
+      #
+      # <tt>Person.db</tt>
+      def db
+        collection.db
+      end
+
+      # Convenience method for getting index information from the collection.
+      #
+      # Example:
+      #
+      # <tt>Person.index_information</tt>
+      def index_information
+        collection.index_information
+      end
+
+      # The MongoDB logger is not exposed through the driver to be changed
+      # after initialization of the connection, this is a hacky way around that
+      # if logging needs to be changed at runtime.
+      #
+      # Example:
+      #
+      # <tt>Person.logger = Logger.new($stdout)</tt>
+      def logger=(logger)
+        db.connection.instance_variable_set(:@logger, logger)
+      end
+
       # Macro for setting the collection name to store in.
       #
       # Example:

data/lib/mongoid/components.rb

@@ -9,13 +9,15 @@ module Mongoid #:nodoc
       include ActiveModel::Naming
       include ActiveModel::Serialization
       include ActiveModel::Serializers::JSON
+      include ActiveModel::Serializers::Xml
       include Mongoid::Associations
+      include Mongoid::Atomicity
       include Mongoid::Attributes
-      include Mongoid::Callbacks
       include Mongoid::Collections
       include Mongoid::Dirty
       include Mongoid::Extras
       include Mongoid::Fields
+      include Mongoid::Hierarchy
       include Mongoid::Indexes
       include Mongoid::Matchers
       include Mongoid::Memoization
@@ -24,6 +26,7 @@ module Mongoid #:nodoc
       include Mongoid::Persistence
       include Mongoid::State
       include Mongoid::Validations
+      include Mongoid::Callbacks
       extend ActiveModel::Translation
       extend Mongoid::Finders
       extend Mongoid::NamedScope

data/lib/mongoid/config.rb

@@ -193,10 +193,11 @@ module Mongoid #:nodoc
       name = settings["database"] || mongo_uri.path.to_s.sub("/", "")
       host = settings["host"] || mongo_uri.host || "localhost"
       port = settings["port"] || mongo_uri.port || 27017
+      pool_size = settings["pool_size"] || 1 
       username = settings["username"] || mongo_uri.user
       password = settings["password"] || mongo_uri.password
 
-      connection = Mongo::Connection.new(host, port, :logger => logger)
+      connection = Mongo::Connection.new(host, port, :logger => logger, :pool_size => pool_size)
       if username || password
         connection.add_auth(name, username, password)
         connection.apply_saved_authentication

data/lib/mongoid/criteria.rb

@@ -82,6 +82,15 @@ module Mongoid #:nodoc:
       self
     end
 
+    # Return true if the criteria has some Document or not
+    #
+    # Example:
+    #
+    # <tt>criteria.exists?</tt>
+    def exists?
+      context.count > 0
+    end
+
     # Merges the supplied argument hash into a single criteria
     #
     # Options:

data/lib/mongoid/dirty.rb

@@ -2,231 +2,230 @@
 module Mongoid #:nodoc:
   module Dirty #:nodoc:
     extend ActiveSupport::Concern
-    module InstanceMethods #:nodoc:
-      # Gets the changes for a specific field.
-      #
-      # Example:
-      #
-      #   person = Person.new(:title => "Sir")
-      #   person.title = "Madam"
-      #   person.attribute_change("title") # [ "Sir", "Madam" ]
-      #
-      # Returns:
-      #
-      # An +Array+ containing the old and new values.
-      def attribute_change(name)
-        modifications[name]
-      end
 
-      # Determines if a specific field has chaged.
-      #
-      # Example:
-      #
-      #   person = Person.new(:title => "Sir")
-      #   person.title = "Madam"
-      #   person.attribute_changed?("title") # true
-      #
-      # Returns:
-      #
-      # +true+ if changed, +false+ if not.
-      def attribute_changed?(name)
-        modifications.include?(name)
-      end
+    # Gets the changes for a specific field.
+    #
+    # Example:
+    #
+    #   person = Person.new(:title => "Sir")
+    #   person.title = "Madam"
+    #   person.attribute_change("title") # [ "Sir", "Madam" ]
+    #
+    # Returns:
+    #
+    # An +Array+ containing the old and new values.
+    def attribute_change(name)
+      modifications[name]
+    end
 
-      # Gets the old value for a specific field.
-      #
-      # Example:
-      #
-      #   person = Person.new(:title => "Sir")
-      #   person.title = "Madam"
-      #   person.attribute_was("title") # "Sir"
-      #
-      # Returns:
-      #
-      # The old field value.
-      def attribute_was(name)
-        change = modifications[name]
-        change ? change[0] : nil
-      end
+    # Determines if a specific field has chaged.
+    #
+    # Example:
+    #
+    #   person = Person.new(:title => "Sir")
+    #   person.title = "Madam"
+    #   person.attribute_changed?("title") # true
+    #
+    # Returns:
+    #
+    # +true+ if changed, +false+ if not.
+    def attribute_changed?(name)
+      modifications.include?(name)
+    end
 
-      # Gets the names of all the fields that have changed in the document.
-      #
-      # Example:
-      #
-      #   person = Person.new(:title => "Sir")
-      #   person.title = "Madam"
-      #   person.changed # returns [ "title" ]
-      #
-      # Returns:
-      #
-      # An +Array+ of changed field names.
-      def changed
-        modifications.keys
-      end
+    # Gets the old value for a specific field.
+    #
+    # Example:
+    #
+    #   person = Person.new(:title => "Sir")
+    #   person.title = "Madam"
+    #   person.attribute_was("title") # "Sir"
+    #
+    # Returns:
+    #
+    # The old field value.
+    def attribute_was(name)
+      change = modifications[name]
+      change ? change[0] : nil
+    end
 
-      # Alerts to whether the document has been modified or not.
-      #
-      # Example:
-      #
-      #   person = Person.new(:title => "Sir")
-      #   person.title = "Madam"
-      #   person.changed? # returns true
-      #
-      # Returns:
-      #
-      # +true+ if changed, +false+ if not.
-      def changed?
-        !modifications.empty?
-      end
+    # Gets the names of all the fields that have changed in the document.
+    #
+    # Example:
+    #
+    #   person = Person.new(:title => "Sir")
+    #   person.title = "Madam"
+    #   person.changed # returns [ "title" ]
+    #
+    # Returns:
+    #
+    # An +Array+ of changed field names.
+    def changed
+      modifications.keys
+    end
 
-      # Gets all the modifications that have happened to the object as a +Hash+
-      # with the keys being the names of the fields, and the values being an
-      # +Array+ with the old value and new value.
-      #
-      # Example:
-      #
-      #   person = Person.new(:title => "Sir")
-      #   person.title = "Madam"
-      #   person.changes # returns { "title" => [ "Sir", "Madam" ] }
-      #
-      # Returns:
-      #
-      # A +Hash+ of changes.
-      def changes
-        modifications
-      end
+    # Alerts to whether the document has been modified or not.
+    #
+    # Example:
+    #
+    #   person = Person.new(:title => "Sir")
+    #   person.title = "Madam"
+    #   person.changed? # returns true
+    #
+    # Returns:
+    #
+    # +true+ if changed, +false+ if not.
+    def changed?
+      !modifications.empty?
+    end
 
-      # Call this method after save, so the changes can be properly switched.
-      #
-      # Example:
-      #
-      # <tt>person.move_changes</tt>
-      def move_changes
-        @previous_modifications = modifications.dup
-        @modifications = {}
-      end
+    # Gets all the modifications that have happened to the object as a +Hash+
+    # with the keys being the names of the fields, and the values being an
+    # +Array+ with the old value and new value.
+    #
+    # Example:
+    #
+    #   person = Person.new(:title => "Sir")
+    #   person.title = "Madam"
+    #   person.changes # returns { "title" => [ "Sir", "Madam" ] }
+    #
+    # Returns:
+    #
+    # A +Hash+ of changes.
+    def changes
+      modifications
+    end
 
-      # Gets all the new values for each of the changed fields, to be passed to
-      # a MongoDB $set modifier.
-      #
-      # Example:
-      #
-      #   person = Person.new(:title => "Sir")
-      #   person.title = "Madam"
-      #   person.setters # returns { "title" => "Madam" }
-      #
-      # Returns:
-      #
-      # A +Hash+ of new values.
-      def setters
-        modifications.inject({}) do |sets, (field, changes)|
-          key = embedded? ? "#{_position}.#{field}" : field
-          sets[key] = changes[1]; sets
-        end
-      end
+    # Call this method after save, so the changes can be properly switched.
+    #
+    # Example:
+    #
+    # <tt>person.move_changes</tt>
+    def move_changes
+      @previous_modifications = modifications.dup
+      @modifications = {}
+    end
 
-      # Gets all the modifications that have happened to the object before the
-      # object was saved.
-      #
-      # Example:
-      #
-      #   person = Person.new(:title => "Sir")
-      #   person.title = "Madam"
-      #   person.save!
-      #   person.previous_changes # returns { "title" => [ "Sir", "Madam" ] }
-      #
-      # Returns:
-      #
-      # A +Hash+ of changes before save.
-      def previous_changes
-        @previous_modifications
+    # Gets all the new values for each of the changed fields, to be passed to
+    # a MongoDB $set modifier.
+    #
+    # Example:
+    #
+    #   person = Person.new(:title => "Sir")
+    #   person.title = "Madam"
+    #   person.setters # returns { "title" => "Madam" }
+    #
+    # Returns:
+    #
+    # A +Hash+ of new values.
+    def setters
+      modifications.inject({}) do |sets, (field, changes)|
+        key = embedded? ? "#{_position}.#{field}" : field
+        sets[key] = changes[1]; sets
       end
+    end
 
-      # Resets a changed field back to its old value.
-      #
-      # Example:
-      #
-      #   person = Person.new(:title => "Sir")
-      #   person.title = "Madam"
-      #   person.reset_attribute!("title")
-      #   person.title # "Sir"
-      #
-      # Returns:
-      #
-      # The old field value.
-      def reset_attribute!(name)
-        value = attribute_was(name)
-        if value
-          @attributes[name] = value
-          modifications.delete(name)
-        end
-      end
+    # Gets all the modifications that have happened to the object before the
+    # object was saved.
+    #
+    # Example:
+    #
+    #   person = Person.new(:title => "Sir")
+    #   person.title = "Madam"
+    #   person.save!
+    #   person.previous_changes # returns { "title" => [ "Sir", "Madam" ] }
+    #
+    # Returns:
+    #
+    # A +Hash+ of changes before save.
+    def previous_changes
+      @previous_modifications
+    end
 
-      # Sets up the modifications hash. This occurs just after the document is
-      # instantiated.
-      #
-      # Example:
-      #
-      # <tt>document.setup_notifications</tt>
-      def setup_modifications
-        @accessed ||= {}
-        @modifications ||= {}
-        @previous_modifications ||= {}
+    # Resets a changed field back to its old value.
+    #
+    # Example:
+    #
+    #   person = Person.new(:title => "Sir")
+    #   person.title = "Madam"
+    #   person.reset_attribute!("title")
+    #   person.title # "Sir"
+    #
+    # Returns:
+    #
+    # The old field value.
+    def reset_attribute!(name)
+      value = attribute_was(name)
+      if value
+        @attributes[name] = value
+        modifications.delete(name)
       end
+    end
 
-      # Reset all modifications for the document. This will wipe all the marked
-      # changes, but not reset the values.
-      #
-      # Example:
-      #
-      # <tt>document.reset_modifications</tt>
-      def reset_modifications
-        @accessed = {}
-        @modifications = {}
-      end
+    # Sets up the modifications hash. This occurs just after the document is
+    # instantiated.
+    #
+    # Example:
+    #
+    # <tt>document.setup_notifications</tt>
+    def setup_modifications
+      @accessed ||= {}
+      @modifications ||= {}
+      @previous_modifications ||= {}
+    end
 
-      protected
+    # Reset all modifications for the document. This will wipe all the marked
+    # changes, but not reset the values.
+    #
+    # Example:
+    #
+    # <tt>document.reset_modifications</tt>
+    def reset_modifications
+      @accessed = {}
+      @modifications = {}
+    end
 
-      # Audit the original value for a field that can be modified in place.
-      #
-      # Example:
-      #
-      # <tt>person.accessed("aliases", [ "007" ])</tt>
-      def accessed(name, value)
-        @accessed ||= {}
-        @accessed[name] = value.dup if (value.is_a?(Array) || value.is_a?(Hash)) && !@accessed.has_key?(name)
-        value
-      end
+    protected
+
+    # Audit the original value for a field that can be modified in place.
+    #
+    # Example:
+    #
+    # <tt>person.accessed("aliases", [ "007" ])</tt>
+    def accessed(name, value)
+      @accessed ||= {}
+      @accessed[name] = value.dup if (value.is_a?(Array) || value.is_a?(Hash)) && !@accessed.has_key?(name)
+      value
+    end
 
-      # Get all normal modifications plus in place potential changes.
-      #
-      # Example:
-      #
-      # <tt>person.modifications</tt>
-      #
-      # Returns:
-      #
-      # All changes to the document.
-      def modifications
-        @accessed.each_pair do |field, value|
-          current = @attributes[field]
-          @modifications[field] = [ value, current ] if current != value
-        end
-        @accessed.clear
-        @modifications
-      end
+    # Get all normal modifications plus in place potential changes.
+    #
+    # Example:
+    #
+    # <tt>person.modifications</tt>
+    #
+    # Returns:
+    #
+    # All changes to the document.
+    def modifications
+      @accessed.each_pair do |field, value|
+        current = @attributes[field]
+        @modifications[field] = [ value, current ] if current != value
+      end
+      @accessed.clear
+      @modifications
+    end
 
-      # Audit the change of a field's value.
-      #
-      # Example:
-      #
-      # <tt>person.modify("name", "Jack", "John")</tt>
-      def modify(name, old_value, new_value)
-        @attributes[name] = new_value
-        if @modifications && (old_value != new_value)
-          original = @modifications[name].first if @modifications[name]
-          @modifications[name] = [ (original || old_value), new_value ]
-        end
+    # Audit the change of a field's value.
+    #
+    # Example:
+    #
+    # <tt>person.modify("name", "Jack", "John")</tt>
+    def modify(name, old_value, new_value)
+      @attributes[name] = new_value
+      if @modifications && (old_value != new_value)
+        original = @modifications[name].first if @modifications[name]
+        @modifications[name] = [ (original || old_value), new_value ]
       end
     end
 
@@ -243,10 +242,10 @@ module Mongoid #:nodoc:
       #   person.title_was # "Sir"
       #   person.reset_title!
       def add_dirty_methods(name)
-        define_method("#{name}_change") { attribute_change(name) }
-        define_method("#{name}_changed?") { attribute_changed?(name) }
-        define_method("#{name}_was") { attribute_was(name) }
-        define_method("reset_#{name}!") { reset_attribute!(name) }
+        define_method("#{name}_change") { attribute_change(name) } unless instance_methods.include?("#{name}_change")
+        define_method("#{name}_changed?") { attribute_changed?(name) } unless instance_methods.include?("#{name}_changed?")
+        define_method("#{name}_was") { attribute_was(name) } unless instance_methods.include?("#{name}_was")
+        define_method("reset_#{name}!") { reset_attribute!(name) } unless instance_methods.include?("reset_#{name}!")
       end
     end
   end