mongoid 1.2.7 → 1.2.8

data/VERSION

@@ -1 +1 @@
-1.2.7
+1.2.8

data/lib/mongoid.rb

@@ -38,8 +38,8 @@ require "active_support/time_with_zone"
 require "will_paginate/collection"
 require "mongo"
 require "mongoid/associations"
-require "mongoid/associations/options"
 require "mongoid/attributes"
+require "mongoid/caching"
 require "mongoid/callbacks"
 require "mongoid/collection"
 require "mongoid/commands"
@@ -56,6 +56,7 @@ require "mongoid/fields"
 require "mongoid/finders"
 require "mongoid/identity"
 require "mongoid/indexes"
+require "mongoid/javascript"
 require "mongoid/matchers"
 require "mongoid/memoization"
 require "mongoid/named_scope"

data/lib/mongoid/associations.rb

@@ -6,6 +6,8 @@ require "mongoid/associations/has_many"
 require "mongoid/associations/has_many_related"
 require "mongoid/associations/has_one"
 require "mongoid/associations/has_one_related"
+require "mongoid/associations/options"
+require "mongoid/associations/meta_data"
 
 module Mongoid # :nodoc:
   module Associations #:nodoc:
@@ -28,13 +30,13 @@ module Mongoid # :nodoc:
 
       # Updates all the one-to-many relational associations for the name.
       def update_associations(name)
-        send(name).each { |doc| doc.save }
+        send(name).each { |doc| doc.save } if new_record?
       end
 
       # Update the one-to-one relational association for the name.
       def update_association(name)
         association = send(name)
-        association.save unless association.nil?
+        association.save if new_record? && !association.nil?
       end
     end
 
@@ -87,14 +89,12 @@ module Mongoid # :nodoc:
       #   end
       #
       def belongs_to_related(name, options = {}, &block)
