mongoid 2.4.0 → 2.4.12

data/lib/mongoid/callbacks.rb

@@ -39,9 +39,8 @@ module Mongoid #:nodoc:
     #
     # @since 2.3.0
     def run_callbacks(kind, *args, &block)
-      run_cascading_callbacks(cascadable_children(kind), kind, *args) do
-        super(kind, *args, &block)
-      end
+      run_cascading_callbacks(cascadable_children(kind), kind, *args) {}
+      super(kind, *args, &block)
     end
 
     private
@@ -106,6 +105,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.3.0
     def cascadable_child?(kind, child)
+      return false if kind == :initialize || !child.respond_to?("_#{kind}_callbacks")
       [ :create, :destroy ].include?(kind) || child.changed? || child.new_record?
     end
 

data/lib/mongoid/collection.rb

@@ -142,12 +142,16 @@ module Mongoid #:nodoc
     #
     # @since 2.0.0
     def update(selector, document, options = {})
-      updater = Threaded.update_consumer(klass)
+      updater = Threaded.update_consumer(name)
       if updater
         updater.consume(selector, document, options)
       else
         master(options).update(selector, document, options)
       end
     end
+
+    def drop(*args)
+      @master = nil if master.drop
+    end
   end
 end

data/lib/mongoid/collections/retry.rb

@@ -32,6 +32,7 @@ module Mongoid #:nodoc:
           retry
         rescue Mongo::OperationFailure => ex
           if ex.message =~ /not master/
+            Mongoid.reconnect!
             retries = increase_retry_attempts(retries, ex)
             retry
           else
@@ -51,7 +52,7 @@ module Mongoid #:nodoc:
       end
 
       def log_retry(retry_number, ex)
-        Mongoid.logger.warn "A #{ex.class.name} was raised. Retry attempt ##{retry_number}."
+        Mongoid.logger.warn "A #{ex.class.name} was raised. Retry attempt ##{retry_number}." if Mongoid.logger
       end
     end
   end

data/lib/mongoid/components.rb

@@ -22,7 +22,6 @@ module Mongoid #:nodoc
     include Mongoid::Dirty
     include Mongoid::Attributes
     include Mongoid::Collections
-    include Mongoid::Copyable
     include Mongoid::DefaultScope
     include Mongoid::Extras
     include Mongoid::Fields
@@ -45,6 +44,7 @@ module Mongoid #:nodoc
     include Mongoid::Timestamps::Timeless
     include Mongoid::Validations
     include Mongoid::Callbacks
+    include Mongoid::Copyable
     include Mongoid::MultiDatabase
 
     MODULES = [
@@ -66,6 +66,7 @@ module Mongoid #:nodoc
       Mongoid::NestedAttributes,
       Mongoid::Persistence,
       Mongoid::Relations,
+      Mongoid::Relations::Proxy,
       Mongoid::Safety,
       Mongoid::Serialization,
       Mongoid::Sharding,

data/lib/mongoid/config/database.rb

@@ -6,9 +6,6 @@ module Mongoid #:nodoc:
     # database from options.
     class Database < Hash
 
-      # keys to remove from self to not pass through to Mongo::Connection
-      PRIVATE_OPTIONS = %w(uri database username password logger)
-
       # Configure the database connections. This will return an array
       # containing the master and an array of slaves.
       #
@@ -86,7 +83,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0.rc.1
       def master
-        Mongo::Connection.from_uri(uri(self), optional).tap do |conn|
+        Mongo::Connection.from_uri(uri(self), optional.symbolize_keys).tap do |conn|
           conn.apply_saved_authentication
         end
       end
@@ -102,7 +99,7 @@ module Mongoid #:nodoc:
       # @since 2.0.0.rc.1
       def slaves
         (self["slaves"] || []).map do |options|
-          Mongo::Connection.from_uri(uri(options), optional(true)).tap do |conn|
+          Mongo::Connection.from_uri(uri(options), optional(true).symbolize_keys).tap do |conn|
             conn.apply_saved_authentication
           end
         end
@@ -162,8 +159,8 @@ module Mongoid #:nodoc:
           :pool_size => pool_size,
           :logger => logger? ? Mongoid::Logger.new : nil,
           :slave_ok => slave
-        }).merge(self).reject { |k,v| PRIVATE_OPTIONS.include? k }.
-          inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo} # mongo likes symbols
+        }).merge(self).reject { |k,v| Config.blacklisted_options.include? k }.
+          inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo}
       end
 
       # Get a Mongo compliant URI for the database connection.

data/lib/mongoid/config/environment.rb

@@ -8,18 +8,20 @@ module Mongoid #:nodoc
 
       # Get the name of the environment that we are running under. This first
       # looks for Rails, then Sinatra, then a RACK_ENV environment variable,
-      # and if none of those are found returns "development".
+      # and if none of those are found raises an error.
       #
       # @example Get the env name.
       #   Environment.env_name
       #
+      # @raise [ Errors::NoEnvironment ] If no environment was set.
+      #
       # @return [ String ] The name of the current environment.
       #
       # @since 2.3.0
       def env_name
         return Rails.env if defined?(Rails)
         return Sinatra::Base.environment.to_s if defined?(Sinatra)
-        ENV["RACK_ENV"] || raise(Errors::NoEnvironment.new)
+        ENV["RACK_ENV"] || ENV["MONGOID_ENV"] || raise(Errors::NoEnvironment.new)
       end
 
       # Load the yaml from the provided path and return the settings for the

data/lib/mongoid/config/replset_database.rb

@@ -17,11 +17,9 @@ module Mongoid #:nodoc:
         # yes, construction is weird but the driver wants
         # "A list of host-port pairs ending with a hash containing any options"
         # mongo likes symbols
-        options = self.inject({ :logger => Mongoid::Logger.new }) do |memo, (k, v)|
-          memo[k.to_sym] = v
-          memo
-        end
-        connection = Mongo::ReplSetConnection.new(*(hosts.clone << options))
+        options = reject{ |key, value| Config.blacklisted_options.include?(key.to_s) }
+        options["logger"] = Mongoid::Logger.new
+        connection = Mongo::ReplSetConnection.new(*(hosts.clone << options.symbolize_keys))
 
         if authenticating?
           connection.add_auth(database, username, password)

data/lib/mongoid/config.rb

@@ -23,6 +23,7 @@ module Mongoid #:nodoc
     option :autocreate_indexes, :default => false
     option :identity_map_enabled, :default => false
     option :include_root_in_json, :default => false
+    option :include_type_for_serialization, :default => false
     option :max_retries_on_connection_failure, :default => 0
     option :parameterize_keys, :default => true
     option :scope_overwrite_exception, :default => false
@@ -52,6 +53,23 @@ module Mongoid #:nodoc
       end
     end
 
+    # keys to remove from self to not pass through to Mongo::Connection
+    PRIVATE_OPTIONS =
+      %w(uri host hosts port database databases username
+         password logger use_activesupport_time_zone)
+
+    # Get the blacklisted options from passing through to the driver.
+    #
+    # @example Get the blacklisted options.
+    #   Config.blacklisted_options
+    #
+    # @return [ Array<String> ] The blacklist.
+    #
+    # @since 2.4.7
+    def blacklisted_options
+      PRIVATE_OPTIONS + settings.keys.map(&:to_s)
+    end
+
     # Get any extra databases that have been configured.
     #
     # @example Get the extras.

data/lib/mongoid/contexts/enumerable.rb

@@ -210,6 +210,18 @@ module Mongoid #:nodoc:
 
       protected
 
+      # Get the root class collection name.
+      #
+      # @example Get the root class collection name.
+      #   context.collection_name
+      #
+      # @return [ String ] The name of the collection.
+      #
+      # @since 2.4.3
+      def collection_name
+        root ? root.collection_name : nil
+      end
+
       # Filters the documents against the criteria's selector
       #
       # @example Filter the documents.
@@ -251,10 +263,22 @@ module Mongoid #:nodoc:
         documents
       end
 
+      # Get the root document for the enumerable.
+      #
+      # @example Get the root document.
+      #   context.root
+      #
+      # @return [ Document ] The root.
       def root
         @root ||= documents.first.try(:_root)
       end
 
+      # Get the root class for the enumerable.
+      #
+      # @example Get the root class.
+      #   context.root_class
+      #
+      # @return [ Class ] The root class.
       def root_class
         @root_class ||= root ? root.class : nil
       end
@@ -279,7 +303,8 @@ module Mongoid #:nodoc:
         return documents if options[:sort].blank?
         documents.sort_by do |document|
           options[:sort].map do |key, direction|
-            Sort.new(document.read_attribute(key), direction)
+            key = key.to_s.gsub(/(.*)\.#{I18n.locale}$/, '\1')
+            Sort.new(document.send(key), direction)
           end
         end
       end

data/lib/mongoid/contexts/mongo.rb

@@ -135,6 +135,28 @@ module Mongoid #:nodoc:
         klass.collection.distinct(field, selector)
       end
 
+      # Eager load the inclusions for the provided documents.
+      #
+      # @example Eager load the inclusions.
+      #   context.eager_load(docs)
+      #
+      # @param [ Array<Document> ] docs The docs returning from the db.
+      #
+      # @since 2.4.1
+      def eager_load(docs)
+        criteria.inclusions.reject! do |metadata|
+          unless docs.empty?
+            parent_ids = docs.map(&:id)
+            if metadata.macro == :referenced_in
+              child_ids = load_ids(metadata.foreign_key)
+              metadata.eager_load(child_ids)
+            else
+              metadata.eager_load(parent_ids)
+            end
+          end
+        end
+      end
+
       # Execute the context. This will take the selector and options
       # and pass them on to the Ruby driver's +find()+ method on the collection. The
       # collection itself will be retrieved from the class provided, and once the
@@ -148,15 +170,7 @@ module Mongoid #:nodoc:
         collection, options = klass.collection, process_options
         if criteria.inclusions.any?
           collection.find(selector, options).entries.tap do |docs|
-            parent_ids = docs.map(&:id)
-            criteria.inclusions.reject! do |metadata|
-              if metadata.macro == :referenced_in
-                child_ids = load_ids(metadata.foreign_key)
-                metadata.eager_load(child_ids)
-              else
-                metadata.eager_load(parent_ids)
-              end
-            end
+            eager_load(docs)
           end
         else
           collection.find(selector, options)
@@ -189,7 +203,12 @@ module Mongoid #:nodoc:
       # @return [ Document ] The first document in the collection.
       def first
         attributes = klass.collection.find_one(selector, options_with_default_sorting)
-        attributes ? Mongoid::Factory.from_db(klass, attributes) : nil
+        return nil unless attributes
+        selecting do
+          Mongoid::Factory.from_db(klass, attributes).tap do |doc|
+            eager_load([ doc ]) if criteria.inclusions.any?
+          end
+        end
       end
       alias :one :first
 
@@ -237,9 +256,11 @@ module Mongoid #:nodoc:
       # @example Iterate over the results.
       #   context.iterate { |doc| p doc }
       def iterate(&block)
-        return caching(&block) if cached?
-        if block_given?
-          execute.each { |doc| yield doc }
+        selecting do
+          return caching(&block) if cached?
+          if block_given?
+            execute.each { |doc| yield doc }
+          end
         end
       end
 
@@ -255,7 +276,12 @@ module Mongoid #:nodoc:
         opts = options_with_default_sorting
         opts[:sort] = opts[:sort].map{ |option| [ option[0], option[1].invert ] }.uniq
         attributes = klass.collection.find_one(selector, opts)
-        attributes ? Mongoid::Factory.from_db(klass, attributes) : nil
+        return nil unless attributes
+        selecting do
+          Mongoid::Factory.from_db(klass, attributes).tap do |doc|
+            eager_load([ doc ]) if criteria.inclusions.any?
+          end
+        end
       end
 
       # Return the max value for a field.
@@ -434,6 +460,28 @@ module Mongoid #:nodoc:
         end
         options.dup
       end
+
+      # If we are limiting results, we need to set the field limitations on a
+      # thread local to avoid overriding the default values.
+      #
+      # @example Execute with selection.
+      #   context.selecting do
+      #     collection.find
+      #   end
+      #
+      # @return [ Object ] The yielded value.
+      #
+      # @since 2.4.4
+      def selecting
+        begin
+          unless options[:fields].blank?
+            Threaded.selection = options[:fields]
+          end
+          yield
+        ensure
+          Threaded.selection = nil
+        end
+      end
     end
   end
 end

data/lib/mongoid/copyable.rb

@@ -6,11 +6,10 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
 
     COPYABLES = [
-      :@accessed,
-      :@attributes,
-      :@metadata,
-      :@modifications,
-      :@previous_modifications
+      :attributes,
+      :metadata,
+      :changed_attributes,
+      :previous_changes
     ]
 
     protected
@@ -24,18 +23,49 @@ module Mongoid #:nodoc:
     # @example Clone the document.
     #   document.clone
     #
+    # @param [ Document ] other The document getting cloned.
+    #
+    # @return [ Document ] The new document.
+    def initialize_copy(other)
+      __copy__(other)
+    end
+
+    # Clone or dup the current +Document+. This will return all attributes with
+    # the exception of the document's id and versions, and will reset all the
+    # instance variables.
+    #
+    # This clone also includes embedded documents.
+    #
     # @example Dup the document.
     #   document.dup
     #
     # @param [ Document ] other The document getting cloned.
     #
     # @return [ Document ] The new document.
-    def initialize_copy(other)
+    def initialize_dup(other)
+      __copy__(other)
+    end
+
+    private
+
+    # Handle the copy of the object.
+    #
+    # @api private
+    #
+    # @example Copy the object.
+    #   document.__copy__(other)
+    #
+    # @param [ Document ] other The other document.
+    #
+    # @return [ Document ] self.
+    #
+    # @since 3.0.0
+    def __copy__(other)
       other.as_document
       instance_variables.each { |name| remove_instance_variable(name) }
       COPYABLES.each do |name|
-        value = other.instance_variable_get(name)
-        instance_variable_set(name, value ? value.dup : nil)
+        value = other.send(name)
+        instance_variable_set(:"@#{name}", value ? value.dup : nil)
       end
       attributes.delete("_id")
       if attributes.delete("versions")

data/lib/mongoid/criteria.rb

@@ -262,6 +262,7 @@ module Mongoid #:nodoc:
       scope_options = @options.dup
       sorting = scope_options.delete(:sort)
       scope_options[:order_by] = sorting if sorting
+      scope_options[:includes] = inclusions.map(&:name) if inclusions.any?
       { :where => @selector }.merge(scope_options)
     end
     alias :to_ary :to_a

data/lib/mongoid/criterion/exclusion.rb

@@ -96,7 +96,9 @@ module Mongoid #:nodoc:
       def without(*args)
         clone.tap do |crit|
           if args.any?
-            crit.options[:fields] = {}
+            unless args == [ :id ] || args == [ :_id ]
+              crit.options[:fields] = {}
+            end
             args.flatten.each do |f|
               crit.options[:fields][f] = 0
             end

data/lib/mongoid/criterion/inclusion.rb

@@ -210,7 +210,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.2.0
       def includes(*relations)
-        relations.each do |name|
+        relations.flatten.each do |name|
           inclusions.push(klass.reflect_on_association(name))
         end
         clone
@@ -268,7 +268,7 @@ module Mongoid #:nodoc:
               if key.mongoid_id?
                 if crit.selector.has_key?("$and")
                   crit.selector["$and"] << { key => value }
-                else
+                elsif crit.selector[key] != value
                   crit.selector["$and"] = [{ key => crit.selector.delete(key) }, { key => value }]
                 end
               elsif crit.selector[key].respond_to?(:merge) && value.respond_to?(:merge)

data/lib/mongoid/criterion/optional.rb

@@ -109,7 +109,7 @@ module Mongoid #:nodoc:
       #
       # @return [ Criteria ] The cloned criteria.
       def limit(value = 20)
-        clone.tap { |crit| crit.options[:limit] = value }
+        clone.tap { |crit| crit.options[:limit] = value.to_i }
       end
 
       # Returns the offset option. If a per_page option is in the list then it
@@ -163,7 +163,7 @@ module Mongoid #:nodoc:
       #
       # @return [ Criteria ] The cloned criteria.
       def skip(value = 0)
-        clone.tap { |crit| crit.options[:skip] = value }
+        clone.tap { |crit| crit.options[:skip] = value.to_i }
       end
 
       # Adds a criterion to the +Criteria+ that specifies a type or an Array of

data/lib/mongoid/criterion/selector.rb

@@ -85,11 +85,32 @@ module Mongoid #:nodoc:
       # @since 1.0.0
       def try_to_typecast(key, value)
         access = key.to_s
-        if !fields.has_key?(access) && !aliased_fields.has_key?(access)
-          return value
+        if field = fields[key.to_s] || fields[aliased_fields[key.to_s]]
+          typecast_value_for(field, value)
+        elsif proper_and_or_value?(key, value)
+          handle_and_or_value(value)
+        else
+          value
+        end
+      end
+
+      def proper_and_or_value?(key, value)
+        ["$and", "$or"].include?(key) &&
+          value.is_a?(Array) &&
+          value.all?{ |e| e.is_a?(Hash) }
+      end
+
+      def handle_and_or_value(values)
+        [].tap do |result|
+           result.push(*values.map do |value|
+            Hash[value.map do |_key, _value|
+              if klass.fields[_key.to_s].try(:localized?)
+                _key = "#{_key}.#{::I18n.locale}"
+              end
+              [_key, try_to_typecast(_key, _value)]
+            end]
+          end)
         end
-        field = fields[access] || fields[aliased_fields[access]]
-        typecast_value_for(field, value)
       end
 
       # Get the typecast value for the defined field.

data/lib/mongoid/cursor.rb

@@ -45,8 +45,10 @@ module Mongoid #:nodoc
     # @example Iterate over the cursor.
     #   cursor.each { |doc| p doc.title }
     def each
-      cursor.each do |document|
-        yield Mongoid::Factory.from_db(klass, document)
+      retry_on_connection_failure do
+        while document = cursor.next_document
+          yield Factory.from_db(klass, document)
+        end
       end
     end
 

data/lib/mongoid/dirty.rb

@@ -24,7 +24,21 @@ module Mongoid #:nodoc:
     #
     # @since 2.4.0
     def changed?
-      changed_attributes.any?
+      changed_attributes.any? || children_changed?
+    end
+
+    # Have any children (embedded documents) of this document changed?
+    #
+    # @example Have any children changed?
+    #   model.children_changed?
+    #
+    # @return [ true, false ] If any children have changed.
+    #
+    # @since 2.4.1
+    def children_changed?
+      _children.any? do |child|
+        child.changed?
+      end
     end
 
     # Get the attribute changes.
@@ -117,8 +131,14 @@ module Mongoid #:nodoc:
             field = fields[name]
             key = embedded? ? "#{atomic_position}.#{name}" : name
             if field && field.resizable?
-              pushes, pulls = new - (old || []), (old || []) - new
-              field.add_atomic_changes(self, key, modifications, pushes, pulls)
+              field.add_atomic_changes(
+                self,
+                name,
+                key,
+                modifications,
+                new,
+                old
+              )
             else
               modifications[key] = new
             end
@@ -207,36 +227,59 @@ module Mongoid #:nodoc:
       # Generate all the dirty methods needed for the attribute.
       #
       # @example Generate the dirty methods.
-      #   Model.create_dirty_methods("name")
+      #   Model.create_dirty_methods("name", "name")
       #
-      # @param [ String ] name The name of the attribute.
+      # @param [ String ] name The name of the field.
+      # @param [ String ] name The name of the accessor.
       #
       # @return [ Module ] The fields module.
       #
       # @since 2.4.0
-      def create_dirty_methods(name)
+      def create_dirty_methods(name, meth)
         generated_methods.module_eval do
-          class_eval <<-EOM
-            def #{name}_change
-              attribute_change(#{name.inspect})
+          if meth =~ /\W/
+            define_method("#{meth}_change") do
+              attribute_change(name)
             end
 
-            def #{name}_changed?
-              attribute_changed?(#{name.inspect})
+            define_method("#{meth}_changed?") do
+              attribute_changed?(name)
             end
 
-            def #{name}_was
-              attribute_was(#{name.inspect})
+            define_method("#{meth}_was") do
+              attribute_was(name)
             end
 
-            def #{name}_will_change!
-              attribute_will_change!(#{name.inspect})
+            define_method("#{meth}_will_change!") do
+              attribute_will_change!(name)
             end
 
-            def reset_#{name}!
-              reset_attribute!(#{name.inspect})
+            define_method("reset_#{meth}!") do
+              reset_attribute!(name)
             end
-          EOM
+          else
+            class_eval <<-EOM
+              def #{meth}_change
+                attribute_change(#{name.inspect})
+              end
+
+              def #{meth}_changed?
+                attribute_changed?(#{name.inspect})
+              end
+
+              def #{meth}_was
+                attribute_was(#{name.inspect})
+              end
+
+              def #{meth}_will_change!
+                attribute_will_change!(#{name.inspect})
+              end
+
+              def reset_#{meth}!
+                reset_attribute!(#{name.inspect})
+              end
+            EOM
+          end
         end
       end
     end

data/lib/mongoid/document.rb

@@ -44,7 +44,11 @@ module Mongoid #:nodoc:
     #
     # @return [ true, false ] True if the classes are equal, false if not.
     def ===(other)
-      other.is_a?(self.class)
+      if other.class == Class
+        self.class === other
+      else
+        id == other.id
+      end
     end
 
     # Delegates to ==. Used when needing checks in hashes.
@@ -276,7 +280,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.0.0.rc.4
       def ===(other)
-        self == (other.is_a?(Class) ? other : other.class)
+        other.class == Class ? self <= other : other.is_a?(self)
       end
 
       # Instantiate a new object, only when loaded from the database or when