mongoid 3.0.6 → 3.0.9

data/CHANGELOG.md

@@ -3,7 +3,63 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 3.0.6 (branch 3.0.0-stable)
+## 3.0.9
+
+### Resolved Issues
+
+* \#2463 Fixed the broken `rails g mongoid:config` from a fresh repo.
+
+* \#2456 The descendants cache is now reset when the document is inherited
+  again. (Kostyantyn Stepanyuk)
+
+* \#2453 `Model#write_attribute` now properly works with aliased fields.
+  (Campbell Allen)
+
+* \#2444 Removed extra dirty methods creation call. (Kostyantyn Stepanyuk)
+
+* \#2440/\#2435 Pass mass assignment options down to children when setting via
+  nested attributes or embedded documents.
+
+* \#2439 Fixed memory leak in threaded selection of returned fields.
+  (Tim Olsen)
+
+* mongoid/moped\#82 Aliased fields now work with `Criteria#distinct`.
+
+* \#2423 Fixed embedded document's `update_all` to perform the correct $set
+  when using off a criteria.
+
+* \#2414 Index definitions now respect aliased fields.
+
+* \#2413 Enumerable targets now properly return enumerators when no blocks
+  are provided. (Andrew Smith)
+
+* \#2411 BigDecimal fields are properly stored as strings when mongoizing
+  integers and floats.
+
+* \#2409 Don't warn about missing mongoid.yml if configured programatically.
+
+* \#2403 Return false on `update_all` of an embeds many with no documents.
+
+* \#2401 Bring back the ability to merge a criteria with a hash.
+
+* \#2399 Reject blank id values on has_many `Model#object_ids=`.
+  (Tiago Rafael Godinho)
+
+* \#2393 Ensure `inverse_of` is respected when using polymorphic relations.
+
+* \#2388 Map/reduce properly uses `sort` instead of `orderby` in the execution
+  of the command. (Alex Tsibulya)
+
+* \#2386 Allow geo haystack and bits parameters in indexes. (Bradley Rees)
+
+* \#2380 `Model#becomes` now properly copies over dirty attributes.
+
+* \#2331 Don't double push child documents when extra saves are called in an
+  after_create callback.
+
+## 3.0.8 (Yanked)
+
+## 3.0.6
 
 ### Resolved Issues
 

data/lib/config/locales/en.yml

@@ -152,8 +152,12 @@ en:
             \_\_drop_dups: true|false\n
             \_\_name: 'index_name'\n
             \_\_sparse: true|false\n
-            \_\_unique: true|false\n\n
-            Valid types are: 1, -1, '2d'\n\n
+            \_\_unique: true|false\n
+            \_\_min: 1\n
+            \_\_max: 1\n
+            \_\_bits: 26\n
+            \_\_bucket_size : 1\n
+            Valid types are: 1, -1, '2d', 'geoHaystack'\n\n
             Example:\n
             \_\_class Band\n
             \_\_\_\_include Mongoid::Document\n

data/lib/mongoid/attributes.rb

@@ -119,7 +119,7 @@ module Mongoid
     #
     # @since 1.0.0
     def write_attribute(name, value)
-      access = name.to_s
+      access = database_field_name(name.to_s)
       if attribute_writable?(access)
         _assigning do
           localized = fields[access].try(:localized?)

data/lib/mongoid/attributes/processing.rb

@@ -19,19 +19,41 @@ module Mongoid
       #
       # @since 2.0.0.rc.7
       def process_attributes(attrs = nil, role = :default, guard_protected_attributes = true)
-        attrs ||= {}
-        if !attrs.empty?
-          attrs = sanitize_for_mass_assignment(attrs, role) if guard_protected_attributes
-          attrs.each_pair do |key, value|
-            next if pending_attribute?(key, value)
-            process_attribute(key, value)
+        with_mass_assignment(role, guard_protected_attributes) do
+          attrs ||= {}
+          if !attrs.empty?
+            attrs = sanitize_for_mass_assignment(attrs, role) if guard_protected_attributes
+            attrs.each_pair do |key, value|
+              next if pending_attribute?(key, value)
+              process_attribute(key, value)
+            end
           end
+          yield self if block_given?
+          process_pending
         end
-        yield self if block_given?
-        process_pending
       end
 
-      protected
+      private
+
+      # Get the current mass assignment options for this model.
+      #
+      # @api private
+      #
+      # @return [ Hash ] The mass assignment options.
+      #
+      # @since 3.0.7
+      def mass_assignment_options
+        @mass_assignment_options ||= {}
+      end
+
+      # Set the mass assignment options for the current model.
+      #
+      # @api private
+      #
+      # @return [ Hash ] The mass assignment options.
+      #
+      # @since 3.0.7
+      attr_writer :mass_assignment_options
 
       # If the key provided is the name of a relation or a nested attribute, we
       # need to wait until all other attributes are set before processing
@@ -121,6 +143,8 @@ module Mongoid
       # @example Process the pending items.
       #   document.process_pending
       #
+      # @param [ Hash ] options The mass assignment options.
+      #
       # @since 2.0.0.rc.7
       def process_pending
         process_nested and process_relations
@@ -133,18 +157,41 @@ module Mongoid
       # @example Process the relations.
       #   document.process_relations
       #
+      # @param [ Hash ] options The mass assignment options.
+      #
       # @since 2.0.0.rc.7
       def process_relations
         pending_relations.each_pair do |name, value|
           metadata = relations[name]
           if value.is_a?(Hash)
-            metadata.nested_builder(value, {}).build(self)
+            metadata.nested_builder(value, {}).build(self, mass_assignment_options)
           else
             send("#{name}=", value)
           end
         end
       end
+
+      # Execute the block with the provided mass assignment options set.
+      #
+      # @api private
+      #
+      # @example Execute with mass assignment.
+      #   model.with_mass_assignment(:default, true)
+      #
+      # @param [ Symbol ] role The role.
+      # @param [ true, false ] guard_protected_attributes To enable mass
+      #   assignment.
+      #
+      # @since 3.0.7
+      def with_mass_assignment(role, guard_protected_attributes)
+        begin
+          self.mass_assignment_options =
+            { as: role, without_protection: !guard_protected_attributes }
+          yield
+        ensure
+          self.mass_assignment_options = nil
+        end
+      end
     end
   end
 end
-

data/lib/mongoid/config.rb

@@ -26,6 +26,19 @@ module Mongoid
     option :use_activesupport_time_zone, default: true
     option :use_utc, default: false
 
+    # Has Mongoid been configured? This is checking that at least a valid
+    # session config exists.
+    #
+    # @example Is Mongoid configured?
+    #   config.configured?
+    #
+    # @return [ true, false ] If Mongoid is configured.
+    #
+    # @since 3.0.9
+    def configured?
+      sessions.has_key?(:default)
+    end
+
     # Connect to the provided database name on the default session.
     #
     # @note Use only in development or test environments for convenience.

data/lib/mongoid/contextual/map_reduce.rb

@@ -216,7 +216,7 @@ module Mongoid
       def apply_criteria_options
         command[:query] = criteria.selector
         if sort = criteria.options[:sort]
-          command[:orderby] = sort
+          command[:sort] = sort
         end
         if limit = criteria.options[:limit]
           command[:limit] = limit

data/lib/mongoid/contextual/memory.rb

@@ -281,14 +281,15 @@ module Mongoid
       #
       # @since 3.0.4
       def update_documents(attributes, docs)
-        return false unless attributes
-        updates = {}
+        return false if !attributes || docs.empty?
+        updates = { "$set" => {}}
         docs.each do |doc|
           @selector ||= root.atomic_selector
           doc.write_attributes(attributes)
-          updates.merge!(doc.atomic_position => attributes)
+          updates["$set"].merge!(doc.atomic_updates["$set"])
+          doc.move_changes
         end
-        collection.find(selector).update("$set" => updates)
+        collection.find(selector).update(updates)
       end
 
       # Get the limiting value.

data/lib/mongoid/contextual/mongo.rb

@@ -113,7 +113,7 @@ module Mongoid
       #
       # @since 3.0.0
       def distinct(field)
-        query.distinct(field)
+        query.distinct(klass.database_field_name(field))
       end
 
       # Iterate over the context. If provided a block, yield to a Mongoid
@@ -602,7 +602,7 @@ module Mongoid
           Threaded.set_selection(criteria.object_id, fields) unless fields.blank?
           yield
         ensure
-          Threaded.set_selection(criteria.object_id, nil)
+          Threaded.delete_selection(criteria.object_id)
         end
       end
 

data/lib/mongoid/criteria.rb

@@ -320,7 +320,7 @@ module Mongoid
     # @since 1.0.0
     def initialize(klass)
       @klass = klass
-      super(klass.aliased_fields, klass.fields)
+      klass ? super(klass.aliased_fields, klass.fields) : super({}, {})
     end
 
     # Eager loads all the provided relations. Will load all the documents
@@ -390,6 +390,15 @@ module Mongoid
     # @example Merge the criteria with another criteria.
     #   criteri.merge(other_criteria)
     #
+    # @example Merge the criteria with a hash. The hash must contain a klass
+    #   key and the key/value pairs correspond to method names/args.
+
+    #   criteria.merge({
+    #     klass: Band,
+    #     where: { name: "Depeche Mode" },
+    #     order_by: { name: 1 }
+    #   })
+    #
     # @param [ Criteria ] other The other criterion to merge with.
     #
     # @return [ Criteria ] A cloned self.

data/lib/mongoid/dirty.rb

@@ -264,7 +264,6 @@ module Mongoid
         create_dirty_default_change_check(name, meth)
         create_dirty_previous_value_accessor(name, meth)
         create_dirty_reset(name, meth)
-        create_dirty_reset(name, meth)
       end
 
       # Creates the dirty change accessor.

data/lib/mongoid/document.rb

@@ -215,7 +215,8 @@ module Mongoid
       unless klass.include?(Mongoid::Document)
         raise ArgumentError, "A class which includes Mongoid::Document is expected"
       end
-      became = klass.instantiate(as_document.__deep_copy__)
+      became = klass.new(as_document.__deep_copy__)
+      became.instance_variable_set(:@changed_attributes, changed_attributes)
       became.instance_variable_set(:@errors, errors)
       became.instance_variable_set(:@new_record, new_record?)
       became.instance_variable_set(:@destroyed, destroyed?)

data/lib/mongoid/extensions/array.rb

@@ -25,7 +25,7 @@ module Mongoid
       #
       # @since 3.0.0
       def __find_args__
-        flat_map{ |a| a.__find_args__ }.uniq_by{ |a| a.to_s }
+        flat_map{ |a| a.__find_args__ }.uniq{ |a| a.to_s }
       end
 
       # Mongoize the array into an array of object ids.

data/lib/mongoid/extensions/big_decimal.rb

@@ -45,6 +45,21 @@ module Mongoid
             object.numeric? ? ::BigDecimal.new(object.to_s) : object
           end
         end
+
+        # Mongoize an object of any type to how it's stored in the db as a big
+        # decimal.
+        #
+        # @example Mongoize the object.
+        #   BigDecimal.mongoize(123)
+        #
+        # @param [ Object ] object The object to Mongoize
+        #
+        # @return [ String ] The mongoized object.
+        #
+        # @since 3.0.7
+        def mongoize(object)
+          object ? object.to_s : object
+        end
       end
     end
   end

data/lib/mongoid/extensions/hash.rb

@@ -97,6 +97,24 @@ module Mongoid
         true
       end
 
+      # Convert this hash to a criteria. Will iterate over each keys in the
+      # hash which must correspond to method on a criteria object. The hash
+      # must also include a "klass" key.
+      #
+      # @example Convert the hash to a criteria.
+      #   { klass: Band, where: { name: "Depeche Mode" }.to_criteria
+      #
+      # @return [ Criteria ] The criteria.
+      #
+      # @since 3.0.7
+      def to_criteria
+        criteria = Criteria.new(delete(:klass) || delete("klass"))
+        each_pair do |method, args|
+          criteria = criteria.__send__(method, args)
+        end
+        criteria
+      end
+
       module ClassMethods
 
         # Turn the object from the ruby type we deal with to a Mongo friendly