-        field "#{name.to_s}_id"
-        index "#{name.to_s}_id" unless self.embedded
-        add_association(
-          Associations::BelongsToRelated,
-          Associations::Options.new(
-            options.merge(:name => name, :extend => block)
+        opts = Associations::Options.new(
+            options.merge(:name => name, :extend => block, :foreign_key => foreign_key(name, options))
           )
-        )
+        add_association(Associations::BelongsToRelated, opts)
+        field opts.foreign_key
+        index opts.foreign_key unless self.embedded
       end
 
       # Adds the association from a parent document to its children. The name
@@ -140,10 +140,9 @@ module Mongoid # :nodoc:
       #   end
       #
       def has_many_related(name, options = {}, &block)
-        add_association(
-          Associations::HasManyRelated,
+        add_association(Associations::HasManyRelated,
           Associations::Options.new(
-            options.merge(:name => name, :parent_key => self.name.foreign_key, :extend => block)
+            options.merge(:name => name, :foreign_key => foreign_key(self.name, options), :extend => block)
           )
         )
         before_save do |document|
@@ -197,7 +196,7 @@ module Mongoid # :nodoc:
         add_association(
           Associations::HasOneRelated,
           Associations::Options.new(
-            options.merge(:name => name, :parent_key => self.name.foreign_key, :extend => block)
+            options.merge(:name => name, :foreign_key => foreign_key(name, options), :extend => block)
           )
         )
         before_save do |document|
@@ -226,7 +225,7 @@ module Mongoid # :nodoc:
       # getters for the associations will perform the necessary memoization.
       def add_association(type, options)
         name = options.name.to_s
-        associations[name] = type
+        associations[name] = MetaData.new(type, options)
         define_method(name) do
           memoized(name) { type.instantiate(self, options) }
         end
@@ -253,6 +252,11 @@ module Mongoid # :nodoc:
           document.save; document
         end
       end
+
+      # Find the foreign key.
+      def foreign_key(name, options)
+        options[:foreign_key] || name.to_s.foreign_key
+      end
     end
   end
 end

data/lib/mongoid/associations/has_many_related.rb

@@ -59,7 +59,7 @@ module Mongoid #:nodoc:
       # options: The association +Options+.
       def initialize(document, options, target = nil)
         @parent, @klass = document, options.klass
-        @foreign_key = document.class.to_s.foreign_key
+        @foreign_key = options.foreign_key
         @target = target || @klass.all(:conditions => { @foreign_key => document.id })
         extends(options)
       end

data/lib/mongoid/associations/meta_data.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Associations #:nodoc:
+    class MetaData #:nodoc:
+
+      attr_reader :association, :options
+
+      delegate :macro, :to => :association
+
+      # Delegate all methods on +Options+ to the options instance.
+      Associations::Options.public_instance_methods(false).each do |name|
+        define_method(name) { |*args| @options.send(name) }
+      end
+
+      # Create the new associations MetaData object, which holds the type of
+      # the association and its options, with convenience methods for getting
+      # that information.
+      #
+      # Options:
+      #
+      # association: The association type as a class instance.
+      # options: The association options
+      def initialize(association, options)
+        @association, @options = association, options
+      end
+    end
+  end
+end

data/lib/mongoid/associations/options.rb

@@ -21,7 +21,7 @@ module Mongoid #:nodoc:
 
       # Return the foreign key based off the association name.
       def foreign_key
-        name.to_s.foreign_key
+        @attributes[:foreign_key] || klass.name.to_s.foreign_key
       end
 
       # Returns the name of the inverse_of association
@@ -42,11 +42,6 @@ module Mongoid #:nodoc:
         @attributes[:name].to_s
       end
 
-      # Returns the parent foreign key association name.
-      def parent_key
-        @attributes[:parent_key]
-      end
-
       # Returns whether or not this association is polymorphic.
       def polymorphic
         @attributes[:polymorphic] == true

data/lib/mongoid/attributes.rb

@@ -43,7 +43,7 @@ module Mongoid #:nodoc:
           if set_allowed?(key)
             @attributes[key.to_s] = value
           else
-            send("#{key}=", value) if value
+            send("#{key}=", value)
           end
         end
       end

data/lib/mongoid/caching.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Caching #:nodoc:
+    def self.included(base)
+      base.class_eval do
+        extend ClassMethods
+        class_inheritable_accessor :cached
+        self.cached = false
+
+        delegate :cached?, :to => "self.class"
+      end
+    end
+
+    module ClassMethods #:nodoc
+      # Sets caching on for this class. This class level configuration will
+      # default all queries to cache the results of the first iteration over
+      # the cursor into an internal array. This should only be used for queries
+      # that return a small number of results or have small documents, as after
+      # the first iteration the entire results will be stored in memory.
+      #
+      # Example:
+      #
+      #   class Person
+      #     include Mongoid::Document
+      #     cache
+      #   end
+      def cache
+        self.cached = true
+      end
+
+      # Determines if the class is cached or not.
+      #
+      # Returns:
+      #
+      # True if cached, false if not.
+      def cached?
+        self.cached == true
+      end
+    end
+  end
+end

data/lib/mongoid/collection.rb

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

data/lib/mongoid/components.rb

@@ -7,6 +7,7 @@ module Mongoid #:nodoc
         # module, to keep the document class from getting too cluttered.
         include Associations
         include Attributes
+        include Caching
         include Callbacks
         include Commands
         include Enslavement

data/lib/mongoid/config.rb

@@ -8,6 +8,7 @@ module Mongoid #:nodoc
       :reconnect_time,
       :parameterize_keys,
       :persist_in_safe_mode,
+      :persist_types,
       :raise_not_found_error,
       :use_object_ids
 
@@ -16,6 +17,7 @@ module Mongoid #:nodoc
       @allow_dynamic_fields = true
       @parameterize_keys = true
       @persist_in_safe_mode = true
+      @persist_types = true
       @raise_not_found_error = true
       @reconnect_time = 3
       @use_object_ids = false

data/lib/mongoid/contexts/mongo.rb

@@ -7,7 +7,6 @@ module Mongoid #:nodoc:
 
       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
       # 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
@@ -21,7 +20,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 }, Javascript.aggregate, true)
       end
 
       # Get the count of matching documents in the database for the context.
@@ -59,7 +58,6 @@ 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
@@ -77,7 +75,7 @@ module Mongoid #:nodoc:
           options[:fields],
           selector,
           { :group => [] },
-          GROUP_REDUCE,
+          Javascript.group,
           true
         ).collect do |docs|
           docs["group"] = docs["group"].collect do |attrs|
@@ -95,9 +93,11 @@ module Mongoid #:nodoc:
       # <tt>Mongoid::Contexts::Mongo.new(criteria)</tt>
       def initialize(criteria)
         @criteria = criteria
-        if criteria.klass.hereditary
+        if klass.hereditary && Mongoid.persist_types
           criteria.in(:_type => criteria.klass._types)
         end
+        criteria.enslave if klass.enslaved?
+        criteria.cache if klass.cached?
       end
 
       # Return the last result for the +Context+. Essentially does a find_one on
@@ -120,8 +120,6 @@ module Mongoid #:nodoc:
         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
@@ -137,11 +135,9 @@ module Mongoid #:nodoc:
       #
       # A numeric max value.
       def max(field)
-        grouped(:max, field.to_s, MAX_REDUCE)
+        grouped(:max, field.to_s, Javascript.max)
       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
@@ -157,7 +153,7 @@ module Mongoid #:nodoc:
       #
       # A numeric minimum value.
       def min(field)
-        grouped(:min, field.to_s, MIN_REDUCE)
+        grouped(:min, field.to_s, Javascript.min)
       end
 
       # Return the first result for the +Context+.
@@ -176,7 +172,6 @@ module Mongoid #:nodoc:
 
       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
@@ -192,7 +187,7 @@ module Mongoid #:nodoc:
       #
       # A numeric value that is the sum.
       def sum(field)
-        grouped(:sum, field.to_s, SUM_REDUCE)
+        grouped(:sum, field.to_s, Javascript.sum)
       end
 
       # Common functionality for grouping operations. Currently used by min, max

data/lib/mongoid/criteria.rb

@@ -165,7 +165,7 @@ module Mongoid #:nodoc:
     # Returns: <tt>Criteria</tt>
     def method_missing(name, *args)
       if @klass.respond_to?(name)
-        new_scope = @klass.send(name)
+        new_scope = @klass.send(name, *args)
         new_scope.merge(self)
         return new_scope
       else
@@ -203,7 +203,12 @@ module Mongoid #:nodoc:
       unless params.is_a?(Hash)
         return new(klass).id_criteria(params)
       end
-      return new(klass).where(params.delete(:conditions) || {}).extras(params)
+      conditions = params.delete(:conditions) || {}
+      if conditions.include?(:id)
+        conditions[:_id] = conditions[:id]
+        conditions.delete(:id)
+      end
+      return new(klass).where(conditions).extras(params)
     end
 
     protected

data/lib/mongoid/criterion/inclusion.rb

@@ -61,6 +61,7 @@ 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,8 +20,7 @@ module Mongoid #:nodoc:
       #
       # <tt>criteria.cached?</tt>
       def cached?
-        @cached ||= @options.delete(:cache)
-        @cached == true
+        @options[:cache] == true
       end
 
       # Flags the criteria to execute against a read-only slave in the pool
@@ -34,6 +33,15 @@ 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/finders.rb

@@ -112,27 +112,9 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>Float</tt> max value.
     def max(field)
-      Criteria.new(self).max(field)
+      criteria.max(field)
     end
 
-    # Will execute a +Criteria+ based on the +DynamicFinder+ that gets
-    # generated.
-    #
-    # Options:
-    #
-    # name: The finder method name
-    # args: The arguments to pass to the method.
-    #
-    # Example:
-    #
-    # <tt>Person.find_all_by_title_and_age("Sir", 30)</tt>
-    # def method_missing(name, *args)
-      # dyna = DynamicFinder.new(name, *args)
-      # finder, conditions = dyna.finder, dyna.conditions
-      # results = find(finder, :conditions => conditions)
-      # results ? results : dyna.create(self)
-    # end
-
     # Convenience method for returning the min value of a field.
     #
     # Options:
@@ -145,7 +127,7 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>Float</tt> min value.
     def min(field)
-      Criteria.new(self).min(field)
+      criteria.min(field)
     end
 
     # Find all documents in paginated fashion given the supplied arguments.
@@ -179,7 +161,7 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>Criteria</tt>
     def only(*args)
-      Criteria.new(self).only(*args)
+      criteria.only(*args)
     end
 
     # Convenience method for returning the sum of a specified field for all
@@ -195,7 +177,7 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>Float</tt> of the sum.
     def sum(field)
-      Criteria.new(self).sum(field)
+      criteria.sum(field)
     end
 
     # Entry point for creating a new criteria from a Document. This will
@@ -212,7 +194,7 @@ module Mongoid #:nodoc:
     #
     # Returns: <tt>Criteria</tt>
     def where(selector = nil)
-      Criteria.new(self).where(selector)
+      criteria.where(selector)
     end
 
     protected