mongoid 3.0.1 → 3.0.2

data/CHANGELOG.md

@@ -3,6 +3,53 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 3.0.2 (branch: 3.0.0-stable)
+
+### Resolved Issues
+
+* \#2244 Get rid of id mass assignment warnings in nested attributes.
+
+* \#2242 Fix eager loading not to load all documents when calling first or
+  last.
+
+* \#2241 Map/reduce operations now always use strong consistency since they
+  have the potential to write to collections, most of the time.
+
+* \#2238 Ensure n-n foreign key fields are flagged as resizable to prevent
+  `nil` -> `[]` changes when using `#only` and updating.
+
+* \#2236 Keep the instance of the document in the validations exception
+  accessible via `document` or `record`.
+
+* \#2234 Ensure validations when document is getting persisted with custom
+  options work properly with custom options, and do not clear them out if
+  validation passes.
+
+* \#2224 `Model#inc` now accepts `BigDecimal` values.
+
+* \#2216 Fixed assignment of metadata on embeds one relations when setting
+  multiple times in a row.
+
+* \#2212 Ensure errors are cleared after a save with `validate: false` in all
+  situations.
+
+* \#2207 When eager loading ids the query must be duped to avoid multiple
+  iteration problems not getting the required fields.
+
+* \#2204 Raise an `InvalidIncludes` error when passing arguments to
+  `Criteria.includes` that are invalid (not relations, or more than 1 level.)
+
+* \#2203 Map/Reduce now works properly in conjunction with `Model#with`.
+
+        Band.
+          with(session: "secondary").
+          where(:likes.gt => 100).
+          map_reduce(map, reduce).
+          out(inline: 1)
+
+* \#2199 Autosave false is now respected when automatically adding
+  presence validation. (John Nishinaga)
+
 ## 3.0.1
 
 ### Resolved Issues

data/lib/config/locales/en.yml

@@ -132,6 +132,15 @@ en:
             \_\_\_\_include Mongoid::Document\n
             \_\_\_\_field :%{name}, %{option}: true\n
             \_\_end\n\n"
+        invalid_includes:
+          message: "Invalid includes directive: %{klass}.includes(%{args})"
+          summary: "Eager loading in Mongoid only supports providing arguments
+            to %{klass}.includes that are the names of relations on the %{klass}
+            model, and only supports one level of eager loading. (ie, eager loading
+            associations not on the %{klass} but one step away via another relation
+            is not allowed."
+          resolution: "Ensure that each parameter passed to %{klass}.includes is
+            a valid name of a relation on the %{klass} model. These are: %{relations}."
         invalid_index:
           message: "Invalid index specification on %{klass}: %{spec}, %{options}"
           summary: "Indexes in Mongoid are defined as a hash of field name and

data/lib/mongoid/contextual/command.rb

@@ -3,6 +3,10 @@ module Mongoid
   module Contextual
     module Command
 
+      # @attribute [r] collection The collection to query against.
+      # @attribute [r] criteria The criteria for the context.
+      attr_reader :collection, :criteria
+
       # The database command that is being built to send to the db.
       #
       # @example Get the command.
@@ -15,18 +19,6 @@ module Mongoid
         @command ||= {}
       end
 
-      # Get the criteria for the command.
-      #
-      # @example Get the criteria.
-      #   command.criteria
-      #
-      # @return [ Criteria ] The criteria.
-      #
-      # @since 3.0.0
-      def criteria
-        @criteria
-      end
-
       # Get the database session.
       #
       # @example Get the session.
@@ -36,7 +28,7 @@ module Mongoid
       #
       # @since 3.0.0
       def session
-        criteria.klass.mongo_session
+        collection.database.session
       end
     end
   end

data/lib/mongoid/contextual/find_and_modify.rb

@@ -25,9 +25,10 @@ module Mongoid
       # @option options [ true, false ] :upsert Create the document if it doesn't exist.
       #
       # @since 3.0.0
-      def initialize(criteria, update, options = {})
-        @criteria, @options, @update = criteria, options, update
-        @query = criteria.klass.collection.find(criteria.selector)
+      def initialize(collection, criteria, update, options = {})
+        @collection, @criteria, @options, @update =
+          collection, criteria, options, update
+        @query = collection.find(criteria.selector)
         apply_criteria_options
       end
 

data/lib/mongoid/contextual/map_reduce.rb

@@ -78,9 +78,9 @@ module Mongoid
       # @param [ String ] reduce The reduce js function.
       #
       # @since 3.0.0
-      def initialize(criteria, map, reduce)
-        @criteria = criteria
-        command[:mapreduce] = criteria.klass.collection_name.to_s
+      def initialize(collection, criteria, map, reduce)
+        @collection, @criteria = collection, criteria
+        command[:mapreduce] = collection.name.to_s
         command[:map], command[:reduce] = map, reduce
         apply_criteria_options
       end
@@ -266,7 +266,7 @@ module Mongoid
       # @since 3.0.0
       def results
         raise Errors::NoMapReduceOutput.new(command) unless command[:out]
-        @results ||= session.command(command)
+        @results ||= session.with(consistency: :strong).command(command)
       end
     end
   end

data/lib/mongoid/contextual/mongo.rb

@@ -12,10 +12,11 @@ module Mongoid
       include Aggregable::Mongo
       include Atomic
 
+      # @attribute [r] collection The collection to query against.
       # @attribute [r] criteria The criteria for the context.
       # @attribute [r] klass The klass for the criteria.
       # @attribute [r] query The Moped query.
-      attr_reader :criteria, :klass, :query
+      attr_reader :collection, :criteria, :klass, :query
 
       # @attribute [rw] eager_loaded Has the context been eager loaded?
       attr_accessor :eager_loaded
@@ -66,7 +67,7 @@ module Mongoid
       def count(document = nil, &block)
         return super(&block) if block_given?
         return query.count unless document
-        klass.collection.find(criteria.and(_id: document.id).selector).count
+        collection.find(criteria.and(_id: document.id).selector).count
       end
 
       # Delete all documents in the database that match the selector.
@@ -182,7 +183,7 @@ module Mongoid
       #
       # @since 3.0.0
       def find_and_modify(update, options = {})
-        if doc = FindAndModify.new(criteria, update, options).result
+        if doc = FindAndModify.new(collection, criteria, update, options).result
           Factory.from_db(klass, doc)
         end
       end
@@ -212,8 +213,9 @@ module Mongoid
       # @since 3.0.0
       def initialize(criteria)
         @criteria, @klass, @cache = criteria, criteria.klass, criteria.options[:cache]
+        @collection = klass.collection
         add_type_selection
-        @query = klass.collection.find(criteria.selector)
+        @query = collection.find(criteria.selector)
         apply_options
       end
 
@@ -269,7 +271,7 @@ module Mongoid
       #
       # @since 3.0.0
       def map_reduce(map, reduce)
-        MapReduce.new(criteria, map, reduce)
+        MapReduce.new(collection, criteria, map, reduce)
       end
 
       # Skips the provided number of documents.
@@ -536,7 +538,7 @@ module Mongoid
       # @since 3.0.0
       def eager_loaded_ids(docs, metadata)
         if metadata.stores_foreign_key?
-          load_ids(metadata.foreign_key).flatten
+          docs.flat_map{ |doc| doc.send(metadata.foreign_key) }
         else
           docs.map(&:id)
         end
@@ -582,23 +584,6 @@ module Mongoid
         @length = 0
       end
 
-      # Loads an array of ids only for the current criteria. Used by eager
-      # loading to determine the documents to load.
-      #
-      # @example Load the related ids.
-      #   criteria.load_ids("person_id")
-      #
-      # @param [ String ] key The id or foriegn key string.
-      #
-      # @return [ Array<String, Moped::BSON::ObjectId> ] The ids to load.
-      #
-      # @since 3.0.0
-      def load_ids(key)
-        query.select(key => 1).map do |doc|
-          doc[key]
-        end
-      end
-
       # Apply all the optional criterion.
       #
       # @example Apply the options.

data/lib/mongoid/criteria.rb

@@ -360,8 +360,9 @@ module Mongoid
     #
     # @since 2.2.0
     def includes(*relations)
-      relations.each do |name|
+      relations.flatten.each do |name|
         metadata = klass.reflect_on_association(name)
+        raise Errors::InvalidIncludes.new(klass, relations) unless metadata
         inclusions.push(metadata) unless inclusions.include?(metadata)
       end
       clone

data/lib/mongoid/errors.rb

@@ -10,6 +10,7 @@ require "mongoid/errors/invalid_database"
 require "mongoid/errors/invalid_field"
 require "mongoid/errors/invalid_field_option"
 require "mongoid/errors/invalid_find"
+require "mongoid/errors/invalid_includes"
 require "mongoid/errors/invalid_index"
 require "mongoid/errors/invalid_options"
 require "mongoid/errors/invalid_scope"

data/lib/mongoid/errors/invalid_includes.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # This error is raised when an invalid value is passed to an eager
+    # loading query.
+    class InvalidIncludes < MongoidError
+
+      # Initialize the error.
+      #
+      # @example Initialize the error.
+      #   InvalidIncludes.new(Band, [ :members ])
+      #
+      # @param [ Class ] klass The model class.
+      # @param [ Array<Object> ] args The arguments passed to the includes.
+      #
+      # @since 3.0.2
+      def initialize(klass, args)
+        super(
+          compose_message(
+            "invalid_includes",
+            {
+              klass: klass.name,
+              args: args.map(&:inspect).join(", "),
+              relations: klass.relations.keys.map(&:inspect).join(", ")
+            }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/validations.rb

@@ -8,7 +8,12 @@ module Mongoid
     # @example Create the error.
     #   Validations.new(person.errors)
     class Validations < MongoidError
+      attr_reader :document
+      alias :record :document
+
       def initialize(document)
+        @document = document
+
         super(
           compose_message(
             "validations",

data/lib/mongoid/extensions/hash.rb

@@ -47,6 +47,18 @@ module Mongoid
         consolidated
       end
 
+      # Deletes an id value from the hash.
+      #
+      # @example Delete an id value.
+      #   {}.delete_id
+      #
+      # @return [ Object ] The deleted value, or nil.
+      #
+      # @since 3.0.2
+      def delete_id
+        delete("_id") || delete("id") || delete(:id) || delete(:_id)
+      end
+
       # Get the id attribute from this hash, whether it's prefixed with an
       # underscore or is a symbol.
       #

data/lib/mongoid/fields/foreign_key.rb

@@ -100,6 +100,18 @@ module Mongoid
           metadata.polymorphic? ? true : metadata.klass.using_object_ids?
       end
 
+      # Returns true if an array, false if not.
+      #
+      # @example Is the field resizable?
+      #   field.resizable?
+      #
+      # @return [ true, false ] If the field is resizable.
+      #
+      # @since 3.0.2
+      def resizable?
+        type.resizable?
+      end
+
       private
 
       # Evaluate the default proc. In some cases we need to instance exec,

data/lib/mongoid/persistence/atomic.rb

@@ -72,7 +72,7 @@ module Mongoid
       #   person.inc(:score, 2)
       #
       # @param [ Symbol ] field The name of the field.
-      # @param [ Integer ] value The value to increment.
+      # @param [ Numeric ] value The value to increment.
       # @param [ Hash ] options The mongo persistence options.
       #
       # @return [ Array<Object> ] The new value of the field.

data/lib/mongoid/persistence/atomic/inc.rb

@@ -12,11 +12,12 @@ module Mongoid
         # @example Persist the new values.
         #   inc.persist
         #
-        # @return [ Object ] The new integer value.
+        # @return [ Object ] The new numeric value.
         #
         # @since 2.0.0
         def persist
           prepare do
+            self.value = value.to_f
             current = document[field] || 0
             document[field] = current + value
             execute("$inc")

data/lib/mongoid/persistence/insertion.rb

@@ -29,6 +29,7 @@ module Mongoid
           end
           document.post_persist unless result == false
         end
+        document.errors.clear unless validating?
         document
       end
     end

data/lib/mongoid/persistence/modification.rb

@@ -26,6 +26,7 @@ module Mongoid
           end
         end
         document.post_persist unless result == false
+        document.errors.clear unless validating?
         result
       end
     end

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

@@ -99,6 +99,7 @@ module Mongoid
                 existing.delete(doc)
                 doc.destroy unless doc.embedded?
               else
+                attrs.delete_id
                 metadata.embedded? ? doc.attributes = attrs : doc.update_attributes(attrs)
               end
             else

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

@@ -25,6 +25,7 @@ module Mongoid
             return if reject?(parent, attributes)
             @existing = parent.send(metadata.name)
             if update?
+              attributes.delete_id
               existing.attributes = attributes
             elsif replace?
               parent.send(metadata.setter, Factory.build(metadata.klass, attributes))

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

@@ -19,6 +19,7 @@ module Mongoid
           init(base, target, metadata) do
             characterize_one(target)
             bind_one
+            characterize_one(target)
             target.save if persistable?
           end
         end
@@ -38,12 +39,14 @@ module Mongoid
           if _assigning?
             base.add_atomic_unset(target)
           else
-            destroy if persistable?
+            target.destroy if persistable?
           end
           unbind_one
           return nil unless replacement
           self.target = replacement
           bind_one
+          characterize_one(target)
+          target.save if persistable? && !_assigning?
           self
         end
 

data/lib/mongoid/sessions.rb

@@ -151,7 +151,7 @@ module Mongoid
       def collection
         if opts = persistence_options
           coll = mongo_session.with(opts)[opts[:collection] || collection_name]
-          clear_persistence_options
+          clear_persistence_options unless validating_with_query?
           coll
         else
           mongo_session[collection_name]

data/lib/mongoid/validations.rb

@@ -3,6 +3,7 @@ require "mongoid/validations/localizable"
 require "mongoid/validations/associated"
 require "mongoid/validations/format"
 require "mongoid/validations/length"
+require "mongoid/validations/queryable"
 require "mongoid/validations/presence"
 require "mongoid/validations/uniqueness"
 
@@ -89,6 +90,18 @@ module Mongoid
       Threaded.validated?(self)
     end
 
+    # Are we currently performing a validation that has a query?
+    #
+    # @example Are we validating with a query?
+    #   document.validating_with_query?
+    #
+    # @return [ true, false ] If we are validating with a query.
+    #
+    # @since 3.0.2
+    def validating_with_query?
+      self.class.validating_with_query?
+    end
+
     module ClassMethods
 
       # Validates whether or not an association is valid or not. Will correctly
@@ -194,13 +207,15 @@ module Mongoid
         if args.first == PresenceValidator
           args.last[:attributes].each do |name|
             metadata = relations[name.to_s]
-            autosave(metadata.merge!(autosave: true)) if metadata
+            if metadata && metadata[:autosave] != false
+              autosave(metadata.merge!(autosave: true))
+            end
           end
         end
         super
       end
 
-      protected
+      private
 
       # Adds an associated validator for the relation if the validate option
       # was not provided or set to true.
@@ -216,6 +231,18 @@ module Mongoid
           validates_associated(metadata.name)
         end
       end
+
+      # Are we currently performing a validation that has a query?
+      #
+      # @example Are we validating with a query?
+      #   Model.validating_with_query?
+      #
+      # @return [ true, false ] If we are validating with a query.
+      #
+      # @since 3.0.2
+      def validating_with_query?
+        Threaded.executing?("#{name}-validate-with-query")
+      end
     end
   end
 end

data/lib/mongoid/validations/queryable.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+module Mongoid
+  module Validations
+    module Queryable
+
+      # Wrap the validation inside the an execution block that alert's the
+      # session not to clear it's persistence options.
+      #
+      # @example Execute the validation with a query.
+      #   with_query(document) do
+      #     #...
+      #   end
+      #
+      # @param [ Document ] document The document being validated.
+      #
+      # @return [ Object ] The result of the yield.
+      #
+      # @since 3.0.2
+      def with_query(document)
+        begin
+          Threaded.begin("#{klass.name}-validate-with-query")
+          yield
+        ensure
+          klass.clear_persistence_options unless document.errors.empty?
+          Threaded.exit("#{klass.name}-validate-with-query")
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/validations/uniqueness.rb

@@ -14,6 +14,8 @@ module Mongoid
     #     validates_uniqueness_of :title
     #   end
     class UniquenessValidator < ActiveModel::EachValidator
+      include Queryable
+
       attr_reader :klass
 
       # Unfortunately, we have to tie Uniqueness validators to a class.
@@ -41,12 +43,14 @@ module Mongoid
       #
       # @since 1.0.0
       def validate_each(document, attribute, value)
-        attrib, val = to_validate(document, attribute, value)
-        return unless validation_required?(document, attrib)
-        if document.embedded?
-          validate_embedded(document, attrib, val)
-        else
-          validate_root(document, attrib, val)
+        with_query(document) do
+          attrib, val = to_validate(document, attribute, value)
+          return unless validation_required?(document, attrib)
+          if document.embedded?
+            validate_embedded(document, attrib, val)
+          else
+            validate_root(document, attrib, val)
+          end
         end
       end
 

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,7 @@ files:
 - lib/mongoid/errors/invalid_field.rb
 - lib/mongoid/errors/invalid_field_option.rb
 - lib/mongoid/errors/invalid_find.rb
+- lib/mongoid/errors/invalid_includes.rb
 - lib/mongoid/errors/invalid_index.rb
 - lib/mongoid/errors/invalid_options.rb
 - lib/mongoid/errors/invalid_scope.rb
@@ -319,6 +320,7 @@ files:
 - lib/mongoid/validations/length.rb
 - lib/mongoid/validations/localizable.rb
 - lib/mongoid/validations/presence.rb
+- lib/mongoid/validations/queryable.rb
 - lib/mongoid/validations/uniqueness.rb
 - lib/mongoid/validations.rb
 - lib/mongoid/version.rb
@@ -352,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 842230721201432915
+      hash: -2401816609188543871
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: