mongoid 1.2.6 → 1.2.7

data/VERSION

@@ -1 +1 @@
-1.2.6
+1.2.7

data/lib/mongoid.rb

@@ -47,6 +47,7 @@ require "mongoid/config"
 require "mongoid/contexts"
 require "mongoid/criteria"
 require "mongoid/cursor"
+require "mongoid/enslavement"
 require "mongoid/extensions"
 require "mongoid/errors"
 require "mongoid/factory"

data/lib/mongoid/associations.rb

@@ -240,7 +240,7 @@ module Mongoid # :nodoc:
       def add_builder(type, options)
         name = options.name.to_s
         define_method("build_#{name}") do |attrs|
-          reset(name) { type.new(self, attrs.stringify_keys, options) }
+          reset(name) { type.new(self, (attrs || {}).stringify_keys, options) }
         end
       end
 

data/lib/mongoid/attributes.rb

@@ -129,6 +129,7 @@ module Mongoid #:nodoc:
         identify if id.blank?
         notify
       end
+      alias :attributes= write_attributes
 
       protected
       # Return true is dynamic field setting is enabled.

data/lib/mongoid/collection.rb

@@ -30,7 +30,7 @@ module Mongoid #:nodoc
     #
     # Either a +Master+ or +Slaves+ collection.
     def directed(options = {})
-      enslave = options.delete(:enslave)
+      enslave = options.delete(:enslave) || @klass.enslaved?
       enslave ? master_or_slaves : master
     end
 

data/lib/mongoid/commands.rb

@@ -67,7 +67,7 @@ module Mongoid #:nodoc:
         rescue Mongo::OperationFailure => e
           errors.add(:mongoid, e.message)
         end
-        run_callbacks(:after_create) if new
+        run_callbacks(:after_create) if new && saved
         saved
       end
 

data/lib/mongoid/commands/delete_all.rb

@@ -14,8 +14,9 @@ module Mongoid #:nodoc:
       #
       # <tt>DeleteAll.execute(Person, :conditions => { :field => "value" })</tt>
       def self.execute(klass, params = {})
+        safe = Mongoid.persist_in_safe_mode
         collection = klass.collection
-        collection.remove((params[:conditions] || {}).merge(:_type => klass.name))
+        collection.remove((params[:conditions] || {}).merge(:_type => klass.name), :safe => safe)
       end
     end
   end

data/lib/mongoid/commands/destroy_all.rb

@@ -16,7 +16,7 @@ module Mongoid #:nodoc:
       def self.execute(klass, params)
         conditions = params[:conditions] || {}
         params[:conditions] = conditions.merge(:_type => klass.name)
-        klass.find(:all, params).each { |doc| Destroy.execute(doc) }
+        klass.find(:all, params).each { |doc| Destroy.execute(doc) }; true
       end
     end
   end

data/lib/mongoid/components.rb

@@ -9,6 +9,7 @@ module Mongoid #:nodoc
         include Attributes
         include Callbacks
         include Commands
+        include Enslavement
         include Fields
         include Indexes
         include Matchers

data/lib/mongoid/config.rb

@@ -8,7 +8,8 @@ module Mongoid #:nodoc
       :reconnect_time,
       :parameterize_keys,
       :persist_in_safe_mode,
-      :raise_not_found_error
+      :raise_not_found_error,
+      :use_object_ids
 
     # Defaults the configuration options to true.
     def initialize
@@ -17,6 +18,7 @@ module Mongoid #:nodoc
       @persist_in_safe_mode = true
       @raise_not_found_error = true
       @reconnect_time = 3
+      @use_object_ids = false
     end
 
     # Sets the Mongo::DB master database to be used. If the object trying to me

data/lib/mongoid/contexts.rb

@@ -1,4 +1,25 @@
 # encoding: utf-8
+require "mongoid/contexts/ids"
 require "mongoid/contexts/paging"
 require "mongoid/contexts/enumerable"
 require "mongoid/contexts/mongo"
+
+module Mongoid
+  module Contexts
+    # Determines the context to be used for this criteria. If the class is an
+    # embedded document, then the context will be the array in the has_many
+    # association it is in. If the class is a root, then the database itself
+    # will be the context.
+    #
+    # Example:
+    #
+    # <tt>Contexts.context_for(criteria)</tt>
+    def self.context_for(criteria)
+      if criteria.klass.embedded
+        return Contexts::Enumerable.new(criteria)
+      end
+      Contexts::Mongo.new(criteria)
+    end
+
+  end
+end

data/lib/mongoid/contexts/enumerable.rb

@@ -2,10 +2,11 @@
 module Mongoid #:nodoc:
   module Contexts #:nodoc:
     class Enumerable
-      include Paging
-      attr_reader :selector, :options, :documents
+      include Ids, Paging
+      attr_reader :criteria
 
       delegate :first, :last, :to => :execute
+      delegate :documents, :options, :selector, :to => :criteria
 
       # Return aggregation counts of the grouped documents. This will count by
       # the first field provided in the fields array.
@@ -21,7 +22,7 @@ module Mongoid #:nodoc:
 
       # Gets the number of documents in the array. Delegates to size.
       def count
-        @count ||= @documents.size
+        @count ||= documents.size
       end
 
       # Groups the documents by the first field supplied in the field options.
@@ -30,8 +31,8 @@ module Mongoid #:nodoc:
       #
       # A +Hash+ with field values as keys, arrays of documents as values.
       def group
-        field = @options[:fields].first
-        @documents.group_by { |doc| doc.send(field) }
+        field = options[:fields].first
+        documents.group_by { |doc| doc.send(field) }
       end
 
       # Enumerable implementation of execute. Returns matching documents for
@@ -41,7 +42,7 @@ module Mongoid #:nodoc:
       #
       # An +Array+ of documents that matched the selector.
       def execute(paginating = false)
-        limit(@documents.select { |document| document.matches?(@selector) })
+        limit(documents.select { |document| document.matches?(selector) })
       end
 
       # Create the new enumerable context. This will need the selector and
@@ -50,9 +51,9 @@ module Mongoid #:nodoc:
       #
       # Example:
       #
-      # <tt>Mongoid::Contexts::Enumerable.new(selector, options, docs)</tt>
-      def initialize(selector, options, documents)
-        @selector, @options, @documents = selector, options, documents
+      # <tt>Mongoid::Contexts::Enumerable.new(criteria)</tt>
+      def initialize(criteria)
+        @criteria = criteria
       end
 
       # Get the largest value for the field in all the documents.
@@ -86,7 +87,7 @@ module Mongoid #:nodoc:
       #
       # The numerical sum of all the document field values.
       def sum(field)
-        sum = @documents.inject(nil) do |memo, doc|
+        sum = documents.inject(nil) do |memo, doc|
           value = doc.send(field)
           memo ? memo += value : value
         end
@@ -95,7 +96,7 @@ module Mongoid #:nodoc:
       protected
       # If the field exists, perform the comparison and set if true.
       def determine(field, operator)
-        matching = @documents.inject(nil) do |memo, doc|
+        matching = documents.inject(nil) do |memo, doc|
           value = doc.send(field)
           (memo && memo.send(operator, value)) ? memo : value
         end
@@ -103,9 +104,11 @@ module Mongoid #:nodoc:
 
       # Limits the result set if skip and limit options.
       def limit(documents)
-        skip, limit = @options[:skip], @options[:limit]
+        skip, limit = options[:skip], options[:limit]
         if skip && limit
           return documents.slice(skip, limit)
+        elsif limit
+          return documents.first(limit)
         end
         documents
       end

data/lib/mongoid/contexts/ids.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Contexts #:nodoc:
+    module Ids
+      # Return documents based on an id search. Will handle if a single id has
+      # been passed or mulitple ids.
+      #
+      # Example:
+      #
+      #   context.id_criteria([1, 2, 3])
+      #
+      # Returns:
+      #
+      # The single or multiple documents.
+      def id_criteria(params)
+        criteria.id(params)
+        result = params.is_a?(Array) ? criteria.entries : one
+        if Mongoid.raise_not_found_error
+          raise Errors::DocumentNotFound.new(klass, params) if result.blank?
+        end
+        return result
+      end
+    end
+  end
+end

data/lib/mongoid/contexts/mongo.rb