data/lib/mongoid/factory.rb

@@ -12,7 +12,7 @@ module Mongoid
     #
     # @param [ Class ] klass The class to instantiate from if _type is not present.
     # @param [ Hash ] attributes The document attributes.
-    # @param [ Hash ] optiosn The mass assignment scoping options.
+    # @param [ Hash ] options The mass assignment scoping options.
     #
     # @return [ Document ] The instantiated document.
     def build(klass, attributes = nil, options = {})

data/lib/mongoid/fields.rb

@@ -109,6 +109,21 @@ module Mongoid
       self.class.attribute_names
     end
 
+    # Get the name of the provided field as it is stored in the database.
+    # Used in determining if the field is aliased or not.
+    #
+    # @example Get the database field name.
+    #   model.database_field_name(:authorization)
+    #
+    # @param [ String, Symbol ] name The name to get.
+    #
+    # @return [ String ] The name of the field as it's stored in the db.
+    #
+    # @since 3.0.7
+    def database_field_name(name)
+      self.class.database_field_name(name)
+    end
+
     # Is the document using object ids?
     #
     # @note Refactored from using delegate for class load performance.
@@ -175,6 +190,22 @@ module Mongoid
         fields.keys
       end
 
+      # Get the name of the provided field as it is stored in the database.
+      # Used in determining if the field is aliased or not.
+      #
+      # @example Get the database field name.
+      #   Model.database_field_name(:authorization)
+      #
+      # @param [ String, Symbol ] name The name to get.
+      #
+      # @return [ String ] The name of the field as it's stored in the db.
+      #
+      # @since 3.0.7
+      def database_field_name(name)
+        normalized = name.to_s
+        aliased_fields[normalized] || normalized
+      end
+
       # Defines all the fields that are accessible on the Document
       # For each field that is defined, a getter and setter will be
       # added as an instance method to the Document.

data/lib/mongoid/hierarchy.rb

@@ -44,6 +44,20 @@ module Mongoid
       children
     end
 
+    # Marks all children as being persisted.
+    #
+    # @example Flag all the children.
+    #   document.flag_children_persisted
+    #
+    # @return [ Array<Document> ] The flagged children.
+    #
+    # @since 3.0.7
+    def flag_children_persisted
+      _children.each do |child|
+        child.new_record = false
+      end
+    end
+
     # Determines if the document is a subclass of another document.
     #
     # @example Check if the document is a subclass
@@ -141,6 +155,7 @@ module Mongoid
       # @since 2.0.0.rc.6
       def inherited(subclass)
         super
+        @_type = nil
         subclass.fields = fields.dup
         subclass.pre_processed_defaults = pre_processed_defaults.dup
         subclass.post_processed_defaults = post_processed_defaults.dup

data/lib/mongoid/indexes.rb

@@ -78,7 +78,7 @@ module Mongoid
       # @since 1.0.0
       def index(spec, options = nil)
         Validators::Options.validate(self, spec, options || {})
-        index_options[spec] = normalize_index_options(options)
+        index_options[normalize_spec(spec)] = normalize_index_options(options)
       end
 
       private
@@ -88,7 +88,7 @@ module Mongoid
       # @api private
       #
       # @example Normalize the index options.
-      # Model.normalize_index_options(drop_dups: true)
+      #   Model.normalize_index_options(drop_dups: true)
       #
       # @param [ Hash ] options The index options.
       #
@@ -98,8 +98,28 @@ module Mongoid
       def normalize_index_options(options)
         opts = options || {}
         opts[:dropDups] = opts.delete(:drop_dups) if opts.has_key?(:drop_dups)
+        opts[:bucketSize] = opts.delete(:bucket_size) if opts.has_key?(:bucket_size)
         opts
       end
