mongoid 2.0.0.rc.7 → 2.0.0.rc.8

data/lib/mongoid/collections/slaves.rb

@@ -1,35 +1,44 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Collections #:nodoc:
+
+    # This class wraps the MongoDB slaves databases.
     class Slaves
+      include Mongoid::Collections::Retry
 
       attr_reader :iterator
 
       # All read operations should delegate to the slave connections.
       # These operations mimic the methods on a Mongo:Collection.
       #
-      # Example:
-      #
-      # <tt>collection.save({ :name => "Al" })</tt>
+      # @example Proxy the driver save.
+      #   collection.save({ :name => "Al" })
       Operations::READ.each do |name|
-        define_method(name) { |*args| collection.send(name, *args) }
+        define_method(name) do |*args|
+          retry_on_connection_failure do
+            collection.send(name, *args)
+          end
+        end
       end
 
       # Is the collection of slaves empty or not?
       #
-      # Return:
+      # @example Is the collection empty?
+      #   slaves.empty?
       #
-      # True is the iterator is not set, false if not.
+      # @return [ true, false ] If the iterator is set or not.
       def empty?
-        @iterator.nil?
+        iterator.nil?
       end
 
       # Create the new database reader. Will create a collection from the
       # slave databases and cycle through them on each read.
       #
-      # Example:
+      # @example Create the slaves.
+      #   Reader.new(slaves, "mongoid_people")
       #
-      # <tt>Reader.new(slaves, "mongoid_people")</tt>
+      # @param [ Array<Mongo::DB> ] slaves The slave databases.
+      # @param [ String ] name The database name.
       def initialize(slaves, name)
         unless slaves.blank?
           @iterator = CyclicIterator.new(slaves.collect { |db| db.collection(name) })
@@ -37,8 +46,15 @@ module Mongoid #:nodoc:
       end
 
       protected
+
+      # Get the next database in the round-robin.
+      #
+      # @example Get the next database.
+      #   slaves.collection
+      #
+      # @return [ Mongo::DB ] The next slave database to read from.
       def collection
-        @iterator.next
+        iterator.next
       end
     end
   end

data/lib/mongoid/components.rb

@@ -7,20 +7,20 @@ module Mongoid #:nodoc
     # module, to keep the document class from getting too cluttered.
     included do
       extend ActiveModel::Translation
-      extend Mongoid::DefaultScope
       extend Mongoid::Finders
-      extend Mongoid::NamedScope
     end
 
     include ActiveModel::Conversion
     include ActiveModel::MassAssignmentSecurity
     include ActiveModel::Naming
+    include ActiveModel::Observing
     include ActiveModel::Serializers::JSON
     include ActiveModel::Serializers::Xml
     include Mongoid::Atomicity
     include Mongoid::Attributes
     include Mongoid::Collections
     include Mongoid::Copyable
+    include Mongoid::DefaultScope
     include Mongoid::Dirty
     include Mongoid::Extras
     include Mongoid::Fields
@@ -30,14 +30,14 @@ module Mongoid #:nodoc
     include Mongoid::JSON
     include Mongoid::Keys
     include Mongoid::Matchers
-    include Mongoid::MultiParameterAttributes
-    include Mongoid::Modifiers
+    include Mongoid::NamedScope
     include Mongoid::NestedAttributes
     include Mongoid::Paths
     include Mongoid::Persistence
     include Mongoid::Relations
     include Mongoid::Safety
     include Mongoid::Serialization
+    include Mongoid::Sharding
     include Mongoid::State
     include Mongoid::Validations
     include Mongoid::Callbacks

data/lib/mongoid/config.rb

@@ -11,6 +11,7 @@ module Mongoid #:nodoc
   # @todo Durran: This module needs an overhaul, remove singleton, etc.
   module Config
     extend self
+    include ActiveModel::Observing
 
     attr_accessor :master, :slaves, :settings
     @settings = {}
@@ -35,15 +36,17 @@ module Mongoid #:nodoc
     end
 
     option :allow_dynamic_fields, :default => true
+    option :autocreate_indexes, :default => false
+    option :binding_defaults, :default => { :binding => false, :continue => true }
+    option :embedded_object_id, :default => true
     option :include_root_in_json, :default => false
     option :parameterize_keys, :default => true
     option :persist_in_safe_mode, :default => false
+    option :preload_models, :default => true
     option :raise_not_found_error, :default => true
-    option :reconnect_time, :default => 3
-    option :autocreate_indexes, :default => false
     option :skip_version_check, :default => false
     option :time_zone, :default => nil
-    option :binding_defaults, :default => { :binding => false, :continue => true }
+    option :max_retries_on_connection_failure, :default => 0
 
     # Adds a new I18n locale file to the load path.
     #

data/lib/mongoid/contexts.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "mongoid/contexts/ids"
 require "mongoid/contexts/paging"
 require "mongoid/contexts/enumerable"
 require "mongoid/contexts/mongo"

data/lib/mongoid/contexts/enumerable.rb

@@ -1,15 +1,16 @@
 # encoding: utf-8
-
 require 'mongoid/contexts/enumerable/sort'
 
 module Mongoid #:nodoc:
   module Contexts #:nodoc:
     class Enumerable
-      include Ids, Paging
-      attr_accessor :criteria
+      include Paging
+      include Relations::Embedded::Atomic
+
+      attr_accessor :collection, :criteria
 
       delegate :blank?, :empty?, :first, :last, :to => :execute
-      delegate :klass, :documents, :options, :selector, :to => :criteria
+      delegate :klass, :documents, :options, :field_list, :selector, :to => :criteria
 
       # Return aggregation counts of the grouped documents. This will count by
       # the first field provided in the fields array.
@@ -51,7 +52,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0.rc.1
       def delete_all
-        count.tap { filter.each(&:delete) }
+        atomically(:$pull) do
+          set_collection
+          count.tap { filter.each(&:delete) }
+        end
       end
       alias :delete :delete_all
 
@@ -64,7 +68,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0.rc.1
       def destroy_all
-        count.tap { filter.each(&:destroy) }
+        atomically(:$pull) do
+          set_collection
+          count.tap { filter.each(&:destroy) }
+        end
       end
       alias :destroy :destroy_all
 
@@ -94,7 +101,7 @@ module Mongoid #:nodoc:
       #
       # A +Hash+ with field values as keys, arrays of documents as values.
       def group
-        field = options[:fields].first
+        field = field_list.first
         execute.group_by { |doc| doc.send(field) }
       end
 
@@ -212,6 +219,11 @@ module Mongoid #:nodoc:
         documents
       end
 
+      def set_collection
+        root = documents.first._root
+        @collection = root.collection if root && !root.embedded?
+      end
+
       # Sorts the result set if sort options have been set.
       def sort(documents)
         return documents if options[:sort].blank?

data/lib/mongoid/contexts/mongo.rb

@@ -2,10 +2,10 @@
 module Mongoid #:nodoc:
   module Contexts #:nodoc:
     class Mongo
-      include Ids, Paging
+      include Paging
       attr_accessor :criteria
 
-      delegate :klass, :options, :selector, :to => :criteria
+      delegate :klass, :options, :field_list, :selector, :to => :criteria
 
       # Aggregate the context. This will take the internally built selector and options
       # and pass them on to the Ruby driver's +group()+ method on the collection. The
@@ -21,7 +21,7 @@ module Mongoid #:nodoc:
       # A +Hash+ with field values as keys, counts as values
       def aggregate
         klass.collection.group(
-          :key => options[:fields],
+          :key => field_list,
           :cond => selector,
           :initial => { :count => 0 },
           :reduce => Javascript.aggregate
@@ -146,7 +146,7 @@ module Mongoid #:nodoc:
       # A +Hash+ with field values as keys, arrays of documents as values.
       def group
         klass.collection.group(
-          :key => options[:fields],
+          :key => field_list,
           :cond => selector,
           :initial => { :group => [] },
           :reduce => Javascript.group
@@ -304,7 +304,11 @@ module Mongoid #:nodoc:
       def process_options
         fields = options[:fields]
         if fields && fields.size > 0 && !fields.include?(:_type)
-          fields << :_type
+          if fields.kind_of?(Hash)
+            fields[:_type] = 1 if fields.first.last != 0 # Not excluding
+          else
+            fields << :type
+          end
           options[:fields] = fields
         end
         options.dup

data/lib/mongoid/copyable.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
+
+  # This module contains the behaviour of Mongoid's clone/dup of documents.
   module Copyable
     extend ActiveSupport::Concern
 
@@ -17,19 +19,19 @@ module Mongoid #:nodoc:
     # the exception of the document's id and versions, and will reset all the
     # instance variables.
     #
-    # Example:
-    #
-    # <tt>document.clone</tt>
-    # <tt>document.dup</tt>
+    # This clone also includes embedded documents.
     #
-    # Options:
+    # @example Clone the document.
+    #   document.clone
     #
-    # other: The document getting cloned.
+    # @example Dup the document.
+    #   document.dup
     #
-    # Returns:
+    # @param [ Document ] other The document getting cloned.
     #
-    # A new document with all the attributes except id and versions
+    # @return [ Document ] The new document.
     def initialize_copy(other)
+      @attributes = other.as_document
       instance_variables.each { |name| remove_instance_variable(name) }
       COPYABLES.each do |name|
         value = other.instance_variable_get(name)

data/lib/mongoid/criteria.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "mongoid/criterion/builder"
 require "mongoid/criterion/creational"
 require "mongoid/criterion/complex"
 require "mongoid/criterion/exclusion"
@@ -25,13 +26,22 @@ module Mongoid #:nodoc:
   # <tt>criteria.execute</tt>
   class Criteria
     include Enumerable
+    include Criterion::Builder
     include Criterion::Creational
     include Criterion::Exclusion
     include Criterion::Inclusion
     include Criterion::Inspection
     include Criterion::Optional
 
-    attr_accessor :collection, :documents, :embedded, :ids, :klass, :options, :selector
+    attr_accessor \
+      :collection,
+      :documents,
+      :embedded,
+      :ids,
+      :klass,
+      :options,
+      :selector,
+      :field_list
 
     delegate \
       :aggregate,
@@ -47,7 +57,6 @@ module Mongoid #:nodoc:
       :execute,
       :first,
       :group,
-      :id_criteria,
       :last,
       :max,
       :min,
@@ -118,6 +127,20 @@ module Mongoid #:nodoc:
       context.count > 0
     end
 
+    # When freezing a criteria we need to initialize the context first
+    # otherwise the setting of the context on attempted iteration will raise a
+    # runtime error.
+    #
+    # @example Freeze the criteria.
+    #   criteria.freeze
+    #
+    # @return [ Criteria ] The frozen criteria.
+    #
+    # @since 2.0.0
+    def freeze
+      context and super
+    end
+
     # Merges the supplied argument hash into a single criteria
     #
     # Options:
@@ -160,9 +183,15 @@ module Mongoid #:nodoc:
     # <tt>criteria.merge({ :conditions => { :title => "Sir" } })</tt>
     def merge(other)
       clone.tap do |crit|
-        crit.selector.update(other.selector)
-        crit.options.update(other.options)
-        crit.documents = other.documents
+        if other.is_a?(Criteria)
+          crit.selector.update(other.selector)
+          crit.options.update(other.options)
+          crit.documents = other.documents
+        else
+          duped = other.dup
+          crit.selector.update(duped.delete(:conditions) || {})
+          crit.options.update(duped)
+        end
       end
     end
 
@@ -207,62 +236,53 @@ module Mongoid #:nodoc:
       entries.as_json(options)
     end
 
-    class << self
-
-      # Encaspulates the behavior of taking arguments and parsing them into a
-      # finder type and a corresponding criteria object.
-      #
-      # Example:
-      #
-      # <tt>Criteria.parse!(Person, :all, :conditions => {})</tt>
-      #
-      # Options:
-      #
-      # klass: The klass to create the criteria for.
-      # args: An assortment of finder options.
-      #
-      # Returns:
-      #
-      # An Array with the type and criteria.
-      def parse!(klass, embedded, *args)
-        if args[0].nil?
-          Errors::InvalidOptions.new("Calling Document#find with nil is invalid")
-        end
-        type = args.delete_at(0) if args[0].is_a?(Symbol)
-        criteria = translate(klass, embedded, *args)
-        return [ type, criteria ]
+    # Search for documents based on a variety of args.
+    #
+    # @example Find by an id.
+    #   criteria.search(BSON::ObjectId.new)
+    #
+    # @example Find by multiple ids.
+    #   criteria.search([ BSON::ObjectId.new, BSON::ObjectId.new ])
+    #
+    # @example Conditionally find all matching documents.
+    #   criteria.search(:all, :conditions => { :title => "Sir" })
+    #
+    # @example Conditionally find the first document.
+    #   criteria.search(:first, :conditions => { :title => "Sir" })
+    #
+    # @example Conditionally find the last document.
+    #   criteria.search(:last, :conditions => { :title => "Sir" })
+    #
+    # @param [ Symbol, BSON::ObjectId, Array<BSON::ObjectId> ] arg The
+    #   argument to search with.
+    # @param [ Hash ] options The options to search with.
+    #
+    # @return [ Array<Symbol, Criteria> ] The type and criteria.
+    #
+    # @since 2.0.0
+    def search(*args)
+      raise_invalid if args[0].nil?
+      type = args[0]
+      params = args[1] || {}
+      return [ :ids, for_ids(type) ] unless type.is_a?(Symbol)
+      conditions = params.delete(:conditions) || {}
+      if conditions.include?(:id)
+        conditions[:_id] = conditions[:id]
+        conditions.delete(:id)
       end
+      return [ type, where(conditions).extras(params) ]
+    end
 
-      # Translate the supplied arguments into a +Criteria+ object.
-      #
-      # If the passed in args is a single +String+, then it will
-      # construct an id +Criteria+ from it.
-      #
-      # If the passed in args are a type and a hash, then it will construct
-      # the +Criteria+ with the proper selector, options, and type.
-      #
-      # Options:
-      #
-      # args: either a +String+ or a +Symbol+, +Hash combination.
-      #
-      # Example:
-      #
-      # <tt>Criteria.translate(Person, "4ab2bc4b8ad548971900005c")</tt>
-      # <tt>Criteria.translate(Person, :conditions => { :field => "value"}, :limit => 20)</tt>
-      def translate(*args)
-        klass = args[0]
-        embedded = args[1]
-        params = args[2] || {}
-        unless params.is_a?(Hash)
-          return klass.criteria(embedded).id_criteria(params)
-        end
-        conditions = params.delete(:conditions) || {}
-        if conditions.include?(:id)
-          conditions[:_id] = conditions[:id]
-          conditions.delete(:id)
-        end
-        return klass.criteria(embedded).where(conditions).extras(params)
-      end
+    # Convenience method of raising an invalid options error.
+    #
+    # @example Raise the error.
+    #   criteria.raise_invalid
+    #
+    # @raise [ Errors::InvalidOptions ] The error.
+    #
+    # @since 2.0.0
+    def raise_invalid
+      raise Errors::InvalidOptions.new(:calling_document_find_with_nil_is_invalid, {})
     end
 
     protected
@@ -318,7 +338,9 @@ module Mongoid #:nodoc:
     # Example:
     #
     # <tt>criteria.update_selector({ :field => "value" }, "$in")</tt>
-    def update_selector(attributes, operator)
+    #
+    # @param [ Symbol ] combine The operator to use when combining sets.
+    def update_selector(attributes, operator, combine = :+)
       clone.tap do |crit|
         converted = BSON::ObjectId.convert(klass, attributes || {})
         converted.each do |key, value|
@@ -326,7 +348,7 @@ module Mongoid #:nodoc:
             crit.selector[key] = { operator => value }
           else
             if crit.selector[key].has_key?(operator)
-              new_value = crit.selector[key].values.first + value
+              new_value = crit.selector[key].values.first.send(combine, value)
               crit.selector[key] = { operator => new_value }
             else
               crit.selector[key][operator] = value