@@ -2,8 +2,10 @@
 module Mongoid #:nodoc:
   module Contexts #:nodoc:
     class Mongo
-      include Paging
-      attr_reader :selector, :options, :klass
+      include Ids, Paging
+      attr_reader :criteria
+
+      delegate :klass, :options, :selector, :to => :criteria
 
       AGGREGATE_REDUCE = "function(obj, prev) { prev.count++; }"
       # Aggregate the context. This will take the internally built selector and options
@@ -19,7 +21,7 @@ module Mongoid #:nodoc:
       #
       # A +Hash+ with field values as keys, counts as values
       def aggregate
-        @klass.collection.group(@options[:fields], @selector, { :count => 0 }, AGGREGATE_REDUCE, true)
+        klass.collection.group(options[:fields], selector, { :count => 0 }, AGGREGATE_REDUCE, true)
       end
 
       # Get the count of matching documents in the database for the context.
@@ -32,7 +34,7 @@ module Mongoid #:nodoc:
       #
       # An +Integer+ count of documents.
       def count
-        @count ||= @klass.collection.find(@selector, process_options).count
+        @count ||= klass.collection.find(selector, process_options).count
       end
 
       # Execute the context. This will take the selector and options
@@ -48,7 +50,7 @@ module Mongoid #:nodoc:
       #
       # An enumerable +Cursor+.
       def execute(paginating = false)
-        cursor = @klass.collection.find(@selector, process_options)
+        cursor = klass.collection.find(selector, process_options)
         if cursor
           @count = cursor.count if paginating
           cursor
@@ -71,15 +73,15 @@ module Mongoid #:nodoc:
       #
       # A +Hash+ with field values as keys, arrays of documents as values.
       def group