+
+      # Normalize the spec, in case aliased fields are provided.
+      #
+      # @api private
+      #
+      # @example Normalize the spec.
+      #   Model.normalize_spec(name: 1)
+      #
+      # @param [ Hash ] spec The index specification.
+      #
+      # @return [ Hash ] The normalized specification.
+      #
+      # @since 3.0.7
+      def normalize_spec(spec)
+        spec.inject({}) do |normalized, (name, direction)|
+          normalized[database_field_name(name).to_sym] = direction
+          normalized
+        end
+      end
     end
   end
 end

data/lib/mongoid/indexes/validators/options.rb

@@ -7,8 +7,8 @@ module Mongoid
       module Options
         extend self
 
-        VALID_OPTIONS = [ :background, :drop_dups, :name, :sparse, :unique, :max, :min ]
-        VALID_TYPES = [ 1, -1, "2d" ]
+        VALID_OPTIONS = [ :background, :drop_dups, :name, :sparse, :unique, :max, :min, :bits, :bucket_size ]
+        VALID_TYPES = [ 1, -1, "2d", "geoHaystack" ]
 
         # Validate the index specification.
         #

data/lib/mongoid/multi_parameter_attributes.rb

@@ -66,7 +66,7 @@ module Mongoid
         multi_parameter_attributes.each_pair do |key, values|
           begin
             values = (values.keys.min..values.keys.max).map { |i| values[i] }
