mongoid 2.4.9 → 2.4.10

data/CHANGELOG.md

@@ -3,10 +3,37 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 2.4.10 (branch: 2.4.0-stable)
+## 2.4.11 (branch: 2.4.0-stable)
 
 ### Resolved Issues
 
+## 2.4.10
+
+### Resolved Issues
+
+* \#2003 Don't fail on document generation when an embedded document was
+  stored as nil in the database.
+
+* \#1997 Don't delete paranoid embedded docs via nested attributes when
+  a before_destroy callback returns false.
+
+* \#1994 `dependent: :delete` only hits the database once now for one to
+  many and many to many relations instead of once for each document.
+
+* \#1987 Don't double-insert documents into identity map when eager loading
+  twice inside the unit of work.
+
+* \#1976 Don't execute eager load queries when base query is empty.
+
+* \#1953 Uniqueness validation now works on localized fields.
+
+* \#1936 Allow setting n levels deep embedded documents atomically without
+  conflicting mods when not using nested attributes or documents themselves
+  in an update call from the parent.
+
+* \#1957/\#1954 Ensure database name is set with inheritance.
+  (Hans Hasselberg)
+
 ## 2.4.9
 
 ### Resolved Issues

data/lib/mongoid/atomic.rb

@@ -252,6 +252,9 @@ module Mongoid #:nodoc:
     # @example Get the atomic paths.
     #   document.atomic_paths
     #
+    # @todo: Durran: Should probably raise error for embedded docs w/o
+    #   metadata.
+    #
     # @return [ Object ] The associated path.
     #
     # @since 2.1.0

data/lib/mongoid/contexts/mongo.rb

@@ -144,13 +144,15 @@ module Mongoid #:nodoc:
       #
       # @since 2.4.1
       def eager_load(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)
+          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

data/lib/mongoid/factory.rb

@@ -15,7 +15,7 @@ module Mongoid #:nodoc:
     # @param [ Hash ] optiosn The mass assignment scoping options.
     #
     # @return [ Document ] The instantiated document.
-    def build(klass, attributes = {}, options = {})
+    def build(klass, attributes = nil, options = {})
       type = (attributes || {})["_type"]
       if type && klass._types.include?(type)
         type.constantize.new(attributes, options)
@@ -34,8 +34,8 @@ module Mongoid #:nodoc:
     # @param [ Hash ] attributes The document attributes.
     #
     # @return [ Document ] The instantiated document.
-    def from_db(klass, attributes = {})
-      type = attributes["_type"]
+    def from_db(klass, attributes = nil)
+      type = (attributes || {})["_type"]
       if type.blank?
         klass.instantiate(attributes)
       else

data/lib/mongoid/identity_map.rb

@@ -4,6 +4,21 @@ module Mongoid #:nodoc:
   # Defines behaviour for the identity map in Mongoid.
   class IdentityMap < Hash
 
+    # Clear the many documents.
+    #
+    # @example Clear the docs.
+    #   identity_map.clear_many(Post, selector)
+    #
+    # @param [ Class ] klass The klass to clear.
+    # @param [ Hash ] selector The selector to identify it.
+    #
+    # @return [ Array<Document> ] The documents.
+    #
+    # @since 2.4.10
+    def clear_many(klass, selector)
+      (documents_for(klass)[selector] ||= []).clear
+    end
+
     # Get a document from the identity map by its id.
     #
     # @example Get the document from the map.

data/lib/mongoid/multi_database.rb

@@ -26,6 +26,11 @@ module Mongoid #:nodoc:
       def set_database(name)
         @database = name.to_s
       end
+
+      def inherited(subclass)
+        super
+        subclass.set_database(database.dup) if database
+      end
     end
   end
 end

data/lib/mongoid/relations/cascading/delete.rb

@@ -27,8 +27,18 @@ module Mongoid # :nodoc:
         #
         # @example Perform the cascading delete.
         #   strategy.cascade
+        #
+        # @since 2.0.0
         def cascade
-          Array.wrap(relation).each { |doc| doc.delete } if relation
+          if relation
+            if relation.cascades.empty?
+              safety = Threaded.safety_options
+              relation.clear
+              Threaded.safety_options = safety
+            else
+              ::Array.wrap(relation).each { |doc| doc.delete }
+            end
+          end
         end
       end
     end

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

@@ -189,8 +189,12 @@ module Mongoid # :nodoc:
           target.delete_one(document).tap do |doc|
             _unscoped.delete_one(doc)
             if doc && !_binding?
-              if _assigning? && !doc.paranoid?
-                base.add_atomic_pull(doc)
+              if _assigning?
+                if doc.paranoid?
+                  doc.destroy(:suppress => true)
+                else
+                  base.add_atomic_pull(doc)
+                end
               else
                 doc.delete(:suppress => true)
               end
@@ -307,7 +311,11 @@ module Mongoid # :nodoc:
               atomically(:$set) do
                 base.delayed_atomic_sets.clear
                 if replacement.first.is_a?(Hash)
-                  replacement = Many.builder(base, metadata, replacement).build
+                  replacement = replacement.map do |doc|
+                    attributes = { :metadata => metadata, :_parent => base }
+                    attributes.merge!(doc)
+                    Factory.build(klass, attributes)
+                  end
                 end
                 docs = replacement.compact
                 proxy.target = docs
@@ -319,6 +327,10 @@ module Mongoid # :nodoc:
                 end
                 if _assigning?
                   name = _unscoped.first.atomic_path
+                  base._children.each do |child|
+                    child.delayed_atomic_sets.clear
+                  end
+                  base.instance_variable_set(:@_children, nil)
                   base.delayed_atomic_sets[name] = proxy.as_document
                 end
               end

data/lib/mongoid/relations/one.rb

@@ -6,6 +6,18 @@ module Mongoid # :nodoc:
     # behaviour or those proxies.
     class One < Proxy
 
+      # Clear this relation - same as calling #delete on the document.
+      #
+      # @example Clear the relation.
+      #   relation.clear
+      #
+      # @return [ true, false ] If the delete suceeded.
+      #
+      # @since 3.0.0
+      def clear
+        target.delete
+      end
+
       # Get all the documents in the relation that are loaded into memory.
       #
       # @example Get the in memory documents.

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

@@ -563,9 +563,15 @@ module Mongoid #:nodoc:
           #
           # @since 2.2.0
           def eager_load(metadata, ids)
+            cleared = false
             klass, foreign_key = metadata.klass, metadata.foreign_key
             klass.any_in(foreign_key => ids).each do |doc|
-              IdentityMap.set_many(doc, foreign_key => doc.send(foreign_key))
+              base_id = doc.send(foreign_key)
+              unless cleared
+                IdentityMap.clear_many(klass, foreign_key => base_id)
+                cleared = true
+              end
+              IdentityMap.set_many(doc, foreign_key => base_id)
             end
           end
 

data/lib/mongoid/validations.rb

@@ -141,6 +141,40 @@ module Mongoid #:nodoc:
         validates_with(UniquenessValidator, _merge_attributes(args))
       end
 
+      # Validates the format of a field.
+      #
+      # @example
+      #   class Person
+      #     include Mongoid::Document
+      #     field :title
+      #
+      #     validates_format_of :title, with: /^[a-z0-9 \-_]*$/i
+      #   end
+      #
+      # @param [ Array ] args The names of the fields to validate.
+      #
+      # @since 2.4.0
+      def validates_format_of(*args)
+        validates_with(Mongoid::Validations::FormatValidator, _merge_attributes(args))
+      end
+
+      # Validates the length of a field.
+      #
+      # @example
+      #   class Person
+      #     include Mongoid::Document
+      #     field :title
+      #
+      #     validates_length_of :title, minimum: 100
+      #   end
+      #
+      # @param [ Array ] args The names of the fields to validate.
+      #
+      # @since 2.4.0
+      def validates_length_of(*args)
+        validates_with(Mongoid::Validations::LengthValidator, _merge_attributes(args))
+      end
+
       # Validates whether or not a field is present - meaning nil or empty.
       #
       # @example

data/lib/mongoid/validations/uniqueness.rb

@@ -44,32 +44,36 @@ module Mongoid #:nodoc:
         attrib, val = to_validate(document, attribute, value)
         return unless validation_required?(document, attrib)
         if document.embedded?
-          return if skip_validation?(document)
-          relation = document._parent.send(document.metadata.name)
-          criteria = relation.where(criterion(document, attrib, val))
-          criteria = scope(criteria, document, attrib)
-          if criteria.count > 1
-            document.errors.add(
-              attrib,
-              :taken,
-              options.except(:case_sensitive, :scope).merge(:val => val)
-            )
-          end
+          validate_embedded(document, attrib, val)
         else
-          criteria = klass.unscoped.where(criterion(document, attrib, val))
-          criteria = scope(criteria, document, attrib)
-          if criteria.exists?
-            document.errors.add(
-              attrib, :taken, options.except(:case_sensitive, :scope).merge(:val => val)
-            )
-          end
+          validate_root(document, attrib, val)
         end
       end
 
-      protected
+      private
+
+      # Add the error to the document.
+      #
+      # @api private
+      #
+      # @example Add the error.
+      #   validator.add_error(doc, :name, "test")
+      #
+      # @param [ Document ] document The document to validate.
+      # @param [ Symbol ] attribute The name of the attribute.
+      # @param [ Object ] value The value of the object.
+      #
+      # @since 2.4.10
+      def add_error(document, attribute, value)
+        document.errors.add(
+          attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value)
+        )
+      end
 
       # Should the uniqueness validation be case sensitive?
       #
+      # @api private
+      #
       # @example Is the validation case sensitive?
       #   validator.case_sensitive?
       #
@@ -80,8 +84,38 @@ module Mongoid #:nodoc:
         !(options[:case_sensitive] == false)
       end
 
+      # Create the validation criteria.
+      #
+      # @api private
+      #
+      # @example Create the criteria.
+      #   validator.create_criteria(User, user, :name, "syd")
+      #
+      # @param [ Class, Proxy ] base The base to execute the criteria from.
+      # @param [ Document ] document The document to validate.
+      # @param [ Symbol ] attribute The name of the attribute.
+      # @param [ Object ] value The value of the object.
+      #
+      # @return [ Criteria ] The criteria.
+      #
+      # @since 2.4.10
+      def create_criteria(base, document, attribute, value)
+        field = document.fields[attribute.to_s]
+        criteria = base.unscoped
+        if field.try(:localized?)
+          criterion(document, attribute, value).each_pair do |key, value|
+            criteria.selector.store(key, value)
+          end
+        else
+          criteria = criteria.where(criterion(document, attribute, value))
+        end
+        scope(criteria, document, attribute)
+      end
+
       # Get the default criteria for checking uniqueness.
       #
+      # @api private
+      #
       # @example Get the criteria.
       #   validator.criterion(person, :title, "Sir")
       #
@@ -102,6 +136,8 @@ module Mongoid #:nodoc:
 
       # Filter the value based on whether the check is case sensitive or not.
       #
+      # @api private
+      #
       # @example Filter the value.
       #   validator.filter("testing")
       #
@@ -116,6 +152,8 @@ module Mongoid #:nodoc:
 
       # Scope the criteria to the scope options provided.
       #
+      # @api private
+      #
       # @example Scope the criteria.
       #   validator.scope(criteria, document)
       #
@@ -134,6 +172,8 @@ module Mongoid #:nodoc:
 
       # Should validation be skipped?
       #
+      # @api private
+      #
       # @example Should the validation be skipped?
       #   validator.skip_validation?(doc)
       #
@@ -148,6 +188,8 @@ module Mongoid #:nodoc:
 
       # Scope reference has changed?
       #
+      # @api private
+      #
       # @example Has scope reference changed?
       #   validator.scope_value_changed?(doc)
       #
@@ -167,6 +209,8 @@ module Mongoid #:nodoc:
       # we need to send the key name and value to the db, not the relation
       # object.
       #
+      # @api private
+      #
       # @example Get the name and key to validate.
       #   validator.to_validate(doc, :parent, Parent.new)
       #
@@ -186,6 +230,42 @@ module Mongoid #:nodoc:
         end
       end
 
+      # Validate an embedded document.
+      #
+      # @api private
+      #
+      # @example Validate the embedded document.
+      #   validator.validate_embedded(doc, :name, "test")
+      #
+      # @param [ Document ] document The document.
+      # @param [ Symbol ] attribute The attribute name.
+      # @param [ Object ] value The value.
+      #
+      # @since 2.4.10
+      def validate_embedded(document, attribute, value)
+        return if skip_validation?(document)
+        relation = document._parent.send(document.metadata.name)
+        criteria = create_criteria(relation, document, attribute, value)
+        add_error(document, attribute, value) if criteria.count > 1
+      end
+
+      # Validate a root document.
+      #
+      # @api private
+      #
+      # @example Validate the root document.
+      #   validator.validate_root(doc, :name, "test")
+      #
+      # @param [ Document ] document The document.
+      # @param [ Symbol ] attribute The attribute name.
+      # @param [ Object ] value The value.
+      #
+      # @since 2.4.10
+      def validate_root(document, attribute, value)
+        criteria = create_criteria(klass, document, attribute, value)
+        add_error(document, attribute, value) if criteria.exists?
+      end
+
       # Are we required to validate the document?
       #
       # @example Is validation needed?

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.4.9"
+  VERSION = "2.4.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.9
+  version: 2.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -461,7 +461,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3721994237204070315
+      hash: 2758014138080710719
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -470,7 +470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Elegant Persistance in Ruby for MongoDB.