-        @klass.collection.group(
-          @options[:fields],
-          @selector,
+        klass.collection.group(
+          options[:fields],
+          selector,
           { :group => [] },
           GROUP_REDUCE,
           true
         ).collect do |docs|
           docs["group"] = docs["group"].collect do |attrs|
-            Mongoid::Factory.build(@klass, attrs)
+            Mongoid::Factory.build(klass, attrs)
           end
           docs
         end
@@ -90,11 +92,11 @@ module Mongoid #:nodoc:
       #
       # Example:
       #
-      # <tt>Mongoid::Contexts::Mongo.new(selector, options, klass)</tt>
-      def initialize(selector, options, klass)
-        @selector, @options, @klass = selector, options, klass
-        if klass.hereditary
-          @hereditary = true
+      # <tt>Mongoid::Contexts::Mongo.new(criteria)</tt>
+      def initialize(criteria)
+        @criteria = criteria
+        if criteria.klass.hereditary
+          criteria.in(:_type => criteria.klass._types)
         end
       end
 
@@ -114,8 +116,8 @@ module Mongoid #:nodoc:
         sorting = opts[:sort]
         sorting = [[:_id, :asc]] unless sorting
         opts[:sort] = sorting.collect { |option| [ option[0], option[1].invert ] }
-        attributes = @klass.collection.find_one(@selector, opts)
-        attributes ? Mongoid::Factory.build(@klass, attributes) : nil
+        attributes = klass.collection.find_one(selector, opts)
+        attributes ? Mongoid::Factory.build(klass, attributes) : nil
       end
 
       MAX_REDUCE = "function(obj, prev) { if (prev.max == 'start') { prev.max = obj.[field]; } " +
@@ -168,8 +170,8 @@ module Mongoid #:nodoc:
       #
       # The first document in the collection.
       def one
-        attributes = @klass.collection.find_one(@selector, process_options)
-        attributes ? Mongoid::Factory.build(@klass, attributes) : nil
+        attributes = klass.collection.find_one(selector, process_options)
+        attributes ? Mongoid::Factory.build(klass, attributes) : nil
       end
 
       alias :first :one
@@ -196,9 +198,9 @@ module Mongoid #:nodoc:
       # Common functionality for grouping operations. Currently used by min, max
       # and sum. Will gsub the field name in the supplied reduce function.
       def grouped(start, field, reduce)
-        collection = @klass.collection.group(
+        collection = klass.collection.group(
           nil,
-          @selector,
+          selector,
           { start => "start" },
           reduce.gsub("[field]", field),
           true
@@ -209,12 +211,12 @@ module Mongoid #:nodoc:
       # Filters the field list. If no fields have been supplied, then it will be
       # empty. If fields have been defined then _type will be included as well.
       def process_options
-        fields = @options[:fields]
+        fields = options[:fields]
         if fields && fields.size > 0 && !fields.include?(:_type)
           fields << :_type
-          @options[:fields] = fields
+          options[:fields] = fields
         end
-        @options.dup
+        options.dup
       end
 
     end

data/lib/mongoid/contexts/paging.rb

@@ -25,7 +25,7 @@ module Mongoid #:nodoc:
       #
       # An +Integer+ page number.
       def page
-        skips, limits = @options[:skip], @options[:limit]
+        skips, limits = options[:skip], options[:limit]
         (skips && limits) ? (skips + limits) / limits : 1
       end
 
@@ -35,7 +35,7 @@ module Mongoid #:nodoc:
       #
       # The +Integer+ number of documents in each page.
       def per_page
-        (@options[:limit] || 20).to_i
+        (options[:limit] || 20).to_i
       end
     end
   end

data/lib/mongoid/criteria.rb

@@ -35,6 +35,7 @@ module Mongoid #:nodoc:
       :execute,
       :first,
       :group,
+      :id_criteria,
       :last,
       :max,
       :min,
@@ -91,7 +92,7 @@ module Mongoid #:nodoc:
     # This will return an Enumerable context if the class is embedded,
     # otherwise it will return a Mongo context for root classes.
     def context
-      @context ||= determine_context
+      @context ||= Contexts.context_for(self)
     end
 
     # Iterate over each +Document+ in the results. This can take an optional
@@ -101,7 +102,7 @@ module Mongoid #:nodoc:
     #
     # <tt>criteria.each { |doc| p doc }</tt>
     def each(&block)
-      return each_cached(&block) if cached?
+      return caching(&block) if cached?
       if block_given?
         execute.each { |doc| yield doc }
       end
@@ -134,10 +135,6 @@ module Mongoid #:nodoc:
     # klass: The class to execute on.
     def initialize(klass)
       @selector, @options, @klass, @documents = {}, {}, klass, []
-      if klass.hereditary
-        @selector = { :_type => { "$in" => klass._types } }
-        @hereditary = true
-      end
     end
 
     # Merges another object into this +Criteria+. The other object may be a
@@ -204,29 +201,15 @@ module Mongoid #:nodoc:
       klass = args[0]
       params = args[1] || {}
       unless params.is_a?(Hash)
-        return id_criteria(klass, params)
+        return new(klass).id_criteria(params)
       end
       return new(klass).where(params.delete(:conditions) || {}).extras(params)
     end
 
     protected
-    # Determines the context to be used for this criteria. If the class is an
-    # embedded document, then thw context will be the array in the has_many
-    # association it is in. If the class is a root, then the database itself
-    # will be the context.
-    #
-    # Example:
-    #
-    # <tt>criteria#determine_context</tt>
-    def determine_context
-      if @klass.embedded
-        return Contexts::Enumerable.new(@selector, @options, @documents)
-      end
-      Contexts::Mongo.new(@selector, @options, @klass)
-    end
 
     # Iterate over each +Document+ in the results and cache the collection.
-    def each_cached(&block)
+    def caching(&block)
       @collection ||= execute
       if block_given?
         docs = []
@@ -272,26 +255,5 @@ module Mongoid #:nodoc:
     def update_selector(attributes, operator)
       attributes.each { |key, value| @selector[key] = { operator => value } }; self
     end
-
-    class << self
-      # Create a criteria or single document based on an id search. Will handle
-      # if a single id has been passed or mulitple ids.
-      #
-      # Example:
-      #
-      #   Criteria.id_criteria(Person, [1, 2, 3])
-      #
-      # Returns:
-      #
-      # The single or multiple documents.
-      def id_criteria(klass, params)
-        criteria = new(klass).id(params)
-        result = params.is_a?(String) ? criteria.one : criteria.entries
-        if Mongoid.raise_not_found_error
-          raise Errors::DocumentNotFound.new(klass, params) if result.blank?
-        end
-        return result
-      end
-    end
   end
 end