mongoid-pre 2.0.0.beta1 → 2.0.0.pre

data/lib/mongoid/contexts/mongo.rb

@@ -2,11 +2,10 @@
 module Mongoid #:nodoc:
   module Contexts #:nodoc:
     class Mongo
-      include Ids, Paging
-      attr_reader :criteria
-
-      delegate :klass, :options, :selector, :to => :criteria
+      include Paging
+      attr_reader :selector, :options, :klass
 
+      AGGREGATE_REDUCE = "function(obj, prev) { prev.count++; }"
       # 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
       # collection itself will be retrieved from the class provided, and once the
@@ -20,40 +19,9 @@ module Mongoid #:nodoc:
       #
       # A +Hash+ with field values as keys, counts as values
       def aggregate
-        klass.collection.group(options[:fields], selector, { :count => 0 }, Javascript.aggregate, true)
-      end
-
-      # Get the average value for the supplied field.
-      #
-      # This will take the internally built selector and options
-      # and pass them on to the Ruby driver's +group()+ method on the collection. The
-      # collection itself will be retrieved from the class provided, and once the
-      # query has returned it will provided a grouping of keys with averages.
-      #
-      # Example:
-      #
-      # <tt>context.avg(:age)</tt>
-      #
-      # Returns:
-      #
-      # A numeric value that is the average.
-      def avg(field)
-        total = sum(field)
-        total ? (total / count) : nil
-      end
-
-      # Determine if the context is empty or blank given the criteria. Will
-      # perform a quick has_one asking only for the id.
-      #
-      # Example:
-      #
-      # <tt>context.blank?</tt>
-      def blank?
-        klass.collection.find_one(selector, { :fields => [ :_id ] }).nil?
+        @klass.collection.group(@options[:fields], @selector, { :count => 0 }, AGGREGATE_REDUCE, true)
       end
 
-      alias :empty? :blank?
-
       # Get the count of matching documents in the database for the context.
       #
       # Example:
@@ -64,17 +32,7 @@ module Mongoid #:nodoc:
       #
       # An +Integer+ count of documents.
       def count
-        @count ||= klass.collection.find(selector, process_options).count
-      end
-
-      # Gets an array of distinct values for the supplied field across the
-      # entire collection or the susbset given the criteria.
-      #
-      # Example:
-      #
-      # <tt>context.distinct(:title)</tt>
-      def distinct(field)
-        klass.collection.distinct(field, selector)
+        @count ||= @klass.collection.find(@selector, process_options).count
       end
 
       # Execute the context. This will take the selector and options
@@ -84,13 +42,13 @@ module Mongoid #:nodoc:
       #
       # Example:
       #
-      # <tt>context.execute</tt>
+      # <tt>mongo.execute</tt>
       #
       # Returns:
       #
       # 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
@@ -99,6 +57,7 @@ module Mongoid #:nodoc:
         end
       end
 
+      GROUP_REDUCE = "function(obj, prev) { prev.group.push(obj); }"
       # Groups 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
       # collection itself will be retrieved from the class provided, and once the
@@ -112,14 +71,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 => [] },
-          Javascript.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
@@ -130,26 +90,11 @@ module Mongoid #:nodoc:
       #
       # Example:
       #
-      # <tt>Mongoid::Contexts::Mongo.new(criteria)</tt>
-      def initialize(criteria)
-        @criteria = criteria
-        if klass.hereditary && Mongoid.persist_types
-          criteria.in(:_type => criteria.klass._types)
-        end
-        criteria.enslave if klass.enslaved?
-        criteria.cache if klass.cached?
-      end
-
-      # Iterate over each +Document+ in the results. This can take an optional
-      # block to pass to each argument in the results.
-      #
-      # Example:
-      #
-      # <tt>context.iterate { |doc| p doc }</tt>
-      def iterate(&block)
-        return caching(&block) if criteria.cached?
-        if block_given?
-          execute.each { |doc| yield doc }
+      # <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
         end
       end
 
@@ -169,10 +114,12 @@ 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]; } " +
+        "if (prev.max < obj.[field]) { prev.max = obj.[field]; } }"
       # Return the max value for a field.
       #
       # This will take the internally built selector and options
@@ -188,9 +135,11 @@ module Mongoid #:nodoc:
       #
       # A numeric max value.
       def max(field)
-        grouped(:max, field.to_s, Javascript.max)
+        grouped(:max, field.to_s, MAX_REDUCE)
       end
 
+      MIN_REDUCE = "function(obj, prev) { if (prev.min == 'start') { prev.min = obj.[field]; } " +
+        "if (prev.min > obj.[field]) { prev.min = obj.[field]; } }"
       # Return the min value for a field.
       #
       # This will take the internally built selector and options
@@ -206,7 +155,7 @@ module Mongoid #:nodoc:
       #
       # A numeric minimum value.
       def min(field)
-        grouped(:min, field.to_s, Javascript.min)
+        grouped(:min, field.to_s, MIN_REDUCE)
       end
 
       # Return the first result for the +Context+.
@@ -219,12 +168,13 @@ 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
 
+      SUM_REDUCE = "function(obj, prev) { if (prev.sum == 'start') { prev.sum = 0; } prev.sum += obj.[field]; }"
       # Sum the context.
       #
       # This will take the internally built selector and options
@@ -240,17 +190,18 @@ module Mongoid #:nodoc:
       #
       # A numeric value that is the sum.
       def sum(field)
-        grouped(:sum, field.to_s, Javascript.sum)
+        grouped(:sum, field.to_s, SUM_REDUCE)
       end
 
       # 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)
+          reduce.gsub("[field]", field),
+          true
         )
         collection.empty? ? nil : collection.first[start.to_s]
       end
@@ -258,28 +209,14 @@ 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
 
-      protected
-
-      # Iterate over each +Document+ in the results and cache the collection.
-      def caching(&block)
-        if defined? @collection
-          @collection.each(&block)
-        else
-          @collection = []
-          execute.each do |doc|
-            @collection << doc
-            yield doc if block_given?
-          end
-        end
-      end
     end
   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/contexts.rb

@@ -1,25 +1,4 @@
 # 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/criteria.rb

@@ -26,19 +26,15 @@ module Mongoid #:nodoc:
     include Enumerable
 
     attr_reader :collection, :ids, :klass, :options, :selector
+
     attr_accessor :documents
 
     delegate \
       :aggregate,
-      :avg,
-      :blank?,
       :count,
-      :distinct,
-      :empty?,
       :execute,
       :first,
       :group,
-      :id_criteria,
       :last,
       :max,
       :min,
@@ -79,12 +75,23 @@ module Mongoid #:nodoc:
       end
     end
 
+    # Returns true if the criteria is empty.
+    #
+    # Example:
+    #
+    # <tt>criteria.blank?</tt>
+    def blank?
+      count < 1
+    end
+
+    alias :empty? :blank?
+
     # Return or create the context in which this criteria should be executed.
     #
     # This will return an Enumerable context if the class is embedded,
     # otherwise it will return a Mongo context for root classes.
     def context
-      @context ||= Contexts.context_for(self)
+      @context ||= determine_context
     end
 
     # Iterate over each +Document+ in the results. This can take an optional
@@ -94,7 +101,10 @@ module Mongoid #:nodoc:
     #
     # <tt>criteria.each { |doc| p doc }</tt>
     def each(&block)
-      context.iterate(&block)
+      return each_cached(&block) if cached?
+      if block_given?
+        execute.each { |doc| yield doc }
+      end
       self
     end
 
@@ -124,6 +134,10 @@ 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
@@ -154,7 +168,7 @@ module Mongoid #:nodoc:
     # Returns: <tt>Criteria</tt>
     def method_missing(name, *args)
       if @klass.respond_to?(name)
-        new_scope = @klass.send(name, *args)
+        new_scope = @klass.send(name)
         new_scope.merge(self)
         return new_scope
       else
@@ -190,17 +204,40 @@ module Mongoid #:nodoc:
       klass = args[0]
       params = args[1] || {}
       unless params.is_a?(Hash)
-        return new(klass).id_criteria(params)
+        return id_criteria(klass, params)
       end
-      conditions = params.delete(:conditions) || {}
-      if conditions.include?(:id)
-        conditions[:_id] = conditions[:id]
-        conditions.delete(:id)
-      end
-      return new(klass).where(conditions).extras(params)
+      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)
+      @collection ||= execute
+      if block_given?
+        docs = []
+        @collection.each do |doc|
+          docs << doc
+          yield doc
+        end
+        @collection = docs
+      end
+      self
+    end
 
     # Filters the unused options out of the options +Hash+. Currently this
     # takes into account the "page" and "per_page" options that would be passed
@@ -235,5 +272,26 @@ 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

data/lib/mongoid/criterion/inclusion.rb

@@ -22,7 +22,6 @@ module Mongoid #:nodoc:
       def all(attributes = {})
         update_selector(attributes, "$all")
       end
-      alias :all_in :all
 
       # Adds a criterion to the +Criteria+ that specifies values that must
       # be matched in order to return results. This is similar to a SQL "WHERE"
@@ -62,7 +61,6 @@ module Mongoid #:nodoc:
       def in(attributes = {})
         update_selector(attributes, "$in")
       end
-      alias :any_in :in
 
       # Adds a criterion to the +Criteria+ that specifies values that must
       # be matched in order to return results. This is similar to a SQL "WHERE"

data/lib/mongoid/criterion/optional.rb

@@ -20,7 +20,8 @@ module Mongoid #:nodoc:
       #
       # <tt>criteria.cached?</tt>
       def cached?
-        @options[:cache] == true
+        @cached ||= @options.delete(:cache)
+        @cached == true
       end
 
       # Flags the criteria to execute against a read-only slave in the pool
@@ -33,15 +34,6 @@ module Mongoid #:nodoc:
         @options.merge!(:enslave => true); self
       end
 
-      # Will return true if the criteria is enslaved.
-      #
-      # Example:
-      #
-      # <tt>criteria.enslaved?</tt>
-      def enslaved?
-        @options[:enslave] == true
-      end
-
       # Adds a criterion to the +Criteria+ that specifies additional options
       # to be passed to the Ruby driver, in the exact format for the driver.
       #

data/lib/mongoid/document.rb

@@ -5,7 +5,12 @@ module Mongoid #:nodoc:
     included do
       include Mongoid::Components
 
-      cattr_accessor :_collection, :collection_name, :embedded, :primary_key, :hereditary
+      cattr_accessor \
+        :_collection,
+        :collection_name,
+        :embedded,
+        :primary_key,
+        :hereditary
 
       self.embedded = false
       self.hereditary = false
@@ -51,7 +56,6 @@ module Mongoid #:nodoc:
         if attributes["_id"] || allocating
           document = allocate
           document.instance_variable_set(:@attributes, attributes)
-          document.setup_modifications
           return document
         else
           return new(attrs)
@@ -67,6 +71,8 @@ module Mongoid #:nodoc:
       #
       #   class Person
       #     include Mongoid::Document
+      #     field :first_name
+      #     field :last_name
       #     key :first_name, :last_name
       #   end
       def key(*fields)
@@ -88,10 +94,11 @@ module Mongoid #:nodoc:
       def _types
         @_type ||= (subclasses_of(self).map { |o| o.to_s } + [ self.name ])
       end
-
+      
       # return the list of subclassses for an object
       def subclasses_of(*superclasses) #:nodoc:
         subclasses = []
+
         superclasses.each do |sup|
           ObjectSpace.each_object(class << sup; self; end) do |k|
             if k != sup && (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
@@ -99,6 +106,7 @@ module Mongoid #:nodoc:
             end
           end
         end
+
         subclasses
       end
     end
@@ -112,17 +120,6 @@ module Mongoid #:nodoc:
           other.attributes.except(:modified_at).except(:created_at)
       end
 
-      # Delegates to ==
-      def eql?(comparison_object)
-        self == (comparison_object)
-      end
-
-      # Delegates to id in order to allow two records of the same type and id to work with something like:
-      #   [ Person.find(1), Person.find(2), Person.find(3) ] & [ Person.find(1), Person.find(4) ] # => [ Person.find(1) ]
-      def hash
-        id.hash
-      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+.
@@ -131,6 +128,10 @@ module Mongoid #:nodoc:
       #
       # parent: The +Document+ to assimilate with.
       # options: The association +Options+ for the child.
+      #
+      # Example:
+      #
+      # <tt>name.assimilate(person, options)</tt>
       def assimilate(parent, options)
         parentize(parent, options.name); notify; self
       end
@@ -176,12 +177,25 @@ module Mongoid #:nodoc:
         "#<#{self.class.name} _id: #{id}, #{attrs}>"
       end
 
-      # Notify observers of an update.
+      # Returns true is the +Document+ has not been persisted to the database,
+      # false if it has. This is determined by the variable @new_record
+      # and NOT if the object has an id.
+      def new_record?
+        @new_record == true
+      end
+
+      # Sets the new_record boolean - used after document is saved.
+      def new_record=(saved)
+        @new_record = saved
+      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
 
@@ -211,7 +225,6 @@ module Mongoid #:nodoc:
       # Reloads the +Document+ attributes from the database.
       def reload
         @attributes = collection.find_one(:_id => id)
-        self
       end
 
       # Remove a child document from this parent +Document+. Will reset the
@@ -246,30 +259,6 @@ module Mongoid #:nodoc:
         attributes.to_json(options)
       end
 
-      # Return an object to be encoded into a JSON string.
-      # Used by Rails 3's object->JSON chain to create JSON
-      # in a backend-agnostic way
-      #
-      # Example:
-      #
-      # <tt>person.as_json</tt>
-      def as_json(options = nil)
-        attributes
-      end
-
-      # Return this document as an object to be encoded as JSON,
-      # with any particular items modified on a per-encoder basis.
-      # Nothing special is required here since Mongoid bubbles up
-      # all the child associations to the parent attribute +Hash+
-      # using observers throughout the +Document+ lifecycle.
-      #
-      # Example:
-      #
-      # <tt>person.encode_json(encoder)</tt>
-      def encode_json(encoder)
-        attributes
-      end
-
       # Returns the id of the Document, used in Rails compatibility.
       def to_param
         id
@@ -286,7 +275,7 @@ module Mongoid #:nodoc:
       #
       # This will also cause the observing +Document+ to notify it's parent if
       # there is any.
-      def observe(child, clear = false)
+      def update(child, clear = false)
         name = child.association_name
         attrs = child.instance_variable_get(:@attributes)
         clear ? @attributes.delete(name) : @attributes.insert(name, attrs)

data/lib/mongoid/extensions.rb

@@ -4,8 +4,6 @@ require "mongoid/extensions/array/aliasing"
 require "mongoid/extensions/array/assimilation"
 require "mongoid/extensions/array/conversions"
 require "mongoid/extensions/array/parentization"
-require "mongoid/extensions/big_decimal/conversions"
-require "mongoid/extensions/binary/conversions"
 require "mongoid/extensions/boolean/conversions"
 require "mongoid/extensions/date/conversions"
 require "mongoid/extensions/datetime/conversions"
@@ -23,7 +21,6 @@ require "mongoid/extensions/string/conversions"
 require "mongoid/extensions/string/inflections"
 require "mongoid/extensions/symbol/inflections"
 require "mongoid/extensions/time/conversions"
-require "mongoid/extensions/objectid/conversions"
 
 class Array #:nodoc
   include Mongoid::Extensions::Array::Accessors
@@ -32,14 +29,6 @@ class Array #:nodoc
   include Mongoid::Extensions::Array::Parentization
 end
 
-class BigDecimal #:nodoc
-  extend Mongoid::Extensions::BigDecimal::Conversions
-end
-
-class Binary #:nodoc
-  extend Mongoid::Extensions::Binary::Conversions
-end
-
 class Boolean #:nodoc
   extend Mongoid::Extensions::Boolean::Conversions
 end
@@ -93,7 +82,3 @@ end
 class Time #:nodoc
   extend Mongoid::Extensions::Time::Conversions
 end
-
-class Mongo::ObjectID #:nodoc
-  extend Mongoid::Extensions::ObjectID::Conversions
-end