-            field = self.class.fields[aliased_fields[key] || key]
+            field = self.class.fields[database_field_name(key)]
             attributes[key] = instantiate_object(field, values)
           rescue => e
             errors << Errors::AttributeAssignmentError.new(

data/lib/mongoid/nested_attributes.rb

@@ -52,7 +52,7 @@ module Mongoid
           autosave(metadata.merge!(autosave: true))
           re_define_method(meth) do |attrs|
             _assigning do
-              metadata.nested_builder(attrs, options).build(self)
+              metadata.nested_builder(attrs, options).build(self, mass_assignment_options)
             end
           end
         end

data/lib/mongoid/persistence.rb

@@ -159,7 +159,7 @@ module Mongoid
       unless attribute_writable?(normalized)
         raise Errors::ReadonlyAttribute.new(normalized, value)
       end
-      write_attribute(aliased_fields[normalized] || normalized, value)
+      write_attribute(database_field_name(normalized), value)
       save(validate: false)
     end
 

data/lib/mongoid/persistence/insertion.rb

@@ -24,6 +24,7 @@ module Mongoid
             document.run_callbacks(:create) do
               yield(document)
               document.new_record = false
+              document.flag_children_persisted
               true
             end
           end

data/lib/mongoid/railtie.rb

@@ -60,20 +60,6 @@ module Rails
 
       # Initialize Mongoid. This will look for a mongoid.yml in the config
       # directory and configure mongoid appropriately.
-      #
-      # @example mongoid.yml
-      #
-      #   development:
-      #     host: localhost
-      #     database: mongoid
-      #     slaves:
-      #       # - host: localhost
-      #         # port: 27018
-      #       # - host: localhost
-      #         # port: 27019
-      #     allow_dynamic_fields: false
-      #     persist_in_safe_mode: false
-      #
       initializer "setup database" do
         config_file = Rails.root.join("config", "mongoid.yml")
         if config_file.file?
@@ -95,7 +81,7 @@ module Rails
       # alert to create one.
       initializer "warn when configuration is missing" do
         config.after_initialize do
-          unless Rails.root.join("config", "mongoid.yml").file?
+          unless Rails.root.join("config", "mongoid.yml").file? || ::Mongoid.configured?
             puts "\nMongoid config not found. Create a config file at: config/mongoid.yml"
             puts "to generate one run: rails generate mongoid:config\n\n"
           end

data/lib/mongoid/relations/accessors.rb

@@ -228,7 +228,7 @@ module Mongoid
         def ids_setter(name, metadata)
           ids_method = "#{name.to_s.singularize}_ids="
           re_define_method(ids_method) do |ids|
-            send(metadata.setter, metadata.klass.find(ids))
+            send(metadata.setter, metadata.klass.find(ids.reject(&:blank?)))
           end
           self
         end

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -16,18 +16,19 @@ module Mongoid
           #   many.build(person)
           #
           # @param [ Document ] parent The parent document of the relation.
+          # @param [ Hash ] options The mass assignment options.
           #
           # @return [ Array ] The attributes.
-          def build(parent)
+          def build(parent, options = {})
             @existing = parent.send(metadata.name)
             if over_limit?(attributes)
               raise Errors::TooManyNestedAttributeRecords.new(existing, options[:limit])
             end
             attributes.each do |attrs|
               if attrs.respond_to?(:with_indifferent_access)
-                process_attributes(parent, attrs)
+                process_attributes(parent, attrs, options)
               else
-                process_attributes(parent, attrs[1])
+                process_attributes(parent, attrs[1], options)
               end
             end
           end
@@ -85,11 +86,17 @@ module Mongoid
           # Process each set of attributes one at a time for each potential
           # new, existing, or ignored document.
           #
+          # @api private
+          #
           # @example Process the attributes
           #   builder.process_attributes({ "id" => 1, "street" => "Bond" })
           #
+          # @param [ Document ] parent The parent document.
           # @param [ Hash ] attrs The single document attributes to process.
-          def process_attributes(parent, attrs)
+          # @param [ Hash ] options the mass assignment options.
+          #
+          # @since 2.0.0
+          def process_attributes(parent, attrs, options)
             return if reject?(parent, attrs)
             if id = attrs.extract_id
               first = existing.first
@@ -100,10 +107,14 @@ module Mongoid
                 doc.destroy unless doc.embedded? || doc.destroyed?
               else
                 attrs.delete_id
-                metadata.embedded? ? doc.attributes = attrs : doc.update_attributes(attrs)
+                if metadata.embedded?
+                  doc.assign_attributes(attrs, options)
+                else
+                  doc.update_attributes(attrs, options)
+                end
               end
             else
-              existing.push(Factory.build(metadata.klass, attrs)) unless destroyable?(attrs)
+              existing.push(Factory.build(metadata.klass, attrs, options)) unless destroyable?(attrs)
             end
           end
         end

data/lib/mongoid/relations/builders/nested_attributes/one.rb

@@ -10,25 +10,27 @@ module Mongoid
           # Builds the relation depending on the attributes and the options
           # passed to the macro.
           #
-          # This attempts to perform 3 operations, either one of an update of
-          # the existing relation, a replacement of the relation with a new
-          # document, or a removal of the relation.
+          # @example Build a 1-1 nested document.
+          #   one.build(person, as: :admin)
           #
-          # Example:
+          # @note This attempts to perform 3 operations, either one of an update of
+          #   the existing relation, a replacement of the relation with a new
+          #   document, or a removal of the relation.
           #
-          # <tt>one.build(person)</tt>
+          # @param [ Document ] parent The parent document.
+          # @param [ Hash ] options The mass assignment options.
           #
-          # Options:
+          # @return [ Document ] The built document.
           #
-          # parent: The parent document of the relation.
-          def build(parent)
+          # @since 2.0.0
+          def build(parent, options = {})
             return if reject?(parent, attributes)
             @existing = parent.send(metadata.name)
             if update?
               attributes.delete_id
-              existing.attributes = attributes
+              existing.assign_attributes(attributes, options)
             elsif replace?
-              parent.send(metadata.setter, Factory.build(metadata.klass, attributes))
+              parent.send(metadata.setter, Factory.build(metadata.klass, attributes, options))
             elsif delete?
               parent.send(metadata.setter, nil)
             end
@@ -37,19 +39,14 @@ module Mongoid
           # Create the new builder for nested attributes on one-to-one
           # relations.
           #
-          # Example:
+          # @example Instantiate the builder.
+          #   One.new(metadata, attributes, options)
           #
-          # <tt>One.new(metadata, attributes, options)</tt>
+          # @param [ Metadata ] metadata The relation metadata.
+          # @param [ Hash ] attributes The attributes hash to attempt to set.
+          # @param [ Hash ] options The options defined.
           #
-          # Options:
-          #
-          # metadata: The relation metadata
-          # attributes: The attributes hash to attempt to set.
-          # options: The options defined.
-          #
-          # Returns:
-          #
-          # A new builder.
+          # @since 2.0.0
           def initialize(metadata, attributes, options)
             @attributes = attributes.with_indifferent_access
             @metadata = metadata
@@ -62,13 +59,14 @@ module Mongoid
           # Is the id in the attribtues acceptable for allowing an update to
           # the existing relation?
           #
-          # Example:
+          # @api private
           #
-          # <tt>acceptable_id?</tt>
+          # @example Is the id acceptable?
+          #   one.acceptable_id?
           #
-          # Returns:
+          # @return [ true, false ] If the id part of the logic will allow an update.
           #
-          # True if the id part of the logic will allow an update.
+          # @since 2.0.0
           def acceptable_id?
             id = convert_id(existing.class, attributes[:id])
             existing.id == id || id.nil? || (existing.id != id && update_only?)
@@ -76,56 +74,49 @@ module Mongoid
 
           # Can the existing relation be deleted?
           #
-          # Example:
+          # @example Can the existing object be deleted?
+          #   one.delete?
           #
-          # <tt>delete?</tt>
+          # @return [ true, false ] If the relation should be deleted.
           #
-          # Returns:
-          #
-          # True if the relation should be deleted.
+          # @since 2.0.0
           def delete?
             destroyable? && !attributes[:id].nil?
           end
 
-          # Can the existing relation potentially be deleted?
-          #
-          # Example:
+          # Can the existing relation potentially be destroyed?
           #
-          # <tt>destroyable?({ :_destroy => "1" })</tt>
+          # @example Is the object destroyable?
+          #   one.destroyable?({ :_destroy => "1" })
           #
-          # Options:
+          # @return [ true, false ] If the relation can potentially be
+          #   destroyed.
           #
-          # attributes: The attributes to pull the flag from.
-          #
-          # Returns:
-          #
-          # True if the relation can potentially be deleted.
+          # @since 2.0.0
           def destroyable?
             [ 1, "1", true, "true" ].include?(destroy) && allow_destroy?
           end
 
           # Is the document to be replaced?
           #
-          # Example:
+          # @example Is the document to be replaced?
+          #   one.replace?
           #
-          # <tt>replace?</tt>
+          # @return [ true, false ] If the document should be replaced.
           #
-          # Returns:
-          #
-          # True if the document should be replaced.
+          # @since 2.0.0
           def replace?
             !existing && !destroyable? && !attributes.blank?
           end
 
           # Should the document be updated?
           #
-          # Example:
-          #
-          # <tt>update?</tt>
+          # @example Should the document be updated?
+          #   one.update?
           #
-          # Returns:
+          # @return [ true, false ] If the object should have its attributes updated.
           #
-          # True if the object should have its attributes updated.
+          # @since 2.0.0
           def update?
             existing && !destroyable? && acceptable_id?
           end

data/lib/mongoid/relations/embedded/batchable.rb

@@ -194,7 +194,7 @@ module Mongoid
             docs.map do |doc|
               attributes = { metadata: metadata, _parent: base }
               attributes.merge!(doc)
-              Factory.build(klass, attributes)
+              Factory.build(klass, attributes, base.send(:mass_assignment_options))
             end
           else
             docs

data/lib/mongoid/relations/metadata.rb

@@ -1131,6 +1131,7 @@ module Mongoid
       #
       # @return [ Array<String> ] The inverse names.
       def lookup_inverses(other)
+        return [ inverse_of ] if inverse_of
         if other
           matches = []
           other.class.relations.values.each do |meta|

data/lib/mongoid/relations/referenced/many.rb

@@ -163,7 +163,11 @@ module Mongoid
         #
         # @since 2.1.0
         def each
-          target.each { |doc| yield(doc) if block_given? }
+          if block_given?
+            target.each { |doc| yield(doc) }
+          else
+            to_enum
+          end
         end
 
         # Determine if any documents in this relation exist in the database.

data/lib/mongoid/relations/targets/enumerable.rb

@@ -139,15 +139,25 @@ module Mongoid
         # the cursor while loading the documents and then iterates over the
         # _added docs.
         #
+        # If no block is passed then it returns an enumerator containing all
+        # docs.
+        #
         # @example Iterate over the enumerable.
         #   enumerable.each do |doc|
         #     puts doc
         #   end
         #
+        # @example return an enumerator containing all the docs 
+        #
+        #   a = enumerable.each
+        #  
         # @return [ true ] That the enumerable is now _loaded.
         #
         # @since 2.1.0
         def each
+          unless block_given?
+            return to_enum
+          end
           if _loaded?
             _loaded.each_pair do |id, doc|
               yield(doc)

data/lib/mongoid/threaded.rb

@@ -301,13 +301,14 @@ module Mongoid
     # @example Get the field selection options.
     #   Threaded.selection
     #
-    # @param [ Class ] klass The model class.
+    # @param [ Integer ] criteria_instance_id The criteria instance id.
     #
     # @return [ Hash ] The field selection.
     #
     # @since 2.4.4
-    def selection(klass)
-      Thread.current["[mongoid][#{klass}]:selection"]
+    def selection(criteria_instance_id)
+      selections = Thread.current["[mongoid][selections]"]
+      selections[criteria_instance_id] if selections
     end
 
     # Set the field selection on the current thread.
@@ -322,7 +323,24 @@ module Mongoid
     #
     # @since 2.4.4
     def set_selection(criteria_instance_id, value)
-      Thread.current["[mongoid][#{criteria_instance_id}]:selection"] = value
+      Thread.current["[mongoid][selections]"] ||= {}
+      Thread.current["[mongoid][selections]"][criteria_instance_id] = value
+    end
+
+    # Delete the field selection on the current thread.
+    #
+    # @example Delete the field selection.
+    #   Threaded.delete_selection(Person)
+    #
+    # @param [ Integer ] criteria_instance_id The criteria instance id.
+    #
+    # @return [ Boolean ] Whether there was a field selection.
+    #
+    # @since 3.0.7
+    def delete_selection(criteria_instance_id)
+      selections = Thread.current["[mongoid][selections]"]
+      return false unless selections
+      !!selections.delete(criteria_instance_id)
     end
 
     # Get the global session override.

data/lib/mongoid/validations/uniqueness.rb

@@ -167,8 +167,7 @@ module Mongoid
       # @since 2.3.0
       def scope(criteria, document, attribute)
         Array.wrap(options[:scope]).each do |item|
-          normalized = item.to_s
-          name = document.aliased_fields[normalized] || normalized
+          name = document.database_field_name(item)
           criteria = criteria.where(item => document.attributes[name])
         end
         criteria = criteria.where(deleted_at: nil) if document.paranoid?

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "3.0.6"
+  VERSION = "3.0.9"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -18,7 +18,15 @@ development:
         # Change the default consistency model to :eventual or :strong.
         # :eventual will send reads to secondaries, :strong sends everything
         # to master. (default: :eventual)
-        consistency: :strong
+        # consistency: :eventual
+
+        # How many times Moped should attempt to retry an operation after
+        # failure. (default: 30)
+        # max_retries: 30
+
+        # The time in seconds that Moped should wait before retrying an
+        # operation on failure. (default: 1)
+        # retry_interval: 1
   # Configure Mongoid specific options. (optional)
   options:
     # Configuration for whether or not to allow access to fields that do
@@ -66,3 +74,7 @@ test:
         - localhost:27017
       options:
         consistency: :strong
+        # In the test environment we lower the retries and retry interval to
+        # low amounts for fast failures.
+        max_retries: 1
+        retry_interval: 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -352,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3437651563723863969
+      hash: 3436548235215749672
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: